harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make manual image scaling work - even if auto scaling kicks in.

Browse Source
This commit is contained in:
friendica 2013-06-23 23:13:07 -07:00
parent d093981d68
commit 5e235fba78
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/network.php
View File

@ -1049,15 +1049,21 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
$s = htmlspecialchars_decode($s); $s = htmlspecialchars_decode($s);
$matches = null; $matches = null;
$c = preg_match_all('/\[img.*?\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER); $c = preg_match_all('/\[img(.*?)\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER);
if($c) { if($c) {
require_once('include/photo/photo_driver.php'); require_once('include/photo/photo_driver.php');
foreach($matches as $mtch) { foreach($matches as $mtch) {
logger('scale_external_image: ' . $mtch[1]); logger('scale_external_image: ' . $mtch[1] . ' ' . $mtch[2]);
if(substr($mtch[1],0,1) == '=') {
$owidth = intval(substr($mtch[1],1));
if(intval($owidth) > 0 && intval($owidth) < 640)
continue;
}
$hostname = str_replace('www.','',substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3)); $hostname = str_replace('www.','',substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3));
if(stristr($mtch[1],$hostname)) if(stristr($mtch[2],$hostname))
continue; continue;
// $scale_replace, if passed, is an array of two elements. The // $scale_replace, if passed, is an array of two elements. The
@ -1066,9 +1072,9 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
// This allows Friendica to display the smaller remote image if // This allows Friendica to display the smaller remote image if
// one exists, while still linking to the full-size image // one exists, while still linking to the full-size image
if($scale_replace) if($scale_replace)
$scaled = str_replace($scale_replace[0], $scale_replace[1], $mtch[1]); $scaled = str_replace($scale_replace[0], $scale_replace[1], $mtch[2]);
else else
$scaled = $mtch[1]; $scaled = $mtch[2];
$i = fetch_url($scaled); $i = fetch_url($scaled);
$cache = get_config('system','itemcache'); $cache = get_config('system','itemcache');
@ -1078,7 +1084,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
} }
// guess mimetype from headers or filename // guess mimetype from headers or filename
$type = guess_image_type($mtch[1],true); $type = guess_image_type($mtch[2],true);
if($i) { if($i) {
$ph = photo_factory($i, $type); $ph = photo_factory($i, $type);
@ -1094,7 +1100,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
logger('scale_external_images: ' . $orig_width . '->' . $new_width . 'w ' . $orig_height . '->' . $new_height . 'h' . ' match: ' . $mtch[0], LOGGER_DEBUG); logger('scale_external_images: ' . $orig_width . '->' . $new_width . 'w ' . $orig_height . '->' . $new_height . 'h' . ' match: ' . $mtch[0], LOGGER_DEBUG);
$s = str_replace($mtch[0],'[img=' . $new_width . 'x' . $new_height. ']' . $scaled . '[/img]' $s = str_replace($mtch[0],'[img=' . $new_width . 'x' . $new_height. ']' . $scaled . '[/img]'
. "\n" . (($include_link) . "\n" . (($include_link)
? '[zrl=' . $mtch[1] . ']' . t('view full size') . '[/zrl]' . "\n" ? '[zrl=' . $mtch[2] . ']' . t('view full size') . '[/zrl]' . "\n"
: ''),$s); : ''),$s);
logger('scale_external_images: new string: ' . $s, LOGGER_DEBUG); logger('scale_external_images: new string: ' . $s, LOGGER_DEBUG);
} }

2
include/zot.php
View File

@ -1040,7 +1040,7 @@ function process_delivery($sender,$arr,$deliveries,$relay) {
continue; continue;
} }
// for events, extract the event info and create and event linked to an item // for events, extract the event info and create an event linked to an item
if((x($arr,'obj_type')) && (activity_match($arr['obj_type'],ACTIVITY_OBJ_EVENT))) { if((x($arr,'obj_type')) && (activity_match($arr['obj_type'],ACTIVITY_OBJ_EVENT))) {
require_once('include/event.php'); require_once('include/event.php');