X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffilerm.php;h=d240c2d6a757927df98f1bf81134889c7e69da16;hb=c4038e7af15442d8bca8c7d7818ffbb9b02a0521;hp=bd46a8bfea2cc540eac71b44b24a9d0637654195;hpb=a0530d1066d7268f1b1ea67bc3c254e9f9fc5ec8;p=friendica.git

diff --git a/mod/filerm.php b/mod/filerm.php
index bd46a8bfea..d240c2d6a7 100644
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -1,33 +1,41 @@
 <?php
 
 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()) {
+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(System::baseUrl() . '/' . $_SESSION['return_url']);
+	else {
+		info('Item was not deleted');
 	}
 
+	$a->internalRedirect('/network?f=&file=' . rawurlencode($term));
 	killme();
 }