Replace *.ini.php by *.config.php in comments

[friendica.git] / mod / fbrowser.php

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index d25e485b4817ba6c4b6e783f20e582fe948c7e98..cc51d41995301def0f1fe7f7a43ed910da538aa2 100644 (file)
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -7,7 +7,9 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Object\Image;
 
 /**
@@ -39,8 +41,8 @@ function fbrowser_content(App $a)
                        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(L10n::t('Contact Photos'))
+                                       DBA::escape('Contact Photos'),
+                                       DBA::escape(L10n::t('Contact Photos'))
                                );
 
                                function _map_folder1($el)
@@ -54,7 +56,7 @@ function fbrowser_content(App $a)
                        $album = "";
                        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];
                        }
@@ -64,8 +66,8 @@ 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(L10n::t('Contact Photos'))
+                               DBA::escape('Contact Photos'),
+                               DBA::escape(L10n::t('Contact Photos'))
                        );
 
                        function _map_files1($rr)
@@ -77,7 +79,7 @@ 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']));
+                                       DBA::escape($rr['resource-id']));
                                if ($p) {
                                        $scale = $p[0]["scale"];
                                } else {
@@ -92,9 +94,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,
@@ -102,7 +104,7 @@ function fbrowser_content(App $a)
                                '$files'    => $files,
                                '$cancel'   => L10n::t('Cancel'),
                                '$nickname' => $a->user['nickname'],
-                               '$upload'       => L10n::t('Upload')
+                               '$upload'   => L10n::t('Upload')
                        ]);
 
                        break;
@@ -124,8 +126,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")] ],
@@ -133,7 +135,7 @@ function fbrowser_content(App $a)
                                        '$files'    => $files,
                                        '$cancel'   => L10n::t('Cancel'),
                                        '$nickname' => $a->user['nickname'],
-                                       '$upload'       => L10n::t('Upload')
+                                       '$upload'   => L10n::t('Upload')
                                ]);
                        }