X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FPhoto.php;h=4a9e11c55472deb4123d375dbcdf8c80284185ef;hb=e0a763b07f12ecb7389925100959f9ac6ebe85a8;hp=555df80e63df689fea8f056f22586783857f0574;hpb=71ec84f6dc83f753fe80170cfdfd32d202850d90;p=friendica.git

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 555df80e63..4a9e11c554 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -14,8 +14,7 @@ use Friendica\Database\DBA;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-
-require_once 'include/dba.php';
+use Friendica\Util\Security;
 
 /**
  * Class to handle photo dabatase table
@@ -96,7 +95,7 @@ class Photo
 		$photo = DBA::selectFirst(
 			'photo', ['resource-id'], ['uid' => $uid, 'contact-id' => $cid, 'scale' => 4, 'album' => 'Contact Photos']
 		);
-		if (x($photo['resource-id'])) {
+		if (!empty($photo['resource-id'])) {
 			$hash = $photo['resource-id'];
 		} else {
 			$hash = self::newResource();
@@ -114,7 +113,7 @@ class Photo
 		$type = Image::guessType($image_url, true);
 		$Image = new Image($img_str, $type);
 		if ($Image->isValid()) {
-			$Image->scaleToSquare(175);
+			$Image->scaleToSquare(300);
 
 			$r = self::store($Image, $uid, $cid, $hash, $filename, 'Contact Photos', 4);
 
@@ -146,7 +145,7 @@ class Photo
 
 			// Remove the cached photo
 			$a = get_app();
-			$basepath = $a->get_basepath();
+			$basepath = $a->getBasePath();
 
 			if (is_dir($basepath . "/photo")) {
 				$filename = $basepath . '/photo/' . $hash . '-4.' . $Image->getExt();
@@ -171,7 +170,7 @@ class Photo
 		}
 
 		if ($photo_failure) {
-			$image_url = System::baseUrl() . '/images/person-175.jpg';
+			$image_url = System::baseUrl() . '/images/person-300.jpg';
 			$thumb = System::baseUrl() . '/images/person-80.jpg';
 			$micro = System::baseUrl() . '/images/person-48.jpg';
 		}
@@ -226,7 +225,7 @@ class Photo
 	 */
 	public static function getAlbums($uid, $update = false)
 	{
-		$sql_extra = permissions_sql($uid);
+		$sql_extra = Security::getPermissionsSQLByUserId($uid);
 
 		$key = "photo_albums:".$uid.":".local_user().":".remote_user();
 		$albums = Cache::get($key);
@@ -252,7 +251,7 @@ class Photo
 					DBA::escape(L10n::t('Contact Photos'))
 				);
 			}
-			Cache::set($key, $albums, CACHE_DAY);
+			Cache::set($key, $albums, Cache::DAY);
 		}
 		return $albums;
 	}
@@ -264,7 +263,7 @@ class Photo
 	public static function clearAlbumCache($uid)
 	{
 		$key = "photo_albums:".$uid.":".local_user().":".remote_user();
-		Cache::set($key, null, CACHE_DAY);
+		Cache::set($key, null, Cache::DAY);
 	}
 
 	/**