From: fabrixxm Date: Wed, 21 Nov 2018 15:29:23 +0000 (+0100) Subject: profile_photo: use Photo model function to get photo and image X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=76579e02cc3602015e2dccf867d24ce6db793338;p=friendica.git profile_photo: use Photo model function to get photo and image --- diff --git a/mod/profile_photo.php b/mod/profile_photo.php index d8e236a737..0f1fc159ab 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -73,14 +73,12 @@ function profile_photo_post(App $a) $srcW = $_POST['xfinal'] - $srcX; $srcH = $_POST['yfinal'] - $srcY; - $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = %d LIMIT 1", DBA::escape($image_id), - DBA::escape(local_user()), intval($scale)); + $base_image = Photo::selectFirst([], ['resource-id' => $image_id, 'uid' => local_user(), 'scale' => $scale]); $path = 'profile/' . $a->user['nickname']; - if (DBA::isResult($r)) { - $base_image = $r[0]; + if (DBA::isResult($base_image)) { - $Image = new Image($base_image['data'], $base_image['type']); + $Image = Photo::getImageForPhoto($base_image); if ($Image->isValid()) { $Image->crop(300, $srcX, $srcY, $srcW, $srcH); @@ -194,9 +192,14 @@ function profile_photo_content(App $a) $resource_id = $a->argv[2]; //die(":".local_user()); + + $r = Photo::select([], ["resource-id" => $resource_id, "uid" => local_user()], ["order" => ["scale"=>false]]); + + /* $r = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC", intval(local_user()), DBA::escape($resource_id) ); + */ if (!DBA::isResult($r)) { notice(L10n::t('Permission denied.') . EOL); @@ -230,7 +233,8 @@ function profile_photo_content(App $a) $a->internalRedirect('profile/' . $a->user['nickname']); return; // NOTREACHED } - $ph = new Image($r[0]['data'], $r[0]['type']); + $ph = Photo::getImageForPhoto($r[0]); + $imagecrop = profile_photo_crop_ui_head($a, $ph); // go ahead as we have jus uploaded a new photo to crop } diff --git a/src/Module/Photo.php b/src/Module/Photo.php index a8e630fd0a..13d9253767 100644 --- a/src/Module/Photo.php +++ b/src/Module/Photo.php @@ -124,7 +124,7 @@ class Photo extends BaseModule private static function stripExtension($name) { $name = str_replace([".jpg", ".png", ".gif"], ["", "", ""], $name); - foreach (Image::supportedTypes() AS $m => $e) { + foreach (Image::supportedTypes() as $m => $e) { $name = str_replace("." . $e, "", $name); } return $name;