X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ftagger.php;h=568b5fd54de1c87484ba501c08db4962e4647e08;hb=9435cc4b88de611407bf992f571e12e8f54b3c51;hp=f661968f35a9b01c8b42b1bc1a0b4ffc2b53ea31;hpb=2f7f9ffdd827dca6996a894fac662e7c77f8e713;p=friendica.git

diff --git a/mod/tagger.php b/mod/tagger.php
index f661968f35..568b5fd54d 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -2,23 +2,28 @@
 /**
  * @file mod/tagger.php
  */
+
 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);
 
@@ -26,27 +31,25 @@ 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;
 	}
 
 	$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'];
 	}
 
@@ -60,24 +63,19 @@ 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);
-	$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('<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,8 +88,8 @@ function tagger_content(App $a) {
 	</target>
 EOT;
 
-	$tagid = System::baseUrl() . '/search?tag=' . $term;
-	$objtype = ACTIVITY_OBJ_TAGTERM;
+	$tagid = DI::baseUrl() . '/search?tag=' . $xterm;
+	$objtype = Activity\ObjectType::TAGTERM;
 
 	$obj = <<< EOT
 	<object>
@@ -104,13 +102,13 @@ EOT;
 	</object>
 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('&#x2317;') . '[url=' . System::baseUrl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/url]';
+	$termlink = html_entity_decode('&#x2317;') . '[url=' . DI::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]';
 
 	$arr = [];
 
@@ -134,7 +132,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;
@@ -167,7 +165,7 @@ EOT;
 		   $term_objtype,
 		   TERM_HASHTAG,
 		   DBA::escape($term),
-		   DBA::escape(System::baseUrl() . '/search?tag=' . $term),
+		   '',
 		   intval($owner_uid)
 		);
 	}
@@ -189,7 +187,7 @@ EOT;
 				$term_objtype,
 				TERM_HASHTAG,
 				DBA::escape($term),
-				DBA::escape(System::baseUrl() . '/search?tag=' . $term),
+				'',
 				intval($owner_uid)
 			);
 		}
@@ -198,11 +196,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();
 }