X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fproxy.php;h=a78f40dab2bf269e59228cf838287408dd4bf720;hb=512e58a7db8fed2e3a5347b3e3ef0098718f86fb;hp=8046e4e9639eabc0fd9331d13792543a60908134;hpb=4d591c4a074a11bb27f5fe0981a13125d4ef2e02;p=friendica.git

diff --git a/mod/proxy.php b/mod/proxy.php
index 8046e4e963..a78f40dab2 100644
--- a/mod/proxy.php
+++ b/mod/proxy.php
@@ -1,6 +1,8 @@
 <?php
 // Based upon "Privacy Image Cache" by Tobias Hößl <https://github.com/CatoTH/>
 
+use Friendica\App;
+
 define('PROXY_DEFAULT_TIME', 86400); // 1 Day
 
 define('PROXY_SIZE_MICRO', 'micro');
@@ -46,15 +48,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])) {
@@ -63,7 +65,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;
 		}
 
@@ -110,7 +112,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));
 
@@ -138,7 +140,7 @@ function proxy_init(App $a) {
 	$valid = true;
 	$r = array();
 
-	if (!$direct_cache AND ($cachefile == '')) {
+	if (!$direct_cache && ($cachefile == '')) {
 		$r = qu("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash);
 		if (dbm::is_result($r)) {
 			$img_str = $r[0]['data'];
@@ -161,7 +163,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
@@ -171,7 +173,7 @@ 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) {
@@ -197,7 +199,7 @@ function proxy_init(App $a) {
 
 		} 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);
 			}
 		}
@@ -217,7 +219,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);
@@ -280,7 +282,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);
 	}
@@ -304,7 +306,7 @@ 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);
@@ -358,7 +360,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']);
 	}