Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items

diff --git a/include/items.php b/include/items.php
index 22ae2f60a718fcc2b6e23343af8e2b50a20fc746..ed91fc7e4ed781393ab3f73eeae0b74a5de8867b 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -1044,7 +1044,7 @@ function encode_rel_links($links) {
 
 
 
-function item_store($arr,$force_parent = false, $notify = false) {
+function item_store($arr,$force_parent = false, $notify = false, $dontcache = false) {
 
        // If it is a posting where users should get notifications, then define it as wall posting
        if ($notify) {
@@ -1469,7 +1469,7 @@ function item_store($arr,$force_parent = false, $notify = false) {
 
        // current post can be deleted if is for a communuty page and no mention are
        // in it.
-       if (!$deleted) {
+       if (!$deleted AND !$dontcache) {
 
                // Store the fresh generated item into the cache
                $cachefile = get_cachefile(urlencode($arr["guid"])."-".hash("md5", $arr['body']));
@@ -1491,7 +1491,7 @@ function item_store($arr,$force_parent = false, $notify = false) {
                }
        }
 
-       create_tags_from_item($current_post);
+       create_tags_from_item($current_post, $dontcache);
        create_files_from_item($current_post);
 
        if ($notify)

diff --git a/include/shadowupdate.php b/include/shadowupdate.php
new file mode 100644 (file)
index 0000000..74c2a43
--- /dev/null
+++ b/include/shadowupdate.php
@@ -0,0 +1,22 @@
+<?php
+require_once("boot.php");
+require_once("include/threads.php");
+
+global $a, $db;
+
+if(is_null($a))
+       $a = new App;
+
+if(is_null($db)) {
+       @include(".htconfig.php");
+       require_once("include/dba.php");
+       $db = new dba($db_host, $db_user, $db_pass, $db_data);
+       unset($db_host, $db_user, $db_pass, $db_data);
+}
+
+load_config('config');
+load_config('system');
+
+update_shadow_copy();
+killme();
+?>

diff --git a/include/tags.php b/include/tags.php
index ea7eed84c3b137a3ba125a3bd20d101391f35be4..05e11b47edfce2a21bf2b5b66e8c5c4d73371dd5 100644 (file)
--- a/include/tags.php
+++ b/include/tags.php
@@ -1,5 +1,5 @@
 <?php
-function create_tags_from_item($itemid) {
+function create_tags_from_item($itemid, $dontcache = false) {
        global $a;
 
        $profile_base = $a->get_baseurl();
@@ -26,14 +26,16 @@ function create_tags_from_item($itemid) {
        if ($message["deleted"])
                return;
 
-       $cachefile = get_cachefile(urlencode($message["guid"])."-".hash("md5", $message['body']));
+       if (!$dontcache) {
+               $cachefile = get_cachefile(urlencode($message["guid"])."-".hash("md5", $message['body']));
 
-       if (($cachefile != '') AND !file_exists($cachefile)) {
-               $s = prepare_text($message['body']);
-               $stamp1 = microtime(true);
-               file_put_contents($cachefile, $s);
-               $a->save_timestamp($stamp1, "file");
-               logger('create_tags_from_item: put item '.$message["id"].' into cachefile '.$cachefile);
+               if (($cachefile != '') AND !file_exists($cachefile)) {
+                       $s = prepare_text($message['body']);
+                       $stamp1 = microtime(true);
+                       file_put_contents($cachefile, $s);
+                       $a->save_timestamp($stamp1, "file");
+                       logger('create_tags_from_item: put item '.$message["id"].' into cachefile '.$cachefile);
+               }
        }
 
        $taglist = explode(",", $message["tag"]);

diff --git a/include/threads.php b/include/threads.php
index 6b1c4342f78dae883ed2887b21fa12553269515d..28bf87f4dae97a7a1ee650a7d022145ff235b876 100644 (file)
--- 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,13 +9,71 @@ 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);
+               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;
+
+       // 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))
+               return;
+
+       $item = q("SELECT * FROM `item` WHERE `id` = %d",
+               intval($itemid));
+
+       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']));
+
+               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, false, true);
+
+                       logger("add_thread: Stored public shadow for post ".$itemid." under id ".$public_shadow, LOGGER_DEBUG);
+               }
+       }
 }
 
 function update_thread_uri($itemuri, $uid) {
@@ -27,7 +85,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 +98,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 +153,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");
 
@@ -96,4 +203,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();
+}
 ?>

diff --git a/mod/community.php b/mod/community.php
index 8d23c4af287b59b7d35c34d005a1c012f1ce303c..e2311515790b5f63f324c8528f6a475fc575fa43 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,19 @@ 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 `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
+               AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
+               ORDER BY `item`.`received` DESC LIMIT %d, %d",
+               intval($start),
+               intval($itemspage)
+       );
+
+       return($r);
+
+}