X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile_photo.php;h=1a80b539db5a89b1057c2d44e7b812b2feb1f53b;hb=76fdf5c910e8cd887f6f7b83559f4c81c88f507d;hp=ddb53fcdf31d654757820e79bda4eb2a0e054cae;hpb=407b2397cbb25a1de9252f16279dfdd786ffade1;p=friendica.git

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index ddb53fcdf3..1a80b539db 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -2,15 +2,18 @@
 /**
  * @file mod/profile_photo.php
  */
+
 use Friendica\App;
 use Friendica\Core\Config;
 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\DateTimeFormat;
 
 function profile_photo_init(App $a)
 {
@@ -82,7 +85,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 +93,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,23 +101,16 @@ 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
 
-				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()),
@@ -124,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(datetime_convert()),
-					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
@@ -160,7 +150,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;
 	}
@@ -227,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(datetime_convert()),
-				intval(local_user())
-			);
+			Contact::updateSelfFromUserID(local_user(), true);
 
 			// Update global directory in background
 			$url = $_SESSION['my_url'];
@@ -255,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:'),
@@ -270,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'],
@@ -307,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);
 
@@ -325,7 +312,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;
 		}