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 19188ba23e884886b5b10ff6a9e6665fc6732ac9..0f1fc159ab3a2cb8ba1240e9de3141322a4986e8 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -7,6 +7,7 @@ use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -15,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)
 {
@@ -71,22 +73,20 @@ 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(175, $srcX, $srcY, $srcW, $srcH);
+                               $Image->crop(300, $srcX, $srcY, $srcW, $srcH);
 
                                $r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'],
                                                L10n::t('Profile Photos'), 4, $is_default_profile);
 
                                if ($r === false) {
-                                       notice(L10n::t('Image size reduction [%s] failed.', "175") . EOL);
+                                       notice(L10n::t('Image size reduction [%s] failed.', "300") . EOL);
                                }
 
                                $Image->scaleDown(80);
@@ -150,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;
        }
@@ -192,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);
@@ -228,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
        }
@@ -238,9 +244,9 @@ function profile_photo_content(App $a)
        );
 
        if (empty($imagecrop)) {
-               $tpl = get_markup_template('profile_photo.tpl');
+               $tpl = Renderer::getMarkupTemplate('profile_photo.tpl');
 
-               $o = replace_macros($tpl,
+               $o = Renderer::replaceMacros($tpl,
                        [
                        '$user' => $a->user['nickname'],
                        '$lbl_upfile' => L10n::t('Upload File:'),
@@ -256,8 +262,8 @@ function profile_photo_content(App $a)
                return $o;
        } else {
                $filename = $imagecrop['hash'] . '-' . $imagecrop['resolution'] . '.' . $imagecrop['ext'];
-               $tpl = get_markup_template("cropbody.tpl");
-               $o = replace_macros($tpl,
+               $tpl = Renderer::getMarkupTemplate("cropbody.tpl");
+               $o = Renderer::replaceMacros($tpl,
                        [
                        '$filename'  => $filename,
                        '$profile'   => (isset($_REQUEST['profile']) ? intval($_REQUEST['profile']) : 0),
@@ -288,7 +294,7 @@ function profile_photo_crop_ui_head(App $a, Image $image)
        $height = $image->getHeight();
 
        if ($width < 175 || $height < 175) {
-               $image->scaleUp(200);
+               $image->scaleUp(300);
                $width = $image->getWidth();
                $height = $image->getHeight();
        }
@@ -318,7 +324,7 @@ function profile_photo_crop_ui_head(App $a, Image $image)
                }
        }
 
-       $a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), []);
+       $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate("crophead.tpl"), []);
 
        $imagecrop = [
                'hash'       => $hash,