X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ftagger.php;h=7cb43e330c951989b94e61cb7375dfe9836e20f0;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=c0eeb684ce7f360e8c268e2ddf3235c855bc98fc;hpb=a0f65ca7a1b1fbc1a2d0f823940211377fc6e13e;p=friendica.git diff --git a/mod/tagger.php b/mod/tagger.php index c0eeb684ce..7cb43e330c 100644 --- 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; @@ -13,15 +13,13 @@ use Friendica\Model\Item; use Friendica\Util\Strings; use Friendica\Util\XML; -require_once 'include/items.php'; - function tagger_content(App $a) { if (!local_user() && !remote_user()) { return; } - $term = Strings::removeTags(trim($_GET['term'])); + $term = Strings::escapeTags(trim($_GET['term'])); // no commas allowed $term = str_replace([',',' '],['','_'],$term); @@ -29,7 +27,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); @@ -78,7 +76,7 @@ function tagger_content(App $a) { $href = System::baseUrl() . '/display/' . $item['guid']; } - $link = XML::escape('' . "\n") ; + $link = XML::escape('' . "\n"); $body = XML::escape($item['body']); @@ -93,7 +91,7 @@ function tagger_content(App $a) { EOT; - $tagid = System::baseUrl() . '/search?tag=' . $term; + $tagid = System::baseUrl() . '/search?tag=' . $xterm; $objtype = ACTIVITY_OBJ_TAGTERM; $obj = <<< EOT @@ -113,7 +111,7 @@ EOT; return; } - $termlink = html_entity_decode('⌗') . '[url=' . System::baseUrl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/url]'; + $termlink = html_entity_decode('⌗') . '[url=' . System::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]'; $arr = []; @@ -170,7 +168,7 @@ EOT; $term_objtype, TERM_HASHTAG, DBA::escape($term), - DBA::escape(System::baseUrl() . '/search?tag=' . $term), + '', intval($owner_uid) ); } @@ -192,7 +190,7 @@ EOT; $term_objtype, TERM_HASHTAG, DBA::escape($term), - DBA::escape(System::baseUrl() . '/search?tag=' . $term), + '', intval($owner_uid) ); } @@ -201,11 +199,9 @@ EOT; $arr['id'] = $post_id; - Addon::callHooks('post_local_end', $arr); + Hook::callAll('post_local_end', $arr); Worker::add(PRIORITY_HIGH, "Notifier", "tag", $post_id); - killme(); - - return; // NOTREACHED + exit(); }