merged 2 if() into one as requested by CR

[friendica.git] / mod / filer.php

diff --git a/mod/filer.php b/mod/filer.php
old mode 100755 (executable)
new mode 100644 (file)
index 3b3a379..47c4aa5
--- a/mod/filer.php
+++ b/mod/filer.php
@@ -5,14 +5,14 @@ require_once('include/bbcode.php');
 require_once('include/items.php');
 
 
-function filer_content(&$a) {
+function filer_content(App $a) {
 
-       if(! local_user()) {
+       if (! local_user()) {
                killme();
        }
 
-       $term = notags(trim($_GET['term']));
-       $item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0);
+       $term = unxmlify(trim($_GET['term']));
+       $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
        logger('filer: tag ' . $term . ' item ' . $item_id);
 
@@ -22,13 +22,15 @@ function filer_content(&$a) {
        } else {
                // return filer dialog
                $filetags = get_pconfig(local_user(),'system','filetags');
-               $filetags = explode("][", trim($filetags,"[]"));
+               $filetags = file_tag_file_to_list($filetags,'file');
+                $filetags = explode(",", $filetags);
+
                $tpl = get_markup_template("filer_dialog.tpl");
                $o = replace_macros($tpl, array(
                        '$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')),
                        '$submit' => t('Save'),
                ));
-               
+
                echo $o;
        }
        killme();