Merge pull request #6559 from tobiasd/20190130-admininiwarning

[friendica.git] / mod / filer.php

diff --git a/mod/filer.php b/mod/filer.php
index cd2a41dfd37b177dff9ec68dda0a174a5ff539b0..0d9afe638b48b16ae681efc9f6aad0e026912fad 100644 (file)
--- a/mod/filer.php
+++ b/mod/filer.php
@@ -6,36 +6,37 @@ use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
-
-require_once 'include/items.php';
+use Friendica\Core\Renderer;
+use Friendica\Model\FileTag;
+use Friendica\Util\XML;
 
 function filer_content(App $a)
 {
        if (! local_user()) {
-               killme();
+               exit();
        }
 
-       $term = unxmlify(trim(defaults($_GET, 'term', '')));
+       $term = XML::unescape(trim(defaults($_GET, 'term', '')));
        $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
        Logger::log('filer: tag ' . $term . ' item ' . $item_id);
 
        if ($item_id && strlen($term)) {
                // file item
-               file_tag_save_file(local_user(), $item_id, $term);
+               FileTag::saveFile(local_user(), $item_id, $term);
        } else {
                // return filer dialog
                $filetags = PConfig::get(local_user(), 'system', 'filetags');
-               $filetags = file_tag_file_to_list($filetags, 'file');
+               $filetags = FileTag::fileToList($filetags, 'file');
                $filetags = explode(",", $filetags);
 
-               $tpl = get_markup_template("filer_dialog.tpl");
-               $o = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate("filer_dialog.tpl");
+               $o = Renderer::replaceMacros($tpl, [
                        '$field' => ['term', L10n::t("Save to Folder:"), '', '', $filetags, L10n::t('- select -')],
                        '$submit' => L10n::t('Save'),
                ]);
 
                echo $o;
        }
-       killme();
+       exit();
 }