Merge pull request #3463 from friendica/develop

[friendica.git] / include / threads.php

diff --git a/include/threads.php b/include/threads.php
index df0f8ee1de5a24e5577be553a4871226573c312d..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`,
@@ -142,12 +145,12 @@ function add_shadow_entry($itemid) {
 
        // 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))
+       if (!dbm::is_result($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))
+       if (dbm::is_result($r))
                return;
 
        // Preparing public shadow (removing user specific data)
@@ -174,7 +177,7 @@ function add_shadow_entry($itemid) {
 function update_thread_uri($itemuri, $uid) {
        $messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
-       if(count($messages))
+       if (dbm::is_result($messages))
                foreach ($messages as $message)
                        update_thread($message["id"]);
 }
@@ -183,7 +186,7 @@ function update_thread($itemid, $setmention = false) {
        $items = q("SELECT `uid`, `guid`, `title`, `body`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`, `gcontact-id`,
                        `deleted`, `origin`, `forum_mode`, `network`, `rendered-html`, `rendered-hash` FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid));
 
-       if (!$items)
+       if (!dbm::is_result($items))
                return;
 
        $item = $items[0];
@@ -241,38 +244,32 @@ function delete_thread($itemid, $itemuri = "") {
                                dbesc($itemuri),
                                intval($item["uid"])
                        );
-               if (!count($r)) {
-                       $r = q("DELETE FROM `item` WHERE `uri` = '%s' AND `uid` = 0",
-                               dbesc($itemuri)
-                       );
+               if (!dbm::is_result($r)) {
+                       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() {
-       $a = get_app();
-
        $users = q("SELECT `uid`, `nickname` FROM `user` ORDER BY `uid`");
 
        foreach ($users AS $user) {
-               $self = normalise_link($a->get_baseurl() . '/profile/' . $user['nickname']);
+               $self = normalise_link(App::get_baseurl() . '/profile/' . $user['nickname']);
                $selfhttps = str_replace("http://", "https://", $self);
                $parents = q("SELECT DISTINCT(`parent`) FROM `item` WHERE `uid` = %d AND
                                ((`owner-link` IN ('%s', '%s')) OR (`author-link` IN ('%s', '%s')))",
@@ -285,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);
 }
-?>