redone the changes I accidentally overwrote ... Me and GIT will never be in love ...

diff --git a/include/threads.php b/include/threads.php
index 6b1c4342f78dae883ed2887b21fa12553269515d..0ad1d396dffa94b46eab7700cc7d0044d496eb71 100644 (file)
--- a/include/threads.php
+++ b/include/threads.php
@@ -13,9 +13,51 @@ function add_thread($itemid) {
                        .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;
+
+       // 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))
+               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))
+               return;
+
+       $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)) {
+
+               $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1",
+                       dbesc($item['uri']));
+
+               if (!$r) {
+                       // Preparing public shadow (removing user specific data)
+                       require_once("include/items.php");
+                       unset($item[0]['id']);
+                       $item[0]['uid'] = 0;
+                       $item[0]['contact-id'] = 0;
+
+                       $public_shadow = item_store($item[0],false);
+                       logger("add_thread: Stored public shadow for post ".$itemid." under id ".$public_shadow, LOGGER_DEBUG);
+               }
+       }
 }
 
 function update_thread_uri($itemuri, $uid) {
@@ -27,7 +69,7 @@ function update_thread_uri($itemuri, $uid) {
 }
 
 function update_thread($itemid, $setmention = false) {
-       $items = q("SELECT `uid`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`,
+       $items = q("SELECT `uid`, `uri`, `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)
@@ -40,16 +82,50 @@ function update_thread($itemid, $setmention = false) {
 
        $sql = "";
 
-       foreach ($item AS $field => $data) {
-               if ($sql != "")
-                       $sql .= ", ";
+       foreach ($item AS $field => $data)
+               if ($field != "uri") {
+                       if ($sql != "")
+                               $sql .= ", ";
 
-               $sql .= "`".$field."` = '".$data."'";
-       }
+                       $sql .= "`".$field."` = '".dbesc($data)."'";
+               }
 
-       $result = q("UPDATE `thread` SET ".$sql." WHERE `iid` = %d", $itemid);
+       $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);
+
+       // 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"]));
+
+       if (!$items)
+               return;
+
+       $item = $items[0];
+
+       $result = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `network` = '%s' WHERE `id` = %d",
+                       dbesc($item["title"]),
+                       dbesc($item["body"]),
+                       dbesc($item["network"]),
+                       intval($item["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);
+       */
 }
 
 function delete_thread_uri($itemuri, $uid) {
@@ -61,13 +137,28 @@ function delete_thread_uri($itemuri, $uid) {
 }
 
 function delete_thread($itemid) {
+       $item = q("SELECT `uri`, `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)) {
+               $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND NOT (`uid` IN (%d, 0))",
+                               dbesc($item["uri"]),
+                               intval($item["uid"])
+                       );
+               if (!count($r)) {
+                       $r = q("DELETE FROM `item` WHERE `uri` = '%s' AND `uid` = 0)",
+                               dbesc($item["uri"])
+                       );
+                       logger("delete_thread: Deleted shadow for item ".$item["uri"]." - ".print_r($result, true), LOGGER_DEBUG);
+               }
+       }
 }
 
 function update_threads() {
-        global $db;
+       global $db;
 
        logger("update_threads: start");
 

diff --git a/mod/community.php b/mod/community.php
index 8d23c4af287b59b7d35c34d005a1c012f1ce303c..4d1e84cba90f2993747284b7f55250b715d04959 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -114,6 +114,10 @@ function community_content(&$a, $update = 0) {
 }
 
 function community_getitems($start, $itemspage) {
+       // Work in progress
+       if (get_config('system', 'global_community'))
+               return(community_getpublicitems($start, $itemspage));
+
        $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
                `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
                `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
@@ -136,3 +140,22 @@ function community_getitems($start, $itemspage) {
        return($r);
 
 }
+
+function community_getpublicitems($start, $itemspage) {
+       $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
+                       `author-name` AS `name`, `owner-avatar` AS `photo`,
+                       `owner-link` AS `url`, `owner-avatar` AS `thumb`
+               FROM `item` WHERE `item`.`uid` = 0 AND `network` IN ('%s', '%s', '%s')
+               AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
+               AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
+               ORDER BY `item`.`received` DESC LIMIT %d, %d",
+               dbesc(NETWORK_DFRN),
+               dbesc(NETWORK_DIASPORA),
+               dbesc(NETWORK_OSTATUS),
+               intval($start),
+               intval($itemspage)
+       );
+
+       return($r);
+
+}