Catch HTTPExceptions in App::runFrontend()

[friendica.git] / mod / tagger.php

diff --git a/mod/tagger.php b/mod/tagger.php
index f661968f35a9b01c8b42b1bc1a0b4ffc2b53ea31..78133a9e1823a30498262e811269eee948c910e0 100644 (file)
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -5,12 +5,13 @@
 use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
-
-require_once 'include/items.php';
+use Friendica\Util\Strings;
+use Friendica\Util\XML;
 
 function tagger_content(App $a) {
 
@@ -18,7 +19,7 @@ function tagger_content(App $a) {
                return;
        }
 
-       $term = notags(trim($_GET['term']));
+       $term = Strings::escapeTags(trim($_GET['term']));
        // no commas allowed
        $term = str_replace([',',' '],['','_'],$term);
 
@@ -26,15 +27,15 @@ 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('tagger: tag ' . $term . ' item ' . $item_id);
+       Logger::log('tagger: tag ' . $term . ' item ' . $item_id);
 
 
        $item = Item::selectFirst([], ['id' => $item_id]);
 
        if (!$item_id || !DBA::isResult($item)) {
-               logger('tagger: no item ' . $item_id);
+               Logger::log('tagger: no item ' . $item_id);
                return;
        }
 
@@ -60,12 +61,12 @@ function tagger_content(App $a) {
        if (DBA::isResult($r)) {
                        $contact = $r[0];
        } else {
-               logger('tagger: no contact_id');
+               Logger::log('tagger: no contact_id');
                return;
        }
 
        $uri = Item::newURI($owner_uid);
-       $xterm = xmlify($term);
+       $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 );
 
@@ -75,9 +76,9 @@ function tagger_content(App $a) {
                $href = System::baseUrl() . '/display/' . $item['guid'];
        }
 
-       $link = xmlify('<link rel="alternate" type="text/html" href="'. $href . '" />' . "\n") ;
+       $link = XML::escape('<link rel="alternate" type="text/html" href="'. $href . '" />' . "\n");
 
-       $body = xmlify($item['body']);
+       $body = XML::escape($item['body']);
 
        $target = <<< EOT
        <target>
@@ -90,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
@@ -110,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 = [];
 
@@ -167,7 +168,7 @@ EOT;
                   $term_objtype,
                   TERM_HASHTAG,
                   DBA::escape($term),
-                  DBA::escape(System::baseUrl() . '/search?tag=' . $term),
+                  '',
                   intval($owner_uid)
                );
        }
@@ -189,7 +190,7 @@ EOT;
                                $term_objtype,
                                TERM_HASHTAG,
                                DBA::escape($term),
-                               DBA::escape(System::baseUrl() . '/search?tag=' . $term),
+                               '',
                                intval($owner_uid)
                        );
                }