Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 07:10:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Moved "privacy_image_cache" into the core. Enabled by default, can be disabled in the page settings.

Browse source
This commit is contained in:
Michael Vogel 2014-08-13 00:13:13 +02:00
parent 731d944ab5
commit d4b2d3bf8a
14 changed files with 367 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

23
include/api.php
View file

@ -1641,21 +1641,16 @@
$a = get_app();
$result = q("SELECT `installed` FROM `addon` WHERE `name` = 'privacy_image_cache' AND `installed`");
$image_cache = (count($result) > 0);
$include_entities = strtolower(x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:"false");
if ($include_entities != "true") {
if ($image_cache) {
require_once("addon/privacy_image_cache/privacy_image_cache.php");
require_once("mod/proxy.php");
preg_match_all("/\[img](.*?)\[\/img\]/ism", $bbcode, $images);
preg_match_all("/\[img](.*?)\[\/img\]/ism", $bbcode, $images);
foreach ($images[1] AS $image) {
$replace = $a->get_baseurl()."/privacy_image_cache/".privacy_image_cache_cachename($image);
$text = str_replace($image, $replace, $text);
}
foreach ($images[1] AS $image) {
$replace = proxy_url($image);
$text = str_replace($image, $replace, $text);
}
return array();
}
@ -1750,11 +1745,11 @@
require_once("include/Photo.php");
$image = get_photo_info($url);
if ($image) {
// If privacy_image_cache is activated, then use the following sizes:
// If 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);
if (!get_config("system", "proxy_disabled")) {
require_once("mod/proxy.php");
$media_url = proxy_url($url);
$sizes = array();
$scale = scale_image($image[0], $image[1], 150);