X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphoto.php;h=ece784baeca5335ea2611c57a22afb08571313e2;hb=f22fe7118d52251dbd0898279ef078b797885ec4;hp=6562599ca3cf0ccc5b19e997b2734fcbdd408e0d;hpb=61a01141d7e897c30b5931b66675cbb09d6368b8;p=friendica.git

diff --git a/mod/photo.php b/mod/photo.php
index 6562599ca3..ece784baec 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -1,5 +1,8 @@
 <?php
 
+use Friendica\App;
+use Friendica\Database\DBM;
+
 require_once('include/security.php');
 require_once('include/Photo.php');
 
@@ -9,7 +12,7 @@ function photo_init(App $a) {
 	$prvcachecontrol = false;
 	$file = "";
 
-	switch($a->argc) {
+	switch ($a->argc) {
 		case 4:
 			$person = $a->argv[3];
 			$customres = intval($a->argv[2]);
@@ -29,14 +32,13 @@ function photo_init(App $a) {
 			// NOTREACHED
 	}
 
-	//	strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= filemtime($localFileName)) {
 	if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
 		header('HTTP/1.1 304 Not Modified');
 		header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
 		header('Etag: '.$_SERVER['HTTP_IF_NONE_MATCH']);
 	 	header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
 		header("Cache-Control: max-age=31536000");
-		if(function_exists('header_remove')) {
+		if (function_exists('header_remove')) {
 			header_remove('Last-Modified');
 			header_remove('Expires');
 			header_remove('Cache-Control');
@@ -46,14 +48,13 @@ function photo_init(App $a) {
 
 	$default = 'images/person-175.jpg';
 
-	if(isset($type)) {
-
+	if (isset($type)) {
 
 		/**
 		 * Profile photos
 		 */
 
-		switch($type) {
+		switch ($type) {
 
 			case 'profile':
 			case 'custom':
@@ -70,56 +71,61 @@ function photo_init(App $a) {
 				break;
 		}
 
-		$uid = str_replace(array('.jpg','.png'),array('',''), $person);
+		$uid = str_replace(array('.jpg', '.png', '.gif'), array('', '', ''), $person);
 
-		$r = qu("SELECT * FROM `photo` WHERE `scale` = %d AND `uid` = %d AND `profile` = 1 LIMIT 1",
+		foreach (Photo::supportedTypes() AS $m => $e) {
+			$uid = str_replace('.'.$e, '', $uid);
+		}
+
+		$r = q("SELECT * FROM `photo` WHERE `scale` = %d AND `uid` = %d AND `profile` = 1 LIMIT 1",
 			intval($resolution),
 			intval($uid)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$data = $r[0]['data'];
 			$mimetype = $r[0]['type'];
 		}
-		if(! isset($data)) {
+		if (empty($data)) {
 			$data = file_get_contents($default);
 			$mimetype = 'image/jpeg';
 		}
-	}
-	else {
+	} else {
 
 		/**
 		 * Other photos
 		 */
 
 		$resolution = 0;
-		foreach( Photo::supportedTypes() as $m=>$e){
-			$photo = str_replace(".$e",'',$photo);
+		$photo = str_replace(array('.jpg', '.png', '.gif'), array('', '', ''), $photo);
+
+		foreach (Photo::supportedTypes() AS $m => $e) {
+			$photo = str_replace('.'.$e, '', $photo);
 		}
 
-		if(substr($photo,-2,1) == '-') {
-			$resolution = intval(substr($photo,-1,1));
-			$photo = substr($photo,0,-2);
+		if (substr($photo, -2, 1) == '-') {
+			$resolution = intval(substr($photo, -1, 1));
+			$photo = substr($photo, 0, -2);
 		}
 
-        // check if the photo exists and get the owner of the photo
-		$r = qu("SELECT `uid` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1",
+		// check if the photo exists and get the owner of the photo
+		$r = q("SELECT `uid` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1",
 			dbesc($photo),
 			intval($resolution)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 
 			$sql_extra = permissions_sql($r[0]['uid']);
 
 			// Now we'll see if we can access the photo
 
-			$r = qu("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` <= %d $sql_extra ORDER BY scale DESC LIMIT 1",
+			$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` <= %d $sql_extra ORDER BY scale DESC LIMIT 1",
 				dbesc($photo),
 				intval($resolution)
 			);
 
-			$public = (dbm::is_result($r)) AND ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid']  == '') AND ($r[0]['deny_gid']  == '');
+			$public = (DBM::is_result($r)) && ($r[0]['allow_cid'] == '') && ($r[0]['allow_gid'] == '') && ($r[0]['deny_cid']  == '') && ($r[0]['deny_gid']  == '');
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$resolution = $r[0]['scale'];
 				$data = $r[0]['data'];
 				$mimetype = $r[0]['type'];
@@ -134,9 +140,9 @@ function photo_init(App $a) {
 		}
 	}
 
-	if(! isset($data)) {
-		if(isset($resolution)) {
-			switch($resolution) {
+	if (empty($data)) {
+		if (isset($resolution)) {
+			switch ($resolution) {
 
 				case 4:
 					$data = file_get_contents('images/person-175.jpg');
@@ -158,11 +164,11 @@ function photo_init(App $a) {
 		}
 	}
 
-	// Resize only if its not a GIF
-	if ($mime != "image/gif") {
+	// Resize only if its not a GIF and it is supported by the library
+	if (($mimetype != "image/gif") && in_array($mimetype, Photo::supportedTypes())) {
 		$ph = new Photo($data, $mimetype);
-		if($ph->is_valid()) {
-			if(isset($customres) && $customres > 0 && $customres < 500) {
+		if ($ph->is_valid()) {
+			if (isset($customres) && $customres > 0 && $customres < 500) {
 				$ph->scaleImageSquare($customres);
 			}
 			$data = $ph->imageString();
@@ -170,14 +176,14 @@ function photo_init(App $a) {
 		}
 	}
 
-	if(function_exists('header_remove')) {
+	if (function_exists('header_remove')) {
 		header_remove('Pragma');
 		header_remove('pragma');
 	}
 
 	header("Content-type: ".$mimetype);
 
-	if($prvcachecontrol) {
+	if ($prvcachecontrol) {
 
 		// it is a private photo that they have no permission to view.
 		// tell the browser not to cache it, in case they authenticate
@@ -185,8 +191,7 @@ function photo_init(App $a) {
 
 		header("Cache-Control: no-store, no-cache, must-revalidate");
 
-	}
-	else {
+	} else {
 		header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
 		header('Etag: "'.md5($data).'"');
 	 	header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
@@ -198,12 +203,15 @@ function photo_init(App $a) {
 	if ($public and ($file != "")) {
 		// If the photo path isn't there, try to create it
 		$basepath = $a->get_basepath();
-		if (!is_dir($basepath."/photo"))
-			if (is_writable($basepath))
+		if (!is_dir($basepath."/photo")) {
+			if (is_writable($basepath)) {
 				mkdir($basepath."/photo");
+			}
+		}
 
-		if (is_dir($basepath."/photo"))
+		if (is_dir($basepath."/photo")) {
 			file_put_contents($basepath."/photo/".$file, $data);
+		}
 	}
 
 	killme();