Rename DBA::inArray to DBA::toArray

[friendica.git] / src / Database / PostUpdate.php

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index d391d531d5ae83e6aef1d0eecdb91b04099e0589..0a75a0f195d8c57a80e59467afc17c06dc894dad 100644 (file)
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -5,10 +5,9 @@
 namespace Friendica\Database;
 
 use Friendica\Core\Config;
-use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
-use dba;
+use Friendica\Model\PermissionSet;
 
 require_once 'include/dba.php';
 
@@ -31,7 +30,7 @@ class PostUpdate
                if (!self::update1206()) {
                        return;
                }
-               if (!self::update1276()) {
+               if (!self::update1279()) {
                        return;
                }
        }
@@ -125,7 +124,7 @@ class PostUpdate
 
                // Check if the first step is done (Setting "author-id" and "owner-id" in the item table)
                $fields = ['author-link', 'author-name', 'author-avatar', 'owner-link', 'owner-name', 'owner-avatar', 'network', 'uid'];
-               $r = dba::select('item', $fields, ['author-id' => 0, 'owner-id' => 0], ['limit' => 1000]);
+               $r = DBA::select('item', $fields, ['author-id' => 0, 'owner-id' => 0], ['limit' => 1000]);
                if (!$r) {
                        // Are there unfinished entries in the thread table?
                        $r = q("SELECT COUNT(*) AS `total` FROM `thread`
@@ -181,7 +180,7 @@ class PostUpdate
                        if ($owner_id == 0) {
                                $owner_id = -1;
                        }
-                       dba::update('item', ['author-id' => $author_id, 'owner-id' => $owner_id], ['uid' => $item['uid'], 'author-link' => $item['author-link'], 'owner-link' => $item['owner-link'], 'author-id' => 0, 'owner-id' => 0]);
+                       DBA::update('item', ['author-id' => $author_id, 'owner-id' => $owner_id], ['uid' => $item['uid'], 'author-link' => $item['author-link'], 'owner-link' => $item['owner-link'], 'author-id' => 0, 'owner-id' => 0]);
                }
 
                logger("Updated items", LOGGER_DEBUG);
@@ -213,7 +212,7 @@ class PostUpdate
                }
                foreach ($r as $user) {
                        if (!empty($user["lastitem_date"]) && ($user["lastitem_date"] > $user["last-item"])) {
-                               dba::update('contact', ['last-item' => $user['lastitem_date']], ['id' => $user['id']]);
+                               DBA::update('contact', ['last-item' => $user['lastitem_date']], ['id' => $user['id']]);
                        }
                }
 
@@ -227,19 +226,21 @@ class PostUpdate
         *
         * @return bool "true" when the job is done
         */
-       private static function update1276()
+       private static function update1279()
        {
                // Was the script completed?
-               if (Config::get("system", "post_update_version") >= 1276) {
+               if (Config::get("system", "post_update_version") >= 1279) {
                        return true;
                }
 
-               $id = Config::get("system", "post_update_version_1276_id", 0);
+               $id = Config::get("system", "post_update_version_1279_id", 0);
 
                logger("Start from item " . $id, LOGGER_DEBUG);
 
                $fields = array_merge(Item::MIXED_CONTENT_FIELDLIST, ['network', 'author-id', 'owner-id', 'tag', 'file',
-                       'author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link', 'id']);
+                       'author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link', 'id',
+                       'uid', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'psid', 'post-type', 'bookmark', 'type',
+                       'inform']);
 
                $start_id = $id;
                $rows = 0;
@@ -263,18 +264,32 @@ class PostUpdate
                                $item['owner-id'] = Contact::getIdForURL($item["owner-link"], 0, false, $default);
                        }
 
+                       if (empty($item['psid'])) {
+                               $item['psid'] = PermissionSet::fetchIDForPost($item);
+                       }
+
+                       if ($item['post-type'] == 0) {
+                               if (!empty($item['type']) && ($item['type'] == 'note')) {
+                                       $item['post-type'] = Item::PT_PERSONAL_NOTE;
+                               } elseif (!empty($item['type']) && ($item['type'] == 'photo')) {
+                                       $item['post-type'] = Item::PT_IMAGE;
+                               } elseif (!empty($item['bookmark']) && $item['bookmark']) {
+                                       $item['post-type'] = Item::PT_PAGE;
+                               }
+                       }
+
                        Item::update($item, ['id' => $id]);
 
                        ++$rows;
                }
-               dba::close($items);
+               DBA::close($items);
 
-               Config::set("system", "post_update_version_1276_id", $id);
+               Config::set("system", "post_update_version_1279_id", $id);
 
                logger("Processed rows: " . $rows . " - last processed item:  " . $id, LOGGER_DEBUG);
 
                if ($start_id == $id) {
-                       Config::set("system", "post_update_version", 1276);
+                       Config::set("system", "post_update_version", 1279);
                        logger("Done", LOGGER_DEBUG);
                        return true;
                }