Ops, one more left ...

[friendica.git] / mod / fbrowser.php

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 992f2633ff99fa73a5477bf85a3743fe8b8ff5b3..3839bcc1cdef93749db9270798dea249ac4839a5 100644 (file)
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -6,14 +6,16 @@
  */
 
 use Friendica\App;
+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,33 +26,36 @@ 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 = [["", 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];
                        }
@@ -60,11 +65,12 @@ 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){
+                       function _map_files1($rr)
+                       {
                                $a = get_app();
                                $types = Image::supportedTypes();
                                $ext = $types[$rr['type']];
@@ -72,11 +78,12 @@ function fbrowser_content(App $a) {
 
                                // 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'],
@@ -94,11 +101,11 @@ function fbrowser_content(App $a) {
                                '$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 +113,10 @@ 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'];
 
@@ -121,24 +129,22 @@ function fbrowser_content(App $a) {
                                $o = replace_macros($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 (x($_GET, 'mode')) {
                return $o;
        } else {
                echo $o;
                killme();
        }
-
-
 }