X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffilerm.php;h=b1f9f8d74b88989518469f238694ad7e8a6bdd10;hb=25aa3cff1bf1adffde722bb3e8a38b2a3371a714;hp=66b684dc964b69cb5a140d8dc176e0172feb59a7;hpb=cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2;p=friendica.git

diff --git a/mod/filerm.php b/mod/filerm.php
index 66b684dc96..b1f9f8d74b 100644
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -1,21 +1,40 @@
 <?php
 
-function filerm_content(&$a) {
+use Friendica\App;
+use Friendica\Core\Logger;
+use Friendica\Model\FileTag;
+use Friendica\Util\XML;
 
-	if(! local_user()) {
-		killme();
+function filerm_content(App $a)
+{
+	if (! local_user())
+	{
+		exit();
 	}
 
-	$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']);
-	
-	killme();
+	$a->internalRedirect('/network?f=&file=' . rawurlencode($term));
+	exit();
 }