X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fproxy.php;h=8b5f0834f297dab95905dbf939c74b8e887bb619;hb=09667dd82bbb9bb23a4ad8d86c1e9f3146665aa5;hp=9311e55a96c02e4e6be68b50b323bef4906ba5d3;hpb=fd5d058156185c6c02c1285a794139d07f4d13ce;p=friendica.git
diff --git a/mod/proxy.php b/mod/proxy.php
index 9311e55a96..8b5f0834f2 100644
--- a/mod/proxy.php
+++ b/mod/proxy.php
@@ -2,6 +2,9 @@
// Based upon "Privacy Image Cache" by Tobias HöÃl
use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
define('PROXY_DEFAULT_TIME', 86400); // 1 Day
@@ -48,15 +51,15 @@ function proxy_init(App $a) {
$basepath = $a->get_basepath();
// If the cache path isn't there, try to create it
- if (!is_dir($basepath . '/proxy') AND is_writable($basepath)) {
+ if (!is_dir($basepath . '/proxy') && is_writable($basepath)) {
mkdir($basepath . '/proxy');
}
// Checking if caching into a folder in the webroot is activated and working
- $direct_cache = (is_dir($basepath . '/proxy') AND is_writable($basepath . '/proxy'));
+ $direct_cache = (is_dir($basepath . '/proxy') && is_writable($basepath . '/proxy'));
// Look for filename in the arguments
- if ((isset($a->argv[1]) OR isset($a->argv[2]) OR isset($a->argv[3])) AND !isset($_REQUEST['url'])) {
+ if ((isset($a->argv[1]) || isset($a->argv[2]) || isset($a->argv[3])) && !isset($_REQUEST['url'])) {
if (isset($a->argv[3])) {
$url = $a->argv[3];
} elseif (isset($a->argv[2])) {
@@ -65,7 +68,7 @@ function proxy_init(App $a) {
$url = $a->argv[1];
}
- if (isset($a->argv[3]) AND ($a->argv[3] == 'thumb')) {
+ if (isset($a->argv[3]) && ($a->argv[3] == 'thumb')) {
$size = 200;
}
@@ -112,7 +115,7 @@ function proxy_init(App $a) {
$urlhash = 'pic:' . sha1($_REQUEST['url']);
$cachefile = get_cachefile(hash('md5', $_REQUEST['url']));
- if ($cachefile != '' AND file_exists($cachefile)) {
+ if ($cachefile != '' && file_exists($cachefile)) {
$img_str = file_get_contents($cachefile);
$mime = image_type_to_mime_type(exif_imagetype($cachefile));
@@ -140,18 +143,18 @@ function proxy_init(App $a) {
$valid = true;
$r = array();
- if (!$direct_cache AND ($cachefile == '')) {
- $r = qu("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash);
- if (dbm::is_result($r)) {
- $img_str = $r[0]['data'];
- $mime = $r[0]['desc'];
+ if (!$direct_cache && ($cachefile == '')) {
+ $r = dba::select('photo', array('data', 'desc'), array('resource-id' => $urlhash), array('limit' => 1));
+ if (DBM::is_result($r)) {
+ $img_str = $r['data'];
+ $mime = $r['desc'];
if ($mime == '') {
$mime = 'image/jpeg';
}
}
}
- if (!dbm::is_result($r)) {
+ if (!DBM::is_result($r)) {
// It shouldn't happen but it does - spaces in URL
$_REQUEST['url'] = str_replace(' ', '+', $_REQUEST['url']);
$redirects = 0;
@@ -163,7 +166,7 @@ function proxy_init(App $a) {
unlink($tempfile);
// If there is an error then return a blank image
- if ((substr($a->get_curl_code(), 0, 1) == '4') OR (!$img_str)) {
+ if ((substr($a->get_curl_code(), 0, 1) == '4') || (!$img_str)) {
$img_str = file_get_contents('images/blank.png');
$mime = 'image/png';
$cachefile = ''; // Clear the cachefile so that the dummy isn't stored
@@ -173,33 +176,21 @@ function proxy_init(App $a) {
$img->scaleImage(10);
$img_str = $img->imageString();
}
- } elseif ($mime != 'image/jpeg' AND !$direct_cache AND $cachefile == '') {
+ } elseif ($mime != 'image/jpeg' && !$direct_cache && $cachefile == '') {
$image = @imagecreatefromstring($img_str);
if ($image === FALSE) {
die();
}
- q("INSERT INTO `photo`
- ( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, `album`, `height`, `width`, `desc`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` )
- VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' )",
- 0, 0, get_guid(), dbesc($urlhash),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- dbesc(basename(dbesc($_REQUEST['url']))),
- dbesc(''),
- intval(imagesy($image)),
- intval(imagesx($image)),
- $mime,
- dbesc($img_str),
- 100,
- intval(0),
- dbesc(''), dbesc(''), dbesc(''), dbesc('')
- );
-
+ $fields = array('uid' => 0, 'contact-id' => 0, 'guid' => get_guid(), 'resource-id' => $urlhash, 'created' => datetime_convert(), 'edited' => datetime_convert(),
+ 'filename' => basename($_REQUEST['url']), 'type' => '', 'album' => '', 'height' => imagesy($image), 'width' => imagesx($image),
+ 'datasize' => 0, 'data' => $img_str, 'scale' => 100, 'profile' => 0,
+ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '', 'desc' => $mime);
+ dba::insert('photo', $fields);
} else {
$img = new Photo($img_str, $mime);
- if ($img->is_valid() AND !$direct_cache AND ($cachefile == '')) {
+ if ($img->is_valid() && !$direct_cache && ($cachefile == '')) {
$img->store(0, 0, $urlhash, $_REQUEST['url'], '', 100);
}
}
@@ -219,7 +210,7 @@ function proxy_init(App $a) {
// If there is a real existing directory then put the cache file there
// advantage: real file access is really fast
// Otherwise write in cachefile
- if ($valid AND $direct_cache) {
+ if ($valid && $direct_cache) {
file_put_contents($basepath . '/proxy/' . proxy_url($_REQUEST['url'], true), $img_str_orig);
if ($sizetype != '') {
file_put_contents($basepath . '/proxy/' . proxy_url($_REQUEST['url'], true) . $sizetype, $img_str);
@@ -265,11 +256,11 @@ function proxy_url($url, $writemode = false, $size = '') {
// Only continue if it isn't a local image and the isn't deactivated
if (proxy_is_local_image($url)) {
- $url = str_replace(normalise_link(App::get_baseurl()) . '/', App::get_baseurl() . '/', $url);
+ $url = str_replace(normalise_link(System::baseUrl()) . '/', System::baseUrl() . '/', $url);
return $url;
}
- if (get_config('system', 'proxy_disabled')) {
+ if (Config::get('system', 'proxy_disabled')) {
return $url;
}
@@ -282,7 +273,7 @@ function proxy_url($url, $writemode = false, $size = '') {
$shortpath = hash('md5', $url);
$longpath = substr($shortpath, 0, 2);
- if (is_dir($basepath) AND $writemode AND !is_dir($basepath . '/' . $longpath)) {
+ if (is_dir($basepath) && $writemode && !is_dir($basepath . '/' . $longpath)) {
mkdir($basepath . '/' . $longpath);
chmod($basepath . '/' . $longpath, 0777);
}
@@ -298,7 +289,7 @@ function proxy_url($url, $writemode = false, $size = '') {
$longpath .= '.' . $extension;
}
- $proxypath = App::get_baseurl() . '/proxy/' . $longpath;
+ $proxypath = System::baseUrl() . '/proxy/' . $longpath;
if ($size != '') {
$size = ':' . $size;
@@ -306,10 +297,10 @@ function proxy_url($url, $writemode = false, $size = '') {
// Too long files aren't supported by Apache
// Writemode in combination with long files shouldn't be possible
- if ((strlen($proxypath) > 250) AND $writemode) {
+ if ((strlen($proxypath) > 250) && $writemode) {
return $shortpath;
} elseif (strlen($proxypath) > 250) {
- return App::get_baseurl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
+ return System::baseUrl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
} elseif ($writemode) {
return $longpath;
} else {
@@ -331,7 +322,7 @@ function proxy_is_local_image($url) {
}
// links normalised - bug #431
- $baseurl = normalise_link(App::get_baseurl());
+ $baseurl = normalise_link(System::baseUrl());
$url = normalise_link($url);
return (substr($url, 0, strlen($baseurl)) == $baseurl);
}
@@ -360,7 +351,7 @@ function proxy_parse_query($url) {
function proxy_img_cb($matches) {
// if the picture seems to be from another picture cache then take the original source
$queryvar = proxy_parse_query($matches[2]);
- if (($queryvar['url'] != '') AND (substr($queryvar['url'], 0, 4) == 'http')) {
+ if (($queryvar['url'] != '') && (substr($queryvar['url'], 0, 4) == 'http')) {
$matches[2] = urldecode($queryvar['url']);
}
@@ -373,7 +364,7 @@ function proxy_img_cb($matches) {
}
function proxy_parse_html($html) {
- $html = str_replace(normalise_link(App::get_baseurl()) . '/', App::get_baseurl() . '/', $html);
+ $html = str_replace(normalise_link(System::baseUrl()) . '/', System::baseUrl() . '/', $html);
return preg_replace_callback('/(![]()
]*src *= *["\'])([^"\']+)(["\'][^>]*>)/siU', 'proxy_img_cb', $html);
}