Issue 9657: Check the age of an item

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

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index a59376e0ca5a288a3c3ff621b18ad09ef414faa8..aa6a0cf29b66741682882cd9fdfc351667a67d5e 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -350,7 +350,7 @@ class DBStructure
 
                $errors = '';
 
-               Logger::log('updating structure', Logger::DEBUG);
+               Logger::info('updating structure');
 
                // Get the current structure
                $database = [];
@@ -363,7 +363,7 @@ class DBStructure
                        foreach ($tables AS $table) {
                                $table = current($table);
 
-                               Logger::log(sprintf('updating structure for table %s ...', $table), Logger::DEBUG);
+                               Logger::info('updating structure', ['table' => $table]);
                                $database[$table] = self::tableStructure($table);
                        }
                }
@@ -1046,34 +1046,54 @@ class DBStructure
        /**
         * Check if initial database values do exist - or create them
         */
-       public static function checkInitialValues()
+       public static function checkInitialValues(bool $verbose = false)
        {
-               if (self::existsTable('verb') && !DBA::exists('verb', ['id' => 1])) {
-                       foreach (Item::ACTIVITIES as $index => $activity) {
-                               DBA::insert('verb', ['id' => $index + 1, 'name' => $activity], true);
+               if (self::existsTable('verb')) {
+                       if (!DBA::exists('verb', ['id' => 1])) {
+                               foreach (Item::ACTIVITIES as $index => $activity) {
+                                       DBA::insert('verb', ['id' => $index + 1, 'name' => $activity], Database::INSERT_IGNORE);
+                               }
+                               if ($verbose) {
+                                       echo "verb: activities added\n";
+                               }
+                       } elseif ($verbose) {
+                               echo "verb: activities already added\n";
+                       }
+
+                       if (!DBA::exists('verb', ['id' => 0])) {
+                               DBA::insert('verb', ['name' => '']);
+                               $lastid = DBA::lastInsertId();
+                               if ($lastid != 0) {
+                                       DBA::update('verb', ['id' => 0], ['id' => $lastid]);
+                                       if ($verbose) {
+                                               echo "Zero verb added\n";
+                                       }
+                               }
+                       } elseif ($verbose) {
+                               echo "Zero verb already added\n";
                        }
+               } elseif ($verbose) {
+                       echo "verb: Table not found\n";
                }
 
                if (self::existsTable('user') && !DBA::exists('user', ['uid' => 0])) {
-                       $system = User::getSystemAccount();
                        $user = [
-                               "username" => $system['name'],
-                               "nickname" => $system['nick'],
-                               "register_date" => $system['created'],
-                               "pubkey" => $system['pubkey'],
-                               "prvkey" => $system['prvkey'],
-                               "spubkey" => $system['spubkey'],
-                               "sprvkey" => $system['sprvkey'],
                                "verified" => true,
                                "page-flags" => User::PAGE_FLAGS_SOAPBOX,
                                "account-type" => User::ACCOUNT_TYPE_RELAY,
                        ];
-       
                        DBA::insert('user', $user);
                        $lastid = DBA::lastInsertId();
                        if ($lastid != 0) {
                                DBA::update('user', ['uid' => 0], ['uid' => $lastid]);
+                               if ($verbose) {
+                                       echo "Zero user added\n";
+                               }
                        }
+               } elseif (self::existsTable('user') && $verbose) {
+                       echo "Zero user already added\n";
+               } elseif ($verbose) {
+                       echo "user: Table not found\n";
                }
 
                if (self::existsTable('contact') && !DBA::exists('contact', ['id' => 0])) {
@@ -1081,7 +1101,29 @@ class DBStructure
                        $lastid = DBA::lastInsertId();
                        if ($lastid != 0) {
                                DBA::update('contact', ['id' => 0], ['id' => $lastid]);
+                               if ($verbose) {
+                                       echo "Zero contact added\n";
+                               }
                        }               
+               } elseif (self::existsTable('contact') && $verbose) {
+                       echo "Zero contact already added\n";
+               } elseif ($verbose) {
+                       echo "contact: Table not found\n";
+               }
+
+               if (self::existsTable('tag') && !DBA::exists('tag', ['id' => 0])) {
+                       DBA::insert('tag', ['name' => '']);
+                       $lastid = DBA::lastInsertId();
+                       if ($lastid != 0) {
+                               DBA::update('tag', ['id' => 0], ['id' => $lastid]);
+                               if ($verbose) {
+                                       echo "Zero tag added\n";
+                               }
+                       }
+               } elseif (self::existsTable('tag') && $verbose) {
+                       echo "Zero tag already added\n";
+               } elseif ($verbose) {
+                       echo "tag: Table not found\n";
                }
 
                if (self::existsTable('permissionset')) {
@@ -1090,7 +1132,12 @@ class DBStructure
                                $lastid = DBA::lastInsertId();
                                if ($lastid != 0) {
                                        DBA::update('permissionset', ['id' => 0], ['id' => $lastid]);
+                                       if ($verbose) {
+                                               echo "Zero permissionset added\n";
+                                       }
                                }
+                       } elseif ($verbose) {
+                               echo "Zero permissionset already added\n";
                        }
                        if (!self::existsForeignKeyForField('item', 'psid')) {
                                $sets = DBA::p("SELECT `psid`, `item`.`uid`, `item`.`private` FROM `item`
@@ -1113,16 +1160,10 @@ class DBStructure
                                }
                                DBA::close($sets);
                        }
+               } elseif ($verbose) {
+                       echo "permissionset: Table not found\n";
                }
        
-               if (self::existsTable('tag') && !DBA::exists('tag', ['id' => 0])) {
-                       DBA::insert('tag', ['name' => '']);
-                       $lastid = DBA::lastInsertId();
-                       if ($lastid != 0) {
-                               DBA::update('tag', ['id' => 0], ['id' => $lastid]);
-                       }
-               }
-
                if (!self::existsForeignKeyForField('tokens', 'client_id')) {
                        $tokens = DBA::p("SELECT `tokens`.`id` FROM `tokens`
                                LEFT JOIN `clients` ON `clients`.`client_id` = `tokens`.`client_id`