Remove resourceid parameter from Photo::exists()

[friendica.git] / mod / profile_photo.php

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 3304e3cab2c44762e2e8f72d737ee9a1bf8d5641..0f1fc159ab3a2cb8ba1240e9de3141322a4986e8 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -16,6 +16,7 @@ use Friendica\Model\Photo;
 use Friendica\Model\Profile;
 use Friendica\Object\Image;
 use Friendica\Util\Security;
+use Friendica\Util\Strings;
 
 function profile_photo_init(App $a)
 {
@@ -72,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);
 
@@ -151,7 +150,7 @@ function profile_photo_post(App $a)
        $maximagesize = Config::get('system', 'maximagesize');
 
        if (($maximagesize) && ($filesize > $maximagesize)) {
-               notice(L10n::t('Image exceeds size limit of %s', formatBytes($maximagesize)) . EOL);
+               notice(L10n::t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)) . EOL);
                @unlink($src);
                return;
        }
@@ -193,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);
@@ -229,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
        }