]> git.mxchange.org Git - friendica.git/blobdiff - mod/fbrowser.php
Ops, one more left ...
[friendica.git] / mod / fbrowser.php
index 21b9b2e7b416605842ee36378cb24a0d9587247a..3839bcc1cdef93749db9270798dea249ac4839a5 100644 (file)
@@ -6,14 +6,16 @@
  */
 
 use Friendica\App;
-
-require_once('include/Photo.php');
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Object\Image;
 
 /**
  * @param App $a
  */
-function fbrowser_content(App $a) {
-
+function fbrowser_content(App $a)
+{
        if (!local_user()) {
                killme();
        }
@@ -24,85 +26,85 @@ function fbrowser_content(App $a) {
 
        $template_file = "filebrowser.tpl";
        $mode = "";
-       if (x($_GET,'mode')) {
+       if (x($_GET, 'mode')) {
                $mode  = "?mode=".$_GET['mode'];
        }
 
        switch ($a->argv[1]) {
                case "image":
-                       $path = array(array("", 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 array(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[]=array($a->argv[2], $album);
+                               $path[]=[$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()),
-                               dbesc('Contact Photos'),
-                               dbesc( t('Contact Photos'))
+                               DBA::escape('Contact Photos'),
+                               DBA::escape(L10n::t('Contact Photos'))
                        );
 
-                       function _map_files1($rr){
+                       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",
-                                       dbesc($rr['resource-id']));
-                               if ($p)
+                                       DBA::escape($rr['resource-id']));
+                               if ($p) {
                                        $scale = $p[0]["scale"];
-                               else
+                               } else {
                                        $scale = $rr['loq'];
+                               }
 
-                               return array(
-                                       App::get_baseurl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
+                               return [
+                                       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);
 
                        $tpl = get_markup_template($template_file);
 
-                       $o =  replace_macros($tpl, array(
+                       $o =  replace_macros($tpl, [
                                '$type'     => 'image',
-                               '$baseurl'  => App::get_baseurl(),
+                               '$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":
@@ -111,44 +113,38 @@ function fbrowser_content(App $a) {
                                        intval(local_user())
                                );
 
-                               function _map_files2($rr){
+                               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'];
 
-                                       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 [System::baseUrl() . '/attach/' . $rr['id'], $filename_e, System::baseUrl() . '/images/icons/16/' . $filetype . '.png'];
                                }
                                $files = array_map("_map_files2", $files);
 
 
                                $tpl = get_markup_template($template_file);
-                               $o = replace_macros($tpl, array(
+                               $o = replace_macros($tpl, [
                                        '$type'     => 'file',
-                                       '$baseurl'  => App::get_baseurl(),
-                                       '$path'     => array( array( "", t("Files")) ),
+                                       '$baseurl'  => System::baseUrl(),
+                                       '$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 (x($_GET, 'mode')) {
                return $o;
        } else {
                echo $o;
                killme();
        }
-
-
 }