X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffbrowser.php;h=f2bccb085a6f0d4d93c9a981728d94698b1727cd;hb=7c87e83dcfae34c75eb8070f225edab670b81efb;hp=3401359052fa29c39a4992e6c641740d87f35dc0;hpb=af9067a381430b520a155bd3803a338d44cfaace;p=friendica.git

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 3401359052..f2bccb085a 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -11,6 +11,7 @@ use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Object\Image;
+use Friendica\Util\Strings;
 
 /**
  * @param App $a
@@ -27,12 +28,16 @@ function fbrowser_content(App $a)
 		exit();
 	}
 
-	$template_file = "filebrowser.tpl";
-	$mode = "";
-	if (!empty($_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 = [["", L10n::t("Photos")]];
@@ -55,12 +60,11 @@ function fbrowser_content(App $a)
 				$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' ", 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`,
@@ -100,7 +104,6 @@ function fbrowser_content(App $a)
 
 			$o =  Renderer::replaceMacros($tpl, [
 				'$type'     => 'image',
-				'$baseurl'  => System::baseUrl(),
 				'$path'     => $path,
 				'$folders'  => $albums,
 				'$files'    => $files,
@@ -118,8 +121,7 @@ function fbrowser_content(App $a)
 
 				function _map_files2($rr)
 				{
-					$a = \get_app();
-					list($m1,$m2) = explode("/", $rr['filetype']);
+					list($m1, $m2) = explode("/", $rr['filetype']);
 					$filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip");
 					$filename_e = $rr['filename'];
 
@@ -131,7 +133,6 @@ function fbrowser_content(App $a)
 				$tpl = Renderer::getMarkupTemplate($template_file);
 				$o = Renderer::replaceMacros($tpl, [
 					'$type'     => 'file',
-					'$baseurl'  => System::baseUrl(),
 					'$path'     => [ [ "", L10n::t("Files")] ],
 					'$folders'  => false,
 					'$files'    => $files,