Merge develop into 3011_hcard_vcard

[friendica.git] / mod / filer.php

diff --git a/mod/filer.php b/mod/filer.php
old mode 100755 (executable)
new mode 100644 (file)
index a9e2135..4e79f33
--- a/mod/filer.php
+++ b/mod/filer.php
@@ -11,13 +11,27 @@ function filer_content(&$a) {
                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);
 
-       if($item_id && strlen($term))
+       if($item_id && strlen($term)){
+               // file item
                file_tag_save_file(local_user(),$item_id,$term);
-
+       } else {
+               // return filer dialog
+               $filetags = get_pconfig(local_user(),'system','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();
 }