keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

convert feed attach to bbcode

Browse source
This commit is contained in:
Friendika 2011-04-13 01:53:40 -07:00
parent 84b2d5a25b
commit 3c4e501435
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/items.php
View file

@ -477,10 +477,12 @@ function get_atom_elements($feed,$item) {
if($attach) { if($attach) {
$att_arr = array(); $att_arr = array();
foreach($attach as $att) { foreach($attach as $att) {
$len = intval($att->get_length()); $len = intval($att->get_length());
$link = str_replace(',','%2D', notags(trim($att->get_link()))); $link = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att->get_link()))));
$title = str_replace(',','%2D',notags(trim($att->get_title()))); $title = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att->get_title()))));
$type = notags(trim($att->get_type())); $type = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att->get_type()))));
if(strpos($type,';'))
$type = substr($type,0,strpos($type,';'));
if((! $link) || (strpos($link,'http') !== 0)) if((! $link) || (strpos($link,'http') !== 0))
continue; continue;
@ -489,9 +491,7 @@ function get_atom_elements($feed,$item) {
if(! $type) if(! $type)
$type = 'application/octet-stream'; $type = 'application/octet-stream';
// this isn't legal html - there is no size in an 'a' tag, remember to strip it before display $att_arr[] = '[attach]href="' . $link . '" size="' . $len . '" type="' . $type . '" title="' . $title . '"[/attach]';
$att_arr[] = '<a href="' . $link . '" size="' . $len . '" type="' . $type . '">' . $title . '</a>';
} }
$res['attach'] = implode(',', $att_arr); $res['attach'] = implode(',', $att_arr);
} }
@ -1588,13 +1588,13 @@ function item_getfeedattach($item) {
if(count($arr)) { if(count($arr)) {
foreach($arr as $r) { foreach($arr as $r) {
$matches = false; $matches = false;
$cnt = preg_match('|\<a href=\"(.+?)\" size=\"(.+?)\" type=\"(.+?)\" >(.+?)</a>|',$r,$matches); $cnt = preg_match('|\[attach\]href=\"(.+?)\" size=\"(.+?)\" type=\"(.+?)\" title=\"(.+?)\"\[\/attach\]|',$r,$matches);
if($cnt) { if($cnt) {
$ret .= '<link rel="enclosure" href="' . xmlify($matches[1]) . '" type="' . xmlify($matches[3]) . '" '; $ret .= '<link rel="enclosure" href="' . xmlify($matches[1]) . '" type="' . xmlify($matches[3]) . '" ';
if(intval($matches[2])) if(intval($matches[2]))
$ret .= 'size="' . intval($matches[2]) . '" '; $ret .= 'size="' . intval($matches[2]) . '" ';
if($matches[4] !== ' ') if($matches[4] !== ' ')
$ret .= 'title="' . xmlify($matches[4]) . '" '; $ret .= 'title="' . xmlify(trim($matches[4])) . '" ';
$ret .= ' />' . "\r\n"; $ret .= ' />' . "\r\n";
} }
} }