Catch HTTPExceptions in App::runFrontend()

[friendica.git] / mod / tagger.php

diff --git a/mod/tagger.php b/mod/tagger.php
index dd859e61cd04bb1767483880e8a259ba113d6744..78133a9e1823a30498262e811269eee948c910e0 100644 (file)
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -10,17 +10,16 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 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 = notags(trim($_GET['term']));
+       $term = Strings::escapeTags(trim($_GET['term']));
        // no commas allowed
        $term = str_replace([',',' '],['','_'],$term);
 
@@ -28,7 +27,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);
 
@@ -77,7 +76,7 @@ function tagger_content(App $a) {
                $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']);
 
@@ -92,7 +91,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
@@ -112,7 +111,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 = [];
 
@@ -169,7 +168,7 @@ EOT;
                   $term_objtype,
                   TERM_HASHTAG,
                   DBA::escape($term),
-                  DBA::escape(System::baseUrl() . '/search?tag=' . $term),
+                  '',
                   intval($owner_uid)
                );
        }
@@ -191,7 +190,7 @@ EOT;
                                $term_objtype,
                                TERM_HASHTAG,
                                DBA::escape($term),
-                               DBA::escape(System::baseUrl() . '/search?tag=' . $term),
+                               '',
                                intval($owner_uid)
                        );
                }