X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Ftagger.php;h=e674efba698a567a66398eb8dc8c2ccccd6aaee4;hb=6abb4d40d6456f58a748077f161f5101b4048659;hp=adb1c89f46731a30ffa67c590cd72e012cadc06f;hpb=3cef3ab107f87f999cf4adcc909259925a631cea;p=friendica.git

diff --git a/mod/tagger.php b/mod/tagger.php
index adb1c89f46..e674efba69 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,11 +27,11 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Protocol\Activity;
-use Friendica\Util\Strings;
 use Friendica\Util\XML;
 use Friendica\Worker\Delivery;
 
@@ -41,51 +41,39 @@ function tagger_content(App $a) {
 		return;
 	}
 
-	$term = Strings::escapeTags(trim($_GET['term']));
+	$term = trim($_GET['term'] ?? '');
 	// no commas allowed
-	$term = str_replace([',',' '],['','_'],$term);
+	$term = str_replace([',',' ', '<', '>'],['','_', '', ''], $term);
 
 	if (!$term) {
 		return;
 	}
 
-	$item_id = ((DI::args()->getArgc() > 1) ? Strings::escapeTags(trim(DI::args()->getArgv()[1])) : 0);
+	$item_id = ((DI::args()->getArgc() > 1) ? trim(DI::args()->getArgv()[1]) : 0);
 
-	Logger::log('tagger: tag ' . $term . ' item ' . $item_id);
+	Logger::notice('tagger: tag ' . $term . ' item ' . $item_id);
 
 
 	$item = Post::selectFirst([], ['id' => $item_id]);
 
 	if (!$item_id || !DBA::isResult($item)) {
-		Logger::log('tagger: no item ' . $item_id);
+		Logger::notice('tagger: no item ' . $item_id);
 		return;
 	}
 
 	$owner_uid = $item['uid'];
-	$blocktags = 0;
-
-	$r = q("select `blocktags` from user where uid = %d limit 1",
-		intval($owner_uid)
-	);
-	if (DBA::isResult($r)) {
-		$blocktags = $r[0]['blocktags'];
-	}
 
 	if (local_user() != $owner_uid) {
 		return;
 	}
 
-	$r = q("select * from contact where self = 1 and uid = %d limit 1",
-		intval(local_user())
-	);
-	if (DBA::isResult($r)) {
-			$contact = $r[0];
-	} else {
-		Logger::log('tagger: no contact_id');
+	$contact = Contact::selectFirst([], ['self' => true, 'uid' => local_user()]);
+	if (!DBA::isResult($contact)) {
+		Logger::notice('tagger: no contact_id');
 		return;
 	}
 
-	$uri = Item::newURI($owner_uid);
+	$uri = Item::newURI();
 	$xterm = XML::escape($term);
 	$post_type = (($item['resource-id']) ? DI::l10n()->t('photo') : DI::l10n()->t('status'));
 	$targettype = (($item['resource-id']) ? Activity\ObjectType::IMAGE : Activity\ObjectType::NOTE );
@@ -179,6 +167,5 @@ EOT;
 	$post = Post::selectFirst(['uri-id', 'uid'], ['id' => $post_id]);
 
 	Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, $post['uri-id'], $post['uid']);
-
-	exit();
+	System::exit();
 }