X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FConversation.php;h=69bbc3bb6dd4b4718d03ac51ebad98d3b497d8fd;hb=d993c8584c4c2b6023606e727ea3e0db6a6bde51;hp=e6888ca8f6cc01fa930a220939303bd2ef5adbe7;hpb=efa8dbcfb31b1c0fe873f4b8f6990325eb9942f4;p=friendica.git

diff --git a/src/Model/Conversation.php b/src/Model/Conversation.php
index e6888ca8f6..69bbc3bb6d 100644
--- a/src/Model/Conversation.php
+++ b/src/Model/Conversation.php
@@ -11,6 +11,14 @@ require_once "include/dba.php";
 
 class Conversation
 {
+	const PROTOCOL_UNKNOWN         = 0;
+	const PROTOCOL_DFRN            = 1;
+	const PROTOCOL_DIASPORA        = 2;
+	const PROTOCOL_OSTATUS_SALMON  = 3;
+	const PROTOCOL_OSTATUS_FEED    = 4; // Deprecated
+	const PROTOCOL_GS_CONVERSATION = 5; // Deprecated
+	const PROTOCOL_SPLITTED_CONV   = 6;
+
 	/**
 	 * @brief Store the conversation data
 	 *
@@ -44,8 +52,8 @@ class Conversation
 				$conversation['source'] = $arr['source'];
 			}
 
-			$old_conv = dba::fetch_first("SELECT `item-uri`, `reply-to-uri`, `conversation-uri`, `conversation-href`, `protocol`, `source`
-					FROM `conversation` WHERE `item-uri` = ?", $conversation['item-uri']);
+			$fields = ['item-uri', 'reply-to-uri', 'conversation-uri', 'conversation-href', 'protocol', 'source'];
+			$old_conv = dba::selectFirst('conversation', $fields, ['item-uri' => $conversation['item-uri']]);
 			if (DBM::is_result($old_conv)) {
 				// Don't update when only the source has changed.
 				// Only do this when there had been no source before.
@@ -53,12 +61,12 @@ class Conversation
 					unset($old_conv['source']);
 				}
 				// Update structure data all the time but the source only when its from a better protocol.
-				if (($old_conv['protocol'] < $conversation['protocol']) && ($old_conv['protocol'] != 0)) {
+				if (isset($conversation['protocol']) && isset($conversation['source']) && ($old_conv['protocol'] < $conversation['protocol']) && ($old_conv['protocol'] != 0)) {
 					unset($conversation['protocol']);
 					unset($conversation['source']);
 				}
 				if (!dba::update('conversation', $conversation, ['item-uri' => $conversation['item-uri']], $old_conv)) {
-					logger('Conversation: update for '.$conversation['item-uri'].' from '.$conv['protocol'].' to '.$conversation['protocol'].' failed', LOGGER_DEBUG);
+					logger('Conversation: update for '.$conversation['item-uri'].' from '.$old_conv['protocol'].' to '.$conversation['protocol'].' failed', LOGGER_DEBUG);
 				}
 			} else {
 				if (!dba::insert('conversation', $conversation, true)) {