Merge pull request #4618 from tobiasd/210180317-htconfig

[friendica.git] / mod / profile_photo.php

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index ddb53fcdf31d654757820e79bda4eb2a0e054cae..80bdfa534e709f536f9086778b0ceea786aee832 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -2,6 +2,7 @@
 /**
  * @file mod/profile_photo.php
  */
+
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -11,6 +12,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Photo;
 use Friendica\Model\Profile;
 use Friendica\Object\Image;
+use Friendica\Util\DateTimeFormat;
 
 function profile_photo_init(App $a)
 {
@@ -82,7 +84,7 @@ function profile_photo_post(App $a) {
                                $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(sprintf(L10n::t('Image size reduction [%s] failed.'),"175") . EOL);
+                                       notice(L10n::t('Image size reduction [%s] failed.', "175") . EOL);
                                }
 
                                $Image->scaleDown(80);
@@ -90,7 +92,7 @@ function profile_photo_post(App $a) {
                                $r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], L10n::t('Profile Photos'), 5, $is_default_profile);
 
                                if ($r === false) {
-                                       notice( sprintf(L10n::t('Image size reduction [%s] failed.'),"80") . EOL );
+                                       notice(L10n::t('Image size reduction [%s] failed.', "80") . EOL);
                                }
 
                                $Image->scaleDown(48);
@@ -98,7 +100,7 @@ function profile_photo_post(App $a) {
                                $r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], L10n::t('Profile Photos'), 6, $is_default_profile);
 
                                if ($r === false) {
-                                       notice( sprintf(L10n::t('Image size reduction [%s] failed.'),"48") . EOL );
+                                       notice(L10n::t('Image size reduction [%s] failed.', "48") . EOL);
                                }
 
                                // If setting for the default profile, unset the profile photo flag from any other photos I own
@@ -128,7 +130,7 @@ function profile_photo_post(App $a) {
                                // so that browsers will do a cache update unconditionally
 
                                $r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
-                                       dbesc(datetime_convert()),
+                                       dbesc(DateTimeFormat::utcNow()),
                                        intval(local_user())
                                );
 
@@ -160,7 +162,7 @@ function profile_photo_post(App $a) {
        $maximagesize = Config::get('system', 'maximagesize');
 
        if (($maximagesize) && ($filesize > $maximagesize)) {
-               notice(sprintf(L10n::t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
+               notice(L10n::t('Image exceeds size limit of %s', formatBytes($maximagesize)) . EOL);
                @unlink($src);
                return;
        }
@@ -228,7 +230,7 @@ function profile_photo_content(App $a) {
                                );
 
                        $r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
-                               dbesc(datetime_convert()),
+                               dbesc(DateTimeFormat::utcNow()),
                                intval(local_user())
                        );
 
@@ -255,7 +257,7 @@ function profile_photo_content(App $a) {
 
                $tpl = get_markup_template('profile_photo.tpl');
 
-               $o .= replace_macros($tpl,[
+               $o = replace_macros($tpl,[
                        '$user' => $a->user['nickname'],
                        '$lbl_upfile' => L10n::t('Upload File:'),
                        '$lbl_profiles' => L10n::t('Select a profile:'),
@@ -270,9 +272,8 @@ function profile_photo_content(App $a) {
        }
        else {
                $filename = $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'] . '.'.$a->config['imagecrop_ext'];
-               $resolution = $a->config['imagecrop_resolution'];
                $tpl = get_markup_template("cropbody.tpl");
-               $o .= replace_macros($tpl,[
+               $o = replace_macros($tpl,[
                        '$filename' => $filename,
                        '$profile' => intval($_REQUEST['profile']),
                        '$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
@@ -307,10 +308,11 @@ function profile_photo_crop_ui_head(App $a, Image $Image) {
                $height = $Image->getHeight();
        }
 
-       $hash = photo_new_resource();
+       $hash = Photo::newResource();
 
 
        $smallest = 0;
+       $filename = '';
 
        $r = Photo::store($Image, local_user(), 0, $hash, $filename, L10n::t('Profile Photos'), 0);
 
@@ -325,7 +327,7 @@ function profile_photo_crop_ui_head(App $a, Image $Image) {
                $r = Photo::store($Image, local_user(), 0, $hash, $filename, L10n::t('Profile Photos'), 1);
 
                if ($r === false) {
-                       notice(sprintf(L10n::t('Image size reduction [%s] failed.'), "640") . EOL);
+                       notice(L10n::t('Image size reduction [%s] failed.', "640") . EOL);
                } else {
                        $smallest = 1;
                }