nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

API: Support of privacy_image_cache - if enabled

Browse source
This commit is contained in:
Michael Vogel 2014-06-16 21:49:45 +02:00
parent 8bce8b0bd2
commit a1dbfdee65
2 changed files with 540 additions and 461 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

953
include/Photo.php
View file

File diff suppressed because it is too large Load diff

48
include/api.php
View file

@ -710,6 +710,8 @@
if($parent) if($parent)
$_REQUEST['type'] = 'net-comment'; $_REQUEST['type'] = 'net-comment';
else { else {
// logger("api_statuses_update: upload ".print_r($_FILES, true)." ".print_r($_POST, true)." ".print_r($_GET, true), LOGGER_DEBUG);
//die("blubb");
$_REQUEST['type'] = 'wall'; $_REQUEST['type'] = 'wall';
if(x($_FILES,'media')) { if(x($_FILES,'media')) {
// upload the image if we have one // upload the image if we have one
@ -1630,6 +1632,8 @@
if ($include_entities != "true") if ($include_entities != "true")
return array(); return array();
$a = get_app();
$bbcode = bb_CleanPictureLinks($bbcode); $bbcode = bb_CleanPictureLinks($bbcode);
// Change pure links in text to bbcode uris // Change pure links in text to bbcode uris
@ -1708,6 +1712,9 @@
//$entities["media"] = array(); //$entities["media"] = array();
$offset = 0; $offset = 0;
$result = q("SELECT `installed` FROM `addon` WHERE `name` = 'privacy_image_cache' AND `installed`");
$image_cache = (count($result) > 0);
foreach ($ordered_images AS $url) { foreach ($ordered_images AS $url) {
$display_url = str_replace(array("http://www.", "https://www."), array("", ""), $url); $display_url = str_replace(array("http://www.", "https://www."), array("", ""), $url);
$display_url = str_replace(array("http://", "https://"), array("", ""), $display_url); $display_url = str_replace(array("http://", "https://"), array("", ""), $display_url);
@ -1717,24 +1724,47 @@
$start = iconv_strpos($text, $url, $offset, "UTF-8"); $start = iconv_strpos($text, $url, $offset, "UTF-8");
if (!($start === false)) { if (!($start === false)) {
$redirects = 0; require_once("include/Photo.php");
$img_str = fetch_url($url,true, $redirects, 10); $image = get_photo_info($url);
$image = @imagecreatefromstring($img_str);
if ($image) { if ($image) {
// If privacy_image_cache is activated, then use the following sizes:
// thumb (150), small (340), medium (600) and large (1024)
if ($image_cache) {
require_once("addon/privacy_image_cache/privacy_image_cache.php");
$media_url = $a->get_baseurl()."/privacy_image_cache/".privacy_image_cache_cachename($url);
$sizes = array();
$scale = scale_image($image[0], $image[1], 150);
$sizes["thumb"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
if (($image[0] > 150) OR ($image[1] > 150)) {
$scale = scale_image($image[0], $image[1], 340);
$sizes["small"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
}
$scale = scale_image($image[0], $image[1], 600);
$sizes["medium"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
if (($image[0] > 600) OR ($image[1] > 600)) {
$scale = scale_image($image[0], $image[1], 1024);
$sizes["large"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
}
} else {
$media_url = $url;
$sizes["medium"] = array("w" => $image[0], "h" => $image[1], "resize" => "fit");
}
$entities["media"][] = array( $entities["media"][] = array(
"id" => $start+1, "id" => $start+1,
"id_str" => (string)$start+1, "id_str" => (string)$start+1,
"indices" => array($start, $start+strlen($url)), "indices" => array($start, $start+strlen($url)),
"media_url" => $url, "media_url" => normalise_link($media_url),
"media_url_https" => $url, "media_url_https" => $media_url,
"url" => $url, "url" => $url,
"display_url" => $display_url, "display_url" => $display_url,
"expanded_url" => $url, "expanded_url" => $url,
"type" => "photo", "type" => "photo",
"sizes" => array("medium" => array( "sizes" => $sizes);
"w" => imagesx($image),
"h" => imagesy($image),
"resize" => "fit")));
} }
$offset = $start + 1; $offset = $start + 1;
} }