X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fphoto.php;h=54418f730d09e1789208dd78447bb9d0376359c6;hb=5eb8929f0c579630ce35c3e3c0d47e692c084c8a;hp=e899d671d64e3691e3ac2f806cb0a6d5e8ae7b36;hpb=e36f2bb1fb3439e9993c7568e57140c4f954b772;p=friendica.git

diff --git a/mod/photo.php b/mod/photo.php
index e899d671d6..54418f730d 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -4,10 +4,9 @@
  * @file mod/photo.php
  */
 use Friendica\App;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Object\Image;
-
-require_once 'include/security.php';
+use Friendica\Util\Security;
 
 function photo_init(App $a)
 {
@@ -39,7 +38,9 @@ function photo_init(App $a)
 	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']);
+		if (!empty($_SERVER['HTTP_IF_NONE_MATCH'])) {
+			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')) {
@@ -50,7 +51,7 @@ function photo_init(App $a)
 		exit;
 	}
 
-	$default = 'images/person-175.jpg';
+	$default = 'images/person-300.jpg';
 	$public = true;
 
 	if (isset($type)) {
@@ -81,7 +82,7 @@ function photo_init(App $a)
 			intval($resolution),
 			intval($uid)
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$data = $r[0]['data'];
 			$mimetype = $r[0]['type'];
 		}
@@ -105,18 +106,18 @@ function photo_init(App $a)
 
 		// 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),
+			DBA::escape($photo),
 			intval($resolution)
 		);
-		if (DBM::is_result($r)) {
-			$sql_extra = permissions_sql($r[0]['uid']);
+		if (DBA::isResult($r)) {
+			$sql_extra = Security::getPermissionsSQLByUserId($r[0]['uid']);
 
 			// Now we'll see if we can access the photo
 			$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` <= %d $sql_extra ORDER BY scale DESC LIMIT 1",
-				dbesc($photo),
+				DBA::escape($photo),
 				intval($resolution)
 			);
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				$resolution = $r[0]['scale'];
 				$data = $r[0]['data'];
 				$mimetype = $r[0]['type'];
@@ -136,7 +137,7 @@ function photo_init(App $a)
 		if (isset($resolution)) {
 			switch ($resolution) {
 				case 4:
-					$data = file_get_contents('images/person-175.jpg');
+					$data = file_get_contents('images/person-300.jpg');
 					$mimetype = 'image/jpeg';
 					break;
 				case 5:
@@ -190,7 +191,7 @@ function photo_init(App $a)
 	// If the photo is public and there is an existing photo directory store the photo there
 	if ($public and $file != '') {
 		// If the photo path isn't there, try to create it
-		$basepath = $a->get_basepath();
+		$basepath = $a->getBasePath();
 		if (!is_dir($basepath . "/photo")) {
 			if (is_writable($basepath)) {
 				mkdir($basepath . "/photo");