X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffbrowser.php;h=45e960feceb828fbfd5e43f1bcc9b085f27701d5;hb=456ae169aba480141c43616eca385605aa1911d4;hp=14141d4004d614de4b46f18b9c99b4851557ce6d;hpb=fc2340d4afe6466c58e35afd64fe9010bf185b04;p=friendica.git

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 14141d4004..45e960fece 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -24,7 +24,7 @@ function fbrowser_content(App $a)
 		exit();
 	}
 
-	if ($a->argc == 1) {
+	if (DI::args()->getArgc() == 1) {
 		exit();
 	}
 
@@ -38,14 +38,14 @@ 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) {
+			if (DI::args()->getArgc()==2) {
 				$photos = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' ",
 					intval(local_user()),
 					DBA::escape(Photo::CONTACT_PHOTOS),
@@ -55,8 +55,8 @@ function fbrowser_content(App $a)
 				$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;
@@ -79,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
 				];
@@ -103,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)
 				{
@@ -132,7 +125,7 @@ function fbrowser_content(App $a)
 					'$folders'  => false,
 					'$files'    => $files,
 					'$cancel'   => DI::l10n()->t('Cancel'),
-					'$nickname' => $a->user['nickname'],
+					'$nickname' => $a->getLoggedInUserNickname(),
 					'$upload'   => DI::l10n()->t('Upload')
 				]);
 			}