X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffbrowser.php;h=f2bccb085a6f0d4d93c9a981728d94698b1727cd;hb=708ffaff51d3f5112af6b1fbd25d7ff6391e496e;hp=992f2633ff99fa73a5477bf85a3743fe8b8ff5b3;hpb=26b335ef3d8b1ec4e1b4e22cd7d3c34e66d2549d;p=friendica.git

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 992f2633ff..f2bccb085a 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -6,53 +6,65 @@
  */
 
 use Friendica\App;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Object\Image;
+use Friendica\Util\Strings;
 
 /**
  * @param App $a
+ * @return string
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
  */
-function fbrowser_content(App $a) {
-
+function fbrowser_content(App $a)
+{
 	if (!local_user()) {
-		killme();
+		exit();
 	}
 
 	if ($a->argc == 1) {
-		killme();
+		exit();
 	}
 
-	$template_file = "filebrowser.tpl";
-	$mode = "";
-	if (x($_GET,'mode')) {
-		$mode  = "?mode=".$_GET['mode'];
+	// Needed to match the correct template in a module that uses a different theme than the user/site/default
+	$theme = Strings::sanitizeFilePathItem(defaults($_GET, 'theme', null));
+	if ($theme && is_file("view/theme/$theme/config.php")) {
+		$a->setCurrentTheme($theme);
 	}
 
+	$template_file = "filebrowser.tpl";
+
+	$o = '';
+
 	switch ($a->argv[1]) {
 		case "image":
-			$path = [["", t("Photos")]];
+			$path = [["", L10n::t("Photos")]];
 			$albums = false;
 			$sql_extra = "";
 			$sql_extra2 = " ORDER BY created DESC LIMIT 0, 10";
 
-			if ($a->argc==2){
+			if ($a->argc==2) {
 				$albums = 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(L10n::t('Contact Photos'))
 				);
 
-				function _map_folder1($el){return [bin2hex($el['album']),$el['album']];};
-				$albums = array_map( "_map_folder1" , $albums);
+				function _map_folder1($el)
+				{
+					return [bin2hex($el['album']),$el['album']];
+				};
 
+				$albums = array_map("_map_folder1", $albums);
 			}
 
-			$album = "";
-			if ($a->argc==3){
+			if ($a->argc == 3) {
 				$album = hex2bin($a->argv[2]);
-				$sql_extra = sprintf("AND `album` = '%s' ",dbesc($album));
+				$sql_extra = sprintf("AND `album` = '%s' ", DBA::escape($album));
 				$sql_extra2 = "";
-				$path[]=[$a->argv[2], $album];
+				$path[] = [$a->argv[2], $album];
 			}
 
 			$r = q("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`, ANY_VALUE(`type`) AS `type`,
@@ -60,23 +72,25 @@ function fbrowser_content(App $a) {
 					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(L10n::t('Contact Photos'))
 			);
 
-			function _map_files1($rr){
-				$a = get_app();
+			function _map_files1($rr)
+			{
+				$a = \get_app();
 				$types = Image::supportedTypes();
 				$ext = $types[$rr['type']];
 				$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 [
 					System::baseUrl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
@@ -86,19 +100,18 @@ function fbrowser_content(App $a) {
 			}
 			$files = array_map("_map_files1", $r);
 
-			$tpl = get_markup_template($template_file);
+			$tpl = Renderer::getMarkupTemplate($template_file);
 
-			$o =  replace_macros($tpl, [
+			$o =  Renderer::replaceMacros($tpl, [
 				'$type'     => 'image',
-				'$baseurl'  => System::baseUrl(),
 				'$path'     => $path,
 				'$folders'  => $albums,
 				'$files'    => $files,
-				'$cancel'   => t('Cancel'),
+				'$cancel'   => L10n::t('Cancel'),
 				'$nickname' => $a->user['nickname'],
+				'$upload'   => L10n::t('Upload')
 			]);
 
-
 			break;
 		case "file":
 			if ($a->argc==2) {
@@ -106,9 +119,9 @@ function fbrowser_content(App $a) {
 					intval(local_user())
 				);
 
-				function _map_files2($rr){
-					$a = get_app();
-					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'];
 
@@ -117,28 +130,25 @@ function fbrowser_content(App $a) {
 				$files = array_map("_map_files2", $files);
 
 
-				$tpl = get_markup_template($template_file);
-				$o = replace_macros($tpl, [
+				$tpl = Renderer::getMarkupTemplate($template_file);
+				$o = Renderer::replaceMacros($tpl, [
 					'$type'     => 'file',
-					'$baseurl'  => System::baseUrl(),
-					'$path'     => [ [ "", t("Files")] ],
+					'$path'     => [ [ "", L10n::t("Files")] ],
 					'$folders'  => false,
-					'$files'    =>$files,
-					'$cancel'   => t('Cancel'),
+					'$files'    => $files,
+					'$cancel'   => L10n::t('Cancel'),
 					'$nickname' => $a->user['nickname'],
+					'$upload'   => L10n::t('Upload')
 				]);
-
 			}
 
 			break;
 	}
 
-	if (x($_GET,'mode')) {
+	if (!empty($_GET['mode'])) {
 		return $o;
 	} else {
 		echo $o;
-		killme();
+		exit();
 	}
-
-
 }