adding desaturation and transition for forumlist widget

[friendica.git] / mod / tagger.php

diff --git a/mod/tagger.php b/mod/tagger.php
index c0eeb684ce7f360e8c268e2ddf3235c855bc98fc..2c15cdd28c68d62f4d836b905713d1c30b435fa7 100644 (file)
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -3,7 +3,7 @@
  * @file mod/tagger.php
  */
 use Friendica\App;
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
@@ -12,8 +12,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Item;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
-
-require_once 'include/items.php';
+use Friendica\Worker\Delivery;
 
 function tagger_content(App $a) {
 
@@ -21,7 +20,7 @@ function tagger_content(App $a) {
                return;
        }
 
-       $term = Strings::removeTags(trim($_GET['term']));
+       $term = Strings::escapeTags(trim($_GET['term']));
        // no commas allowed
        $term = str_replace([',',' '],['','_'],$term);
 
@@ -29,7 +28,7 @@ function tagger_content(App $a) {
                return;
        }
 
-       $item_id = (($a->argc > 1) ? Strings::removeTags(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);
 
@@ -42,14 +41,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'];
        }
 
@@ -71,14 +68,9 @@ function tagger_content(App $a) {
        $xterm = XML::escape($term);
        $post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
        $targettype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
+       $href = System::baseUrl() . '/display/' . $item['guid'];
 
-       if ($owner_nick) {
-               $href = System::baseUrl() . '/display/' . $owner_nick . '/' . $item['id'];
-       } else {
-               $href = System::baseUrl() . '/display/' . $item['guid'];
-       }
-
-       $link = XML::escape('<link rel="alternate" type="text/html" href="'. $href . '" />' . "\n") ;
+       $link = XML::escape('<link rel="alternate" type="text/html" href="'. $href . '" />' . "\n");
 
        $body = XML::escape($item['body']);
 
@@ -93,7 +85,7 @@ function tagger_content(App $a) {
        </target>
 EOT;
 
-       $tagid = System::baseUrl() . '/search?tag=' . $term;
+       $tagid = System::baseUrl() . '/search?tag=' . $xterm;
        $objtype = ACTIVITY_OBJ_TAGTERM;
 
        $obj = <<< EOT
@@ -113,7 +105,7 @@ EOT;
                return;
        }
 
-       $termlink = html_entity_decode('&#x2317;') . '[url=' . System::baseUrl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/url]';
+       $termlink = html_entity_decode('&#x2317;') . '[url=' . System::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]';
 
        $arr = [];
 
@@ -170,7 +162,7 @@ EOT;
                   $term_objtype,
                   TERM_HASHTAG,
                   DBA::escape($term),
-                  DBA::escape(System::baseUrl() . '/search?tag=' . $term),
+                  '',
                   intval($owner_uid)
                );
        }
@@ -192,7 +184,7 @@ EOT;
                                $term_objtype,
                                TERM_HASHTAG,
                                DBA::escape($term),
-                               DBA::escape(System::baseUrl() . '/search?tag=' . $term),
+                               '',
                                intval($owner_uid)
                        );
                }
@@ -201,11 +193,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();
 }