From 34f21b40f477605b96913571d43e721a25274209 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Wed, 23 Nov 2022 14:08:58 -0500
Subject: [PATCH 1/2] Move missing POST part of Profile\Photos from mod/photos

---
 mod/photos.php                | 216 +-----------------------
 src/Module/Profile/Photos.php | 298 ++++++++++++++++++++++++++++++----
 static/routes.config.php      |   2 +-
 3 files changed, 274 insertions(+), 242 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index 8bcd9f460c..d7d25c0ed8 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -20,7 +20,6 @@
  */
 
 use Friendica\App;
-use Friendica\Content\Feature;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
@@ -41,18 +40,17 @@ use Friendica\Model\Profile;
 use Friendica\Model\Tag;
 use Friendica\Model\User;
 use Friendica\Module\BaseProfile;
+use Friendica\Network\HTTPException;
 use Friendica\Network\Probe;
-use Friendica\Object\Image;
 use Friendica\Protocol\Activity;
+use Friendica\Security\Security;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
 use Friendica\Util\Map;
-use Friendica\Security\Security;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 use Friendica\Util\XML;
-use Friendica\Network\HTTPException;
 
 function photos_init(App $a)
 {
@@ -565,213 +563,6 @@ function photos_post(App $a)
 		DI::baseUrl()->redirect($_SESSION['photo_return']);
 		return; // NOTREACHED
 	}
-
-
-	// default post action - upload a photo
-	Hook::callAll('photo_post_init', $_POST);
-
-	// Determine the album to use
-	$album    = trim($_REQUEST['album'] ?? '');
-	$newalbum = trim($_REQUEST['newalbum'] ?? '');
-
-	Logger::debug('album= ' . $album . ' newalbum= ' . $newalbum);
-
-	if (!strlen($album)) {
-		if (strlen($newalbum)) {
-			$album = $newalbum;
-		} else {
-			$album = DateTimeFormat::localNow('Y');
-		}
-	}
-
-	/*
-	 * We create a wall item for every photo, but we don't want to
-	 * overwhelm the data stream with a hundred newly uploaded photos.
-	 * So we will make the first photo uploaded to this album in the last several hours
-	 * visible by default, the rest will become visible over time when and if
-	 * they acquire comments, likes, dislikes, and/or tags
-	 */
-
-	$r = Photo::selectToArray([], ['`album` = ? AND `uid` = ? AND `created` > ?', $album, $page_owner_uid, DateTimeFormat::utc('now - 3 hours')]);
-
-	if (!DBA::isResult($r) || ($album == DI::l10n()->t(Photo::PROFILE_PHOTOS))) {
-		$visible = 1;
-	} else {
-		$visible = 0;
-	}
-
-	if (!empty($_REQUEST['not_visible']) && $_REQUEST['not_visible'] !== 'false') {
-		$visible = 0;
-	}
-
-	$ret = ['src' => '', 'filename' => '', 'filesize' => 0, 'type' => ''];
-
-	Hook::callAll('photo_post_file', $ret);
-
-	if (!empty($ret['src']) && !empty($ret['filesize'])) {
-		$src      = $ret['src'];
-		$filename = $ret['filename'];
-		$filesize = $ret['filesize'];
-		$type     = $ret['type'];
-		$error    = UPLOAD_ERR_OK;
-	} elseif (!empty($_FILES['userfile'])) {
-		$src      = $_FILES['userfile']['tmp_name'];
-		$filename = basename($_FILES['userfile']['name']);
-		$filesize = intval($_FILES['userfile']['size']);
-		$type     = $_FILES['userfile']['type'];
-		$error    = $_FILES['userfile']['error'];
-	} else {
-		$error    = UPLOAD_ERR_NO_FILE;
-	}
-
-	if ($error !== UPLOAD_ERR_OK) {
-		switch ($error) {
-			case UPLOAD_ERR_INI_SIZE:
-				DI::sysmsg()->addNotice(DI::l10n()->t('Image exceeds size limit of %s', ini_get('upload_max_filesize')));
-				break;
-			case UPLOAD_ERR_FORM_SIZE:
-				DI::sysmsg()->addNotice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($_REQUEST['MAX_FILE_SIZE'] ?? 0)));
-				break;
-			case UPLOAD_ERR_PARTIAL:
-				DI::sysmsg()->addNotice(DI::l10n()->t('Image upload didn\'t complete, please try again'));
-				break;
-			case UPLOAD_ERR_NO_FILE:
-				DI::sysmsg()->addNotice(DI::l10n()->t('Image file is missing'));
-				break;
-			case UPLOAD_ERR_NO_TMP_DIR:
-			case UPLOAD_ERR_CANT_WRITE:
-			case UPLOAD_ERR_EXTENSION:
-				DI::sysmsg()->addNotice(DI::l10n()->t('Server can\'t accept new file upload at this time, please contact your administrator'));
-				break;
-		}
-		@unlink($src);
-		$foo = 0;
-		Hook::callAll('photo_post_end', $foo);
-		return;
-	}
-
-	$type = Images::getMimeTypeBySource($src, $filename, $type);
-
-	Logger::info('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes');
-
-	$maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
-
-	if ($maximagesize && ($filesize > $maximagesize)) {
-		DI::sysmsg()->addNotice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)));
-		@unlink($src);
-		$foo = 0;
-		Hook::callAll('photo_post_end', $foo);
-		return;
-	}
-
-	if (!$filesize) {
-		DI::sysmsg()->addNotice(DI::l10n()->t('Image file is empty.'));
-		@unlink($src);
-		$foo = 0;
-		Hook::callAll('photo_post_end', $foo);
-		return;
-	}
-
-	Logger::debug('loading contents', ['src' => $src]);
-
-	$imagedata = @file_get_contents($src);
-
-	$image = new Image($imagedata, $type);
-
-	if (!$image->isValid()) {
-		Logger::notice('unable to process image');
-		DI::sysmsg()->addNotice(DI::l10n()->t('Unable to process image.'));
-		@unlink($src);
-		$foo = 0;
-		Hook::callAll('photo_post_end',$foo);
-		return;
-	}
-
-	$exif = $image->orient($src);
-	@unlink($src);
-
-	$max_length = DI::config()->get('system', 'max_image_length');
-	if ($max_length > 0) {
-		$image->scaleDown($max_length);
-	}
-
-	$width  = $image->getWidth();
-	$height = $image->getHeight();
-
-	$smallest = 0;
-
-	$resource_id = Photo::newResource();
-
-	$r = Photo::store($image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 0 , Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
-
-	if (!$r) {
-		Logger::warning('image store failed');
-		DI::sysmsg()->addNotice(DI::l10n()->t('Image upload failed.'));
-		return;
-	}
-
-	if ($width > 640 || $height > 640) {
-		$image->scaleDown(640);
-		Photo::store($image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 1, Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
-		$smallest = 1;
-	}
-
-	if ($width > 320 || $height > 320) {
-		$image->scaleDown(320);
-		Photo::store($image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 2, Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
-		$smallest = 2;
-	}
-
-	$uri = Item::newURI();
-
-	// Create item container
-	$lat = $lon = null;
-	if (!empty($exif['GPS']) && Feature::isEnabled($page_owner_uid, 'photo_location')) {
-		$lat = Photo::getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']);
-		$lon = Photo::getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']);
-	}
-
-	$arr = [];
-	if ($lat && $lon) {
-		$arr['coord'] = $lat . ' ' . $lon;
-	}
-
-	$arr['guid']          = System::createUUID();
-	$arr['uid']           = $page_owner_uid;
-	$arr['uri']           = $uri;
-	$arr['post-type']     = Item::PT_IMAGE;
-	$arr['wall']          = 1;
-	$arr['resource-id']   = $resource_id;
-	$arr['contact-id']    = $owner_record['id'];
-	$arr['owner-name']    = $owner_record['name'];
-	$arr['owner-link']    = $owner_record['url'];
-	$arr['owner-avatar']  = $owner_record['thumb'];
-	$arr['author-name']   = $owner_record['name'];
-	$arr['author-link']   = $owner_record['url'];
-	$arr['author-avatar'] = $owner_record['thumb'];
-	$arr['title']         = '';
-	$arr['allow_cid']     = $str_contact_allow;
-	$arr['allow_gid']     = $str_group_allow;
-	$arr['deny_cid']      = $str_contact_deny;
-	$arr['deny_gid']      = $str_group_deny;
-	$arr['visible']       = $visible;
-	$arr['origin']        = 1;
-
-	$arr['body']          = '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $resource_id . ']'
-				. '[img]' . DI::baseUrl() . "/photo/{$resource_id}-{$smallest}.".$image->getExt() . '[/img]'
-				. '[/url]';
-
-	$item_id = Item::insert($arr);
-	// Update the photo albums cache
-	Photo::clearAlbumCache($page_owner_uid);
-
-	Hook::callAll('photo_post_end', $item_id);
-
-	// addon uploaders should call "exit()" within the photo_post_end hook
-	// if they do not wish to be redirected
-
-	DI::baseUrl()->redirect($_SESSION['photo_return']);
-	// NOTREACHED
 }
 
 function photos_content(App $a)
@@ -884,6 +675,9 @@ function photos_content(App $a)
 			return;
 		}
 
+		// This prevents the photo upload form to return to itself without a hint the picture has been correctly uploaded.
+		DI::session()->remove('photo_return');
+
 		$selname = (!is_null($datum) && Strings::isHex($datum)) ? hex2bin($datum) : '';
 
 		$albumselect = '';
diff --git a/src/Module/Profile/Photos.php b/src/Module/Profile/Photos.php
index 12c0552b6a..caf0d16011 100644
--- a/src/Module/Profile/Photos.php
+++ b/src/Module/Profile/Photos.php
@@ -22,22 +22,29 @@
 namespace Friendica\Module\Profile;
 
 use Friendica\App;
+use Friendica\Content\Feature;
 use Friendica\Content\Pager;
-use Friendica\Content\Widget;
 use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Model\Contact;
+use Friendica\Model\Item;
 use Friendica\Model\Photo;
 use Friendica\Model\Profile;
-use Friendica\Model\User;
 use Friendica\Module\Response;
+use Friendica\Navigation\SystemMessages;
 use Friendica\Network\HTTPException;
+use Friendica\Object\Image;
 use Friendica\Security\Security;
+use Friendica\Util\ACLFormatter;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
 use Friendica\Util\Profiler;
+use Friendica\Util\Strings;
 use Psr\Log\LoggerInterface;
 
 class Photos extends \Friendica\Module\BaseProfile
@@ -52,16 +59,252 @@ class Photos extends \Friendica\Module\BaseProfile
 	private $app;
 	/** @var Database */
 	private $database;
+	/** @var SystemMessages */
+	private $systemMessages;
+	/** @var ACLFormatter */
+	private $aclFormatter;
+	/** @var array owner-view record */
+	private $owner;
 
-	public function __construct(Database $database, App $app, IManageConfigValues $config, App\Page $page, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+	public function __construct(ACLFormatter $aclFormatter, SystemMessages $systemMessages, Database $database, App $app, IManageConfigValues $config, App\Page $page, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
 	{
 		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-		$this->session  = $session;
-		$this->page     = $page;
-		$this->config   = $config;
-		$this->app      = $app;
-		$this->database = $database;
+		$this->session        = $session;
+		$this->page           = $page;
+		$this->config         = $config;
+		$this->app            = $app;
+		$this->database       = $database;
+		$this->systemMessages = $systemMessages;
+		$this->aclFormatter   = $aclFormatter;
+
+		$owner = Profile::load($this->app, $this->parameters['nickname'] ?? '');
+		if (!$owner || $owner['account_removed'] || $owner['account_expired']) {
+			throw new HTTPException\NotFoundException($this->t('User not found.'));
+		}
+
+		$this->owner = $owner;
+	}
+
+	protected function post(array $request = [])
+	{
+		if ($this->session->getLocalUserId() != $this->owner['uid']) {
+			throw new HTTPException\ForbiddenException($this->t('Permission denied.'));
+		}
+
+		$str_contact_allow = isset($request['contact_allow']) ? $this->aclFormatter->toString($request['contact_allow']) : $this->owner['allow_cid'] ?? '';
+		$str_group_allow   = isset($request['group_allow'])   ? $this->aclFormatter->toString($request['group_allow'])   : $this->owner['allow_gid'] ?? '';
+		$str_contact_deny  = isset($request['contact_deny'])  ? $this->aclFormatter->toString($request['contact_deny'])  : $this->owner['deny_cid']  ?? '';
+		$str_group_deny    = isset($request['group_deny'])    ? $this->aclFormatter->toString($request['group_deny'])    : $this->owner['deny_gid']  ?? '';
+
+		$visibility = $request['visibility'] ?? '';
+		if ($visibility === 'public') {
+			// The ACL selector introduced in version 2019.12 sends ACL input data even when the Public visibility is selected
+			$str_contact_allow = $str_group_allow = $str_contact_deny = $str_group_deny = '';
+		} else if ($visibility === 'custom') {
+			// Since we know from the visibility parameter the item should be private, we have to prevent the empty ACL
+			// case that would make it public. So we always append the author's contact id to the allowed contacts.
+			// See https://github.com/friendica/friendica/issues/9672
+			$str_contact_allow .= $this->aclFormatter->toString(Contact::getPublicIdByUserId($this->owner['uid']));
+		}
+
+		// default post action - upload a photo
+		Hook::callAll('photo_post_init', $request);
+
+		// Determine the album to use
+		$album    = trim($request['album'] ?? '');
+		$newalbum = trim($request['newalbum'] ?? '');
+
+		$this->logger->debug('album= ' . $album . ' newalbum= ' . $newalbum);
+
+		$album = $album ?: $newalbum ?: DateTimeFormat::localNow('Y');
+
+		/*
+		 * We create a wall item for every photo, but we don't want to
+		 * overwhelm the data stream with a hundred newly uploaded photos.
+		 * So we will make the first photo uploaded to this album in the last several hours
+		 * visible by default, the rest will become visible over time when and if
+		 * they acquire comments, likes, dislikes, and/or tags
+		 */
+
+		$r = Photo::selectToArray([], ['`album` = ? AND `uid` = ? AND `created` > ?', $album, $this->owner['uid'], DateTimeFormat::utc('now - 3 hours')]);
+		if (!$r || ($album == $this->t(Photo::PROFILE_PHOTOS))) {
+			$visible = 1;
+		} else {
+			$visible = 0;
+		}
+
+		if (!empty($request['not_visible']) && $request['not_visible'] !== 'false') {
+			$visible = 0;
+		}
+
+		$ret = ['src' => '', 'filename' => '', 'filesize' => 0, 'type' => ''];
+
+		Hook::callAll('photo_post_file', $ret);
+
+		if (!empty($ret['src']) && !empty($ret['filesize'])) {
+			$src      = $ret['src'];
+			$filename = $ret['filename'];
+			$filesize = $ret['filesize'];
+			$type     = $ret['type'];
+			$error    = UPLOAD_ERR_OK;
+		} elseif (!empty($_FILES['userfile'])) {
+			$src      = $_FILES['userfile']['tmp_name'];
+			$filename = basename($_FILES['userfile']['name']);
+			$filesize = intval($_FILES['userfile']['size']);
+			$type     = $_FILES['userfile']['type'];
+			$error    = $_FILES['userfile']['error'];
+		} else {
+			$error    = UPLOAD_ERR_NO_FILE;
+		}
+
+		if ($error !== UPLOAD_ERR_OK) {
+			switch ($error) {
+				case UPLOAD_ERR_INI_SIZE:
+					$this->systemMessages->addNotice($this->t('Image exceeds size limit of %s', ini_get('upload_max_filesize')));
+					break;
+				case UPLOAD_ERR_FORM_SIZE:
+					$this->systemMessages->addNotice($this->t('Image exceeds size limit of %s', Strings::formatBytes($request['MAX_FILE_SIZE'] ?? 0)));
+					break;
+				case UPLOAD_ERR_PARTIAL:
+					$this->systemMessages->addNotice($this->t('Image upload didn\'t complete, please try again'));
+					break;
+				case UPLOAD_ERR_NO_FILE:
+					$this->systemMessages->addNotice($this->t('Image file is missing'));
+					break;
+				case UPLOAD_ERR_NO_TMP_DIR:
+				case UPLOAD_ERR_CANT_WRITE:
+				case UPLOAD_ERR_EXTENSION:
+					$this->systemMessages->addNotice($this->t('Server can\'t accept new file upload at this time, please contact your administrator'));
+					break;
+			}
+			@unlink($src);
+			$foo = 0;
+			Hook::callAll('photo_post_end', $foo);
+			return;
+		}
+
+		$type = Images::getMimeTypeBySource($src, $filename, $type);
+
+		$this->logger->info('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes');
+
+		$maximagesize = Strings::getBytesFromShorthand($this->config->get('system', 'maximagesize'));
+
+		if ($maximagesize && ($filesize > $maximagesize)) {
+			$this->systemMessages->addNotice($this->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)));
+			@unlink($src);
+			$foo = 0;
+			Hook::callAll('photo_post_end', $foo);
+			return;
+		}
+
+		if (!$filesize) {
+			$this->systemMessages->addNotice($this->t('Image file is empty.'));
+			@unlink($src);
+			$foo = 0;
+			Hook::callAll('photo_post_end', $foo);
+			return;
+		}
+
+		$this->logger->debug('loading contents', ['src' => $src]);
+
+		$imagedata = @file_get_contents($src);
+
+		$image = new Image($imagedata, $type);
+
+		if (!$image->isValid()) {
+			$this->logger->notice('unable to process image');
+			$this->systemMessages->addNotice($this->t('Unable to process image.'));
+			@unlink($src);
+			$foo = 0;
+			Hook::callAll('photo_post_end',$foo);
+			return;
+		}
+
+		$exif = $image->orient($src);
+		@unlink($src);
+
+		$max_length = $this->config->get('system', 'max_image_length');
+		if ($max_length > 0) {
+			$image->scaleDown($max_length);
+		}
+
+		$width  = $image->getWidth();
+		$height = $image->getHeight();
+
+		$smallest = 0;
+
+		$resource_id = Photo::newResource();
+
+		$r = Photo::store($image, $this->owner['uid'], 0, $resource_id, $filename, $album, 0 , Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+
+		if (!$r) {
+			$this->logger->warning('image store failed');
+			$this->systemMessages->addNotice($this->t('Image upload failed.'));
+			return;
+		}
+
+		if ($width > 640 || $height > 640) {
+			$image->scaleDown(640);
+			Photo::store($image, $this->owner['uid'], 0, $resource_id, $filename, $album, 1, Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+			$smallest = 1;
+		}
+
+		if ($width > 320 || $height > 320) {
+			$image->scaleDown(320);
+			Photo::store($image, $this->owner['uid'], 0, $resource_id, $filename, $album, 2, Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+			$smallest = 2;
+		}
+
+		$uri = Item::newURI();
+
+		// Create item container
+		$lat = $lon = null;
+		if (!empty($exif['GPS']) && Feature::isEnabled($this->owner['uid'], 'photo_location')) {
+			$lat = Photo::getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']);
+			$lon = Photo::getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']);
+		}
+
+		$arr = [];
+		if ($lat && $lon) {
+			$arr['coord'] = $lat . ' ' . $lon;
+		}
+
+		$arr['guid']          = System::createUUID();
+		$arr['uid']           = $this->owner['uid'];
+		$arr['uri']           = $uri;
+		$arr['post-type']     = Item::PT_IMAGE;
+		$arr['wall']          = 1;
+		$arr['resource-id']   = $resource_id;
+		$arr['contact-id']    = $this->owner['id'];
+		$arr['owner-name']    = $this->owner['name'];
+		$arr['owner-link']    = $this->owner['url'];
+		$arr['owner-avatar']  = $this->owner['thumb'];
+		$arr['author-name']   = $this->owner['name'];
+		$arr['author-link']   = $this->owner['url'];
+		$arr['author-avatar'] = $this->owner['thumb'];
+		$arr['title']         = '';
+		$arr['allow_cid']     = $str_contact_allow;
+		$arr['allow_gid']     = $str_group_allow;
+		$arr['deny_cid']      = $str_contact_deny;
+		$arr['deny_gid']      = $str_group_deny;
+		$arr['visible']       = $visible;
+		$arr['origin']        = 1;
+
+		$arr['body']          = '[url=' . $this->baseUrl . '/photos/' . $this->owner['nickname'] . '/image/' . $resource_id . ']'
+			. '[img]' . $this->baseUrl . "/photo/{$resource_id}-{$smallest}.".$image->getExt() . '[/img]'
+			. '[/url]';
+
+		$item_id = Item::insert($arr);
+		// Update the photo albums cache
+		Photo::clearAlbumCache($this->owner['uid']);
+
+		Hook::callAll('photo_post_end', $item_id);
+
+		// addon uploaders should call "exit()" within the photo_post_end hook
+		// if they do not wish to be redirected
+
+		$this->baseUrl->redirect($this->session->get('photo_return') ?? 'profile/' . $this->owner['nickname'] . '/photos');
 	}
 
 	protected function content(array $request = []): string
@@ -72,13 +315,8 @@ class Photos extends \Friendica\Module\BaseProfile
 			throw new HttpException\ForbiddenException($this->t('Public access denied.'));
 		}
 
-		$owner = Profile::load($this->app, $this->parameters['nickname'] ?? '');
-		if (!$owner || $owner['account_removed'] || $owner['account_expired']) {
-			throw new HTTPException\NotFoundException($this->t('User not found.'));
-		}
-
-		$owner_uid = $owner['uid'];
-		$is_owner  = $this->session->getLocalUserId() && ($this->session->getLocalUserId() == $owner_uid);
+		$owner_uid = $this->owner['uid'];
+		$is_owner  = $this->session->getLocalUserId() == $owner_uid;
 
 		$remote_contact = false;
 		if ($this->session->getRemoteContactID($owner_uid)) {
@@ -88,7 +326,7 @@ class Photos extends \Friendica\Module\BaseProfile
 			$remote_contact = $contact && !$contact['blocked'] && !$contact['pending'];
 		}
 
-		if ($owner['hidewall'] && !$this->session->isAuthenticated()) {
+		if ($this->owner['hidewall'] && !$this->session->isAuthenticated()) {
 			$this->baseUrl->redirect('profile/' . $owner['nickname'] . '/restricted');
 		}
 
@@ -102,7 +340,7 @@ class Photos extends \Friendica\Module\BaseProfile
 			WHERE `uid` = ?
 			  AND `photo-type` = ?
 			  $sql_extra",
-			$owner['uid'],
+			$this->owner['uid'],
 			Photo::DEFAULT,
 		));
 		$total = $photo[0]['count'];
@@ -125,7 +363,7 @@ class Photos extends \Friendica\Module\BaseProfile
 			GROUP BY `resource-id`
 			ORDER BY `created` DESC
 		    LIMIT ? , ?",
-			$owner['uid'],
+			$this->owner['uid'],
 			Photo::DEFAULT,
 			$pager->getStart(),
 			$pager->getItemsPerPage()
@@ -133,15 +371,15 @@ class Photos extends \Friendica\Module\BaseProfile
 
 		$phototypes = Images::supportedTypes();
 
-		$photos = array_map(function ($photo) use ($owner, $phototypes) {
+		$photos = array_map(function ($photo) use ($phototypes) {
 			return [
 				'id'    => $photo['id'],
-				'link'  => 'photos/' . $owner['nickname'] . '/image/' . $photo['resource-id'],
+				'link'  => 'photos/' . $this->owner['nickname'] . '/image/' . $photo['resource-id'],
 				'title' => $this->t('View Photo'),
 				'src'   => 'photo/' . $photo['resource-id'] . '-' . ((($photo['scale']) == 6) ? 4 : $photo['scale']) . '.' . $phototypes[$photo['type']],
 				'alt'   => $photo['filename'],
 				'album' => [
-					'link' => 'photos/' . $owner['nickname'] . '/album/' . bin2hex($photo['album']),
+					'link' => 'photos/' . $this->owner['nickname'] . '/album/' . bin2hex($photo['album']),
 					'name' => $photo['album'],
 					'alt'  => $this->t('View Album'),
 				],
@@ -153,24 +391,24 @@ class Photos extends \Friendica\Module\BaseProfile
 			'$ispublic' => $this->t('everybody')
 		]);
 
-		if ($albums = Photo::getAlbums($owner['uid'])) {
-			$albums = array_map(function ($album) use ($owner) {
+		if ($albums = Photo::getAlbums($this->owner['uid'])) {
+			$albums = array_map(function ($album) {
 				return [
 					'text'      => $album['album'],
 					'total'     => $album['total'],
-					'url'       => 'photos/' . $owner['nickname'] . '/album/' . bin2hex($album['album']),
+					'url'       => 'photos/' . $this->owner['nickname'] . '/album/' . bin2hex($album['album']),
 					'urlencode' => urlencode($album['album']),
 					'bin2hex'   => bin2hex($album['album'])
 				];
 			}, $albums);
 
 			$photo_albums_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('photo_albums.tpl'), [
-				'$nick'     => $owner['nickname'],
+				'$nick'     => $this->owner['nickname'],
 				'$title'    => $this->t('Photo Albums'),
 				'$recent'   => $this->t('Recent Photos'),
 				'$albums'   => $albums,
-				'$upload'   => [$this->t('Upload New Photos'), 'photos/' . $owner['nickname'] . '/upload'],
-				'$can_post' => $this->session->getLocalUserId() && $owner['uid'] == $this->session->getLocalUserId(),
+				'$upload'   => [$this->t('Upload New Photos'), 'photos/' . $this->owner['nickname'] . '/upload'],
+				'$can_post' => $this->session->getLocalUserId() && $this->owner['uid'] == $this->session->getLocalUserId(),
 			]);
 		}
 
@@ -178,13 +416,13 @@ class Photos extends \Friendica\Module\BaseProfile
 			$this->page['aside'] .= $photo_albums_widget;
 		}
 
-		$o = self::getTabsHTML('photos', $is_owner, $owner['nickname'], Profile::getByUID($owner['uid'])['hide-friends'] ?? false);
+		$o = self::getTabsHTML('photos', $is_owner, $this->owner['nickname'], Profile::getByUID($this->owner['uid'])['hide-friends'] ?? false);
 
 		$tpl = Renderer::getMarkupTemplate('photos_recent.tpl');
 		$o .= Renderer::replaceMacros($tpl, [
 			'$title'    => $this->t('Recent Photos'),
-			'$can_post' => $is_owner || $remote_contact && $owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY,
-			'$upload'   => [$this->t('Upload New Photos'), 'photos/' . $owner['nickname'] . '/upload'],
+			'$can_post' => $is_owner,
+			'$upload'   => [$this->t('Upload New Photos'), 'photos/' . $this->owner['nickname'] . '/upload'],
 			'$photos'   => $photos,
 			'$paginate' => $pager->renderFull($total),
 		]);
diff --git a/static/routes.config.php b/static/routes.config.php
index b4ce8f79ed..f33cd9581a 100644
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -35,7 +35,7 @@ $profileRoutes = [
 	'/contacts/common'                         => [Module\Profile\Common::class,       [R::GET]],
 	'/contacts[/{type}]'                       => [Module\Profile\Contacts::class,     [R::GET]],
 	'/media'                                   => [Module\Profile\Media::class,        [R::GET]],
-	'/photos'                                  => [Module\Profile\Photos::class,       [R::GET         ]],
+	'/photos'                                  => [Module\Profile\Photos::class,       [R::GET, R::POST]],
 	'/profile'                                 => [Module\Profile\Profile::class,      [R::GET]],
 	'/remote_follow'                           => [Module\Profile\RemoteFollow::class, [R::GET, R::POST]],
 	'/restricted'                              => [Module\Profile\Restricted::class,   [R::GET         ]],

From 60f18f6f5679d648613c84d439a1df4591442f06 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Wed, 23 Nov 2022 16:03:38 -0500
Subject: [PATCH 2/2] Updated main translation file after moving strings

---
 view/lang/C/messages.po | 334 ++++++++++++++++++++--------------------
 1 file changed, 167 insertions(+), 167 deletions(-)

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index c1fb00c8fd..5728520d53 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2022.12-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-30 18:10-0500\n"
+"POT-Creation-Date: 2022-12-01 18:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,11 +23,11 @@ msgid "Unable to locate original post."
 msgstr ""
 
 #: mod/item.php:179 mod/item.php:184 mod/item.php:855 mod/message.php:69
-#: mod/message.php:114 mod/notes.php:44 mod/photos.php:159 mod/photos.php:883
+#: mod/message.php:114 mod/notes.php:44 mod/photos.php:157 mod/photos.php:674
 #: src/Model/Event.php:522 src/Module/Attach.php:55 src/Module/BaseApi.php:94
 #: src/Module/BaseNotifications.php:98 src/Module/BaseSettings.php:52
 #: src/Module/Calendar/Event/API.php:88 src/Module/Calendar/Event/Form.php:84
-#: src/Module/Calendar/Export.php:62 src/Module/Calendar/Show.php:77
+#: src/Module/Calendar/Export.php:62 src/Module/Calendar/Show.php:81
 #: src/Module/Contact/Advanced.php:60 src/Module/Contact/Follow.php:86
 #: src/Module/Contact/Follow.php:160 src/Module/Contact/MatchInterests.php:86
 #: src/Module/Contact/Suggestions.php:54 src/Module/Contact/Unfollow.php:66
@@ -39,15 +39,15 @@ msgstr ""
 #: src/Module/Notifications/Notification.php:107
 #: src/Module/OStatus/Repair.php:60 src/Module/OStatus/Subscribe.php:66
 #: src/Module/Post/Edit.php:76 src/Module/Profile/Common.php:55
-#: src/Module/Profile/Contacts.php:55 src/Module/Profile/Schedule.php:39
-#: src/Module/Profile/Schedule.php:56 src/Module/Profile/UnkMail.php:69
-#: src/Module/Profile/UnkMail.php:121 src/Module/Profile/UnkMail.php:132
-#: src/Module/Register.php:77 src/Module/Register.php:90
-#: src/Module/Register.php:206 src/Module/Register.php:245
-#: src/Module/Search/Directory.php:37 src/Module/Settings/Account.php:50
-#: src/Module/Settings/Account.php:407 src/Module/Settings/Delegation.php:41
-#: src/Module/Settings/Delegation.php:69 src/Module/Settings/Display.php:41
-#: src/Module/Settings/Display.php:119
+#: src/Module/Profile/Contacts.php:55 src/Module/Profile/Photos.php:92
+#: src/Module/Profile/Schedule.php:39 src/Module/Profile/Schedule.php:56
+#: src/Module/Profile/UnkMail.php:69 src/Module/Profile/UnkMail.php:121
+#: src/Module/Profile/UnkMail.php:132 src/Module/Register.php:77
+#: src/Module/Register.php:90 src/Module/Register.php:206
+#: src/Module/Register.php:245 src/Module/Search/Directory.php:37
+#: src/Module/Settings/Account.php:50 src/Module/Settings/Account.php:407
+#: src/Module/Settings/Delegation.php:41 src/Module/Settings/Delegation.php:69
+#: src/Module/Settings/Display.php:41 src/Module/Settings/Display.php:119
 #: src/Module/Settings/Profile/Photo/Crop.php:165
 #: src/Module/Settings/Profile/Photo/Index.php:111
 #: src/Module/Settings/RemoveMe.php:117 src/Module/Settings/UserExport.php:80
@@ -291,16 +291,16 @@ msgstr ""
 msgid "Insert web link"
 msgstr ""
 
-#: mod/message.php:203 mod/message.php:360 mod/photos.php:1496
+#: mod/message.php:203 mod/message.php:360 mod/photos.php:1290
 #: src/Content/Conversation.php:371 src/Content/Conversation.php:717
 #: src/Module/Item/Compose.php:204 src/Module/Post/Edit.php:142
 #: src/Module/Profile/UnkMail.php:155 src/Object/Post.php:537
 msgid "Please wait"
 msgstr ""
 
-#: mod/message.php:204 mod/message.php:359 mod/photos.php:913
-#: mod/photos.php:1030 mod/photos.php:1302 mod/photos.php:1343
-#: mod/photos.php:1399 mod/photos.php:1473
+#: mod/message.php:204 mod/message.php:359 mod/photos.php:707
+#: mod/photos.php:824 mod/photos.php:1096 mod/photos.php:1137
+#: mod/photos.php:1193 mod/photos.php:1267
 #: src/Module/Calendar/Event/Form.php:250 src/Module/Contact/Advanced.php:132
 #: src/Module/Contact/Profile.php:327
 #: src/Module/Debug/ActivityPubConversion.php:140
@@ -383,148 +383,112 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: mod/photos.php:68 mod/photos.php:139 mod/photos.php:791
+#: mod/photos.php:66 mod/photos.php:137 mod/photos.php:582
 #: src/Model/Event.php:514 src/Model/Profile.php:234
-#: src/Module/Calendar/Export.php:67 src/Module/DFRN/Poll.php:43
-#: src/Module/Feed.php:65 src/Module/HCard.php:51
+#: src/Module/Calendar/Export.php:67 src/Module/Calendar/Show.php:73
+#: src/Module/DFRN/Poll.php:43 src/Module/Feed.php:65 src/Module/HCard.php:51
 #: src/Module/Profile/Common.php:40 src/Module/Profile/Common.php:51
 #: src/Module/Profile/Contacts.php:39 src/Module/Profile/Contacts.php:49
-#: src/Module/Profile/Media.php:38 src/Module/Profile/Photos.php:77
+#: src/Module/Profile/Media.php:38 src/Module/Profile/Photos.php:83
 #: src/Module/Profile/RemoteFollow.php:71 src/Module/Profile/Status.php:58
 #: src/Module/Register.php:267
 msgid "User not found."
 msgstr ""
 
-#: mod/photos.php:107 src/Module/BaseProfile.php:68
-#: src/Module/Profile/Photos.php:169
+#: mod/photos.php:105 src/Module/BaseProfile.php:68
+#: src/Module/Profile/Photos.php:407
 msgid "Photo Albums"
 msgstr ""
 
-#: mod/photos.php:108 src/Module/Profile/Photos.php:170
-#: src/Module/Profile/Photos.php:185
+#: mod/photos.php:106 src/Module/Profile/Photos.php:408
+#: src/Module/Profile/Photos.php:423
 msgid "Recent Photos"
 msgstr ""
 
-#: mod/photos.php:110 mod/photos.php:1078 src/Module/Profile/Photos.php:172
-#: src/Module/Profile/Photos.php:187
+#: mod/photos.php:108 mod/photos.php:872 src/Module/Profile/Photos.php:410
+#: src/Module/Profile/Photos.php:425
 msgid "Upload New Photos"
 msgstr ""
 
-#: mod/photos.php:128 src/Module/BaseSettings.php:74
-#: src/Module/Profile/Photos.php:153
+#: mod/photos.php:126 src/Module/BaseSettings.php:74
+#: src/Module/Profile/Photos.php:391
 msgid "everybody"
 msgstr ""
 
-#: mod/photos.php:166
+#: mod/photos.php:164
 msgid "Contact information unavailable"
 msgstr ""
 
-#: mod/photos.php:195
+#: mod/photos.php:193
 msgid "Album not found."
 msgstr ""
 
-#: mod/photos.php:249
+#: mod/photos.php:247
 msgid "Album successfully deleted"
 msgstr ""
 
-#: mod/photos.php:251
+#: mod/photos.php:249
 msgid "Album was empty."
 msgstr ""
 
-#: mod/photos.php:283
+#: mod/photos.php:281
 msgid "Failed to delete the photo."
 msgstr ""
 
-#: mod/photos.php:551
+#: mod/photos.php:549
 msgid "a photo"
 msgstr ""
 
-#: mod/photos.php:551
+#: mod/photos.php:549
 #, php-format
 msgid "%1$s was tagged in %2$s by %3$s"
 msgstr ""
 
-#: mod/photos.php:630 mod/photos.php:633 mod/photos.php:660
-#: src/Module/Media/Photo/Upload.php:188
-#: src/Module/Settings/Profile/Photo/Index.php:59
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr ""
-
-#: mod/photos.php:636
-msgid "Image upload didn't complete, please try again"
-msgstr ""
-
-#: mod/photos.php:639
-msgid "Image file is missing"
-msgstr ""
-
-#: mod/photos.php:644
-msgid ""
-"Server can't accept new file upload at this time, please contact your "
-"administrator"
-msgstr ""
-
-#: mod/photos.php:668
-msgid "Image file is empty."
-msgstr ""
-
-#: mod/photos.php:683 src/Module/Media/Photo/Upload.php:154
-#: src/Module/Media/Photo/Upload.php:155
-#: src/Module/Settings/Profile/Photo/Index.php:68
-msgid "Unable to process image."
-msgstr ""
-
-#: mod/photos.php:709 src/Module/Media/Photo/Upload.php:206
-#: src/Module/Settings/Profile/Photo/Index.php:95
-msgid "Image upload failed."
-msgstr ""
-
-#: mod/photos.php:795 src/Module/Conversation/Community.php:187
-#: src/Module/Directory.php:48 src/Module/Profile/Photos.php:72
+#: mod/photos.php:586 src/Module/Conversation/Community.php:187
+#: src/Module/Directory.php:48 src/Module/Profile/Photos.php:315
 #: src/Module/Search/Index.php:64
 msgid "Public access denied."
 msgstr ""
 
-#: mod/photos.php:800
+#: mod/photos.php:591
 msgid "No photos selected"
 msgstr ""
 
-#: mod/photos.php:929
+#: mod/photos.php:723
 #, php-format
 msgid "The maximum accepted image size is %s"
 msgstr ""
 
-#: mod/photos.php:936
+#: mod/photos.php:730
 msgid "Upload Photos"
 msgstr ""
 
-#: mod/photos.php:940 mod/photos.php:1026
+#: mod/photos.php:734 mod/photos.php:820
 msgid "New album name: "
 msgstr ""
 
-#: mod/photos.php:941
+#: mod/photos.php:735
 msgid "or select existing album:"
 msgstr ""
 
-#: mod/photos.php:942
+#: mod/photos.php:736
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: mod/photos.php:944 mod/photos.php:1298 src/Content/Conversation.php:373
+#: mod/photos.php:738 mod/photos.php:1092 src/Content/Conversation.php:373
 #: src/Module/Calendar/Event/Form.php:253 src/Module/Post/Edit.php:179
 msgid "Permissions"
 msgstr ""
 
-#: mod/photos.php:1007
+#: mod/photos.php:801
 msgid "Do you really want to delete this photo album and all its photos?"
 msgstr ""
 
-#: mod/photos.php:1008 mod/photos.php:1031
+#: mod/photos.php:802 mod/photos.php:825
 msgid "Delete Album"
 msgstr ""
 
-#: mod/photos.php:1009 mod/photos.php:1110 src/Content/Conversation.php:389
+#: mod/photos.php:803 mod/photos.php:904 src/Content/Conversation.php:389
 #: src/Module/Contact/Follow.php:173 src/Module/Contact/Revoke.php:109
 #: src/Module/Contact/Unfollow.php:126
 #: src/Module/Media/Attachment/Browser.php:77
@@ -534,130 +498,130 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: mod/photos.php:1035
+#: mod/photos.php:829
 msgid "Edit Album"
 msgstr ""
 
-#: mod/photos.php:1036
+#: mod/photos.php:830
 msgid "Drop Album"
 msgstr ""
 
-#: mod/photos.php:1040
+#: mod/photos.php:834
 msgid "Show Newest First"
 msgstr ""
 
-#: mod/photos.php:1042
+#: mod/photos.php:836
 msgid "Show Oldest First"
 msgstr ""
 
-#: mod/photos.php:1063 src/Module/Profile/Photos.php:140
+#: mod/photos.php:857 src/Module/Profile/Photos.php:378
 msgid "View Photo"
 msgstr ""
 
-#: mod/photos.php:1096
+#: mod/photos.php:890
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: mod/photos.php:1098
+#: mod/photos.php:892
 msgid "Photo not available"
 msgstr ""
 
-#: mod/photos.php:1108
+#: mod/photos.php:902
 msgid "Do you really want to delete this photo?"
 msgstr ""
 
-#: mod/photos.php:1109 mod/photos.php:1303
+#: mod/photos.php:903 mod/photos.php:1097
 msgid "Delete Photo"
 msgstr ""
 
-#: mod/photos.php:1201
+#: mod/photos.php:995
 msgid "View photo"
 msgstr ""
 
-#: mod/photos.php:1203
+#: mod/photos.php:997
 msgid "Edit photo"
 msgstr ""
 
-#: mod/photos.php:1204
+#: mod/photos.php:998
 msgid "Delete photo"
 msgstr ""
 
-#: mod/photos.php:1205
+#: mod/photos.php:999
 msgid "Use as profile photo"
 msgstr ""
 
-#: mod/photos.php:1212
+#: mod/photos.php:1006
 msgid "Private Photo"
 msgstr ""
 
-#: mod/photos.php:1218
+#: mod/photos.php:1012
 msgid "View Full Size"
 msgstr ""
 
-#: mod/photos.php:1271
+#: mod/photos.php:1065
 msgid "Tags: "
 msgstr ""
 
-#: mod/photos.php:1274
+#: mod/photos.php:1068
 msgid "[Select tags to remove]"
 msgstr ""
 
-#: mod/photos.php:1289
+#: mod/photos.php:1083
 msgid "New album name"
 msgstr ""
 
-#: mod/photos.php:1290
+#: mod/photos.php:1084
 msgid "Caption"
 msgstr ""
 
-#: mod/photos.php:1291
+#: mod/photos.php:1085
 msgid "Add a Tag"
 msgstr ""
 
-#: mod/photos.php:1291
+#: mod/photos.php:1085
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: mod/photos.php:1292
+#: mod/photos.php:1086
 msgid "Do not rotate"
 msgstr ""
 
-#: mod/photos.php:1293
+#: mod/photos.php:1087
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: mod/photos.php:1294
+#: mod/photos.php:1088
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: mod/photos.php:1340 mod/photos.php:1396 mod/photos.php:1470
+#: mod/photos.php:1134 mod/photos.php:1190 mod/photos.php:1264
 #: src/Module/Contact.php:547 src/Module/Item/Compose.php:188
 #: src/Object/Post.php:983
 msgid "This is you"
 msgstr ""
 
-#: mod/photos.php:1342 mod/photos.php:1398 mod/photos.php:1472
+#: mod/photos.php:1136 mod/photos.php:1192 mod/photos.php:1266
 #: src/Object/Post.php:531 src/Object/Post.php:985
 msgid "Comment"
 msgstr ""
 
-#: mod/photos.php:1344 mod/photos.php:1400 mod/photos.php:1474
+#: mod/photos.php:1138 mod/photos.php:1194 mod/photos.php:1268
 #: src/Content/Conversation.php:386 src/Module/Calendar/Event/Form.php:248
 #: src/Module/Item/Compose.php:199 src/Module/Post/Edit.php:162
 #: src/Object/Post.php:997
 msgid "Preview"
 msgstr ""
 
-#: mod/photos.php:1345 src/Content/Conversation.php:341
+#: mod/photos.php:1139 src/Content/Conversation.php:341
 #: src/Module/Post/Edit.php:127 src/Object/Post.php:987
 msgid "Loading..."
 msgstr ""
 
-#: mod/photos.php:1431 src/Content/Conversation.php:633 src/Object/Post.php:255
+#: mod/photos.php:1225 src/Content/Conversation.php:633 src/Object/Post.php:255
 msgid "Select"
 msgstr ""
 
-#: mod/photos.php:1432 src/Content/Conversation.php:634
+#: mod/photos.php:1226 src/Content/Conversation.php:634
 #: src/Module/Moderation/Users/Active.php:136
 #: src/Module/Moderation/Users/Blocked.php:136
 #: src/Module/Moderation/Users/Index.php:151
@@ -665,23 +629,23 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: mod/photos.php:1493 src/Object/Post.php:378
+#: mod/photos.php:1287 src/Object/Post.php:378
 msgid "Like"
 msgstr ""
 
-#: mod/photos.php:1494 src/Object/Post.php:378
+#: mod/photos.php:1288 src/Object/Post.php:378
 msgid "I like this (toggle)"
 msgstr ""
 
-#: mod/photos.php:1495 src/Object/Post.php:379
+#: mod/photos.php:1289 src/Object/Post.php:379
 msgid "Dislike"
 msgstr ""
 
-#: mod/photos.php:1497 src/Object/Post.php:379
+#: mod/photos.php:1291 src/Object/Post.php:379
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: mod/photos.php:1519
+#: mod/photos.php:1313
 msgid "Map"
 msgstr ""
 
@@ -2993,21 +2957,21 @@ msgstr ""
 msgid "Sept"
 msgstr ""
 
-#: src/Model/Event.php:462 src/Module/Calendar/Show.php:122
+#: src/Model/Event.php:462 src/Module/Calendar/Show.php:126
 msgid "today"
 msgstr ""
 
-#: src/Model/Event.php:463 src/Module/Calendar/Show.php:123
+#: src/Model/Event.php:463 src/Module/Calendar/Show.php:127
 #: src/Util/Temporal.php:341
 msgid "month"
 msgstr ""
 
-#: src/Model/Event.php:464 src/Module/Calendar/Show.php:124
+#: src/Model/Event.php:464 src/Module/Calendar/Show.php:128
 #: src/Util/Temporal.php:342
 msgid "week"
 msgstr ""
 
-#: src/Model/Event.php:465 src/Module/Calendar/Show.php:125
+#: src/Model/Event.php:465 src/Module/Calendar/Show.php:129
 #: src/Util/Temporal.php:343
 msgid "day"
 msgstr ""
@@ -3331,7 +3295,7 @@ msgstr ""
 msgid "Contact information and Social Networks"
 msgstr ""
 
-#: src/Model/User.php:212 src/Model/User.php:1080
+#: src/Model/User.php:212 src/Model/User.php:1100
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
@@ -3343,134 +3307,134 @@ msgstr ""
 msgid "Not enough information to authenticate"
 msgstr ""
 
-#: src/Model/User.php:730
+#: src/Model/User.php:750
 msgid "Password can't be empty"
 msgstr ""
 
-#: src/Model/User.php:772
+#: src/Model/User.php:792
 msgid "Empty passwords are not allowed."
 msgstr ""
 
-#: src/Model/User.php:776
+#: src/Model/User.php:796
 msgid ""
 "The new password has been exposed in a public data dump, please choose "
 "another."
 msgstr ""
 
-#: src/Model/User.php:780
+#: src/Model/User.php:800
 msgid "The password length is limited to 72 characters."
 msgstr ""
 
-#: src/Model/User.php:784
+#: src/Model/User.php:804
 msgid ""
 "The password can't contain accentuated letters, white spaces or colons (:)"
 msgstr ""
 
-#: src/Model/User.php:963
+#: src/Model/User.php:983
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: src/Model/User.php:970
+#: src/Model/User.php:990
 msgid "An invitation is required."
 msgstr ""
 
-#: src/Model/User.php:974
+#: src/Model/User.php:994
 msgid "Invitation could not be verified."
 msgstr ""
 
-#: src/Model/User.php:982
+#: src/Model/User.php:1002
 msgid "Invalid OpenID url"
 msgstr ""
 
-#: src/Model/User.php:995 src/Security/Authentication.php:239
+#: src/Model/User.php:1015 src/Security/Authentication.php:241
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr ""
 
-#: src/Model/User.php:995 src/Security/Authentication.php:239
+#: src/Model/User.php:1015 src/Security/Authentication.php:241
 msgid "The error message was:"
 msgstr ""
 
-#: src/Model/User.php:1001
+#: src/Model/User.php:1021
 msgid "Please enter the required information."
 msgstr ""
 
-#: src/Model/User.php:1015
+#: src/Model/User.php:1035
 #, php-format
 msgid ""
 "system.username_min_length (%s) and system.username_max_length (%s) are "
 "excluding each other, swapping values."
 msgstr ""
 
-#: src/Model/User.php:1022
+#: src/Model/User.php:1042
 #, php-format
 msgid "Username should be at least %s character."
 msgid_plural "Username should be at least %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Model/User.php:1026
+#: src/Model/User.php:1046
 #, php-format
 msgid "Username should be at most %s character."
 msgid_plural "Username should be at most %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Model/User.php:1034
+#: src/Model/User.php:1054
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: src/Model/User.php:1039
+#: src/Model/User.php:1059
 msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: src/Model/User.php:1043
+#: src/Model/User.php:1063
 msgid "Not a valid email address."
 msgstr ""
 
-#: src/Model/User.php:1046
+#: src/Model/User.php:1066
 msgid "The nickname was blocked from registration by the nodes admin."
 msgstr ""
 
-#: src/Model/User.php:1050 src/Model/User.php:1056
+#: src/Model/User.php:1070 src/Model/User.php:1076
 msgid "Cannot use that email."
 msgstr ""
 
-#: src/Model/User.php:1062
+#: src/Model/User.php:1082
 msgid "Your nickname can only contain a-z, 0-9 and _."
 msgstr ""
 
-#: src/Model/User.php:1070 src/Model/User.php:1127
+#: src/Model/User.php:1090 src/Model/User.php:1147
 msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: src/Model/User.php:1114 src/Model/User.php:1118
+#: src/Model/User.php:1134 src/Model/User.php:1138
 msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: src/Model/User.php:1141
+#: src/Model/User.php:1161
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: src/Model/User.php:1148
+#: src/Model/User.php:1168
 msgid "An error occurred creating your self contact. Please try again."
 msgstr ""
 
-#: src/Model/User.php:1153
+#: src/Model/User.php:1173
 msgid "Friends"
 msgstr ""
 
-#: src/Model/User.php:1157
+#: src/Model/User.php:1177
 msgid ""
 "An error occurred creating your default contact group. Please try again."
 msgstr ""
 
-#: src/Model/User.php:1196
+#: src/Model/User.php:1216
 msgid "Profile Photos"
 msgstr ""
 
-#: src/Model/User.php:1389
+#: src/Model/User.php:1409
 #, php-format
 msgid ""
 "\n"
@@ -3478,7 +3442,7 @@ msgid ""
 "\t\t\tthe administrator of %2$s has set up an account for you."
 msgstr ""
 
-#: src/Model/User.php:1392
+#: src/Model/User.php:1412
 #, php-format
 msgid ""
 "\n"
@@ -3516,12 +3480,12 @@ msgid ""
 "\t\tThank you and welcome to %4$s."
 msgstr ""
 
-#: src/Model/User.php:1425 src/Model/User.php:1532
+#: src/Model/User.php:1445 src/Model/User.php:1552
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
-#: src/Model/User.php:1445
+#: src/Model/User.php:1465
 #, php-format
 msgid ""
 "\n"
@@ -3537,12 +3501,12 @@ msgid ""
 "\t\t"
 msgstr ""
 
-#: src/Model/User.php:1464
+#: src/Model/User.php:1484
 #, php-format
 msgid "Registration at %s"
 msgstr ""
 
-#: src/Model/User.php:1488
+#: src/Model/User.php:1508
 #, php-format
 msgid ""
 "\n"
@@ -3551,7 +3515,7 @@ msgid ""
 "\t\t\t"
 msgstr ""
 
-#: src/Model/User.php:1496
+#: src/Model/User.php:1516
 #, php-format
 msgid ""
 "\n"
@@ -5582,19 +5546,19 @@ msgstr ""
 msgid "calendar"
 msgstr ""
 
-#: src/Module/Calendar/Show.php:118
+#: src/Module/Calendar/Show.php:122
 msgid "Events"
 msgstr ""
 
-#: src/Module/Calendar/Show.php:119
+#: src/Module/Calendar/Show.php:123
 msgid "View"
 msgstr ""
 
-#: src/Module/Calendar/Show.php:120
+#: src/Module/Calendar/Show.php:124
 msgid "Create New Event"
 msgstr ""
 
-#: src/Module/Calendar/Show.php:126
+#: src/Module/Calendar/Show.php:130
 msgid "list"
 msgstr ""
 
@@ -7174,6 +7138,24 @@ msgstr ""
 msgid "File upload failed."
 msgstr ""
 
+#: src/Module/Media/Photo/Upload.php:154 src/Module/Media/Photo/Upload.php:155
+#: src/Module/Profile/Photos.php:217
+#: src/Module/Settings/Profile/Photo/Index.php:68
+msgid "Unable to process image."
+msgstr ""
+
+#: src/Module/Media/Photo/Upload.php:188 src/Module/Profile/Photos.php:164
+#: src/Module/Profile/Photos.php:167 src/Module/Profile/Photos.php:194
+#: src/Module/Settings/Profile/Photo/Index.php:59
+#, php-format
+msgid "Image exceeds size limit of %s"
+msgstr ""
+
+#: src/Module/Media/Photo/Upload.php:206 src/Module/Profile/Photos.php:243
+#: src/Module/Settings/Profile/Photo/Index.php:95
+msgid "Image upload failed."
+msgstr ""
+
 #: src/Module/Moderation/BaseUsers.php:72
 msgid "List of all users"
 msgstr ""
@@ -8183,7 +8165,25 @@ msgstr ""
 msgid "No contacts."
 msgstr ""
 
-#: src/Module/Profile/Photos.php:146
+#: src/Module/Profile/Photos.php:170
+msgid "Image upload didn't complete, please try again"
+msgstr ""
+
+#: src/Module/Profile/Photos.php:173
+msgid "Image file is missing"
+msgstr ""
+
+#: src/Module/Profile/Photos.php:178
+msgid ""
+"Server can't accept new file upload at this time, please contact your "
+"administrator"
+msgstr ""
+
+#: src/Module/Profile/Photos.php:202
+msgid "Image file is empty."
+msgstr ""
+
+#: src/Module/Profile/Photos.php:384
 msgid "View Album"
 msgstr ""
 
@@ -11201,20 +11201,20 @@ msgstr ""
 msgid "The folder %s must be writable by webserver."
 msgstr ""
 
-#: src/Security/Authentication.php:225
+#: src/Security/Authentication.php:227
 msgid "Login failed."
 msgstr ""
 
-#: src/Security/Authentication.php:270
+#: src/Security/Authentication.php:272
 msgid "Login failed. Please check your credentials."
 msgstr ""
 
-#: src/Security/Authentication.php:382
+#: src/Security/Authentication.php:389
 #, php-format
 msgid "Welcome %s"
 msgstr ""
 
-#: src/Security/Authentication.php:383
+#: src/Security/Authentication.php:390
 msgid "Please upload a profile photo."
 msgstr ""