Improve Console/Config display for array values

[friendica.git] / mod / filerm.php

diff --git a/mod/filerm.php b/mod/filerm.php
index c520fec7ac0f48a5adcdf13630f76a1026bd611c..bd46a8bfea2cc540eac71b44b24a9d0637654195 100644 (file)
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -1,21 +1,33 @@
 <?php
 
-function filerm_content(&$a) {
+use Friendica\App;
+use Friendica\Core\System;
 
-       if(! local_user()) {
+function filerm_content(App $a) {
+
+       if (! local_user()) {
                killme();
        }
 
        $term = unxmlify(trim($_GET['term']));
+       $cat = unxmlify(trim($_GET['cat']));
+
+       $category = (($cat) ? true : false);
+       if ($category) {
+               $term = $cat;
+       }
+
        $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
        logger('filerm: tag ' . $term . ' item ' . $item_id);
 
-       if($item_id && strlen($term))
-               file_tag_unsave_file(local_user(),$item_id,$term);
+       if ($item_id && strlen($term)) {
+               file_tag_unsave_file(local_user(),$item_id,$term, $category);
+       }
+
+       if (x($_SESSION,'return_url')) {
+               goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
+       }
 
-       if(x($_SESSION,'return_url'))
-               goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
-       
        killme();
 }