Merge pull request #11761 from tobiasd/20220722-zh-cn

[friendica.git] / mod / tagger.php

diff --git a/mod/tagger.php b/mod/tagger.php
index af555790a53fda3a083758d36ca30d44187bce31..e674efba698a567a66398eb8dc8c2ccccd6aaee4 100644 (file)
--- 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
  *
@@ -32,7 +32,6 @@ 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;
 
@@ -42,15 +41,15 @@ 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::notice('tagger: tag ' . $term . ' item ' . $item_id);
 
@@ -74,7 +73,7 @@ function tagger_content(App $a) {
                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 );
@@ -168,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();
 }