Remove include/ requires that are now done directly from Composer

[friendica.git] / mod / filerm.php

diff --git a/mod/filerm.php b/mod/filerm.php
index 8ad1cddbf1d150e7a493552c6ae09a8a96d4626e..d240c2d6a757927df98f1bf81134889c7e69da16 100644 (file)
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -4,7 +4,7 @@ use Friendica\App;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Model\FileTag;
-use Friendica\Util\Strings;
+use Friendica\Util\XML;
 
 function filerm_content(App $a)
 {
@@ -13,8 +13,8 @@ function filerm_content(App $a)
                killme();
        }
 
-       $term = Strings::unescape(trim($_GET['term']));
-       $cat = Strings::unescape(trim($_GET['cat']));
+       $term = XML::unescape(trim($_GET['term']));
+       $cat = XML::unescape(trim(defaults($_GET, 'cat', '')));
 
        $category = (($cat) ? true : false);
 
@@ -25,12 +25,17 @@ function filerm_content(App $a)
 
        $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
-       Logger::log('filerm: tag ' . $term . ' item ' . $item_id);
+       Logger::log('filerm: tag ' . $term . ' item ' . $item_id  . ' category ' . ($category ? 'true' :  'false'));
 
-       if ($item_id && strlen($term))
-       {
-               FileTag::unsaveFile(local_user(), $item_id, $term, $category);
+       if ($item_id && strlen($term)) {
+               if (FileTag::unsaveFile(local_user(), $item_id, $term, $category)) {
+                       info('Item removed');
+               }
+       }
+       else {
+               info('Item was not deleted');
        }
 
+       $a->internalRedirect('/network?f=&file=' . rawurlencode($term));
        killme();
 }