X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile_photo.php;h=80bdfa534e709f536f9086778b0ceea786aee832;hb=bf0b98017decf73123891e935993f2921d3b0acf;hp=e12c6e5c646b6a56111d3b289a42414363a3d41d;hpb=e437c74d0e4e4ece4693a2e32513c3ecde7efb4d;p=friendica.git

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index e12c6e5c64..80bdfa534e 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -2,27 +2,31 @@
 /**
  * @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\Photo;
+use Friendica\Model\Profile;
 use Friendica\Object\Image;
+use Friendica\Util\DateTimeFormat;
 
-function profile_photo_init(App $a) {
-
+function profile_photo_init(App $a)
+{
 	if (! local_user()) {
 		return;
 	}
 
-	profile_load($a,$a->user['nickname']);
+	Profile::load($a, $a->user['nickname']);
 }
 
 function profile_photo_post(App $a) {
 
 	if (! local_user()) {
-		notice ( t('Permission denied.') . EOL );
+		notice(L10n::t('Permission denied.') . EOL );
 		return;
 	}
 
@@ -47,7 +51,7 @@ function profile_photo_post(App $a) {
 		// phase 2 - we have finished cropping
 
 		if($a->argc != 2) {
-			notice( t('Image uploaded but image cropping failed.') . EOL );
+			notice(L10n::t('Image uploaded but image cropping failed.') . EOL );
 			return;
 		}
 
@@ -77,26 +81,26 @@ function profile_photo_post(App $a) {
 			if ($Image->isValid()) {
 				$Image->crop(175,$srcX,$srcY,$srcW,$srcH);
 
-				$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, $is_default_profile);
+				$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(t('Image size reduction [%s] failed.'),"175") . EOL );
+					notice(L10n::t('Image size reduction [%s] failed.', "175") . EOL);
 				}
 
 				$Image->scaleDown(80);
 
-				$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, $is_default_profile);
+				$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(t('Image size reduction [%s] failed.'),"80") . EOL );
+					notice(L10n::t('Image size reduction [%s] failed.', "80") . EOL);
 				}
 
 				$Image->scaleDown(48);
 
-				$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 6, $is_default_profile);
+				$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(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
@@ -126,11 +130,11 @@ 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())
 				);
 
-				info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
+				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
 				$url = System::baseUrl() . '/profile/' . $a->user['nickname'];
 				if ($url && strlen(Config::get('system','directory'))) {
@@ -139,7 +143,7 @@ function profile_photo_post(App $a) {
 
 				Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
 			} else {
-				notice( t('Unable to process image') . EOL);
+				notice(L10n::t('Unable to process image') . EOL);
 			}
 		}
 
@@ -158,7 +162,7 @@ function profile_photo_post(App $a) {
 	$maximagesize = Config::get('system', 'maximagesize');
 
 	if (($maximagesize) && ($filesize > $maximagesize)) {
-		notice(sprintf(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;
 	}
@@ -167,7 +171,7 @@ function profile_photo_post(App $a) {
 	$ph = new Image($imagedata, $filetype);
 
 	if (! $ph->isValid()) {
-		notice(t('Unable to process image.') . EOL);
+		notice(L10n::t('Unable to process image.') . EOL);
 		@unlink($src);
 		return;
 	}
@@ -178,11 +182,10 @@ function profile_photo_post(App $a) {
 }
 
 
-if(! function_exists('profile_photo_content')) {
 function profile_photo_content(App $a) {
 
 	if (! local_user()) {
-		notice( t('Permission denied.') . EOL );
+		notice(L10n::t('Permission denied.') . EOL );
 		return;
 	}
 
@@ -193,7 +196,7 @@ function profile_photo_content(App $a) {
 
 	if( $a->argv[1]=='use'){
 		if ($a->argc<3){
-			notice( t('Permission denied.') . EOL );
+			notice(L10n::t('Permission denied.') . EOL );
 			return;
 		};
 
@@ -206,7 +209,7 @@ function profile_photo_content(App $a) {
 			dbesc($resource_id)
 			);
 		if (!DBM::is_result($r)){
-			notice( t('Permission denied.') . EOL );
+			notice(L10n::t('Permission denied.') . EOL );
 			return;
 		}
 		$havescale = false;
@@ -217,7 +220,7 @@ function profile_photo_content(App $a) {
 
 		// set an already uloaded photo as profile photo
 		// if photo is in 'Profile Photos', change it in db
-		if (($r[0]['album']== t('Profile Photos')) && ($havescale)){
+		if (($r[0]['album']== L10n::t('Profile Photos')) && ($havescale)){
 			$r=q("UPDATE `photo` SET `profile`=0 WHERE `profile`=1 AND `uid`=%d",
 				intval(local_user()));
 
@@ -227,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())
 			);
 
@@ -254,41 +257,39 @@ function profile_photo_content(App $a) {
 
 		$tpl = get_markup_template('profile_photo.tpl');
 
-		$o .= replace_macros($tpl,array(
+		$o = replace_macros($tpl,[
 			'$user' => $a->user['nickname'],
-			'$lbl_upfile' => t('Upload File:'),
-			'$lbl_profiles' => t('Select a profile:'),
-			'$title' => t('Upload Profile Photo'),
-			'$submit' => t('Upload'),
+			'$lbl_upfile' => L10n::t('Upload File:'),
+			'$lbl_profiles' => L10n::t('Select a profile:'),
+			'$title' => L10n::t('Upload Profile Photo'),
+			'$submit' => L10n::t('Upload'),
 			'$profiles' => $profiles,
 			'$form_security_token' => get_form_security_token("profile_photo"),
-			'$select' => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . System::baseUrl() . '">' . t('skip this step') . '</a>' : '<a href="'. System::baseUrl() . '/photos/' . $a->user['nickname'] . '">' . t('select a photo from your photo albums') . '</a>')
-		));
+			'$select' => sprintf('%s %s', L10n::t('or'), ($newuser) ? '<a href="' . System::baseUrl() . '">' . L10n::t('skip this step') . '</a>' : '<a href="'. System::baseUrl() . '/photos/' . $a->user['nickname'] . '">' . L10n::t('select a photo from your photo albums') . '</a>')
+		]);
 
 		return $o;
 	}
 	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,array(
+		$o = replace_macros($tpl,[
 			'$filename' => $filename,
 			'$profile' => intval($_REQUEST['profile']),
 			'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
 			'$image_url' => System::baseUrl() . '/photo/' . $filename,
-			'$title' => t('Crop Image'),
-			'$desc' => t('Please adjust the image cropping for optimum viewing.'),
+			'$title' => L10n::t('Crop Image'),
+			'$desc' => L10n::t('Please adjust the image cropping for optimum viewing.'),
 			'$form_security_token' => get_form_security_token("profile_photo"),
-			'$done' => t('Done Editing')
-		));
+			'$done' => L10n::t('Done Editing')
+		]);
 		return $o;
 	}
 
 	return; // NOTREACHED
-}}
+}
 
 
-if(! function_exists('profile_photo_crop_ui_head')) {
 function profile_photo_crop_ui_head(App $a, Image $Image) {
 	$max_length = Config::get('system','max_image_length');
 	if (! $max_length) {
@@ -307,25 +308,26 @@ 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, t('Profile Photos'), 0 );
+	$r = Photo::store($Image, local_user(), 0, $hash, $filename, L10n::t('Profile Photos'), 0);
 
 	if ($r) {
-		info( t('Image uploaded successfully.') . EOL );
+		info(L10n::t('Image uploaded successfully.') . EOL);
 	} else {
-		notice( t('Image upload failed.') . EOL );
+		notice(L10n::t('Image upload failed.') . EOL);
 	}
 
 	if ($width > 640 || $height > 640) {
 		$Image->scaleDown(640);
-		$r = Photo::store($Image, local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );
+		$r = Photo::store($Image, local_user(), 0, $hash, $filename, L10n::t('Profile Photos'), 1);
 
 		if ($r === false) {
-			notice( sprintf(t('Image size reduction [%s] failed.'),"640") . EOL );
+			notice(L10n::t('Image size reduction [%s] failed.', "640") . EOL);
 		} else {
 			$smallest = 1;
 		}
@@ -334,8 +336,7 @@ function profile_photo_crop_ui_head(App $a, Image $Image) {
 	$a->config['imagecrop'] = $hash;
 	$a->config['imagecrop_resolution'] = $smallest;
 	$a->config['imagecrop_ext'] = $Image->getExt();
-	$a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), array());
-	$a->page['end'] .= replace_macros(get_markup_template("cropend.tpl"), array());
+	$a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), []);
+	$a->page['end'] .= replace_macros(get_markup_template("cropend.tpl"), []);
 	return;
-}}
-
+}