X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffbrowser.php;h=9bd7793e4269811798075ee876ff04cf27f57455;hb=a2f1bf6a83cef0b67d060b6a4686e585e5908c42;hp=984747bcd8124b529281b90137e5e4c56f4d146a;hpb=16f48731b120f1efb93f022f4dce5b4dc6738591;p=friendica.git

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 984747bcd8..9bd7793e42 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -9,6 +9,7 @@ use Friendica\App;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Photo;
 use Friendica\Util\Images;
 use Friendica\Util\Strings;
 
@@ -23,7 +24,7 @@ function fbrowser_content(App $a)
 		exit();
 	}
 
-	if ($a->argc == 1) {
+	if (DI::args()->getArgc() == 1) {
 		exit();
 	}
 
@@ -37,38 +38,38 @@ function fbrowser_content(App $a)
 
 	$o = '';
 
-	switch ($a->argv[1]) {
+	switch (DI::args()->getArgv()[1]) {
 		case "image":
 			$path = ['' => DI::l10n()->t('Photos')];
 			$albums = false;
 			$sql_extra = "";
 			$sql_extra2 = " ORDER BY created DESC LIMIT 0, 10";
 
-			if ($a->argc==2) {
-				$photos = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' ",
-					intval(local_user()),
-					DBA::escape('Contact Photos'),
-					DBA::escape(DI::l10n()->t('Contact Photos'))
-				);
+			if (DI::args()->getArgc() == 2) {
+				$photos = DBA::toArray(DBA::p("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = ? AND NOT `photo-type` IN (?, ?)",
+					local_user(),
+					Photo::CONTACT_AVATAR,
+					Photo::CONTACT_BANNER
+				));
 
 				$albums = array_column($photos, 'album');
 			}
 
-			if ($a->argc == 3) {
-				$album = $a->argv[2];
+			if (DI::args()->getArgc() == 3) {
+				$album = DI::args()->getArgv()[2];
 				$sql_extra = sprintf("AND `album` = '%s' ", DBA::escape($album));
 				$sql_extra2 = "";
 				$path[$album] = $album;
 			}
 
-			$r = q("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`, ANY_VALUE(`type`) AS `type`,
+			$r = DBA::toArray(DBA::p("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`, ANY_VALUE(`type`) AS `type`,
 					min(`scale`) AS `hiq`, max(`scale`) AS `loq`, ANY_VALUE(`desc`) AS `desc`, ANY_VALUE(`created`) AS `created`
-					FROM `photo` WHERE `uid` = %d $sql_extra AND `album` != '%s' AND `album` != '%s'
+					FROM `photo` WHERE `uid` = ? $sql_extra AND NOT `photo-type` IN (?, ?)
 					GROUP BY `resource-id` $sql_extra2",
-				intval(local_user()),
-				DBA::escape('Contact Photos'),
-				DBA::escape(DI::l10n()->t('Contact Photos'))
-			);
+				local_user(),
+				Photo::CONTACT_AVATAR,
+				Photo::CONTACT_BANNER
+			));
 
 			function _map_files1($rr)
 			{
@@ -78,16 +79,11 @@ function fbrowser_content(App $a)
 				$filename_e = $rr['filename'];
 
 				// Take the largest picture that is smaller or equal 640 pixels
-				$p = q("SELECT `scale` FROM `photo` WHERE `resource-id` = '%s' AND `height` <= 640 AND `width` <= 640 ORDER BY `resource-id`, `scale` LIMIT 1",
-					DBA::escape($rr['resource-id']));
-				if ($p) {
-					$scale = $p[0]["scale"];
-				} else {
-					$scale = $rr['loq'];
-				}
+				$photo = Photo::selectFirst(['scale'], ["`resource-id` = ? AND `height` <= ? AND `width` <= ?", $rr['resource-id'], 640, 640], ['order' => ['scale']]);
+				$scale = $photo['scale'] ?? $rr['loq'];
 
 				return [
-					DI::baseUrl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
+					DI::baseUrl() . '/photos/' . $a->getLoggedInUserNickname() . '/image/' . $rr['resource-id'],
 					$filename_e,
 					DI::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
 				];
@@ -102,16 +98,14 @@ function fbrowser_content(App $a)
 				'$folders'  => $albums,
 				'$files'    => $files,
 				'$cancel'   => DI::l10n()->t('Cancel'),
-				'$nickname' => $a->user['nickname'],
+				'$nickname' => $a->getLoggedInUserNickname(),
 				'$upload'   => DI::l10n()->t('Upload')
 			]);
 
 			break;
 		case "file":
-			if ($a->argc==2) {
-				$files = q("SELECT `id`, `filename`, `filetype` FROM `attach` WHERE `uid` = %d ",
-					intval(local_user())
-				);
+			if (DI::args()->getArgc()==2) {
+				$files = DBA::selectToArray('attach', ['id', 'filename', 'filetype'], ['uid' => local_user()]);
 
 				function _map_files2($rr)
 				{
@@ -127,11 +121,11 @@ function fbrowser_content(App $a)
 				$tpl = Renderer::getMarkupTemplate($template_file);
 				$o = Renderer::replaceMacros($tpl, [
 					'$type'     => 'file',
-					'$path'     => [ [ "", DI::l10n()->t("Files")] ],
+					'$path'     => ['' => DI::l10n()->t('Files')],
 					'$folders'  => false,
 					'$files'    => $files,
 					'$cancel'   => DI::l10n()->t('Cancel'),
-					'$nickname' => $a->user['nickname'],
+					'$nickname' => $a->getLoggedInUserNickname(),
 					'$upload'   => DI::l10n()->t('Upload')
 				]);
 			}