X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffbrowser.php;h=984747bcd8124b529281b90137e5e4c56f4d146a;hb=631095eefdd8cc9698190c60a26322a35b57fc1b;hp=110ca9585c9d2e5ff0e346aaf4ad4328afffadd7;hpb=94bf0e2ad83f9d64cc374ee9e3d940ba417188ea;p=friendica.git diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 110ca9585c..984747bcd8 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -5,149 +5,144 @@ * @author Fabio Comuni */ -require_once('include/Photo.php'); +use Friendica\App; +use Friendica\Core\Renderer; +use Friendica\Database\DBA; +use Friendica\DI; +use Friendica\Util\Images; +use Friendica\Util\Strings; /** * @param App $a + * @return string + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ -function fbrowser_content($a){ +function fbrowser_content(App $a) +{ + if (!local_user()) { + exit(); + } - if (!local_user()) - killme(); + if ($a->argc == 1) { + exit(); + } - if ($a->argc==1) - killme(); + // Needed to match the correct template in a module that uses a different theme than the user/site/default + $theme = Strings::sanitizeFilePathItem($_GET['theme'] ?? null); + if ($theme && is_file("view/theme/$theme/config.php")) { + $a->setCurrentTheme($theme); + } $template_file = "filebrowser.tpl"; - $mode = ""; - if (x($_GET,'mode')) { - $template_file = "filebrowser_plain.tpl"; - $mode = "?mode=".$_GET['mode']; - } - //echo "
"; var_dump($a->argv); killme();
+	$o = '';
 
-	switch($a->argv[1]){
+	switch ($a->argv[1]) {
 		case "image":
-			$path = array( array("", t("Photos")));
+			$path = ['' => DI::l10n()->t('Photos')];
 			$albums = false;
 			$sql_extra = "";
 			$sql_extra2 = " ORDER BY created DESC LIMIT 0, 10";
 
-			if ($a->argc==2){
-				$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' ",
+			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()),
-					dbesc('Contact Photos'),
-					dbesc( t('Contact Photos'))
+					DBA::escape('Contact Photos'),
+					DBA::escape(DI::l10n()->t('Contact Photos'))
 				);
 
-				function _map_folder1($el){return array(bin2hex($el['album']),$el['album']);};
-				$albums = array_map( "_map_folder1" , $albums);
-
+				$albums = array_column($photos, 'album');
 			}
 
-			$album = "";
-			if ($a->argc==3){
-				$album = hex2bin($a->argv[2]);
-				$sql_extra = sprintf("AND `album` = '%s' ",dbesc($album));
+			if ($a->argc == 3) {
+				$album = $a->argv[2];
+				$sql_extra = sprintf("AND `album` = '%s' ", DBA::escape($album));
 				$sql_extra2 = "";
-				$path[]=array($a->argv[2], $album);
+				$path[$album] = $album;
 			}
 
-			$r = q("SELECT `resource-id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc`
+			$r = q("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'
 					GROUP BY `resource-id` $sql_extra2",
 				intval(local_user()),
-				dbesc('Contact Photos'),
-				dbesc( t('Contact Photos'))
+				DBA::escape('Contact Photos'),
+				DBA::escape(DI::l10n()->t('Contact Photos'))
 			);
 
-			function _map_files1($rr){
-				global $a;
-				$types = Photo::supportedTypes();
+			function _map_files1($rr)
+			{
+				$a = DI::app();
+				$types = Images::supportedTypes();
 				$ext = $types[$rr['type']];
-
-				if($a->theme['template_engine'] === 'internal') {
-					$filename_e = template_escape($rr['filename']);
-				}
-				else {
-					$filename_e = $rr['filename'];
-				}
+				$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",
-					dbesc($rr['resource-id']));
-				if ($p)
+					DBA::escape($rr['resource-id']));
+				if ($p) {
 					$scale = $p[0]["scale"];
-				else
+				} else {
 					$scale = $rr['loq'];
+				}
 
-				return array(
-					$a->get_baseurl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
+				return [
+					DI::baseUrl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
 					$filename_e,
-					$a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
-				);
+					DI::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
+				];
 			}
 			$files = array_map("_map_files1", $r);
 
-			$tpl = get_markup_template($template_file);
+			$tpl = Renderer::getMarkupTemplate($template_file);
 
-			$o =  replace_macros($tpl, array(
-				'$type' => 'image',
-				'$baseurl' => $a->get_baseurl(),
-				'$path' => $path,
-				'$folders' => $albums,
-				'$files' =>$files,
-				'$cancel' => t('Cancel'),
+			$o =  Renderer::replaceMacros($tpl, [
+				'$type'     => 'image',
+				'$path'     => $path,
+				'$folders'  => $albums,
+				'$files'    => $files,
+				'$cancel'   => DI::l10n()->t('Cancel'),
 				'$nickname' => $a->user['nickname'],
-			));
-
+				'$upload'   => DI::l10n()->t('Upload')
+			]);
 
 			break;
 		case "file":
-			if ($a->argc==2){
+			if ($a->argc==2) {
 				$files = q("SELECT `id`, `filename`, `filetype` FROM `attach` WHERE `uid` = %d ",
 					intval(local_user())
 				);
 
-				function _map_files2($rr){ global $a;
-					list($m1,$m2) = explode("/",$rr['filetype']);
+				function _map_files2($rr)
+				{
+					list($m1, $m2) = explode("/", $rr['filetype']);
 					$filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip");
+					$filename_e = $rr['filename'];
 
-					if($a->theme['template_engine'] === 'internal') {
-						$filename_e = template_escape($rr['filename']);
-					}
-					else {
-						$filename_e = $rr['filename'];
-					}
-
-					return array( $a->get_baseurl() . '/attach/' . $rr['id'], $filename_e, $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png');
+					return [DI::baseUrl() . '/attach/' . $rr['id'], $filename_e, DI::baseUrl() . '/images/icons/16/' . $filetype . '.png'];
 				}
 				$files = array_map("_map_files2", $files);
 
 
-				$tpl = get_markup_template($template_file);
-				$o = replace_macros($tpl, array(
-					'$type' => 'file',
-					'$baseurl' => $a->get_baseurl(),
-					'$path' => array( array( "", t("Files")) ),
-					'$folders' => false,
-					'$files' =>$files,
-					'$cancel' => t('Cancel'),
+				$tpl = Renderer::getMarkupTemplate($template_file);
+				$o = Renderer::replaceMacros($tpl, [
+					'$type'     => 'file',
+					'$path'     => [ [ "", DI::l10n()->t("Files")] ],
+					'$folders'  => false,
+					'$files'    => $files,
+					'$cancel'   => DI::l10n()->t('Cancel'),
 					'$nickname' => $a->user['nickname'],
-				));
-
+					'$upload'   => DI::l10n()->t('Upload')
+				]);
 			}
 
 			break;
 	}
 
-	if (x($_GET,'mode')) {
+	if (!empty($_GET['mode'])) {
 		return $o;
 	} else {
 		echo $o;
-		killme();
+		exit();
 	}
-
-
 }