Moved table definition

diff --git a/database.sql b/database.sql
index 3e4e76cf0be2498c569225a822f32742efbf3d91..054284657267fbf2128ed4b51aa1bc02994779d9 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -33,6 +33,61 @@ CREATE TABLE IF NOT EXISTS `gserver` (
         UNIQUE INDEX `nurl` (`nurl`(190))
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Global servers';
 
+--
+-- TABLE user
+--
+CREATE TABLE IF NOT EXISTS `user` (
+       `uid` mediumint unsigned NOT NULL auto_increment COMMENT 'sequential ID',
+       `parent-uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'The parent user that has full control about this user',
+       `guid` varchar(64) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this user',
+       `username` varchar(255) NOT NULL DEFAULT '' COMMENT 'Name that this user is known by',
+       `password` varchar(255) NOT NULL DEFAULT '' COMMENT 'encrypted password',
+       `legacy_password` boolean NOT NULL DEFAULT '0' COMMENT 'Is the password hash double-hashed?',
+       `nickname` varchar(255) NOT NULL DEFAULT '' COMMENT 'nick- and user name',
+       `email` varchar(255) NOT NULL DEFAULT '' COMMENT 'the users email address',
+       `openid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+       `timezone` varchar(128) NOT NULL DEFAULT '' COMMENT 'PHP-legal timezone',
+       `language` varchar(32) NOT NULL DEFAULT 'en' COMMENT 'default language',
+       `register_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'timestamp of registration',
+       `login_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'timestamp of last login',
+       `default-location` varchar(255) NOT NULL DEFAULT '' COMMENT 'Default for item.location',
+       `allow_location` boolean NOT NULL DEFAULT '0' COMMENT '1 allows to display the location',
+       `theme` varchar(255) NOT NULL DEFAULT '' COMMENT 'user theme preference',
+       `pubkey` text COMMENT 'RSA public key 4096 bit',
+       `prvkey` text COMMENT 'RSA private key 4096 bit',
+       `spubkey` text COMMENT '',
+       `sprvkey` text COMMENT '',
+       `verified` boolean NOT NULL DEFAULT '0' COMMENT 'user is verified through email',
+       `blocked` boolean NOT NULL DEFAULT '0' COMMENT '1 for user is blocked',
+       `blockwall` boolean NOT NULL DEFAULT '0' COMMENT 'Prohibit contacts to post to the profile page of the user',
+       `hidewall` boolean NOT NULL DEFAULT '0' COMMENT 'Hide profile details from unkown viewers',
+       `blocktags` boolean NOT NULL DEFAULT '0' COMMENT 'Prohibit contacts to tag the post of this user',
+       `unkmail` boolean NOT NULL DEFAULT '0' COMMENT 'Permit unknown people to send private mails to this user',
+       `cntunkmail` int unsigned NOT NULL DEFAULT 10 COMMENT '',
+       `notify-flags` smallint unsigned NOT NULL DEFAULT 65535 COMMENT 'email notification options',
+       `page-flags` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'page/profile type',
+       `account-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
+       `prvnets` boolean NOT NULL DEFAULT '0' COMMENT '',
+       `pwdreset` varchar(255) COMMENT 'Password reset request token',
+       `pwdreset_time` datetime COMMENT 'Timestamp of the last password reset request',
+       `maxreq` int unsigned NOT NULL DEFAULT 10 COMMENT '',
+       `expire` int unsigned NOT NULL DEFAULT 0 COMMENT '',
+       `account_removed` boolean NOT NULL DEFAULT '0' COMMENT 'if 1 the account is removed',
+       `account_expired` boolean NOT NULL DEFAULT '0' COMMENT '',
+       `account_expires_on` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'timestamp when account expires and will be deleted',
+       `expire_notification_sent` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'timestamp of last warning of account expiration',
+       `def_gid` int unsigned NOT NULL DEFAULT 0 COMMENT '',
+       `allow_cid` mediumtext COMMENT 'default permission for this user',
+       `allow_gid` mediumtext COMMENT 'default permission for this user',
+       `deny_cid` mediumtext COMMENT 'default permission for this user',
+       `deny_gid` mediumtext COMMENT 'default permission for this user',
+       `openidserver` text COMMENT '',
+        PRIMARY KEY(`uid`),
+        INDEX `nickname` (`nickname`(32)),
+        INDEX `parent-uid` (`parent-uid`),
+       FOREIGN KEY (`parent-uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='The local users';
+
 --
 -- TABLE contact
 --
@@ -163,61 +218,6 @@ CREATE TABLE IF NOT EXISTS `tag` (
         INDEX `url` (`url`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='tags and mentions';
 
---
--- TABLE user
---
-CREATE TABLE IF NOT EXISTS `user` (
-       `uid` mediumint unsigned NOT NULL auto_increment COMMENT 'sequential ID',
-       `parent-uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'The parent user that has full control about this user',
-       `guid` varchar(64) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this user',
-       `username` varchar(255) NOT NULL DEFAULT '' COMMENT 'Name that this user is known by',
-       `password` varchar(255) NOT NULL DEFAULT '' COMMENT 'encrypted password',
-       `legacy_password` boolean NOT NULL DEFAULT '0' COMMENT 'Is the password hash double-hashed?',
-       `nickname` varchar(255) NOT NULL DEFAULT '' COMMENT 'nick- and user name',
-       `email` varchar(255) NOT NULL DEFAULT '' COMMENT 'the users email address',
-       `openid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-       `timezone` varchar(128) NOT NULL DEFAULT '' COMMENT 'PHP-legal timezone',
-       `language` varchar(32) NOT NULL DEFAULT 'en' COMMENT 'default language',
-       `register_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'timestamp of registration',
-       `login_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'timestamp of last login',
-       `default-location` varchar(255) NOT NULL DEFAULT '' COMMENT 'Default for item.location',
-       `allow_location` boolean NOT NULL DEFAULT '0' COMMENT '1 allows to display the location',
-       `theme` varchar(255) NOT NULL DEFAULT '' COMMENT 'user theme preference',
-       `pubkey` text COMMENT 'RSA public key 4096 bit',
-       `prvkey` text COMMENT 'RSA private key 4096 bit',
-       `spubkey` text COMMENT '',
-       `sprvkey` text COMMENT '',
-       `verified` boolean NOT NULL DEFAULT '0' COMMENT 'user is verified through email',
-       `blocked` boolean NOT NULL DEFAULT '0' COMMENT '1 for user is blocked',
-       `blockwall` boolean NOT NULL DEFAULT '0' COMMENT 'Prohibit contacts to post to the profile page of the user',
-       `hidewall` boolean NOT NULL DEFAULT '0' COMMENT 'Hide profile details from unkown viewers',
-       `blocktags` boolean NOT NULL DEFAULT '0' COMMENT 'Prohibit contacts to tag the post of this user',
-       `unkmail` boolean NOT NULL DEFAULT '0' COMMENT 'Permit unknown people to send private mails to this user',
-       `cntunkmail` int unsigned NOT NULL DEFAULT 10 COMMENT '',
-       `notify-flags` smallint unsigned NOT NULL DEFAULT 65535 COMMENT 'email notification options',
-       `page-flags` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'page/profile type',
-       `account-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
-       `prvnets` boolean NOT NULL DEFAULT '0' COMMENT '',
-       `pwdreset` varchar(255) COMMENT 'Password reset request token',
-       `pwdreset_time` datetime COMMENT 'Timestamp of the last password reset request',
-       `maxreq` int unsigned NOT NULL DEFAULT 10 COMMENT '',
-       `expire` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-       `account_removed` boolean NOT NULL DEFAULT '0' COMMENT 'if 1 the account is removed',
-       `account_expired` boolean NOT NULL DEFAULT '0' COMMENT '',
-       `account_expires_on` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'timestamp when account expires and will be deleted',
-       `expire_notification_sent` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'timestamp of last warning of account expiration',
-       `def_gid` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-       `allow_cid` mediumtext COMMENT 'default permission for this user',
-       `allow_gid` mediumtext COMMENT 'default permission for this user',
-       `deny_cid` mediumtext COMMENT 'default permission for this user',
-       `deny_gid` mediumtext COMMENT 'default permission for this user',
-       `openidserver` text COMMENT '',
-        PRIMARY KEY(`uid`),
-        INDEX `nickname` (`nickname`(32)),
-        INDEX `parent-uid` (`parent-uid`),
-       FOREIGN KEY (`parent-uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='The local users';
-
 --
 -- TABLE clients
 --

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index 9548e95f372ed2a9b64fd71fe85afdea369e7312..65d7ce7817797e7139bb431134886b32f50b5fa8 100644 (file)
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -89,6 +89,62 @@ return [
                        "nurl" => ["UNIQUE", "nurl(190)"],
                ]
        ],
+       "user" => [
+               "comment" => "The local users",
+               "fields" => [
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "parent-uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"],
+                               "comment" => "The parent user that has full control about this user"],
+                       "guid" => ["type" => "varchar(64)", "not null" => "1", "default" => "", "comment" => "A unique identifier for this user"],
+                       "username" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Name that this user is known by"],
+                       "password" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "encrypted password"],
+                       "legacy_password" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Is the password hash double-hashed?"],
+                       "nickname" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "nick- and user name"],
+                       "email" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "the users email address"],
+                       "openid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "timezone" => ["type" => "varchar(128)", "not null" => "1", "default" => "", "comment" => "PHP-legal timezone"],
+                       "language" => ["type" => "varchar(32)", "not null" => "1", "default" => "en", "comment" => "default language"],
+                       "register_date" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "timestamp of registration"],
+                       "login_date" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "timestamp of last login"],
+                       "default-location" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Default for item.location"],
+                       "allow_location" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 allows to display the location"],
+                       "theme" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "user theme preference"],
+                       "pubkey" => ["type" => "text", "comment" => "RSA public key 4096 bit"],
+                       "prvkey" => ["type" => "text", "comment" => "RSA private key 4096 bit"],
+                       "spubkey" => ["type" => "text", "comment" => ""],
+                       "sprvkey" => ["type" => "text", "comment" => ""],
+                       "verified" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "user is verified through email"],
+                       "blocked" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 for user is blocked"],
+                       "blockwall" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Prohibit contacts to post to the profile page of the user"],
+                       "hidewall" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Hide profile details from unkown viewers"],
+                       "blocktags" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Prohibit contacts to tag the post of this user"],
+                       "unkmail" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Permit unknown people to send private mails to this user"],
+                       "cntunkmail" => ["type" => "int unsigned", "not null" => "1", "default" => "10", "comment" => ""],
+                       "notify-flags" => ["type" => "smallint unsigned", "not null" => "1", "default" => "65535", "comment" => "email notification options"],
+                       "page-flags" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "page/profile type"],
+                       "account-type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "prvnets" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "pwdreset" => ["type" => "varchar(255)", "comment" => "Password reset request token"],
+                       "pwdreset_time" => ["type" => "datetime", "comment" => "Timestamp of the last password reset request"],
+                       "maxreq" => ["type" => "int unsigned", "not null" => "1", "default" => "10", "comment" => ""],
+                       "expire" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "account_removed" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "if 1 the account is removed"],
+                       "account_expired" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "account_expires_on" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "timestamp when account expires and will be deleted"],
+                       "expire_notification_sent" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "timestamp of last warning of account expiration"],
+                       "def_gid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "allow_cid" => ["type" => "mediumtext", "comment" => "default permission for this user"],
+                       "allow_gid" => ["type" => "mediumtext", "comment" => "default permission for this user"],
+                       "deny_cid" => ["type" => "mediumtext", "comment" => "default permission for this user"],
+                       "deny_gid" => ["type" => "mediumtext", "comment" => "default permission for this user"],
+                       "openidserver" => ["type" => "text", "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["uid"],
+                       "nickname" => ["nickname(32)"],
+                       "parent-uid" => ["parent-uid"],
+               ]
+       ],
        "contact" => [
                "comment" => "contact table",
                "fields" => [
@@ -220,62 +276,6 @@ return [
                        "url" => ["url"]
                ]
        ],
-       "user" => [
-               "comment" => "The local users",
-               "fields" => [
-                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
-                       "parent-uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"],
-                               "comment" => "The parent user that has full control about this user"],
-                       "guid" => ["type" => "varchar(64)", "not null" => "1", "default" => "", "comment" => "A unique identifier for this user"],
-                       "username" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Name that this user is known by"],
-                       "password" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "encrypted password"],
-                       "legacy_password" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Is the password hash double-hashed?"],
-                       "nickname" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "nick- and user name"],
-                       "email" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "the users email address"],
-                       "openid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-                       "timezone" => ["type" => "varchar(128)", "not null" => "1", "default" => "", "comment" => "PHP-legal timezone"],
-                       "language" => ["type" => "varchar(32)", "not null" => "1", "default" => "en", "comment" => "default language"],
-                       "register_date" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "timestamp of registration"],
-                       "login_date" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "timestamp of last login"],
-                       "default-location" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Default for item.location"],
-                       "allow_location" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 allows to display the location"],
-                       "theme" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "user theme preference"],
-                       "pubkey" => ["type" => "text", "comment" => "RSA public key 4096 bit"],
-                       "prvkey" => ["type" => "text", "comment" => "RSA private key 4096 bit"],
-                       "spubkey" => ["type" => "text", "comment" => ""],
-                       "sprvkey" => ["type" => "text", "comment" => ""],
-                       "verified" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "user is verified through email"],
-                       "blocked" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 for user is blocked"],
-                       "blockwall" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Prohibit contacts to post to the profile page of the user"],
-                       "hidewall" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Hide profile details from unkown viewers"],
-                       "blocktags" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Prohibit contacts to tag the post of this user"],
-                       "unkmail" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Permit unknown people to send private mails to this user"],
-                       "cntunkmail" => ["type" => "int unsigned", "not null" => "1", "default" => "10", "comment" => ""],
-                       "notify-flags" => ["type" => "smallint unsigned", "not null" => "1", "default" => "65535", "comment" => "email notification options"],
-                       "page-flags" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "page/profile type"],
-                       "account-type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-                       "prvnets" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-                       "pwdreset" => ["type" => "varchar(255)", "comment" => "Password reset request token"],
-                       "pwdreset_time" => ["type" => "datetime", "comment" => "Timestamp of the last password reset request"],
-                       "maxreq" => ["type" => "int unsigned", "not null" => "1", "default" => "10", "comment" => ""],
-                       "expire" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-                       "account_removed" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "if 1 the account is removed"],
-                       "account_expired" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-                       "account_expires_on" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "timestamp when account expires and will be deleted"],
-                       "expire_notification_sent" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "timestamp of last warning of account expiration"],
-                       "def_gid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-                       "allow_cid" => ["type" => "mediumtext", "comment" => "default permission for this user"],
-                       "allow_gid" => ["type" => "mediumtext", "comment" => "default permission for this user"],
-                       "deny_cid" => ["type" => "mediumtext", "comment" => "default permission for this user"],
-                       "deny_gid" => ["type" => "mediumtext", "comment" => "default permission for this user"],
-                       "openidserver" => ["type" => "text", "comment" => ""],
-               ],
-               "indexes" => [
-                       "PRIMARY" => ["uid"],
-                       "nickname" => ["nickname(32)"],
-                       "parent-uid" => ["parent-uid"],
-               ]
-       ],
        "clients" => [
                "comment" => "OAuth usage",
                "fields" => [