X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FTerm.php;h=a81241cb42af31298fe95bea2d64753d3d04c79f;hb=0bc2fe66f54717a3f2e86fd9626dc565e9d00fd7;hp=53c9da8aac01eae2300551739b812378507422af;hpb=0ab9f2e265c6d981429bd72152af06089a30076f;p=friendica.git

diff --git a/src/Model/Term.php b/src/Model/Term.php
index 53c9da8aac..a81241cb42 100644
--- a/src/Model/Term.php
+++ b/src/Model/Term.php
@@ -5,9 +5,7 @@
 namespace Friendica\Model;
 
 use Friendica\Core\System;
-use Friendica\Database\DBM;
-use Friendica\Model\Item;
-use dba;
+use Friendica\Database\DBA;
 
 require_once 'boot.php';
 require_once 'include/conversation.php';
@@ -19,8 +17,8 @@ class Term
 	{
 		$tag_text = '';
 		$condition = ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_HASHTAG, TERM_MENTION]];
-		$tags = dba::select('term', [], $condition);
-		while ($tag = dba::fetch($tags)) {
+		$tags = DBA::select('term', [], $condition);
+		while ($tag = DBA::fetch($tags)) {
 			if ($tag_text != '') {
 				$tag_text .= ',';
 			}
@@ -35,7 +33,22 @@ class Term
 		return $tag_text;
 	}
 
-	public static function insertFromTagFieldByItemId($itemid)
+	public static function fileTextFromItemId($itemid)
+	{
+		$file_text = '';
+		$condition = ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_FILE, TERM_CATEGORY]];
+		$tags = DBA::select('term', [], $condition);
+		while ($tag = DBA::fetch($tags)) {
+			if ($tag['type'] == TERM_CATEGORY) {
+				$file_text .= '<' . $tag['term'] . '>';
+			} else {
+				$file_text .= '[' . $tag['term'] . ']';
+			}
+		}
+		return $file_text;
+	}
+
+	public static function insertFromTagFieldByItemId($itemid, $tags)
 	{
 		$profile_base = System::baseUrl();
 		$profile_data = parse_url($profile_base);
@@ -43,14 +56,16 @@ class Term
 		$profile_base_friendica = $profile_data['host'] . $profile_path . '/profile/';
 		$profile_base_diaspora = $profile_data['host'] . $profile_path . '/u/';
 
-		$fields = ['guid', 'uid', 'id', 'edited', 'deleted', 'created', 'received', 'title', 'body', 'tag', 'parent'];
+		$fields = ['guid', 'uid', 'id', 'edited', 'deleted', 'created', 'received', 'title', 'body', 'parent'];
 		$message = Item::selectFirst($fields, ['id' => $itemid]);
-		if (!DBM::is_result($message)) {
+		if (!DBA::isResult($message)) {
 			return;
 		}
 
+		$message['tag'] = $tags;
+
 		// Clean up all tags
-		dba::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_HASHTAG, TERM_MENTION]]);
+		DBA::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_HASHTAG, TERM_MENTION]]);
 
 		if ($message['deleted']) {
 			return;
@@ -112,12 +127,12 @@ class Term
 
 			if ($message['uid'] == 0) {
 				$global = true;
-				dba::update('term', ['global' => true], ['otype' => TERM_OBJ_POST, 'guid' => $message['guid']]);
+				DBA::update('term', ['global' => true], ['otype' => TERM_OBJ_POST, 'guid' => $message['guid']]);
 			} else {
-				$global = dba::exists('term', ['uid' => 0, 'otype' => TERM_OBJ_POST, 'guid' => $message['guid']]);
+				$global = DBA::exists('term', ['uid' => 0, 'otype' => TERM_OBJ_POST, 'guid' => $message['guid']]);
 			}
 
-			dba::insert('term', [
+			DBA::insert('term', [
 				'uid'      => $message['uid'],
 				'oid'      => $itemid,
 				'otype'    => TERM_OBJ_POST,
@@ -136,8 +151,8 @@ class Term
 				foreach ($users AS $user) {
 					if ($user['uid'] == $message['uid']) {
 						/// @todo This function is called frim Item::update - so we mustn't call that function here
-						dba::update('item', ['mention' => true], ['id' => $itemid]);
-						dba::update('thread', ['mention' => true], ['iid' => $message['parent']]);
+						DBA::update('item', ['mention' => true], ['id' => $itemid]);
+						DBA::update('thread', ['mention' => true], ['iid' => $message['parent']]);
 					}
 				}
 			}
@@ -148,23 +163,25 @@ class Term
 	 * @param integer $itemid item id
 	 * @return void
 	 */
-	public static function insertFromFileFieldByItemId($itemid)
+	public static function insertFromFileFieldByItemId($itemid, $files)
 	{
-		$message = Item::selectFirst(['uid', 'deleted', 'file'], ['id' => $itemid]);
-		if (!DBM::is_result($message)) {
+		$message = Item::selectFirst(['uid', 'deleted'], ['id' => $itemid]);
+		if (!DBA::isResult($message)) {
 			return;
 		}
 
 		// Clean up all tags
-		dba::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_FILE, TERM_CATEGORY]]);
+		DBA::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_FILE, TERM_CATEGORY]]);
 
 		if ($message["deleted"]) {
 			return;
 		}
 
+		$message['file'] = $files;
+
 		if (preg_match_all("/\[(.*?)\]/ism", $message["file"], $files)) {
 			foreach ($files[1] as $file) {
-				dba::insert('term', [
+				DBA::insert('term', [
 					'uid' => $message["uid"],
 					'oid' => $itemid,
 					'otype' => TERM_OBJ_POST,
@@ -176,7 +193,7 @@ class Term
 
 		if (preg_match_all("/\<(.*?)\>/ism", $message["file"], $files)) {
 			foreach ($files[1] as $file) {
-				dba::insert('term', [
+				DBA::insert('term', [
 					'uid' => $message["uid"],
 					'oid' => $itemid,
 					'otype' => TERM_OBJ_POST,
@@ -204,21 +221,23 @@ class Term
 
 		$searchpath = System::baseUrl() . "/search?tag=";
 
-		$taglist = dba::select(
+		$taglist = DBA::select(
 			'term',
 			['type', 'term', 'url'],
 			["`otype` = ? AND `oid` = ? AND `type` IN (?, ?)", TERM_OBJ_POST, $item['id'], TERM_HASHTAG, TERM_MENTION],
 			['order' => ['tid']]
 		);
 
-		while ($tag = dba::fetch($taglist)) {
+		while ($tag = DBA::fetch($taglist)) {
 			if ($tag["url"] == "") {
 				$tag["url"] = $searchpath . $tag["term"];
 			}
 
 			$orig_tag = $tag["url"];
 
-			$tag["url"] = Contact::magicLinkById($item['author-id'], $tag['url']);
+			$author = ['uid' => 0, 'id' => $item['author-id'],
+				'network' => $item['author-network'], 'url' => $item['author-link']];
+			$tag["url"] = Contact::magicLinkByContact($author, $tag['url']);
 
 			if ($tag["type"] == TERM_HASHTAG) {
 				if ($orig_tag != $tag["url"]) {
@@ -234,7 +253,7 @@ class Term
 
 			$return['tags'][] = $prefix . "<a href=\"" . $tag["url"] . "\" target=\"_blank\">" . $tag["term"] . "</a>";
 		}
-		dba::close($taglist);
+		DBA::close($taglist);
 
 		return $return;
 	}