X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphoto.php;h=dee483d835bbda6479376d21a0c5a603f9cf29b1;hb=1b9438120cdf13aa355cf6d761e92f4a39063c44;hp=fcc75a513fee302b901b173a4cc912019890f4bc;hpb=0508ccf50fc6f64af40ad97e3a573a0d489630f2;p=friendica.git

diff --git a/mod/photo.php b/mod/photo.php
index fcc75a513f..dee483d835 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -1,9 +1,36 @@
 <?php
 
 require_once('include/security.php');
+require_once('include/Photo.php');
 
 function photo_init(&$a) {
 
+	// To-Do:
+	// - checking with realpath
+	// - checking permissions
+	/*
+	$cache = get_config('system','itemcache');
+        if (($cache != '') and is_dir($cache)) {
+		$cachefile = $cache."/".$a->argc."-".$a->argv[1]."-".$a->argv[2]."-".$a->argv[3];
+		if (file_exists($cachefile)) {
+			$data = file_get_contents($cachefile);
+
+			if(function_exists('header_remove')) {
+				header_remove('Pragma');
+				header_remove('pragma');
+			}
+
+			header("Content-type: image/jpeg");
+ 			header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
+			header("Cache-Control: max-age=" . (3600*24));
+			echo $data;
+			killme();
+			// NOTREACHED
+		}
+	}*/
+
+	$prvcachecontrol = false;
+
 	switch($a->argc) {
 		case 4:
 			$person = $a->argv[3];
@@ -23,10 +50,11 @@ function photo_init(&$a) {
 			// NOTREACHED
 	}
 
-	$default = 'images/default-profile.jpg';
+	$default = 'images/person-175.jpg';
 
 	if(isset($type)) {
 
+
 		/**
 		 * Profile photos
 		 */
@@ -39,16 +67,16 @@ function photo_init(&$a) {
 				break;
 			case 'micro':
 				$resolution = 6;
-				$default = 'images/default-profile-mm.jpg';
+				$default = 'images/person-48.jpg';
 				break;
 			case 'avatar':
 			default:
 				$resolution = 5;
-				$default = 'images/default-profile-sm.jpg';
+				$default = 'images/person-80.jpg';
 				break;
 		}
 
-		$uid = str_replace('.jpg', '', $person);
+		$uid = str_replace(array('.jpg','.png'),array('',''), $person);
 
 		$r = q("SELECT * FROM `photo` WHERE `scale` = %d AND `uid` = %d AND `profile` = 1 LIMIT 1",
 			intval($resolution),
@@ -56,9 +84,11 @@ function photo_init(&$a) {
 		);
 		if(count($r)) {
 			$data = $r[0]['data'];
+			$mimetype = $r[0]['type'];
 		}
 		if(! isset($data)) {
 			$data = file_get_contents($default);
+			$mimetype = 'image/jpeg';
 		}
 	}
 	else {
@@ -68,7 +98,9 @@ function photo_init(&$a) {
 		 */
 
 		$resolution = 0;
-		$photo = str_replace('.jpg','',$photo);
+		foreach( Photo::supportedTypes() as $m=>$e){
+			$photo = str_replace(".$e",'',$photo);
+		}
 	
 		if(substr($photo,-2,1) == '-') {
 			$resolution = intval(substr($photo,-1,1));
@@ -92,6 +124,7 @@ function photo_init(&$a) {
 
 			if(count($r)) {
 				$data = $r[0]['data'];
+				$mimetype = $r[0]['type'];
 			}
 			else {
 
@@ -109,28 +142,72 @@ function photo_init(&$a) {
 				);
 				if(count($r)) {
 					$data = file_get_contents('images/nosign.jpg');
+					$mimetype = 'image/jpeg';
+					$prvcachecontrol = true;
 				}
 			}
 		}
 	}
 
 	if(! isset($data)) {
-		killme();
-		// NOTREACHED
+		if(isset($resolution)) {
+			switch($resolution) {
+
+				case 4:
+					$data = file_get_contents('images/person-175.jpg');
+					$mimetype = 'image/jpeg';
+					break;
+				case 5:
+					$data = file_get_contents('images/person-80.jpg');
+					$mimetype = 'image/jpeg';
+					break;
+				case 6:
+					$data = file_get_contents('images/person-48.jpg');
+					$mimetype = 'image/jpeg';
+					break;
+				default:
+					killme();
+					// NOTREACHED
+					break;
+			}
+		}
 	}
 
-	if(intval($customres) && $customres > 0 && $customres < 500) {
-		require_once('include/Photo.php');
-		$ph = new Photo($data);
+	if(isset($customres) && $customres > 0 && $customres < 500) {
+		$ph = new Photo($data, $mimetype);
 		if($ph->is_valid()) {
 			$ph->scaleImageSquare($customres);
 			$data = $ph->imageString();
+			$mimetype = $ph->getType();
 		}
 	}
 
-	header("Content-type: image/jpeg");
- 	header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT";
-	header("Cache-Control: max-age=" . (3600*24));
+	// Writing in cachefile
+	if (isset($cachefile) && $cachefile != '')
+		file_put_contents($cachefile, $data);
+
+	if(function_exists('header_remove')) {
+		header_remove('Pragma');
+		header_remove('pragma');
+	}
+
+	header("Content-type: ".$mimetype);
+
+	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
+		// and subsequently have permission to see it
+
+		header("Cache-Control: no-store, no-cache, must-revalidate");
+
+	}
+	else {
+
+	 	header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
+		header("Cache-Control: max-age=" . (3600*24));
+
+	}
 	echo $data;
 	killme();
 	// NOTREACHED