Merge pull request #6432 from annando/deleted-pending

[friendica.git] / mod / filerm.php

diff --git a/mod/filerm.php b/mod/filerm.php
index d3d74a4c2f6b84c0e31e75c08b2877e24db5a845..d240c2d6a757927df98f1bf81134889c7e69da16 100644 (file)
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -1,30 +1,41 @@
 <?php
 
-function filerm_content(&$a) {
-
-       if (! local_user()) {
+use Friendica\App;
+use Friendica\Core\Logger;
+use Friendica\Core\System;
+use Friendica\Model\FileTag;
+use Friendica\Util\XML;
+
+function filerm_content(App $a)
+{
+       if (! local_user())
+       {
                killme();
        }
 
-       $term = unxmlify(trim($_GET['term']));
-       $cat = unxmlify(trim($_GET['cat']));
+       $term = XML::unescape(trim($_GET['term']));
+       $cat = XML::unescape(trim(defaults($_GET, 'cat', '')));
 
        $category = (($cat) ? true : false);
-       if ($category) {
+
+       if ($category)
+       {
                $term = $cat;
        }
 
        $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
-       logger('filerm: tag ' . $term . ' item ' . $item_id);
+       Logger::log('filerm: tag ' . $term . ' item ' . $item_id  . ' category ' . ($category ? 'true' :  'false'));
 
        if ($item_id && strlen($term)) {
-               file_tag_unsave_file(local_user(),$item_id,$term, $category);
+               if (FileTag::unsaveFile(local_user(), $item_id, $term, $category)) {
+                       info('Item removed');
+               }
        }
-
-       if (x($_SESSION,'return_url')) {
-               goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
+       else {
+               info('Item was not deleted');
        }
 
+       $a->internalRedirect('/network?f=&file=' . rawurlencode($term));
        killme();
 }