Merge pull request #5370 from MrPetovan/develop

[friendica.git] / mod / profile_photo.php

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 82050e962e07a011c4773f583081a03b3adc3907..1a80b539db5a89b1057c2d44e7b812b2feb1f53b 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -9,10 +9,11 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 use Friendica\Model\Profile;
 use Friendica\Object\Image;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
 
 function profile_photo_init(App $a)
 {
@@ -105,18 +106,11 @@ function profile_photo_post(App $a) {
 
                                // If setting for the default profile, unset the profile photo flag from any other photos I own
 
-                               if($is_default_profile) {
+                               if ($is_default_profile) {
                                        $r = q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d",
                                                dbesc($base_image['resource-id']),
                                                intval(local_user())
                                        );
-
-                                       $r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s'  WHERE `self` AND `uid` = %d",
-                                               dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()),
-                                               dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $Image->getExt()),
-                                               dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-6.' . $Image->getExt()),
-                                               intval(local_user())
-                                       );
                                } else {
                                        $r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d",
                                                dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()),
@@ -126,13 +120,7 @@ function profile_photo_post(App $a) {
                                        );
                                }
 
-                               // we'll set the updated profile-photo timestamp even if it isn't the default profile,
-                               // so that browsers will do a cache update unconditionally
-
-                               $r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
-                                       dbesc(Temporal::utcNow()),
-                                       intval(local_user())
-                               );
+                               Contact::updateSelfFromUserID(local_user(), true);
 
                                info(L10n::t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
                                // Update global directory in background
@@ -229,10 +217,7 @@ function profile_photo_content(App $a) {
                                dbesc($resource_id)
                                );
 
-                       $r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
-                               dbesc(Temporal::utcNow()),
-                               intval(local_user())
-                       );
+                       Contact::updateSelfFromUserID(local_user(), true);
 
                        // Update global directory in background
                        $url = $_SESSION['my_url'];
@@ -257,7 +242,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:'),
@@ -272,9 +257,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'],
@@ -309,10 +293,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);