friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

better handling of remote urls - especially FB opengraph

Browse source
This commit is contained in:
Friendika 2011-10-28 02:50:00 -07:00
commit e5992003e8
3 changed files with 82 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/bb2diaspora.php
View file

@ -22,7 +22,7 @@ function diaspora2bb($s) {
}
function scale_diaspora_images($s) {
function scale_diaspora_images($s,$include_link = true) {
$matches = null;
$c = preg_match_all('/\[img\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER);
@ -38,7 +38,9 @@ function scale_diaspora_images($s) {
$new_width = $ph->getWidth();
$new_height = $ph->getHeight();
$s = str_replace($mtch[0],'[img=' . $new_width . 'x' . $new_height. ']' . $mtch[1] . '[/img]'
. "\n" . '[url=' . $mtch[1] . ']' . t('view full size') . '[/url]' . "\n",$s);
. "\n" . ((! $include_link)
? '[url=' . $mtch[1] . ']' . t('view full size') . '[/url]' . "\n"
: ''),$s);
}
}
}

10
include/diaspora.php
View file

@ -635,12 +635,18 @@ function diaspora_reshare($importer,$xml) {
$x = str_replace(array('<activity_streams-photo>','</activity_streams-photo>'),array('<asphoto>','</asphoto>'),$x);
$source_xml = parse_xml_string($x,false);
if(strlen($source_xml->post->asphoto->objectId) && ($source_xml->post->asphoto->objectId != 0) && ($source_xml->post->asphoto->image_url))
if(strlen($source_xml->post->asphoto->objectId) && ($source_xml->post->asphoto->objectId != 0) && ($source_xml->post->asphoto->image_url)) {
$body = '[url=' . notags(unxmlify($source_xml->post->asphoto->image_url)) . '][img]' . notags(unxmlify($source_xml->post->asphoto->objectId)) . '[/img][/url]' . "\n";
elseif($source_xml->post->asphoto->image_url)
$body = scale_diaspora_images($body,false);
}
elseif($source_xml->post->asphoto->image_url) {
$body = '[img]' . notags(unxmlify($source_xml->post->asphoto->image_url)) . '[/img]' . "\n";
$body = scale_diaspora_images($body);
}
elseif($source_xml->post->status_message) {
$body = diaspora2bb($source_xml->post->status_message->raw_message);
$body = scale_diaspora_images($body);
}
else {
logger('diaspora_reshare: no reshare content found: ' . print_r($source_xml,true));