Merge pull request #6432 from annando/deleted-pending

[friendica.git] / mod / filerm.php

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