Bugfix: Signatures for likes hadn't been stored

[friendica.git] / include / threads.php

diff --git a/include/threads.php b/include/threads.php
index 5eb90b36889c0c32683e65ee7e7b5da740490308..bb978bc77428f05a962e9d3c355daa149043b20d 100644 (file)
--- a/include/threads.php
+++ b/include/threads.php
@@ -1,4 +1,7 @@
 <?php
+
+use Friendica\App;
+
 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`, `gcontact-id`,
@@ -42,12 +45,12 @@ function add_shadow_thread($itemid) {
        $item = $items[0];
 
        // is it already a copy?
-       if (($itemid == 0) OR ($item['uid'] == 0)) {
+       if (($itemid == 0) || ($item['uid'] == 0)) {
                return;
        }
 
        // Is it a visible public post?
-       if (!$item["visible"] OR $item["deleted"] OR $item["moderated"] OR $item["private"]) {
+       if (!$item["visible"] || $item["deleted"] || $item["moderated"] || $item["private"]) {
                return;
        }
 
@@ -83,8 +86,8 @@ function add_shadow_thread($itemid) {
 
        $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"] == '')) {
+       if (count($item) && ($item[0]["allow_cid"] == '')  && ($item[0]["allow_gid"] == '') &&
+               ($item[0]["deny_cid"] == '') && ($item[0]["deny_gid"] == '')) {
 
                $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1",
                        dbesc($item['uri']));
@@ -250,28 +253,24 @@ function delete_thread($itemid, $itemuri = "") {
                                intval($item["uid"])
                        );
                if (!dbm::is_result($r)) {
-                       $r = q("DELETE FROM `item` WHERE `uri` = '%s' AND `uid` = 0",
-                               dbesc($itemuri)
-                       );
+                       dba::delete('item', array('uri' => $itemuri, 'uid' => 0));
                        logger("delete_thread: Deleted shadow for item ".$itemuri." - ".print_r($result, true), LOGGER_DEBUG);
                }
        }
 }
 
 function update_threads() {
-       global $db;
-
        logger("update_threads: start");
 
-       $messages = $db->q("SELECT `id` FROM `item` WHERE `id` = `parent`", true);
+       $messages = dba::p("SELECT `id` FROM `item` WHERE `id` = `parent`");
 
-       logger("update_threads: fetched messages: ".count($messages));
+       logger("update_threads: fetched messages: ".dba::num_rows($messages));
 
-       while ($message = $db->qfetch()) {
+       while ($message = dba::fetch($messages)) {
                add_thread($message["id"]);
                add_shadow_thread($message["id"]);
        }
-       $db->qclose();
+       dba::close($messages);
 }
 
 function update_threads_mention() {
@@ -291,18 +290,15 @@ function update_threads_mention() {
 
 
 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);
+       $messages = dba::p("SELECT `iid` FROM `thread` WHERE `uid` != 0 AND `network` IN ('', ?, ?, ?)
+                               AND `visible` AND NOT `deleted` AND NOT `moderated` AND NOT `private` ORDER BY `created`",
+                               NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS);
 
-       logger("fetched messages: ".count($messages));
-       while ($message = $db->qfetch())
+       logger("fetched messages: ".dba::num_rows($messages));
+       while ($message = dba::fetch($messages))
                add_shadow_thread($message["iid"]);
 
-       $db->qclose();
+       dba::close($messages);
 }
-?>