Merge pull request #11224 from annando/statistics-separator

[friendica.git] / mod / tagger.php

diff --git a/mod/tagger.php b/mod/tagger.php
index 38575a21596cd9c13c3bd840e34825e108dad257..310e3c6140347851bd3f59ff75186a49d8da1593 100644 (file)
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @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,47 +41,35 @@ 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 = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[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;
        }
 
@@ -176,7 +164,9 @@ EOT;
 
        Hook::callAll('post_local_end', $arr);
 
-       Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, $post_id);
+       $post = Post::selectFirst(['uri-id', 'uid'], ['id' => $post_id]);
+
+       Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, $post['uri-id'], $post['uid']);
 
        exit();
 }