Fixed fatal error

[friendica.git/.git] / mod / tagger.php

diff --git a/mod/tagger.php b/mod/tagger.php
index 8b7e7d0..a6f35ce 100644 (file)
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -1,26 +1,45 @@
 <?php
 /**
- * @file mod/tagger.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 use Friendica\App;
-use Friendica\Core\Addon;
-use Friendica\Core\L10n;
+use Friendica\Core\Hook;
 use Friendica\Core\Logger;
+use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Protocol\Activity;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
-
-require_once 'include/items.php';
+use Friendica\Worker\Delivery;
 
 function tagger_content(App $a) {
 
-       if (!local_user() && !remote_user()) {
+       if (!Session::isAuthenticated()) {
                return;
        }
 
-       $term = notags(trim($_GET['term']));
+       $term = Strings::escapeTags(trim($_GET['term']));
        // no commas allowed
        $term = str_replace([',',' '],['','_'],$term);
 
@@ -28,7 +47,7 @@ function tagger_content(App $a) {
                return;
        }
 
-       $item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0);
+       $item_id = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : 0);
 
        Logger::log('tagger: tag ' . $term . ' item ' . $item_id);
 
@@ -41,14 +60,12 @@ function tagger_content(App $a) {
        }
 
        $owner_uid = $item['uid'];
-       $owner_nick = '';
        $blocktags = 0;
 
-       $r = q("select `nickname`,`blocktags` from user where uid = %d limit 1",
+       $r = q("select `blocktags` from user where uid = %d limit 1",
                intval($owner_uid)
        );
        if (DBA::isResult($r)) {
-               $owner_nick = $r[0]['nickname'];
                $blocktags = $r[0]['blocktags'];
        }
 
@@ -67,19 +84,14 @@ function tagger_content(App $a) {
        }
 
        $uri = Item::newURI($owner_uid);
-       $xterm = XML::xmlify($term);
-       $post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
-       $targettype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
-
-       if ($owner_nick) {
-               $href = System::baseUrl() . '/display/' . $owner_nick . '/' . $item['id'];
-       } else {
-               $href = System::baseUrl() . '/display/' . $item['guid'];
-       }
+       $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 );
+       $href = DI::baseUrl() . '/display/' . $item['guid'];
 
-       $link = XML::xmlify('<link rel="alternate" type="text/html" href="'. $href . '" />' . "\n") ;
+       $link = XML::escape('<link rel="alternate" type="text/html" href="'. $href . '" />' . "\n");
 
-       $body = XML::xmlify($item['body']);
+       $body = XML::escape($item['body']);
 
        $target = <<< EOT
        <target>
@@ -92,8 +104,8 @@ function tagger_content(App $a) {
        </target>
 EOT;
 
-       $tagid = System::baseUrl() . '/search?tag=' . $term;
-       $objtype = ACTIVITY_OBJ_TAGTERM;
+       $tagid = DI::baseUrl() . '/search?tag=' . $xterm;
+       $objtype = Activity\ObjectType::TAGTERM;
 
        $obj = <<< EOT
        <object>
@@ -106,13 +118,13 @@ EOT;
        </object>
 EOT;
 
-       $bodyverb = L10n::t('%1$s tagged %2$s\'s %3$s with %4$s');
+       $bodyverb = DI::l10n()->t('%1$s tagged %2$s\'s %3$s with %4$s');
 
        if (!isset($bodyverb)) {
                return;
        }
 
-       $termlink = html_entity_decode('&#x2317;') . '[url=' . System::baseUrl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/url]';
+       $termlink = html_entity_decode('&#x2317;') . '[url=' . DI::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]';
 
        $arr = [];
 
@@ -136,7 +148,7 @@ EOT;
        $plink = '[url=' . $item['plink'] . ']' . $post_type . '[/url]';
        $arr['body'] =  sprintf( $bodyverb, $ulink, $alink, $plink, $termlink );
 
-       $arr['verb'] = ACTIVITY_TAG;
+       $arr['verb'] = Activity::TAG;
        $arr['target-type'] = $targettype;
        $arr['target'] = $target;
        $arr['object-type'] = $objtype;
@@ -169,7 +181,7 @@ EOT;
                   $term_objtype,
                   TERM_HASHTAG,
                   DBA::escape($term),
-                  DBA::escape(System::baseUrl() . '/search?tag=' . $term),
+                  '',
                   intval($owner_uid)
                );
        }
@@ -191,7 +203,7 @@ EOT;
                                $term_objtype,
                                TERM_HASHTAG,
                                DBA::escape($term),
-                               DBA::escape(System::baseUrl() . '/search?tag=' . $term),
+                               '',
                                intval($owner_uid)
                        );
                }
@@ -200,11 +212,9 @@ EOT;
 
        $arr['id'] = $post_id;
 
-       Addon::callHooks('post_local_end', $arr);
-
-       Worker::add(PRIORITY_HIGH, "Notifier", "tag", $post_id);
+       Hook::callAll('post_local_end', $arr);
 
-       killme();
+       Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, $post_id);
 
-       return; // NOTREACHED
+       exit();
 }