X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fthreads.php;h=3cfa02564036b4d38577da017a31ee48f1b243a7;hb=93fd6dce843d74f36192a7960de63766755aff0f;hp=0ad1d396dffa94b46eab7700cc7d0044d496eb71;hpb=2ac42036fb0e42d9291d193b1bbbf715e4ade5e9;p=friendica.git

diff --git a/include/threads.php b/include/threads.php
index 0ad1d396df..3cfa025640 100644
--- a/include/threads.php
+++ b/include/threads.php
@@ -1,5 +1,5 @@
 <?php
-function add_thread($itemid) {
+function add_thread($itemid, $onlyshadow = false) {
 	$items = q("SELECT `uid`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`,
 			`deleted`, `origin`, `forum_mode`, `mention`, `network`  FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid));
 
@@ -9,28 +9,42 @@ function add_thread($itemid) {
 	$item = $items[0];
 	$item['iid'] = $itemid;
 
-	$result = dbq("INSERT INTO `thread` (`"
-			.implode("`, `", array_keys($item))
-			."`) VALUES ('"
-			.implode("', '", array_values($item))
-			."')");
+	if (!$onlyshadow) {
+		$result = dbq("INSERT INTO `thread` (`"
+				.implode("`, `", array_keys($item))
+				."`) VALUES ('"
+				.implode("', '", array_values($item))
+				."')");
 
-	logger("add_thread: Add thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
-
-	// Store a shadow copy of public items for displaying a global community page?
-	if (!get_config('system', 'global_community'))
-		return;
+		logger("add_thread: Add thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
+	}
 
 	// is it already a copy?
 	if (($itemid == 0) OR ($item['uid'] == 0))
 		return;
 
-	// Check, if hide-friends is activated - then don't do a shadow entry
-	$r = q("SELECT `hide-friends` FROM `profile` WHERE `is-default` AND `uid` = %d AND NOT `hide-friends`",
-		$item['uid']);
-	if (!count($r))
+	// Is it a visible public post?
+	if (!$item["visible"] OR $item["deleted"] OR $item["moderated"] OR $item["private"])
+		return;
+
+	// is it an entry from a connector? Only add an entry for natively connected networks
+	if (!in_array($item["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, "")))
 		return;
 
+	// Only do these checks if the post isn't a wall post
+	if (!$item["wall"]) {
+		// Check, if hide-friends is activated - then don't do a shadow entry
+		$r = q("SELECT `hide-friends` FROM `profile` WHERE `is-default` AND `uid` = %d AND NOT `hide-friends`",
+			$item['uid']);
+		if (!count($r))
+			return;
+		// Check if the contact is hidden or blocked
+		$r = q("SELECT `id` FROM `contact` WHERE NOT `hidden` AND NOT `blocked` AND `id` = %d",
+			$item['contact-id']);
+		if (!count($r))
+			return;
+	}
+
 	// Only add a shadow, if the profile isn't hidden
 	$r = q("SELECT `uid` FROM `user` where `uid` = %d AND NOT `hidewall`", $item['uid']);
 	if (!count($r))
@@ -39,10 +53,8 @@ function add_thread($itemid) {
 	$item = q("SELECT * FROM `item` WHERE `id` = %d",
 		intval($itemid));
 
-	if (count($item) AND ($item[0]["visible"] == 1) AND ($item[0]["deleted"] == 0) AND
-		(($item[0]["id"] == $item[0]["parent"]) OR ($item[0]["parent"] == 0)) AND
-		($item[0]["moderated"] == 0) AND ($item[0]["allow_cid"] == '')  AND ($item[0]["allow_gid"] == '') AND
-		($item[0]["deny_cid"] == '') AND ($item[0]["deny_gid"] == '') AND ($item[0]["private"] == 0)) {
+	if (count($item) AND ($item[0]["allow_cid"] == '')  AND ($item[0]["allow_gid"] == '') AND
+		($item[0]["deny_cid"] == '') AND ($item[0]["deny_gid"] == '')) {
 
 		$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1",
 			dbesc($item['uri']));
@@ -50,16 +62,47 @@ function add_thread($itemid) {
 		if (!$r) {
 			// Preparing public shadow (removing user specific data)
 			require_once("include/items.php");
+			require_once("include/Contact.php");
+
 			unset($item[0]['id']);
 			$item[0]['uid'] = 0;
-			$item[0]['contact-id'] = 0;
+			$item[0]['contact-id'] = get_contact($item[0]['author-link'], 0);
+			$public_shadow = item_store($item[0], false, false, true);
 
-			$public_shadow = item_store($item[0],false);
 			logger("add_thread: Stored public shadow for post ".$itemid." under id ".$public_shadow, LOGGER_DEBUG);
 		}
 	}
 }
 
+function add_shadow_entry($item) {
+
+	// Is this a shadow entry?
+	if ($item['uid'] == 0)
+		return;
+
+	// Is there a shadow parent?
+	$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item['parent-uri']));
+	if (!count($r))
+		return;
+
+	// Is there already a shadow entry?
+	$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item['uri']));
+
+	if (count($r))
+		return;
+
+	// Preparing public shadow (removing user specific data)
+	require_once("include/items.php");
+	require_once("include/Contact.php");
+
+	unset($item['id']);
+	$item['uid'] = 0;
+	$item['contact-id'] = get_contact($item['author-link'], 0);
+	$public_shadow = item_store($item, false, false, true);
+
+	logger("Stored public shadow for comment ".$item['uri']." under id ".$public_shadow, LOGGER_DEBUG);
+}
+
 function update_thread_uri($itemuri, $uid) {
 	$messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
@@ -69,7 +112,7 @@ function update_thread_uri($itemuri, $uid) {
 }
 
 function update_thread($itemid, $setmention = false) {
-	$items = q("SELECT `uid`, `uri`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`,
+	$items = q("SELECT `uid`, `guid`, `title`, `body`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`,
 			`deleted`, `origin`, `forum_mode`, `network`  FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid));
 
 	if (!$items)
@@ -83,7 +126,7 @@ function update_thread($itemid, $setmention = false) {
 	$sql = "";
 
 	foreach ($item AS $field => $data)
-		if ($field != "uri") {
+		if (!in_array($field, array("guid", "title", "body"))) {
 			if ($sql != "")
 				$sql .= ", ";
 
@@ -92,40 +135,20 @@ function update_thread($itemid, $setmention = false) {
 
 	$result = q("UPDATE `thread` SET ".$sql." WHERE `iid` = %d", intval($itemid));
 
-	logger("update_thread: Update thread for item ".$itemid." - ".print_r($result, true)." ".print_r($item, true), LOGGER_DEBUG);
+	logger("Update thread for item ".$itemid." - guid ".$item["guid"]." - ".print_r($result, true)." ".print_r($item, true), LOGGER_DEBUG);
 
 	// Updating a shadow item entry
-	$items = q("SELECT `id`, `title`, `body`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`,
-			`moderated`, `visible`, `spam`, `starred`, `bookmark`, `deleted`, `origin`, `forum_mode`, `network`
-			FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item["uri"]));
+	$items = q("SELECT `id` FROM `item` WHERE `guid` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item["guid"]));
 
 	if (!$items)
 		return;
 
-	$item = $items[0];
-
-	$result = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `network` = '%s' WHERE `id` = %d",
+	$result = q("UPDATE `item` SET `title` = '%s', `body` = '%s' WHERE `id` = %d",
 			dbesc($item["title"]),
 			dbesc($item["body"]),
-			dbesc($item["network"]),
-			intval($item["id"])
+			intval($items[0]["id"])
 		);
-	logger("update_thread: Updating public shadow for post ".$item["id"]." Result: ".print_r($result, true), LOGGER_DEBUG);
-
-	/*
-	$sql = "";
-
-	foreach ($item AS $field => $data)
-		if ($field != "id") {
-			if ($sql != "")
-				$sql .= ", ";
-
-			$sql .= "`".$field."` = '".dbesc($data)."'";
-		}
-	//logger("update_thread: Updating public shadow for post ".$item["id"]." SQL: ".$sql, LOGGER_DEBUG);
-	$result = q("UPDATE `item` SET ".$sql." WHERE `id` = %d", intval($item["id"]));
-	logger("update_thread: Updating public shadow for post ".$item["id"]." Result: ".print_r($result, true), LOGGER_DEBUG);
-	*/
+	logger("Updating public shadow for post ".$items[0]["id"]." - guid ".$item["guid"]." Result: ".print_r($result, true), LOGGER_DEBUG);
 }
 
 function delete_thread_uri($itemuri, $uid) {
@@ -133,26 +156,26 @@ function delete_thread_uri($itemuri, $uid) {
 
 	if(count($messages))
 		foreach ($messages as $message)
-			delete_thread($message["id"]);
+			delete_thread($message["id"], $itemuri);
 }
 
-function delete_thread($itemid) {
-	$item = q("SELECT `uri`, `uid` FROM `thread` WHERE `iid` = %d", intval($itemid));
+function delete_thread($itemid, $itemuri = "") {
+	$item = q("SELECT `uid` FROM `thread` WHERE `iid` = %d", intval($itemid));
 
 	$result = q("DELETE FROM `thread` WHERE `iid` = %d", intval($itemid));
 
 	logger("delete_thread: Deleted thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
 
-	if (count($item)) {
+	if ($itemuri != "") {
 		$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND NOT (`uid` IN (%d, 0))",
-				dbesc($item["uri"]),
+				dbesc($itemuri),
 				intval($item["uid"])
 			);
 		if (!count($r)) {
 			$r = q("DELETE FROM `item` WHERE `uri` = '%s' AND `uid` = 0)",
-				dbesc($item["uri"])
+				dbesc($itemuri)
 			);
-			logger("delete_thread: Deleted shadow for item ".$item["uri"]." - ".print_r($result, true), LOGGER_DEBUG);
+			logger("delete_thread: Deleted shadow for item ".$itemuri." - ".print_r($result, true), LOGGER_DEBUG);
 		}
 	}
 }
@@ -187,4 +210,21 @@ function update_threads_mention() {
 			q("UPDATE `thread` SET `mention` = 1 WHERE `iid` = %d", $parent["parent"]);
 	}
 }
+
+
+function update_shadow_copy() {
+	global $db;
+
+	logger("start");
+
+	$messages = $db->q(sprintf("SELECT `iid` FROM `thread` WHERE `uid` != 0 AND `network` IN ('', '%s', '%s', '%s')
+					AND `visible` AND NOT `deleted` AND NOT `moderated` AND NOT `private` ORDER BY `created`",
+				NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS), true);
+
+	logger("fetched messages: ".count($messages));
+	while ($message = $db->qfetch())
+		add_thread($message["iid"], true);
+
+	$db->qclose();
+}
 ?>