X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffbrowser.php;h=3297dd918b0a74567362670cd1afcdda2d02a93a;hb=3b23f89ca257f972aa9c7beffdd308b1fd1b37e6;hp=21b9b2e7b416605842ee36378cb24a0d9587247a;hpb=1f58bcc114928a5a3cd97bd0de34a5aa7d585931;p=friendica.git

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 21b9b2e7b4..3297dd918b 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -6,8 +6,8 @@
  */
 
 use Friendica\App;
-
-require_once('include/Photo.php');
+use Friendica\Core\System;
+use Friendica\Object\Image;
 
 /**
  * @param App $a
@@ -55,7 +55,8 @@ function fbrowser_content(App $a) {
 				$path[]=array($a->argv[2], $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()),
@@ -65,15 +66,9 @@ function fbrowser_content(App $a) {
 
 			function _map_files1($rr){
 				$a = get_app();
-				$types = Photo::supportedTypes();
+				$types = Image::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",
@@ -84,9 +79,9 @@ function fbrowser_content(App $a) {
 					$scale = $rr['loq'];
 
 				return array(
-					App::get_baseurl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
+					System::baseUrl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
 					$filename_e,
-					App::get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
+					System::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
 				);
 			}
 			$files = array_map("_map_files1", $r);
@@ -95,7 +90,7 @@ function fbrowser_content(App $a) {
 
 			$o =  replace_macros($tpl, array(
 				'$type'     => 'image',
-				'$baseurl'  => App::get_baseurl(),
+				'$baseurl'  => System::baseUrl(),
 				'$path'     => $path,
 				'$folders'  => $albums,
 				'$files'    => $files,
@@ -115,14 +110,9 @@ function fbrowser_content(App $a) {
 					$a = get_app();
 					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( App::get_baseurl() . '/attach/' . $rr['id'], $filename_e, App::get_baseurl() . '/images/icons/16/' . $filetype . '.png');
+					return array(System::baseUrl() . '/attach/' . $rr['id'], $filename_e, System::baseUrl() . '/images/icons/16/' . $filetype . '.png');
 				}
 				$files = array_map("_map_files2", $files);
 
@@ -130,7 +120,7 @@ function fbrowser_content(App $a) {
 				$tpl = get_markup_template($template_file);
 				$o = replace_macros($tpl, array(
 					'$type'     => 'file',
-					'$baseurl'  => App::get_baseurl(),
+					'$baseurl'  => System::baseUrl(),
 					'$path'     => array( array( "", t("Files")) ),
 					'$folders'  => false,
 					'$files'    =>$files,