X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ftagger.php;h=211e2ffa1fe6c94bb63eac0c84ebc7447ade683a;hb=c1d9c29eeac4356e578c06fdb6cd5151dcf49b5a;hp=84e5e5615c4186c8c0ea18774ef3a1142030a56d;hpb=c847a2f9cc969c9d79141713f646dd371e898168;p=friendica.git

diff --git a/mod/tagger.php b/mod/tagger.php
index 84e5e5615c..211e2ffa1f 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -1,12 +1,17 @@
 <?php
-
+/**
+ * @file mod/tagger.php
+ */
 use Friendica\App;
+use Friendica\Core\Addon;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
+use Friendica\Model\Item;
 
-require_once('include/security.php');
-require_once('include/bbcode.php');
-require_once('include/items.php');
+require_once 'include/security.php';
+require_once 'include/items.php';
 
 function tagger_content(App $a) {
 
@@ -16,7 +21,7 @@ function tagger_content(App $a) {
 
 	$term = notags(trim($_GET['term']));
 	// no commas allowed
-	$term = str_replace(array(',',' '),array('','_'),$term);
+	$term = str_replace([',',' '],['','_'],$term);
 
 	if(! $term)
 		return;
@@ -30,7 +35,7 @@ function tagger_content(App $a) {
 		dbesc($item_id)
 	);
 
-	if(! $item_id || (! dbm::is_result($r))) {
+	if(! $item_id || (! DBM::is_result($r))) {
 		logger('tagger: no item ' . $item_id);
 		return;
 	}
@@ -38,11 +43,13 @@ function tagger_content(App $a) {
 	$item = $r[0];
 
 	$owner_uid = $item['uid'];
+	$owner_nick = '';
+	$blocktags = 0;
 
 	$r = q("select `nickname`,`blocktags` from user where uid = %d limit 1",
 		intval($owner_uid)
 	);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$owner_nick = $r[0]['nickname'];
 		$blocktags = $r[0]['blocktags'];
 	}
@@ -53,7 +60,7 @@ function tagger_content(App $a) {
 	$r = q("select * from contact where self = 1 and uid = %d limit 1",
 		intval(local_user())
 	);
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 			$contact = $r[0];
 	else {
 		logger('tagger: no contact_id');
@@ -62,11 +69,16 @@ function tagger_content(App $a) {
 
 	$uri = item_new_uri($a->get_hostname(),$owner_uid);
 	$xterm = xmlify($term);
-	$post_type = (($item['resource-id']) ? t('photo') : t('status'));
+	$post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
 	$targettype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
 
-	$link = xmlify('<link rel="alternate" type="text/html" href="'
-		. System::baseUrl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
+	if ($owner_nick) {
+		$href = System::baseUrl() . '/display/' . $owner_nick . '/' . $item['id'];
+	} else {
+		$href = System::baseUrl() . '/display/' . $item['guid'];
+	}
+
+	$link = xmlify('<link rel="alternate" type="text/html" href="'. $href . '" />' . "\n") ;
 
 	$body = xmlify($item['body']);
 
@@ -95,7 +107,7 @@ EOT;
 	</object>
 EOT;
 
-	$bodyverb = t('%1$s tagged %2$s\'s %3$s with %4$s');
+	$bodyverb = L10n::t('%1$s tagged %2$s\'s %3$s with %4$s');
 
 	if (! isset($bodyverb)) {
 		return;
@@ -103,7 +115,7 @@ EOT;
 
 	$termlink = html_entity_decode('&#x2317;') . '[url=' . System::baseUrl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/url]';
 
-	$arr = array();
+	$arr = [];
 
 	$arr['guid'] = get_guid(32);
 	$arr['uri'] = $uri;
@@ -138,35 +150,22 @@ EOT;
 	$arr['deny_gid'] = $item['deny_gid'];
 	$arr['visible'] = 1;
 	$arr['unseen'] = 1;
-	$arr['last-child'] = 1;
 	$arr['origin'] = 1;
 
-	$post_id = item_store($arr);
-
-//	q("UPDATE `item` set plink = '%s' where id = %d",
-//		dbesc(System::baseUrl() . '/display/' . $owner_nick . '/' . $post_id),
-//		intval($post_id)
-//	);
+	$post_id = Item::insert($arr);
 
-
-	if(! $item['visible']) {
-		$r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d",
-			intval($item['id']),
-			intval($owner_uid)
-		);
+	if (!$item['visible']) {
+		Item::update(['visible' => true], ['id' => $item['id']]);
 	}
 
-	$term_objtype = (($item['resource-id']) ? TERM_OBJ_PHOTO : TERM_OBJ_POST );
-        $t = q("SELECT count(tid) as tcount FROM term WHERE oid=%d AND term='%s'",
-                intval($item['id']),
-                dbesc($term)
-        );
-	if((! $blocktags) && $t[0]['tcount']==0 ) {
-		/*q("update item set tag = '%s' where id = %d",
-			dbesc($item['tag'] . (strlen($item['tag']) ? ',' : '') . '#[url=' . System::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
-			intval($item['id'])
-		);*/
+	$term_objtype = ($item['resource-id'] ? TERM_OBJ_PHOTO : TERM_OBJ_POST);
+
+	$t = q("SELECT count(tid) as tcount FROM term WHERE oid=%d AND term='%s'",
+		intval($item['id']),
+		dbesc($term)
+	);
 
+	if ((!$blocktags) && $t[0]['tcount'] == 0 ) {
 		q("INSERT INTO term (oid, otype, type, term, url, uid) VALUE (%d, %d, %d, '%s', '%s', %d)",
 		   intval($item['id']),
 		   $term_objtype,
@@ -179,47 +178,39 @@ EOT;
 
 	// if the original post is on this site, update it.
 
-	$r = q("select `tag`,`id`,`uid` from item where `origin` = 1 AND `uri` = '%s' LIMIT 1",
+	$r = q("SELECT `tag`,`id`,`uid` FROM `item` WHERE `origin`=1 AND `uri`='%s' LIMIT 1",
 		dbesc($item['uri'])
 	);
-	if (dbm::is_result($r)) {
-		$x = q("SELECT `blocktags` FROM `user` WHERE `uid` = %d limit 1",
+
+	if (DBM::is_result($r)) {
+		$x = q("SELECT `blocktags` FROM `user` WHERE `uid`=%d LIMIT 1",
 			intval($r[0]['uid'])
 		);
-		$t = q("SELECT count(tid) as tcount FROM term WHERE oid=%d AND term='%s'",
+		$t = q("SELECT COUNT(`tid`) AS `tcount` FROM `term` WHERE `oid`=%d AND `term`='%s'",
 			intval($r[0]['id']),
 			dbesc($term)
 		);
-		if(count($x) && !$x[0]['blocktags'] && $t[0]['tcount']==0){
-			q("INSERT INTO term (oid, otype, type, term, url, uid) VALUE (%d, %d, %d, '%s', '%s', %d)",
-	                   intval($r[0]['id']),
-	                   $term_objtype,
-	                   TERM_HASHTAG,
-	                   dbesc($term),
-	                   dbesc(System::baseUrl() . '/search?tag=' . $term),
-	                   intval($owner_uid)
-	                );
-		}
 
-		/*if(count($x) && !$x[0]['blocktags'] && (! stristr($r[0]['tag'], ']' . $term . '['))) {
-			q("update item set tag = '%s' where id = %d",
-				dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . System::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
-				intval($r[0]['id'])
+		if (DBM::is_result($x) && !$x[0]['blocktags'] && $t[0]['tcount'] == 0){
+			q("INSERT INTO term (`oid`, `otype`, `type`, `term`, `url`, `uid`) VALUE (%d, %d, %d, '%s', '%s', %d)",
+				intval($r[0]['id']),
+				$term_objtype,
+				TERM_HASHTAG,
+				dbesc($term),
+				dbesc(System::baseUrl() . '/search?tag=' . $term),
+				intval($owner_uid)
 			);
-		}*/
-
+		}
 	}
 
 
 	$arr['id'] = $post_id;
 
-	call_hooks('post_local_end', $arr);
+	Addon::callHooks('post_local_end', $arr);
 
-	Worker::add(PRIORITY_HIGH, "notifier", "tag", $post_id);
+	Worker::add(PRIORITY_HIGH, "Notifier", "tag", $post_id);
 
 	killme();
 
 	return; // NOTREACHED
-
-
 }