wrong indent

[friendica.git] / mod / fbrowser.php

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 14802b08f4c3435490af445828c45bd59e21f556..559896acb13932ea6c690b4dd93d6dca0a385ef2 100644 (file)
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -7,27 +7,29 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Object\Image;
 
 /**
  * @param App $a
+ * @return string
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
  */
 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'];
-       }
+
+       $o = '';
 
        switch ($a->argv[1]) {
                case "image":
@@ -51,12 +53,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`,
@@ -70,7 +71,7 @@ function fbrowser_content(App $a)
 
                        function _map_files1($rr)
                        {
-                               $a = get_app();
+                               $a = \get_app();
                                $types = Image::supportedTypes();
                                $ext = $types[$rr['type']];
                                $filename_e = $rr['filename'];
@@ -92,9 +93,9 @@ 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,
@@ -114,8 +115,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'];
 
@@ -124,8 +124,8 @@ 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'     => [ [ "", L10n::t("Files")] ],
@@ -140,10 +140,10 @@ function fbrowser_content(App $a)
                        break;
        }
 
-       if (x($_GET, 'mode')) {
+       if (!empty($_GET['mode'])) {
                return $o;
        } else {
                echo $o;
-               killme();
+               exit();
        }
 }