X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fphotos.php;h=53388512fa9768c96ea594d259780c9a0f7e12b6;hb=e99fcfddb5f7f95bbc78cca7d8fbb88464ccc1cc;hp=3d6a1d4051f1cece7072ea8b4b522ea9e59ed505;hpb=c6d1c01426ab98133e2f1329b373459b3867b159;p=friendica.git

diff --git a/mod/photos.php b/mod/photos.php
index 3d6a1d4051..53388512fa 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -117,7 +117,7 @@ function photos_init(App $a)
 
 		$tpl = Renderer::getMarkupTemplate("photos_head.tpl");
 
-		DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl,[
+		DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
 			'$ispublic' => DI::l10n()->t('everybody')
 		]);
 	}
@@ -163,14 +163,14 @@ function photos_post(App $a)
 
 	$aclFormatter = DI::aclFormatter();
 	$str_contact_allow = isset($_REQUEST['contact_allow']) ? $aclFormatter->toString($_REQUEST['contact_allow']) : $owner_record['allow_cid'] ?? '';
-	$str_group_allow   = isset($_REQUEST['group_allow'])   ? $aclFormatter->toString($_REQUEST['group_allow'])   : $owner_record['allow_gid'] ?? '';
+	$str_circle_allow  = isset($_REQUEST['circle_allow'])  ? $aclFormatter->toString($_REQUEST['circle_allow'])  : $owner_record['allow_gid'] ?? '';
 	$str_contact_deny  = isset($_REQUEST['contact_deny'])  ? $aclFormatter->toString($_REQUEST['contact_deny'])  : $owner_record['deny_cid']  ?? '';
-	$str_group_deny    = isset($_REQUEST['group_deny'])    ? $aclFormatter->toString($_REQUEST['group_deny'])    : $owner_record['deny_gid']  ?? '';
+	$str_circle_deny   = isset($_REQUEST['circle_deny'])   ? $aclFormatter->toString($_REQUEST['circle_deny'])   : $owner_record['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 = '';
+		$str_contact_allow = $str_circle_allow = $str_contact_deny = $str_circle_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.
@@ -214,13 +214,15 @@ function photos_post(App $a)
 
 			// get the list of photos we are about to delete
 			if ($visitor) {
-				$r = DBA::toArray(DBA::p("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `contact-id` = ? AND `uid` = ? AND `album` = ?",
+				$r = DBA::toArray(DBA::p(
+					"SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `contact-id` = ? AND `uid` = ? AND `album` = ?",
 					$visitor,
 					$page_owner_uid,
 					$album
 				));
 			} else {
-				$r = DBA::toArray(DBA::p("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `uid` = ? AND `album` = ?",
+				$r = DBA::toArray(DBA::p(
+					"SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `uid` = ? AND `album` = ?",
 					DI::userSession()->getLocalUserId(),
 					$album
 				));
@@ -258,7 +260,6 @@ function photos_post(App $a)
 			// same as above but remove single photo
 			if ($visitor) {
 				$condition = ['contact-id' => $visitor, 'uid' => $page_owner_uid, 'resource-id' => DI::args()->getArgv()[3]];
-
 			} else {
 				$condition = ['uid' => DI::userSession()->getLocalUserId(), 'resource-id' => DI::args()->getArgv()[3]];
 			}
@@ -311,16 +312,16 @@ function photos_post(App $a)
 
 					Photo::update(['height' => $height, 'width' => $width], ['resource-id' => $resource_id, 'uid' => $page_owner_uid, 'scale' => 0], $image);
 
-					if ($width > 640 || $height > 640) {
-						$image->scaleDown(640);
+					if ($width > \Friendica\Util\Proxy::PIXEL_MEDIUM || $height > \Friendica\Util\Proxy::PIXEL_MEDIUM) {
+						$image->scaleDown(\Friendica\Util\Proxy::PIXEL_MEDIUM);
 						$width  = $image->getWidth();
 						$height = $image->getHeight();
 
 						Photo::update(['height' => $height, 'width' => $width], ['resource-id' => $resource_id, 'uid' => $page_owner_uid, 'scale' => 1], $image);
 					}
 
-					if ($width > 320 || $height > 320) {
-						$image->scaleDown(320);
+					if ($width > \Friendica\Util\Proxy::PIXEL_SMALL || $height > \Friendica\Util\Proxy::PIXEL_SMALL) {
+						$image->scaleDown(\Friendica\Util\Proxy::PIXEL_SMALL);
 						$width  = $image->getWidth();
 						$height = $image->getHeight();
 
@@ -338,7 +339,7 @@ function photos_post(App $a)
 			$photo = $photos[0];
 			$ext = $phototypes[$photo['type']];
 			Photo::update(
-				['desc' => $desc, 'album' => $albname, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow, 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny],
+				['desc' => $desc, 'album' => $albname, 'allow_cid' => $str_contact_allow, 'allow_gid' => $str_circle_allow, 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_circle_deny],
 				['resource-id' => $resource_id, 'uid' => $page_owner_uid]
 			);
 
@@ -375,9 +376,7 @@ function photos_post(App $a)
 			$arr['visible']       = 0;
 			$arr['origin']        = 1;
 
-			$arr['body']          = '[url=' . DI::baseUrl() . '/photos/' . $user['nickname'] . '/image/' . $photo['resource-id'] . ']'
-						. '[img]' . DI::baseUrl() . '/photo/' . $photo['resource-id'] . '-' . $photo['scale'] . '.'. $ext . '[/img]'
-						. '[/url]';
+			$arr['body']          = Images::getBBCodeByResource($photo['resource-id'], $user['nickname'], $photo['scale'], $ext);
 
 			$item_id = Item::insert($arr);
 		}
@@ -407,7 +406,7 @@ function photos_post(App $a)
 					if (strpos($tag, '@') === 0) {
 						$profile = '';
 						$contact = null;
-						$name = substr($tag,1);
+						$name = substr($tag, 1);
 
 						if ((strpos($name, '@')) || (strpos($name, 'http://'))) {
 							$newname = $name;
@@ -443,13 +442,15 @@ function photos_post(App $a)
 							if ($tagcid) {
 								$contact = DBA::selectFirst('contact', [], ['id' => $tagcid, 'uid' => $page_owner_uid]);
 							} else {
-								$newname = str_replace('_',' ',$name);
+								$newname = str_replace('_', ' ', $name);
 
 								//select someone from this user's contacts by name
 								$contact = DBA::selectFirst('contact', [], ['name' => $newname, 'uid' => $page_owner_uid]);
 								if (!DBA::isResult($contact)) {
 									//select someone by attag or nick and the name passed in
-									$contact = DBA::selectFirst('contact', [],
+									$contact = DBA::selectFirst(
+										'contact',
+										[],
 										['(`attag` = ? OR `nick` = ?) AND `uid` = ?', $name, $name, $page_owner_uid],
 										['order' => ['attag' => true]]
 									);
@@ -691,11 +692,13 @@ function photos_content(App $a)
 
 		$uploader = '';
 
-		$ret = ['post_url' => 'profile/' . $user['nickname'] . '/photos',
-				'addon_text' => $uploader,
-				'default_upload' => true];
+		$ret = [
+			'post_url' => 'profile/' . $user['nickname'] . '/photos',
+			'addon_text' => $uploader,
+			'default_upload' => true
+		];
 
-		Hook::callAll('photo_upload_form',$ret);
+		Hook::callAll('photo_upload_form', $ret);
 
 		$default_upload_box = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_box.tpl'), []);
 		$default_upload_submit = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_submit.tpl'), [
@@ -707,7 +710,7 @@ function photos_content(App $a)
 		$umf_bytes = Strings::getBytesFromShorthand(ini_get('upload_max_filesize'));
 
 		// Per Friendica definition a value of '0' means unlimited:
-		If ($mis_bytes == 0) {
+		if ($mis_bytes == 0) {
 			$mis_bytes = INF;
 		}
 
@@ -721,7 +724,7 @@ function photos_content(App $a)
 
 		$aclselect_e = ($visitor ? '' : ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId()));
 
-		$o .= Renderer::replaceMacros($tpl,[
+		$o .= Renderer::replaceMacros($tpl, [
 			'$pagename' => DI::l10n()->t('Upload Photos'),
 			'$sessid' => session_id(),
 			'$usage' => $usage_message,
@@ -749,7 +752,7 @@ function photos_content(App $a)
 	if ($datatype === 'album') {
 		// if $datum is not a valid hex, redirect to the default page
 		if (is_null($datum) || !Strings::isHex($datum)) {
-			DI::baseUrl()->redirect('photos/' . $user['nickname']. '/album');
+			DI::baseUrl()->redirect('photos/' . $user['nickname'] . '/album');
 		}
 		$album = hex2bin($datum);
 
@@ -758,7 +761,8 @@ function photos_content(App $a)
 		}
 
 		$total = 0;
-		$r = DBA::toArray(DBA::p("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = ? AND `album` = ?
+		$r = DBA::toArray(DBA::p(
+			"SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = ? AND `album` = ?
 			AND `scale` <= 4 $sql_extra GROUP BY `resource-id`",
 			$owner_uid,
 			$album
@@ -777,7 +781,8 @@ function photos_content(App $a)
 			$order = 'DESC';
 		}
 
-		$r = DBA::toArray(DBA::p("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`,
+		$r = DBA::toArray(DBA::p(
+			"SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`,
 			ANY_VALUE(`type`) AS `type`, max(`scale`) AS `scale`, ANY_VALUE(`desc`) as `desc`,
 			ANY_VALUE(`created`) as `created`
 			FROM `photo` WHERE `uid` = ? AND `album` = ?
@@ -811,7 +816,7 @@ function photos_content(App $a)
 
 				$album_e = $album;
 
-				$o .= Renderer::replaceMacros($edit_tpl,[
+				$o .= Renderer::replaceMacros($edit_tpl, [
 					'$nametext' => DI::l10n()->t('New album name: '),
 					'$nickname' => $user['nickname'],
 					'$album' => $album_e,
@@ -845,16 +850,16 @@ function photos_content(App $a)
 				$desc_e = $rr['desc'];
 
 				$photos[] = [
-					'id' => $rr['id'],
-					'twist' => ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2,4),
-					'link' => 'photos/' . $user['nickname'] . '/image/' . $rr['resource-id']
+					'id'    => $rr['id'],
+					'twist' => ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2, 4),
+					'link'  => 'photos/' . $user['nickname'] . '/image/' . $rr['resource-id']
 						. ($order_field === 'created' ? '?order=created' : ''),
 					'title' => DI::l10n()->t('View Photo'),
-					'src' => 'photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext,
-					'alt' => $imgalt_e,
-					'desc'=> $desc_e,
-					'ext' => $ext,
-					'hash'=> $rr['resource-id'],
+					'src'   => 'photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' . $ext,
+					'alt'   => $imgalt_e,
+					'desc'  => $desc_e,
+					'ext'   => $ext,
+					'hash'  => $rr['resource-id'],
 				];
 			}
 		}
@@ -872,7 +877,6 @@ function photos_content(App $a)
 		]);
 
 		return $o;
-
 	}
 
 	// Display one photo
@@ -957,7 +961,7 @@ function photos_content(App $a)
 				}
 
 				$tpl = Renderer::getMarkupTemplate('photo_edit_head.tpl');
-				DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl,[
+				DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
 					'$prevlink' => $prevlink,
 					'$nextlink' => $nextlink
 				]);
@@ -969,7 +973,7 @@ function photos_content(App $a)
 				if ($nextlink) {
 					$nextlink = [$nextlink, '<div class="icon next"></div>'];
 				}
- 			}
+			}
 		}
 
 		if (count($ph) == 1) {
@@ -1009,12 +1013,12 @@ function photos_content(App $a)
 		}
 
 		$photo = [
-			'href' => 'photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']],
-			'title'=> DI::l10n()->t('View Full Size'),
-			'src'  => 'photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?_u=' . DateTimeFormat::utcNow('ymdhis'),
-			'height' => $hires['height'],
-			'width' => $hires['width'],
-			'album' => $hires['album'],
+			'href'     => 'photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']],
+			'title'    => DI::l10n()->t('View Full Size'),
+			'src'      => 'photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?_u=' . DateTimeFormat::utcNow('ymdhis'),
+			'height'   => $hires['height'],
+			'width'    => $hires['width'],
+			'album'    => $hires['album'],
 			'filename' => $hires['filename'],
 		];
 
@@ -1081,12 +1085,12 @@ function photos_content(App $a)
 
 			$edit = Renderer::replaceMacros($edit_tpl, [
 				'$id' => $ph[0]['id'],
-				'$album' => ['albname', DI::l10n()->t('New album name'), $album_e,''],
+				'$album' => ['albname', DI::l10n()->t('New album name'), $album_e, ''],
 				'$caption' => ['desc', DI::l10n()->t('Caption'), $caption_e, ''],
 				'$tags' => ['newtag', DI::l10n()->t('Add a Tag'), "", DI::l10n()->t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')],
-				'$rotate_none' => ['rotate', DI::l10n()->t('Do not rotate'),0,'', true],
-				'$rotate_cw' => ['rotate', DI::l10n()->t("Rotate CW \x28right\x29"),1,''],
-				'$rotate_ccw' => ['rotate', DI::l10n()->t("Rotate CCW \x28left\x29"),2,''],
+				'$rotate_none' => ['rotate', DI::l10n()->t('Do not rotate'), 0, '', true],
+				'$rotate_cw' => ['rotate', DI::l10n()->t("Rotate CW \x28right\x29"), 1, ''],
+				'$rotate_ccw' => ['rotate', DI::l10n()->t("Rotate CCW \x28left\x29"), 2, ''],
 
 				'$nickname' => $user['nickname'],
 				'$resource_id' => $ph[0]['resource-id'],
@@ -1181,7 +1185,7 @@ function photos_content(App $a)
 						$qcomment = $words ? explode("\n", $words) : [];
 					}
 
-					$comments .= Renderer::replaceMacros($cmnt_tpl,[
+					$comments .= Renderer::replaceMacros($cmnt_tpl, [
 						'$return_path' => '',
 						'$jsreload' => $return_path,
 						'$id' => $link_item['id'],
@@ -1205,13 +1209,19 @@ function photos_content(App $a)
 					$activity = DI::activity();
 
 					if (($activity->match($item['verb'], Activity::LIKE) ||
-					     $activity->match($item['verb'], Activity::DISLIKE)) &&
-					    ($item['gravity'] != Item::GRAVITY_PARENT)) {
+							$activity->match($item['verb'], Activity::DISLIKE)) &&
+						($item['gravity'] != Item::GRAVITY_PARENT)
+					) {
 						continue;
 					}
 
-					$author = ['uid' => 0, 'id' => $item['author-id'],
-						'network' => $item['author-network'], 'url' => $item['author-link']];
+					$author = [
+						'uid'     => 0,
+						'id'      => $item['author-id'],
+						'network' => $item['author-network'],
+						'url'     => $item['author-link'],
+						'alias'   => $item['author-alias']
+					];
 					$profile_url = Contact::magicLinkByContact($author);
 					if (strpos($profile_url, 'contact/redir/') === 0) {
 						$sparkle = ' sparkle';
@@ -1230,7 +1240,7 @@ function photos_content(App $a)
 					$title_e = $item['title'];
 					$body_e = BBCode::convertForUriId($item['uri-id'], $item['body']);
 
-					$comments .= Renderer::replaceMacros($template,[
+					$comments .= Renderer::replaceMacros($template, [
 						'$id'          => $item['id'],
 						'$profile_url' => $profile_url,
 						'$name'        => $item['author-name'],