X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ftagger.php;h=a6f35cea12432c9c2cb41533de8b26bef607ea6f;hb=a16dba2941bb3507faa84a13df2001a61daa3e96;hp=edfcd7bd13e45a910ef13c51aa3a8a07adad6df8;hpb=2f28c2ebbfd8f66093d7081d40b1d48f65fcff20;p=friendica.git
diff --git a/mod/tagger.php b/mod/tagger.php
index edfcd7bd13..a6f35cea12 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -1,25 +1,45 @@
.
+ *
*/
+
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;
-
-require_once 'include/items.php';
+use Friendica\Protocol\Activity;
+use Friendica\Util\Strings;
+use Friendica\Util\XML;
+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);
@@ -27,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);
@@ -40,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'];
}
@@ -66,19 +84,14 @@ function tagger_content(App $a) {
}
$uri = Item::newURI($owner_uid);
- $xterm = 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 = xmlify('' . "\n") ;
+ $link = XML::escape('' . "\n");
- $body = xmlify($item['body']);
+ $body = XML::escape($item['body']);
$target = <<< EOT
@@ -91,8 +104,8 @@ function tagger_content(App $a) {
EOT;
- $tagid = System::baseUrl() . '/search?tag=' . $term;
- $objtype = ACTIVITY_OBJ_TAGTERM;
+ $tagid = DI::baseUrl() . '/search?tag=' . $xterm;
+ $objtype = Activity\ObjectType::TAGTERM;
$obj = <<< EOT
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('⌗') . '[url=' . System::baseUrl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/url]';
+ $termlink = html_entity_decode('⌗') . '[url=' . DI::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]';
$arr = [];
@@ -135,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;
@@ -168,7 +181,7 @@ EOT;
$term_objtype,
TERM_HASHTAG,
DBA::escape($term),
- DBA::escape(System::baseUrl() . '/search?tag=' . $term),
+ '',
intval($owner_uid)
);
}
@@ -190,7 +203,7 @@ EOT;
$term_objtype,
TERM_HASHTAG,
DBA::escape($term),
- DBA::escape(System::baseUrl() . '/search?tag=' . $term),
+ '',
intval($owner_uid)
);
}
@@ -199,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();
}