Merge pull request #3463 from friendica/develop

[friendica.git] / include / threads.php

diff --git a/include/threads.php b/include/threads.php
index c214cf264487a6f89ddecab8248e7b81909ed5b8..b0ba54684062022b0a28c7b05e88003cc0455cfc 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`,
@@ -242,28 +245,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() {
@@ -283,18 +282,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);
 }
-?>