X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ftags.php;h=8720367fae995ff78b7bd5a543705151b5410003;hb=1cc50a80f4e2fc76cfbb64ac8b0c1deb5ac4088b;hp=6067f3f4b93c58b2c41308412fbf18b4f9a264c2;hpb=86cae070f2a048e553c545caec54be72c1c14da5;p=friendica.git

diff --git a/include/tags.php b/include/tags.php
index 6067f3f4b9..8720367fae 100644
--- a/include/tags.php
+++ b/include/tags.php
@@ -1,15 +1,14 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function create_tags_from_item($itemid) {
-	$profile_base = App::get_baseurl();
+	$profile_base = System::baseUrl();
 	$profile_data = parse_url($profile_base);
 	$profile_base_friendica = $profile_data['host'].$profile_data['path']."/profile/";
 	$profile_base_diaspora = $profile_data['host'].$profile_data['path']."/u/";
 
-	$searchpath = App::get_baseurl()."/search?tag=";
-
 	$messages = q("SELECT `guid`, `uid`, `id`, `edited`, `deleted`, `created`, `received`, `title`, `body`, `tag`, `parent` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid));
 
 	if (!$messages)
@@ -31,7 +30,7 @@ function create_tags_from_item($itemid) {
 
 	$tags = "";
 	foreach ($taglist as $tag)
-		if ((substr(trim($tag), 0, 1) == "#") OR (substr(trim($tag), 0, 1) == "@"))
+		if ((substr(trim($tag), 0, 1) == "#") || (substr(trim($tag), 0, 1) == "@"))
 			$tags .= " ".trim($tag);
 		else
 			$tags .= " #".trim($tag);
@@ -46,7 +45,7 @@ function create_tags_from_item($itemid) {
 	$pattern = "/\W\#([^\[].*?)[\s'\".,:;\?!\[\]\/]/ism";
 	if (preg_match_all($pattern, $data, $matches))
 		foreach ($matches[1] as $match)
-			$tags["#".strtolower($match)] = ""; // $searchpath.strtolower($match);
+			$tags["#".strtolower($match)] = "";
 
 	$pattern = "/\W([\#@])\[url\=(.*?)\](.*?)\[\/url\]/ism";
 	if (preg_match_all($pattern, $data, $matches, PREG_SET_ORDER)) {
@@ -58,10 +57,10 @@ function create_tags_from_item($itemid) {
 
 		if (substr(trim($tag), 0, 1) == "#") {
 			// try to ignore #039 or #1 or anything like that
-			if(ctype_digit(substr(trim($tag),1)))
+			if (ctype_digit(substr(trim($tag),1)))
 				continue;
 			// try to ignore html hex escapes, e.g. #x2317
-			if((substr(trim($tag),1,1) == 'x' || substr(trim($tag),1,1) == 'X') && ctype_digit(substr(trim($tag),2)))
+			if ((substr(trim($tag),1,1) == 'x' || substr(trim($tag),1,1) == 'X') && ctype_digit(substr(trim($tag),2)))
 				continue;
 			$type = TERM_HASHTAG;
 			$term = substr($tag, 1);
@@ -91,7 +90,7 @@ function create_tags_from_item($itemid) {
 			dbesc($link), dbesc($message["guid"]), dbesc($message["created"]), dbesc($message["received"]), intval($global));
 
 		// Search for mentions
-		if ((substr($tag, 0, 1) == '@') AND (strpos($link, $profile_base_friendica) OR strpos($link, $profile_base_diaspora))) {
+		if ((substr($tag, 0, 1) == '@') && (strpos($link, $profile_base_friendica) || strpos($link, $profile_base_diaspora))) {
 			$users = q("SELECT `uid` FROM `contact` WHERE self AND (`url` = '%s' OR `nurl` = '%s')", $link, $link);
 			foreach ($users AS $user) {
 				if ($user["uid"] == $message["uid"]) {
@@ -107,9 +106,10 @@ function create_tags_from_item($itemid) {
 function create_tags_from_itemuri($itemuri, $uid) {
 	$messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
-	if(count($messages)) {
-		foreach ($messages as $message)
+	if (count($messages)) {
+		foreach ($messages as $message) {
 			create_tags_from_item($message["id"]);
+		}
 	}
 }