]> git.mxchange.org Git - friendica.git/commitdiff
Merge pull request #5981 from MrPetovan/task/move-dbstructure-to-php
authorMichael Vogel <icarus@dabo.de>
Mon, 22 Oct 2018 21:19:38 +0000 (23:19 +0200)
committerGitHub <noreply@github.com>
Mon, 22 Oct 2018 21:19:38 +0000 (23:19 +0200)
Move dbstructure to PHP array

33 files changed:
boot.php
config/dbstructure.json [deleted file]
config/dbstructure.php [new file with mode: 0644]
mod/admin.php
mod/events.php
mod/friendica.php
mod/profiles.php
mod/settings.php
src/App.php
src/Core/Addon.php
src/Core/Authentication.php
src/Core/Hook.php [new file with mode: 0644]
src/Core/UserImport.php
src/Core/Worker.php
src/Database/DBA.php
src/Database/DBStructure.php
src/Model/Contact.php
src/Model/Event.php
src/Model/GContact.php
src/Model/Profile.php
src/Model/PushSubscriber.php
src/Module/Contact.php
src/Object/Post.php
src/Protocol/PortableContact.php
src/Util/Temporal.php
src/Worker/Cron.php
src/Worker/CronJobs.php
src/Worker/Expire.php
src/Worker/ForkHook.php
src/Worker/Notifier.php
src/Worker/OnePoll.php
tests/Util/VFSTrait.php
update.php

index 91f62c4b4fb32731e84ecb266414c90bc6e2f0ad..7fb87ca4eb4391d9c5086c7eefdcf0b2e105b7a1 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -41,7 +41,6 @@ define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
 define('FRIENDICA_VERSION',      '2018.12-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1289);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**
@@ -345,11 +344,6 @@ define('SR_SCOPE_ALL',  'all');
 define('SR_SCOPE_TAGS', 'tags');
 /* @}*/
 
-/**
- * Lowest possible date time value
- */
-define('NULL_DATE', '0001-01-01 00:00:00');
-
 // Normally this constant is defined - but not if "pcntl" isn't installed
 if (!defined("SIGTERM")) {
        define("SIGTERM", 15);
diff --git a/config/dbstructure.json b/config/dbstructure.json
deleted file mode 100644 (file)
index 43fce1d..0000000
+++ /dev/null
@@ -1,1326 +0,0 @@
-{
-       "addon": {
-               "comment": "registered addons",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": ""},
-                       "name": {"type": "varchar(50)", "not null": "1", "default": "", "comment": "addon base (file)name"},
-                       "version": {"type": "varchar(50)", "not null": "1", "default": "", "comment": "currently unused"},
-                       "installed": {"type": "boolean", "not null": "1", "default": "0", "comment": "currently always 1"},
-                       "hidden": {"type": "boolean", "not null": "1", "default": "0", "comment": "currently unused"},
-                       "timestamp": {"type": "int unsigned", "not null": "1", "default": "0", "comment": "file timestamp to check for reloads"},
-                       "plugin_admin": {"type": "boolean", "not null": "1", "default": "0", "comment": "1 = has admin config, 0 = has no admin config"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "name": ["UNIQUE", "name"]
-               }
-       },
-       "apcontact": {
-               "comment": "ActivityPub compatible contacts - used in the ActivityPub implementation",
-               "fields": {
-                       "url": {"type": "varbinary(255)", "not null": "1", "primary": "1", "comment": "URL of the contact"},
-                       "uuid": {"type": "varchar(255)", "comment": ""},
-                       "type": {"type": "varchar(20)", "not null": "1", "comment": ""},
-                       "following": {"type": "varchar(255)", "comment": ""},
-                       "followers": {"type": "varchar(255)", "comment": ""},
-                       "inbox": {"type": "varchar(255)", "not null": "1", "comment": ""},
-                       "outbox": {"type": "varchar(255)", "comment": ""},
-                       "sharedinbox": {"type": "varchar(255)", "comment": ""},
-                       "nick": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "name": {"type": "varchar(255)", "comment": ""},
-                       "about": {"type": "text", "comment": ""},
-                       "photo": {"type": "varchar(255)", "comment": ""},
-                       "addr": {"type": "varchar(255)", "comment": ""},
-                       "alias": {"type": "varchar(255)", "comment": ""},
-                       "pubkey": {"type": "text", "comment": ""},
-                       "baseurl": {"type": "varchar(255)", "comment": "baseurl of the ap contact"},
-                       "updated": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""}
-
-               },
-               "indexes": {
-                       "PRIMARY": ["url"],
-                       "addr": ["addr(32)"],
-                       "alias": ["alias(190)"],
-                       "url": ["followers(190)"]
-               }
-       },
-       "attach": {
-               "comment": "file attachments",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "generated index"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner User id"},
-                       "hash": {"type": "varchar(64)", "not null": "1", "default": "", "comment": "hash"},
-                       "filename": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "filename of original"},
-                       "filetype": {"type": "varchar(64)", "not null": "1", "default": "", "comment": "mimetype"},
-                       "filesize": {"type": "int unsigned", "not null": "1", "default": "0", "comment": "size in bytes"},
-                       "data": {"type": "longblob", "not null": "1", "comment": "file data"},
-                       "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "creation time"},
-                       "edited": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "last edit time"},
-                       "allow_cid": {"type": "mediumtext", "comment": "Access Control - list of allowed contact.id '<19><78>"},
-                       "allow_gid": {"type": "mediumtext", "comment": "Access Control - list of allowed groups"},
-                       "deny_cid": {"type": "mediumtext", "comment": "Access Control - list of denied contact.id"},
-                       "deny_gid": {"type": "mediumtext", "comment": "Access Control - list of denied groups"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"]
-               }
-       },
-       "auth_codes": {
-               "comment": "OAuth usage",
-               "fields": {
-                       "id": {"type": "varchar(40)", "not null": "1", "primary": "1", "comment": ""},
-                       "client_id": {"type": "varchar(20)", "not null": "1", "default": "", "relation": {"clients": "client_id"}, "comment": ""},
-                       "redirect_uri": {"type": "varchar(200)", "not null": "1", "default": "", "comment": ""},
-                       "expires": {"type": "int", "not null": "1", "default": "0", "comment": ""},
-                       "scope": {"type": "varchar(250)", "not null": "1", "default": "", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"]
-               }
-       },
-       "cache": {
-               "comment": "Stores temporary data",
-               "fields": {
-                       "k": {"type": "varbinary(255)", "not null": "1", "primary": "1", "comment": "cache key"},
-                       "v": {"type": "mediumtext", "comment": "cached serialized value"},
-                       "expires": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "datetime of cache expiration"},
-                       "updated": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "datetime of cache insertion"}
-               },
-               "indexes": {
-                       "PRIMARY": ["k"],
-                       "k_expires": ["k", "expires"]
-               }
-       },
-       "challenge": {
-               "comment": "",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "challenge": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "dfrn-id": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "expire": {"type": "int unsigned", "not null": "1", "default": "0", "comment": ""},
-                       "type": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "last_update": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"]
-               }
-       },
-       "clients": {
-               "comment": "OAuth usage",
-               "fields": {
-                       "client_id": {"type": "varchar(20)", "not null": "1", "primary": "1", "comment": ""},
-                       "pw": {"type": "varchar(20)", "not null": "1", "default": "", "comment": ""},
-                       "redirect_uri": {"type": "varchar(200)", "not null": "1", "default": "", "comment": ""},
-                       "name": {"type": "text", "comment": ""},
-                       "icon": {"type": "text", "comment": ""},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"}
-               },
-               "indexes": {
-                       "PRIMARY": ["client_id"]
-               }
-       },
-       "config": {
-               "comment": "main configuration storage",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": ""},
-                       "cat": {"type": "varbinary(50)", "not null": "1", "default": "", "comment": ""},
-                       "k": {"type": "varbinary(50)", "not null": "1", "default": "", "comment": ""},
-                       "v": {"type": "mediumtext", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "cat_k": ["UNIQUE", "cat", "k"]
-               }
-       },
-       "contact": {
-               "comment": "contact table",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner User id"},
-                       "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "self": {"type": "boolean", "not null": "1", "default": "0", "comment": "1 if the contact is the user him/her self"},
-                       "remote_self": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "rel": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": "The kind of the relation between the user and the contact"},
-                       "duplex": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "network": {"type": "char(4)", "not null": "1", "default": "", "comment": "Network protocol of the contact"},
-                       "name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Name that this contact is known by"},
-                       "nick": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Nick- and user name of the contact"},
-                       "location": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "about": {"type": "text", "comment": ""},
-                       "keywords": {"type": "text", "comment": "public keywords (interests) of the contact"},
-                       "gender": {"type": "varchar(32)", "not null": "1", "default": "", "comment": ""},
-                       "xmpp": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "attag": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "avatar": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "photo": {"type": "varchar(255)", "default": "", "comment": "Link to the profile photo of the contact"},
-                       "thumb": {"type": "varchar(255)", "default": "", "comment": "Link to the profile photo (thumb size)"},
-                       "micro": {"type": "varchar(255)", "default": "", "comment": "Link to the profile photo (micro size)"},
-                       "site-pubkey": {"type": "text", "comment": ""},
-                       "issued-id": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "dfrn-id": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "nurl": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "addr": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "alias": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "pubkey": {"type": "text", "comment": "RSA public key 4096 bit"},
-                       "prvkey": {"type": "text", "comment": "RSA private key 4096 bit"},
-                       "batch": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "request": {"type": "varchar(255)", "comment": ""},
-                       "notify": {"type": "varchar(255)", "comment": ""},
-                       "poll": {"type": "varchar(255)", "comment": ""},
-                       "confirm": {"type": "varchar(255)", "comment": ""},
-                       "poco": {"type": "varchar(255)", "comment": ""},
-                       "aes_allow": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "ret-aes": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "usehub": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "subhub": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "hub-verify": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "last-update": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date of the last try to update the contact info"},
-                       "success_update": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date of the last successful contact update"},
-                       "failure_update": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date of the last failed update"},
-                       "name-date": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "uri-date": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "avatar-date": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "term-date": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "last-item": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "date of the last post"},
-                       "priority": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
-                       "blocked": {"type": "boolean", "not null": "1", "default": "1", "comment": ""},
-                       "readonly": {"type": "boolean", "not null": "1", "default": "0", "comment": "posts of the contact are readonly"},
-                       "writable": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "forum": {"type": "boolean", "not null": "1", "default": "0", "comment": "contact is a forum"},
-                       "prv": {"type": "boolean", "not null": "1", "default": "0", "comment": "contact is a private group"},
-                       "contact-type": {"type": "tinyint", "not null": "1", "default": "0", "comment": ""},
-                       "hidden": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "archive": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "pending": {"type": "boolean", "not null": "1", "default": "1", "comment": ""},
-                       "deleted": {"type": "boolean", "not null": "1", "default": "0", "comment": "Contact has been deleted"},
-                       "rating": {"type": "tinyint", "not null": "1", "default": "0", "comment": ""},
-                       "reason": {"type": "text", "comment": ""},
-                       "closeness": {"type": "tinyint unsigned", "not null": "1", "default": "99", "comment": ""},
-                       "info": {"type": "mediumtext", "comment": ""},
-                       "profile-id": {"type": "int unsigned", "not null": "1", "default": "0", "comment": ""},
-                       "bdyear": {"type": "varchar(4)", "not null": "1", "default": "", "comment": ""},
-                       "bd": {"type": "date", "not null": "1", "default": "0001-01-01", "comment": ""},
-                       "notify_new_posts": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "fetch_further_information": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
-                       "ffi_keyword_blacklist": {"type": "text", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "uid_name": ["uid", "name(190)"],
-                       "self_uid": ["self", "uid"],
-                       "alias_uid": ["alias(32)", "uid"],
-                       "pending_uid": ["pending", "uid"],
-                       "blocked_uid": ["blocked", "uid"],
-                       "uid_rel_network_poll": ["uid", "rel", "network", "poll(64)", "archive"],
-                       "uid_network_batch": ["uid", "network", "batch(64)"],
-                       "addr_uid": ["addr(32)", "uid"],
-                       "nurl_uid": ["nurl(32)", "uid"],
-                       "nick_uid": ["nick(32)", "uid"],
-                       "dfrn-id": ["dfrn-id(64)"],
-                       "issued-id": ["issued-id(64)"]
-               }
-       },
-       "conv": {
-               "comment": "private messages",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "guid": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "A unique identifier for this conversation"},
-                       "recips": {"type": "text", "comment": "sender_handle;recipient_handle"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner User id"},
-                       "creator": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "handle of creator"},
-                       "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "creation timestamp"},
-                       "updated": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "edited timestamp"},
-                       "subject": {"type": "text", "comment": "subject of initial message"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "uid": ["uid"]
-               }
-       },
-       "conversation": {
-               "comment": "Raw data and structure information for messages",
-               "fields": {
-                       "item-uri": {"type": "varbinary(255)", "not null": "1", "primary": "1", "comment": "Original URI of the item - unrelated to the table with the same name"},
-                       "reply-to-uri": {"type": "varbinary(255)", "not null": "1", "default": "", "comment": "URI to which this item is a reply"},
-                       "conversation-uri": {"type": "varbinary(255)", "not null": "1", "default": "", "comment": "GNU Social conversation URI"},
-                       "conversation-href": {"type": "varbinary(255)", "not null": "1", "default": "", "comment": "GNU Social conversation link"},
-                       "protocol": {"type": "tinyint unsigned", "not null": "1", "default": "255", "comment": "The protocol of the item"},
-                       "source": {"type": "mediumtext", "comment": "Original source"},
-                       "received": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Receiving date"}
-               },
-               "indexes": {
-                       "PRIMARY": ["item-uri"],
-                       "conversation-uri": ["conversation-uri"],
-                       "received": ["received"]
-               }
-       },
-       "diaspora-interaction": {
-               "comment": "Signed Diaspora Interaction",
-               "fields": {
-                       "uri-id": {"type": "int unsigned", "not null": "1", "primary": "1", "relation": {"item-uri": "id"}, "comment": "Id of the item-uri table entry that contains the item uri"},
-                       "interaction": {"type": "mediumtext", "comment": "The Diaspora interaction"}
-               },
-               "indexes": {
-                       "PRIMARY": ["uri-id"]
-               }
-       },
-       "event": {
-               "comment": "Events",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "guid": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner User id"},
-                       "cid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "contact_id (ID of the contact in contact table)"},
-                       "uri": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "creation time"},
-                       "edited": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "last edit time"},
-                       "start": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "event start time"},
-                       "finish": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "event end time"},
-                       "summary": {"type": "text", "comment": "short description or title of the event"},
-                       "desc": {"type": "text", "comment": "event description"},
-                       "location": {"type": "text", "comment": "event location"},
-                       "type": {"type": "varchar(20)", "not null": "1", "default": "", "comment": "event or birthday"},
-                       "nofinish": {"type": "boolean", "not null": "1", "default": "0", "comment": "if event does have no end this is 1"},
-                       "adjust": {"type": "boolean", "not null": "1", "default": "1", "comment": "adjust to timezone of the recipient (0 or 1)"},
-                       "ignore": {"type": "boolean", "not null": "1", "default": "0", "comment": "0 or 1"},
-                       "allow_cid": {"type": "mediumtext", "comment": "Access Control - list of allowed contact.id '<19><78>'"},
-                       "allow_gid": {"type": "mediumtext", "comment": "Access Control - list of allowed groups"},
-                       "deny_cid": {"type": "mediumtext", "comment": "Access Control - list of denied contact.id"},
-                       "deny_gid": {"type": "mediumtext", "comment": "Access Control - list of denied groups"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "uid_start": ["uid", "start"]
-               }
-       },
-       "fcontact": {
-               "comment": "Diaspora compatible contacts - used in the Diaspora implementation",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "guid": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "unique id"},
-                       "url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "photo": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "request": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "nick": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "addr": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "batch": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "notify": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "poll": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "confirm": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "priority": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
-                       "network": {"type": "char(4)", "not null": "1", "default": "", "comment": ""},
-                       "alias": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "pubkey": {"type": "text", "comment": ""},
-                       "updated": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "addr": ["addr(32)"],
-                       "url": ["UNIQUE", "url(190)"]
-               }
-       },
-       "fsuggest": {
-               "comment": "friend suggestion stuff",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": ""},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
-                       "cid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": ""},
-                       "name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "request": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "photo": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "note": {"type": "text", "comment": ""},
-                       "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"]
-               }
-       },
-       "gcign": {
-               "comment": "contacts ignored by friend suggestions",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Local User id"},
-                       "gcid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"gcontact": "id"}, "comment": "gcontact.id of ignored contact"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "uid": ["uid"],
-                       "gcid": ["gcid"]
-               }
-       },
-       "gcontact": {
-               "comment": "global contacts",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Name that this contact is known by"},
-                       "nick": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Nick- and user name of the contact"},
-                       "url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Link to the contacts profile page"},
-                       "nurl": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "photo": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Link to the profile photo"},
-                       "connect": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "updated": {"type": "datetime", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "last_contact": {"type": "datetime", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "last_failure": {"type": "datetime", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "location": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "about": {"type": "text", "comment": ""},
-                       "keywords": {"type": "text", "comment": "puplic keywords (interests)"},
-                       "gender": {"type": "varchar(32)", "not null": "1", "default": "", "comment": ""},
-                       "birthday": {"type": "varchar(32)", "not null": "1", "default": "0001-01-01", "comment": ""},
-                       "community": {"type": "boolean", "not null": "1", "default": "0", "comment": "1 if contact is forum account"},
-                       "contact-type": {"type": "tinyint", "not null": "1", "default": "-1", "comment": ""},
-                       "hide": {"type": "boolean", "not null": "1", "default": "0", "comment": "1 = should be hidden from search"},
-                       "nsfw": {"type": "boolean", "not null": "1", "default": "0", "comment": "1 = contact posts nsfw content"},
-                       "network": {"type": "char(4)", "not null": "1", "default": "", "comment": "social network protocol"},
-                       "addr": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "notify": {"type": "varchar(255)", "comment": ""},
-                       "alias": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "generation": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
-                       "server_url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "baseurl of the contacts server"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "nurl": ["UNIQUE", "nurl(190)"],
-                       "name": ["name(64)"],
-                       "nick": ["nick(32)"],
-                       "addr": ["addr(64)"],
-                       "hide_network_updated": ["hide", "network", "updated"],
-                       "updated": ["updated"]
-               }
-       },
-       "glink": {
-               "comment": "'friends of friends' linkages derived from poco",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "cid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": ""},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
-                       "gcid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"gcontact": "id"}, "comment": ""},
-                       "zcid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"gcontact": "id"}, "comment": ""},
-                       "updated": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "cid_uid_gcid_zcid": ["UNIQUE", "cid", "uid", "gcid", "zcid"],
-                       "gcid": ["gcid"]
-               }
-       },
-       "group": {
-               "comment": "privacy groups, group info",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner User id"},
-                       "visible": {"type": "boolean", "not null": "1", "default": "0", "comment": "1 indicates the member list is not private"},
-                       "deleted": {"type": "boolean", "not null": "1", "default": "0", "comment": "1 indicates the group has been deleted"},
-                       "name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "human readable name of group"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "uid": ["uid"]
-               }
-       },
-       "group_member": {
-               "comment": "privacy groups, member info",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "gid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"group": "id"}, "comment": "groups.id of the associated group"},
-                       "contact-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "contact.id of the member assigned to the associated group"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "contactid": ["contact-id"],
-                       "gid_contactid": ["UNIQUE", "gid", "contact-id"]
-               }
-       },
-       "gserver": {
-               "comment": "Global servers",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "nurl": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "version": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "site_name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "info": {"type": "text", "comment": ""},
-                       "register_policy": {"type": "tinyint", "not null": "1", "default": "0", "comment": ""},
-                       "registered-users": {"type": "int unsigned", "not null": "1", "default": "0", "comment": "Number of registered users"},
-                       "poco": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "noscrape": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "network": {"type": "char(4)", "not null": "1", "default": "", "comment": ""},
-                       "platform": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "relay-subscribe": {"type": "boolean", "not null": "1", "default": "0", "comment": "Has the server subscribed to the relay system"},
-                       "relay-scope": {"type": "varchar(10)", "not null": "1", "default": "", "comment": "The scope of messages that the server wants to get"},
-                       "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "last_poco_query": {"type": "datetime", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "last_contact": {"type": "datetime", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "last_failure": {"type": "datetime", "default": "0001-01-01 00:00:00", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "nurl": ["UNIQUE", "nurl(190)"]
-               }
-       },
-       "gserver-tag": {
-               "comment": "Tags that the server has subscribed",
-               "fields": {
-                       "gserver-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"gserver": "id"}, "primary": "1", "comment": "The id of the gserver"},
-                       "tag": {"type": "varchar(100)", "not null": "1", "default": "", "primary": "1", "comment": "Tag that the server has subscribed"}
-               },
-               "indexes": {
-                       "PRIMARY": ["gserver-id", "tag"],
-                       "tag": ["tag"]
-               }
-       },
-       "hook": {
-               "comment": "addon hook registry",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "hook": {"type": "varbinary(100)", "not null": "1", "default": "", "comment": "name of hook"},
-                       "file": {"type": "varbinary(200)", "not null": "1", "default": "", "comment": "relative filename of hook handler"},
-                       "function": {"type": "varbinary(200)", "not null": "1", "default": "", "comment": "function name of hook handler"},
-                       "priority": {"type": "smallint unsigned", "not null": "1", "default": "0", "comment": "not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "hook_file_function": ["UNIQUE", "hook", "file", "function"]
-               }
-       },
-       "intro": {
-               "comment": "",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
-                       "fid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"fcontact": "id"}, "comment": ""},
-                       "contact-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": ""},
-                       "knowyou": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "duplex": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "note": {"type": "text", "comment": ""},
-                       "hash": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "datetime": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "blocked": {"type": "boolean", "not null": "1", "default": "1", "comment": ""},
-                       "ignore": {"type": "boolean", "not null": "1", "default": "0", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"]
-               }
-       },
-       "item": {
-               "comment": "Structure for all posts",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "relation": {"thread": "iid"}},
-                       "guid": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "A unique identifier for this item"},
-                       "uri": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "uri-id": {"type": "int unsigned", "relation": {"item-uri": "id"}, "comment": "Id of the item-uri table entry that contains the item uri"},
-                       "uri-hash": {"type": "varchar(80)", "not null": "1", "default": "", "comment": "RIPEMD-128 hash from uri"},
-                       "parent": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"item": "id"}, "comment": "item.id of the parent to this item if it is a reply of some form; otherwise this must be set to the id of this item"},
-                       "parent-uri": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "uri of the parent to this item"},
-                       "parent-uri-id": {"type": "int unsigned", "relation": {"item-uri": "id"}, "comment": "Id of the item-uri table that contains the parent uri"},
-                       "thr-parent": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "If the parent of this item is not the top-level item in the conversation, the uri of the immediate parent; otherwise set to parent-uri"},
-                       "thr-parent-id": {"type": "int unsigned", "relation": {"item-uri": "id"}, "comment": "Id of the item-uri table that contains the thread parent uri"},
-                       "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Creation timestamp."},
-                       "edited": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date of last edit (default is created)"},
-                       "commented": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date of last comment/reply to this item"},
-                       "received": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "datetime"},
-                       "changed": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date that something in the conversation changed, indicating clients should fetch the conversation again"},
-                       "gravity": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
-                       "network": {"type": "char(4)", "not null": "1", "default": "", "comment": "Network from where the item comes from"},
-                       "owner-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "Link to the contact table with uid=0 of the owner of this item"},
-                       "author-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "Link to the contact table with uid=0 of the author of this item"},
-                       "icid": {"type": "int unsigned", "relation": {"item-content": "id"}, "comment": "Id of the item-content table entry that contains the whole item content"},
-                       "iaid": {"type": "int unsigned", "relation": {"item-activity": "id"}, "comment": "Id of the item-activity table entry that contains the activity data"},
-                       "extid": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "post-type": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": "Post type (personal note, bookmark, ...)"},
-                       "global": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "private": {"type": "boolean", "not null": "1", "default": "0", "comment": "distribution is restricted"},
-                       "visible": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "moderated": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "deleted": {"type": "boolean", "not null": "1", "default": "0", "comment": "item has been deleted"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner id which owns this copy of the item"},
-                       "contact-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "contact.id"},
-                       "wall": {"type": "boolean", "not null": "1", "default": "0", "comment": "This item was posted to the wall of uid"},
-                       "origin": {"type": "boolean", "not null": "1", "default": "0", "comment": "item originated at this site"},
-                       "pubmail": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "starred": {"type": "boolean", "not null": "1", "default": "0", "comment": "item has been favourited"},
-                       "unseen": {"type": "boolean", "not null": "1", "default": "1", "comment": "item has not been seen"},
-                       "mention": {"type": "boolean", "not null": "1", "default": "0", "comment": "The owner of this item was mentioned in it"},
-                       "forum_mode": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
-                       "psid": {"type": "int unsigned", "relation": {"permissionset": "id"}, "comment": "ID of the permission set of this post"},
-                       "resource-id": {"type": "varchar(32)", "not null": "1", "default": "", "comment": "Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type"},
-                       "event-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"event": "id"}, "comment": "Used to link to the event.id"},
-                       "attach": {"type": "mediumtext", "comment": "JSON structure representing attachments to this item"},
-                       "allow_cid": {"type": "mediumtext", "comment": "Deprecated"},
-                       "allow_gid": {"type": "mediumtext", "comment": "Deprecated"},
-                       "deny_cid": {"type": "mediumtext", "comment": "Deprecated"},
-                       "deny_gid": {"type": "mediumtext", "comment": "Deprecated"},
-                       "postopts": {"type": "text", "comment": "Deprecated"},
-                       "inform": {"type": "mediumtext", "comment": "Deprecated"},
-                       "type": {"type": "varchar(20)", "comment": "Deprecated"},
-                       "bookmark": {"type": "boolean", "comment": "Deprecated"},
-                       "file": {"type": "mediumtext", "comment": "Deprecated"},
-                       "location": {"type": "varchar(255)", "comment": "Deprecated"},
-                       "coord": {"type": "varchar(255)", "comment": "Deprecated"},
-                       "tag": {"type": "mediumtext", "comment": "Deprecated"},
-                       "plink": {"type": "varchar(255)", "comment": "Deprecated"},
-                       "title": {"type": "varchar(255)", "comment": "Deprecated"},
-                       "content-warning": {"type": "varchar(255)", "comment": "Deprecated"},
-                       "body": {"type": "mediumtext", "comment": "Deprecated"},
-                       "app": {"type": "varchar(255)", "comment": "Deprecated"},
-                       "verb": {"type": "varchar(100)", "comment": "Deprecated"},
-                       "object-type": {"type": "varchar(100)", "comment": "Deprecated"},
-                       "object": {"type": "text", "comment": "Deprecated"},
-                       "target-type": {"type": "varchar(100)", "comment": "Deprecated"},
-                       "target": {"type": "text", "comment": "Deprecated"},
-                       "author-name": {"type": "varchar(255)", "comment": "Deprecated"},
-                       "author-link": {"type": "varchar(255)", "comment": "Deprecated"},
-                       "author-avatar": {"type": "varchar(255)", "comment": "Deprecated"},
-                       "owner-name": {"type": "varchar(255)", "comment": "Deprecated"},
-                       "owner-link": {"type": "varchar(255)", "comment": "Deprecated"},
-                       "owner-avatar": {"type": "varchar(255)", "comment": "Deprecated"},
-                       "rendered-hash": {"type": "varchar(32)", "comment": "Deprecated"},
-                       "rendered-html": {"type": "mediumtext", "comment": "Deprecated"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "guid": ["guid(191)"],
-                       "uri": ["uri(191)"],
-                       "parent": ["parent"],
-                       "parent-uri": ["parent-uri(191)"],
-                       "extid": ["extid(191)"],
-                       "uid_id": ["uid", "id"],
-                       "uid_contactid_id": ["uid", "contact-id", "id"],
-                       "uid_created": ["uid", "created"],
-                       "uid_commented": ["uid", "commented"],
-                       "uid_unseen_contactid": ["uid", "unseen", "contact-id"],
-                       "uid_network_received": ["uid", "network", "received"],
-                       "uid_network_commented": ["uid", "network", "commented"],
-                       "uid_thrparent": ["uid", "thr-parent(190)"],
-                       "uid_parenturi": ["uid", "parent-uri(190)"],
-                       "uid_contactid_created": ["uid", "contact-id", "created"],
-                       "authorid_created": ["author-id", "created"],
-                       "ownerid": ["owner-id"],
-                       "uid_uri": ["uid", "uri(190)"],
-                       "resource-id": ["resource-id"],
-                       "deleted_changed": ["deleted", "changed"],
-                       "uid_wall_changed": ["uid", "wall", "changed"],
-                       "uid_eventid": ["uid", "event-id"],
-                       "icid": ["icid"],
-                       "iaid": ["iaid"],
-                       "psid_wall": ["psid", "wall"]
-               }
-       },
-       "item-activity": {
-               "comment": "Activities for items",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "relation": {"thread": "iid"}},
-                       "uri": {"type": "varchar(255)", "comment": ""},
-                       "uri-id": {"type": "int unsigned", "relation": {"item-uri": "id"}, "comment": "Id of the item-uri table entry that contains the item uri"},
-                       "uri-hash": {"type": "varchar(80)", "not null": "1", "default": "", "comment": "RIPEMD-128 hash from uri"},
-                       "activity": {"type": "smallint unsigned", "not null": "1", "default": "0", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "uri-hash": ["UNIQUE", "uri-hash"],
-                       "uri": ["uri(191)"],
-                       "uri-id": ["uri-id"]
-               }
-       },
-       "item-content": {
-               "comment": "Content for all posts",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "relation": {"thread": "iid"}},
-                       "uri": {"type": "varchar(255)", "comment": ""},
-                       "uri-id": {"type": "int unsigned", "relation": {"item-uri": "id"}, "comment": "Id of the item-uri table entry that contains the item uri"},
-                       "uri-plink-hash": {"type": "varchar(80)", "not null": "1", "default": "", "comment": "RIPEMD-128 hash from uri"},
-                       "title": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "item title"},
-                       "content-warning": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "body": {"type": "mediumtext", "comment": "item body content"},
-                       "location": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "text location where this item originated"},
-                       "coord": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "longitude/latitude pair representing location where this item originated"},
-                       "language": {"type": "text", "comment": "Language information about this post"},
-                       "app": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "application which generated this item"},
-                       "rendered-hash": {"type": "varchar(32)", "not null": "1", "default": "", "comment": ""},
-                       "rendered-html": {"type": "mediumtext", "comment": "item.body converted to html"},
-                       "object-type": {"type": "varchar(100)", "not null": "1", "default": "", "comment": "ActivityStreams object type"},
-                       "object": {"type": "text", "comment": "JSON encoded object structure unless it is an implied object (normal post)"},
-                       "target-type": {"type": "varchar(100)", "not null": "1", "default": "", "comment": "ActivityStreams target type if applicable (URI)"},
-                       "target": {"type": "text", "comment": "JSON encoded target structure if used"},
-                       "plink": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "permalink or URL to a displayable copy of the message at its source"},
-                       "verb": {"type": "varchar(100)", "not null": "1", "default": "", "comment": "ActivityStreams verb"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "uri-plink-hash": ["UNIQUE", "uri-plink-hash"],
-                       "uri": ["uri(191)"],
-                       "uri-id": ["uri-id"]
-               }
-       },
-       "item-delivery-data": {
-               "comment": "Delivery data for items",
-               "fields": {
-                       "iid": {"type": "int unsigned", "not null": "1", "primary": "1", "relation": {"item": "id"}, "comment": "Item id"},
-                       "postopts": {"type": "text", "comment": "External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery"},
-                       "inform": {"type": "mediumtext", "comment": "Additional receivers of the linked item"}
-               },
-               "indexes": {
-                       "PRIMARY": ["iid"]
-               }
-       },
-       "item-uri": {
-               "comment": "URI and GUID for items",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1"},
-                       "uri": {"type": "varbinary(255)", "not null": "1", "comment": "URI of an item"},
-                       "guid": {"type": "varbinary(255)", "comment": "A unique identifier for an item"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "uri": ["UNIQUE", "uri"],
-                       "guid": ["guid"]
-               }
-       },
-       "locks": {
-               "comment": "",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "name": {"type": "varchar(128)", "not null": "1", "default": "", "comment": ""},
-                       "locked": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "pid": {"type": "int unsigned", "not null": "1", "default": "0", "comment": "Process ID"},
-                       "expires": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "datetime of cache expiration"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "name_expires": ["name", "expires"]
-               }
-       },
-       "mail": {
-               "comment": "private messages",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner User id"},
-                       "guid": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "A unique identifier for this private message"},
-                       "from-name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "name of the sender"},
-                       "from-photo": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "contact photo link of the sender"},
-                       "from-url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "profile linke of the sender"},
-                       "contact-id": {"type": "varchar(255)", "not null": "1", "default": "", "relation": {"contact": "id"}, "comment": "contact.id"},
-                       "convid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"conv": "id"}, "comment": "conv.id"},
-                       "title": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "body": {"type": "mediumtext", "comment": ""},
-                       "seen": {"type": "boolean", "not null": "1", "default": "0", "comment": "if message visited it is 1"},
-                       "reply": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "replied": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "unknown": {"type": "boolean", "not null": "1", "default": "0", "comment": "if sender not in the contact table this is 1"},
-                       "uri": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "parent-uri": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "creation time of the private message"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "uid_seen": ["uid", "seen"],
-                       "convid": ["convid"],
-                       "uri": ["uri(64)"],
-                       "parent-uri": ["parent-uri(64)"],
-                       "contactid": ["contact-id(32)"]
-               }
-       },
-       "mailacct": {
-               "comment": "Mail account data for fetching mails",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
-                       "server": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "port": {"type": "smallint unsigned", "not null": "1", "default": "0", "comment": ""},
-                       "ssltype": {"type": "varchar(16)", "not null": "1", "default": "", "comment": ""},
-                       "mailbox": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "user": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "pass": {"type": "text", "comment": ""},
-                       "reply_to": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "action": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
-                       "movetofolder": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "pubmail": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "last_check": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"]
-               }
-       },
-       "manage": {
-               "comment": "table of accounts that can manage each other",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
-                       "mid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "uid_mid": ["UNIQUE", "uid", "mid"]
-               }
-       },
-       "notify": {
-               "comment": "notifications",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "hash": {"type": "varchar(64)", "not null": "1", "default": "", "comment": ""},
-                       "type": {"type": "smallint unsigned", "not null": "1", "default": "0", "comment": ""},
-                       "name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "photo": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "date": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "msg": {"type": "mediumtext", "comment": ""},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner User id"},
-                       "link": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "iid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"item": "id"}, "comment": "item.id"},
-                       "parent": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"item": "id"}, "comment": ""},
-                       "seen": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "verb": {"type": "varchar(100)", "not null": "1", "default": "", "comment": ""},
-                       "otype": {"type": "varchar(10)", "not null": "1", "default": "", "comment": ""},
-                       "name_cache": {"type": "tinytext", "comment": "Cached bbcode parsing of name"},
-                       "msg_cache": {"type": "mediumtext", "comment": "Cached bbcode parsing of msg"}
-                       },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "hash_uid": ["hash", "uid"],
-                       "seen_uid_date": ["seen", "uid", "date"],
-                       "uid_date": ["uid", "date"],
-                       "uid_type_link": ["uid", "type", "link(190)"]
-               }
-       },
-       "notify-threads": {
-               "comment": "",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "notify-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"notify": "id"}, "comment": ""},
-                       "master-parent-item": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"item": "id"}, "comment": ""},
-                       "parent-item": {"type": "int unsigned", "not null": "1", "default": "0", "comment": ""},
-                       "receiver-uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"]
-               }
-       },
-       "oembed": {
-               "comment": "cache for OEmbed queries",
-               "fields": {
-                       "url": {"type": "varbinary(255)", "not null": "1", "primary": "1", "comment": "page url"},
-                       "maxwidth": {"type": "mediumint unsigned", "not null": "1", "primary": "1", "comment": "Maximum width passed to Oembed"},
-                       "content": {"type": "mediumtext", "comment": "OEmbed data of the page"},
-                       "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "datetime of creation"}
-               },
-               "indexes": {
-                       "PRIMARY": ["url", "maxwidth"],
-                       "created": ["created"]
-               }
-       },
-       "openwebauth-token": {
-               "comment": "Store OpenWebAuth token to verify contacts",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
-                       "type": {"type": "varchar(32)", "not null": "1", "default": "", "comment": "Verify type"},
-                       "token": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "A generated token"},
-                       "meta": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "datetime of creation"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"]
-               }
-       },
-       "parsed_url": {
-               "comment": "cache for 'parse_url' queries",
-               "fields": {
-                       "url": {"type": "varbinary(255)", "not null": "1", "primary": "1", "comment": "page url"},
-                       "guessing": {"type": "boolean", "not null": "1", "default": "0", "primary": "1", "comment": "is the 'guessing' mode active?"},
-                       "oembed": {"type": "boolean", "not null": "1", "default": "0", "primary": "1", "comment": "is the data the result of oembed?"},
-                       "content": {"type": "mediumtext", "comment": "page data"},
-                       "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "datetime of creation"}
-               },
-               "indexes": {
-                       "PRIMARY": ["url", "guessing", "oembed"],
-                       "created": ["created"]
-               }
-       },
-       "participation": {
-               "comment": "Storage for participation messages from Diaspora",
-               "fields": {
-                       "iid": {"type": "int unsigned", "not null": "1", "primary": "1", "relation": {"item": "id"}, "comment": ""},
-                       "server": {"type": "varchar(60)", "not null": "1", "primary": "1", "comment": ""},
-                       "cid": {"type": "int unsigned", "not null": "1", "relation": {"contact": "id"}, "comment": ""},
-                       "fid": {"type": "int unsigned", "not null": "1", "relation": {"fcontact": "id"}, "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["iid", "server"]
-                       }
-               },
-       "pconfig": {
-               "comment": "personal (per user) configuration storage",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": ""},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
-                       "cat": {"type": "varbinary(50)", "not null": "1", "default": "", "comment": ""},
-                       "k": {"type": "varbinary(100)", "not null": "1", "default": "", "comment": ""},
-                       "v": {"type": "mediumtext", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "uid_cat_k": ["UNIQUE", "uid", "cat", "k"]
-               }
-       },
-       "permissionset": {
-               "comment": "",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner id of this permission set"},
-                       "allow_cid": {"type": "mediumtext", "comment": "Access Control - list of allowed contact.id '<19><78>'"},
-                       "allow_gid": {"type": "mediumtext", "comment": "Access Control - list of allowed groups"},
-                       "deny_cid": {"type": "mediumtext", "comment": "Access Control - list of denied contact.id"},
-                       "deny_gid": {"type": "mediumtext", "comment": "Access Control - list of denied groups"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "uid_allow_cid_allow_gid_deny_cid_deny_gid": ["allow_cid(50)", "allow_gid(30)", "deny_cid(50)", "deny_gid(30)"]
-               }
-       },
-       "photo": {
-               "comment": "photo storage",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner User id"},
-                       "contact-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "contact.id"},
-                       "guid": {"type": "char(16)", "not null": "1", "default": "", "comment": "A unique identifier for this photo"},
-                       "resource-id": {"type": "char(32)", "not null": "1", "default": "", "comment": ""},
-                       "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "creation date"},
-                       "edited": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "last edited date"},
-                       "title": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "desc": {"type": "text", "comment": ""},
-                       "album": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "The name of the album to which the photo belongs"},
-                       "filename": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "type": {"type": "varchar(30)", "not null": "1", "default": "image/jpeg"},
-                       "height": {"type": "smallint unsigned", "not null": "1", "default": "0", "comment": ""},
-                       "width": {"type": "smallint unsigned", "not null": "1", "default": "0", "comment": ""},
-                       "datasize": {"type": "int unsigned", "not null": "1", "default": "0", "comment": ""},
-                       "data": {"type": "mediumblob", "not null": "1", "comment": ""},
-                       "scale": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
-                       "profile": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "allow_cid": {"type": "mediumtext", "comment": "Access Control - list of allowed contact.id '<19><78>'"},
-                       "allow_gid": {"type": "mediumtext", "comment": "Access Control - list of allowed groups"},
-                       "deny_cid": {"type": "mediumtext", "comment": "Access Control - list of denied contact.id"},
-                       "deny_gid": {"type": "mediumtext", "comment": "Access Control - list of denied groups"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "contactid": ["contact-id"],
-                       "uid_contactid": ["uid", "contact-id"],
-                       "uid_profile": ["uid", "profile"],
-                       "uid_album_scale_created": ["uid", "album(32)", "scale", "created"],
-                       "uid_album_resource-id_created": ["uid", "album(32)", "resource-id", "created"],
-                       "resource-id": ["resource-id"]
-               }
-       },
-       "poll": {
-               "comment": "Currently unused table for storing poll results",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": ""},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
-                       "q0": {"type": "text", "comment": ""},
-                       "q1": {"type": "text", "comment": ""},
-                       "q2": {"type": "text", "comment": ""},
-                       "q3": {"type": "text", "comment": ""},
-                       "q4": {"type": "text", "comment": ""},
-                       "q5": {"type": "text", "comment": ""},
-                       "q6": {"type": "text", "comment": ""},
-                       "q7": {"type": "text", "comment": ""},
-                       "q8": {"type": "text", "comment": ""},
-                       "q9": {"type": "text", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "uid": ["uid"]
-               }
-       },
-       "poll_result": {
-               "comment": "data for polls - currently unused",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "poll_id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"poll": "id"}},
-                       "choice": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "poll_id": ["poll_id"]
-               }
-       },
-       "process": {
-               "comment": "Currently running system processes",
-               "fields": {
-                       "pid": {"type": "int unsigned", "not null": "1", "primary": "1", "comment": ""},
-                       "command": {"type": "varbinary(32)", "not null": "1", "default": "", "comment": ""},
-                       "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["pid"],
-                       "command": ["command"]
-               }
-       },
-       "profile": {
-               "comment": "user profiles data",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner User id"},
-                       "profile-name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Name of the profile"},
-                       "is-default": {"type": "boolean", "not null": "1", "default": "0", "comment": "Mark this profile as default profile"},
-                       "hide-friends": {"type": "boolean", "not null": "1", "default": "0", "comment": "Hide friend list from viewers of this profile"},
-                       "name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "pdesc": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Title or description"},
-                       "dob": {"type": "varchar(32)", "not null": "1", "default": "0000-00-00", "comment": "Day of birth"},
-                       "address": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "locality": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "region": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "postal-code": {"type": "varchar(32)", "not null": "1", "default": "", "comment": ""},
-                       "country-name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "hometown": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "gender": {"type": "varchar(32)", "not null": "1", "default": "", "comment": ""},
-                       "marital": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "with": {"type": "text", "comment": ""},
-                       "howlong": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "sexual": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "politic": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "religion": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "pub_keywords": {"type": "text", "comment": ""},
-                       "prv_keywords": {"type": "text", "comment": ""},
-                       "likes": {"type": "text", "comment": ""},
-                       "dislikes": {"type": "text", "comment": ""},
-                       "about": {"type": "text", "comment": ""},
-                       "summary": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "music": {"type": "text", "comment": ""},
-                       "book": {"type": "text", "comment": ""},
-                       "tv": {"type": "text", "comment": ""},
-                       "film": {"type": "text", "comment": ""},
-                       "interest": {"type": "text", "comment": ""},
-                       "romance": {"type": "text", "comment": ""},
-                       "work": {"type": "text", "comment": ""},
-                       "education": {"type": "text", "comment": ""},
-                       "contact": {"type": "text", "comment": ""},
-                       "homepage": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "xmpp": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "photo": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "thumb": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "publish": {"type": "boolean", "not null": "1", "default": "0", "comment": "publish default profile in local directory"},
-                       "net-publish": {"type": "boolean", "not null": "1", "default": "0", "comment": "publish profile in global directory"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "uid_is-default": ["uid", "is-default"]
-               }
-       },
-       "profile_check": {
-               "comment": "DFRN remote auth use",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
-                       "cid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "contact.id"},
-                       "dfrn_id": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "sec": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "expire": {"type": "int unsigned", "not null": "1", "default": "0", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"]
-               }
-       },
-       "push_subscriber": {
-               "comment": "Used for OStatus: Contains feed subscribers",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
-                       "callback_url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "topic": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "nickname": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "push": {"type": "tinyint", "not null": "1", "default": "0", "comment": "Retrial counter"},
-                       "last_update": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date of last successful trial"},
-                       "next_try": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Next retrial date"},
-                       "renewed": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date of last subscription renewal"},
-                       "secret": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "next_try": ["next_try"]
-               }
-       },
-       "queue": {
-               "comment": "Queue for messages that couldn't be delivered",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "cid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "Message receiver"},
-                       "network": {"type": "char(4)", "not null": "1", "default": "", "comment": "Receiver's network"},
-                       "guid": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Unique GUID of the message"},
-                       "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date, when the message was created"},
-                       "last": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date of last trial"},
-                       "next": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Next retrial date"},
-                       "retrial": {"type": "tinyint", "not null": "1", "default": "0", "comment": "Retrial counter"},
-                       "content": {"type": "mediumtext", "comment": ""},
-                       "batch": {"type": "boolean", "not null": "1", "default": "0", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "last": ["last"],
-                       "next": ["next"]
-               }
-       },
-       "register": {
-               "comment": "registrations requiring admin approval",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "hash": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
-                       "password": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "language": {"type": "varchar(16)", "not null": "1", "default": "", "comment": ""},
-                       "note": {"type": "text", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"]
-               }
-       },
-       "search": {
-               "comment": "",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
-                       "term": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "uid": ["uid"]
-               }
-       },
-       "session": {
-               "comment": "web session storage",
-               "fields": {
-                       "id": {"type": "bigint unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "sid": {"type": "varbinary(255)", "not null": "1", "default": "", "comment": ""},
-                       "data": {"type": "text", "comment": ""},
-                       "expire": {"type": "int unsigned", "not null": "1", "default": "0", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "sid": ["sid(64)"],
-                       "expire": ["expire"]
-               }
-       },
-       "sign": {
-               "comment": "Diaspora signatures",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "iid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"item": "id"}, "comment": "item.id"},
-                       "signed_text": {"type": "mediumtext", "comment": ""},
-                       "signature": {"type": "text", "comment": ""},
-                       "signer": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "iid": ["UNIQUE", "iid"]
-               }
-       },
-       "term": {
-               "comment": "item taxonomy (categories, tags, etc.) table",
-               "fields": {
-                       "tid": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": ""},
-                       "oid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"item": "id"}, "comment": ""},
-                       "otype": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
-                       "type": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
-                       "term": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "guid": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
-                       "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "received": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "global": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"}
-               },
-               "indexes": {
-                       "PRIMARY": ["tid"],
-                       "oid_otype_type_term": ["oid", "otype", "type", "term(32)"],
-                       "uid_otype_type_term_global_created": ["uid", "otype", "type", "term(32)", "global", "created"],
-                       "uid_otype_type_url": ["uid", "otype", "type", "url(64)"],
-                       "guid": ["guid(64)"]
-               }
-       },
-       "thread": {
-               "comment": "Thread related data",
-               "fields": {
-                       "iid": {"type": "int unsigned", "not null": "1", "default": "0", "primary": "1", "relation": {"item": "id"}, "comment": "sequential ID"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
-                       "contact-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": ""},
-                       "owner-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "Item owner"},
-                       "author-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "Item author"},
-                       "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "edited": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "commented": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "received": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "changed": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
-                       "wall": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "private": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "pubmail": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "moderated": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "visible": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "starred": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "ignored": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "post-type": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": "Post type (personal note, bookmark, ...)"},
-                       "unseen": {"type": "boolean", "not null": "1", "default": "1", "comment": ""},
-                       "deleted": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "origin": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "forum_mode": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
-                       "mention": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
-                       "network": {"type": "char(4)", "not null": "1", "default": "", "comment": ""},
-                       "bookmark": {"type": "boolean", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["iid"],
-                       "uid_network_commented": ["uid", "network", "commented"],
-                       "uid_network_created": ["uid", "network", "created"],
-                       "uid_contactid_commented": ["uid", "contact-id", "commented"],
-                       "uid_contactid_created": ["uid", "contact-id", "created"],
-                       "contactid": ["contact-id"],
-                       "ownerid": ["owner-id"],
-                       "authorid": ["author-id"],
-                       "uid_created": ["uid", "created"],
-                       "uid_commented": ["uid", "commented"],
-                       "uid_wall_created": ["uid", "wall", "created"],
-                       "private_wall_origin_commented": ["private", "wall", "origin", "commented"]
-               }
-       },
-       "tokens": {
-               "comment": "OAuth usage",
-               "fields": {
-                       "id": {"type": "varchar(40)", "not null": "1", "primary": "1", "comment": ""},
-                       "secret": {"type": "text", "comment": ""},
-                       "client_id": {"type": "varchar(20)", "not null": "1", "default": "", "relation": {"clients": "client_id"}},
-                       "expires": {"type": "int", "not null": "1", "default": "0", "comment": ""},
-                       "scope": {"type": "varchar(200)", "not null": "1", "default": "", "comment": ""},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"]
-               }
-       },
-       "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", "relation": {"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": "0001-01-01 00:00:00", "comment": "timestamp of registration"},
-                       "login_date": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "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": "0001-01-01 00:00:00", "comment": "timestamp when account expires and will be deleted"},
-                       "expire_notification_sent": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "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)"]
-               }
-       },
-       "userd": {
-               "comment": "Deleted usernames",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
-                       "username": {"type": "varchar(255)", "not null": "1", "comment": ""}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "username": ["username(32)"]
-               }
-       },
-       "user-contact": {
-               "comment": "User specific public contact data",
-               "fields": {
-                       "cid": {"type": "int unsigned", "not null": "1", "default": "0", "primary": "1", "relation": {"contact": "id"}, "comment": "Contact id of the linked public contact"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "primary": "1", "relation": {"user": "uid"}, "comment": "User id"},
-                       "blocked": {"type": "boolean", "comment": "Contact is completely blocked for this user"},
-                       "ignored": {"type": "boolean", "comment": "Posts from this contact are ignored"},
-                       "collapsed": {"type": "boolean", "comment": "Posts from this contact are collapsed"}
-               },
-               "indexes": {
-                       "PRIMARY": ["uid", "cid"]
-               }
-       },
-       "user-item": {
-               "comment": "User specific item data",
-               "fields": {
-                       "iid": {"type": "int unsigned", "not null": "1", "default": "0", "primary": "1", "relation": {"item": "id"}, "comment": "Item id"},
-                       "uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "primary": "1", "relation": {"user": "uid"}, "comment": "User id"},
-                       "hidden": {"type": "boolean", "not null": "1", "default": "0", "comment": "Marker to hide an item from the user"},
-                       "ignored": {"type": "boolean", "comment": "Ignore this thread if set"}
-               },
-               "indexes": {
-                       "PRIMARY": ["uid", "iid"]
-               }
-       },
-       "worker-ipc": {
-               "comment": "Inter process communication between the frontend and the worker",
-               "fields": {
-                       "key": {"type": "int", "not null": "1", "primary": "1", "comment": ""},
-                       "jobs": {"type": "boolean", "comment": "Flag for outstanding jobs"}
-               },
-               "indexes": {
-                       "PRIMARY": ["key"]
-               },
-               "engine": "MEMORY"
-       },
-       "workerqueue": {
-               "comment": "Background tasks queue entries",
-               "fields": {
-                       "id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "Auto incremented worker task id"},
-                       "parameter": {"type": "mediumblob", "comment": "Task command"},
-                       "priority": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": "Task priority"},
-                       "created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Creation date"},
-                       "pid": {"type": "int unsigned", "not null": "1", "default": "0", "comment": "Process id of the worker"},
-                       "executed": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Execution date"},
-                       "next_try": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Next retrial date"},
-                       "retrial": {"type": "tinyint", "not null": "1", "default": "0", "comment": "Retrial counter"},
-                       "done": {"type": "boolean", "not null": "1", "default": "0", "comment": "Marked 1 when the task was done - will be deleted later"}
-               },
-               "indexes": {
-                       "PRIMARY": ["id"],
-                       "pid": ["pid"],
-                       "parameter": ["parameter(64)"],
-                       "priority_created_next_try": ["priority", "created", "next_try"],
-                       "done_executed_next_try": ["done", "executed", "next_try"]
-               }
-       }
-}
diff --git a/config/dbstructure.php b/config/dbstructure.php
new file mode 100644 (file)
index 0000000..96f90fb
--- /dev/null
@@ -0,0 +1,1374 @@
+<?php
+
+/* Main database structure configuration file.
+ *
+ * Here are described all the tables, fields and indexes Friendica needs to work.
+ *
+ * Syntax (braces indicate optionale values):
+ * "<table name>" => [
+ *     "comment" => "Description of the table",
+ *     "fields" => [
+ *             "<field name>" => [
+ *                     "type" => "<field type>{(<field size>)} <unsigned>",
+ *                     "not null" => 0|1,
+ *                     {"extra" => "auto_increment",}
+ *                     {"default" => "<default value>",}
+ *                     {"default" => NULL_DATE,} (for datetime fields)
+ *                     {"primary" => "1",}
+ *                     {"relation" => ["<foreign key table name>" => "<foreign key field name>"],}
+ *                     "comment" => "Description of the fields"
+ *             ],
+ *             ...
+ *     ],
+ *     "indexes" => [
+ *             "PRIMARY" => ["<primary key field name>", ...],
+ *             "<index name>" => [{"UNIQUE",} "<field name>{(<key size>)}", ...]
+ *             ...
+ *     ],
+ * ],
+ *
+ * If you need to make any change, make sure to increment the DB_UPDATE_VERSION constant value below.
+ *
+ */
+
+use Friendica\Database\DBA;
+
+if (!defined('DB_UPDATE_VERSION')) {
+       define('DB_UPDATE_VERSION', 1289);
+}
+
+return [
+       "addon" => [
+               "comment" => "registered addons",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
+                       "name" => ["type" => "varchar(50)", "not null" => "1", "default" => "", "comment" => "addon base (file)name"],
+                       "version" => ["type" => "varchar(50)", "not null" => "1", "default" => "", "comment" => "currently unused"],
+                       "installed" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "currently always 1"],
+                       "hidden" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "currently unused"],
+                       "timestamp" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => "file timestamp to check for reloads"],
+                       "plugin_admin" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 = has admin config, 0 = has no admin config"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "name" => ["UNIQUE", "name"],
+               ]
+       ],
+       "apcontact" => [
+               "comment" => "ActivityPub compatible contacts - used in the ActivityPub implementation",
+               "fields" => [
+                       "url" => ["type" => "varbinary(255)", "not null" => "1", "primary" => "1", "comment" => "URL of the contact"],
+                       "uuid" => ["type" => "varchar(255)", "comment" => ""],
+                       "type" => ["type" => "varchar(20)", "not null" => "1", "comment" => ""],
+                       "following" => ["type" => "varchar(255)", "comment" => ""],
+                       "followers" => ["type" => "varchar(255)", "comment" => ""],
+                       "inbox" => ["type" => "varchar(255)", "not null" => "1", "comment" => ""],
+                       "outbox" => ["type" => "varchar(255)", "comment" => ""],
+                       "sharedinbox" => ["type" => "varchar(255)", "comment" => ""],
+                       "nick" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "name" => ["type" => "varchar(255)", "comment" => ""],
+                       "about" => ["type" => "text", "comment" => ""],
+                       "photo" => ["type" => "varchar(255)", "comment" => ""],
+                       "addr" => ["type" => "varchar(255)", "comment" => ""],
+                       "alias" => ["type" => "varchar(255)", "comment" => ""],
+                       "pubkey" => ["type" => "text", "comment" => ""],
+                       "baseurl" => ["type" => "varchar(255)", "comment" => "baseurl of the ap contact"],
+                       "updated" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""]
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["url"],
+                       "addr" => ["addr(32)"],
+                       "alias" => ["alias(190)"],
+                       "url" => ["followers(190)"]
+               ]
+       ],
+       "attach" => [
+               "comment" => "file attachments",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "generated index"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "Owner User id"],
+                       "hash" => ["type" => "varchar(64)", "not null" => "1", "default" => "", "comment" => "hash"],
+                       "filename" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "filename of original"],
+                       "filetype" => ["type" => "varchar(64)", "not null" => "1", "default" => "", "comment" => "mimetype"],
+                       "filesize" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => "size in bytes"],
+                       "data" => ["type" => "longblob", "not null" => "1", "comment" => "file data"],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "creation time"],
+                       "edited" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "last edit time"],
+                       "allow_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed contact.id '<19><78>"],
+                       "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed groups"],
+                       "deny_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied contact.id"],
+                       "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied groups"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+               ]
+       ],
+       "auth_codes" => [
+               "comment" => "OAuth usage",
+               "fields" => [
+                       "id" => ["type" => "varchar(40)", "not null" => "1", "primary" => "1", "comment" => ""],
+                       "client_id" => ["type" => "varchar(20)", "not null" => "1", "default" => "", "relation" => ["clients" => "client_id"],
+                               "comment" => ""],
+                       "redirect_uri" => ["type" => "varchar(200)", "not null" => "1", "default" => "", "comment" => ""],
+                       "expires" => ["type" => "int", "not null" => "1", "default" => "0", "comment" => ""],
+                       "scope" => ["type" => "varchar(250)", "not null" => "1", "default" => "", "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+               ]
+       ],
+       "cache" => [
+               "comment" => "Stores temporary data",
+               "fields" => [
+                       "k" => ["type" => "varbinary(255)", "not null" => "1", "primary" => "1", "comment" => "cache key"],
+                       "v" => ["type" => "mediumtext", "comment" => "cached serialized value"],
+                       "expires" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "datetime of cache expiration"],
+                       "updated" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "datetime of cache insertion"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["k"],
+                       "k_expires" => ["k", "expires"],
+               ]
+       ],
+       "challenge" => [
+               "comment" => "",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "challenge" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "dfrn-id" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "expire" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "type" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "last_update" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+               ]
+       ],
+       "clients" => [
+               "comment" => "OAuth usage",
+               "fields" => [
+                       "client_id" => ["type" => "varchar(20)", "not null" => "1", "primary" => "1", "comment" => ""],
+                       "pw" => ["type" => "varchar(20)", "not null" => "1", "default" => "", "comment" => ""],
+                       "redirect_uri" => ["type" => "varchar(200)", "not null" => "1", "default" => "", "comment" => ""],
+                       "name" => ["type" => "text", "comment" => ""],
+                       "icon" => ["type" => "text", "comment" => ""],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["client_id"],
+               ]
+       ],
+       "config" => [
+               "comment" => "main configuration storage",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
+                       "cat" => ["type" => "varbinary(50)", "not null" => "1", "default" => "", "comment" => ""],
+                       "k" => ["type" => "varbinary(50)", "not null" => "1", "default" => "", "comment" => ""],
+                       "v" => ["type" => "mediumtext", "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "cat_k" => ["UNIQUE", "cat", "k"],
+               ]
+       ],
+       "contact" => [
+               "comment" => "contact table",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "Owner User id"],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "self" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 if the contact is the user him/her self"],
+                       "remote_self" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "rel" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "The kind of the relation between the user and the contact"],
+                       "duplex" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => "Network protocol of the contact"],
+                       "name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Name that this contact is known by"],
+                       "nick" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Nick- and user name of the contact"],
+                       "location" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "about" => ["type" => "text", "comment" => ""],
+                       "keywords" => ["type" => "text", "comment" => "public keywords (interests) of the contact"],
+                       "gender" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""],
+                       "xmpp" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "attag" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "avatar" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "photo" => ["type" => "varchar(255)", "default" => "", "comment" => "Link to the profile photo of the contact"],
+                       "thumb" => ["type" => "varchar(255)", "default" => "", "comment" => "Link to the profile photo (thumb size)"],
+                       "micro" => ["type" => "varchar(255)", "default" => "", "comment" => "Link to the profile photo (micro size)"],
+                       "site-pubkey" => ["type" => "text", "comment" => ""],
+                       "issued-id" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "dfrn-id" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "nurl" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "addr" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "alias" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "pubkey" => ["type" => "text", "comment" => "RSA public key 4096 bit"],
+                       "prvkey" => ["type" => "text", "comment" => "RSA private key 4096 bit"],
+                       "batch" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "request" => ["type" => "varchar(255)", "comment" => ""],
+                       "notify" => ["type" => "varchar(255)", "comment" => ""],
+                       "poll" => ["type" => "varchar(255)", "comment" => ""],
+                       "confirm" => ["type" => "varchar(255)", "comment" => ""],
+                       "poco" => ["type" => "varchar(255)", "comment" => ""],
+                       "aes_allow" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "ret-aes" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "usehub" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "subhub" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "hub-verify" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "last-update" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of the last try to update the contact info"],
+                       "success_update" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of the last successful contact update"],
+                       "failure_update" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of the last failed update"],
+                       "name-date" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "uri-date" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "avatar-date" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "term-date" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "last-item" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "date of the last post"],
+                       "priority" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "blocked" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => ""],
+                       "readonly" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "posts of the contact are readonly"],
+                       "writable" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "forum" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "contact is a forum"],
+                       "prv" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "contact is a private group"],
+                       "contact-type" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => ""],
+                       "hidden" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "archive" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "pending" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => ""],
+                       "deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Contact has been deleted"],
+                       "rating" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => ""],
+                       "reason" => ["type" => "text", "comment" => ""],
+                       "closeness" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "99", "comment" => ""],
+                       "info" => ["type" => "mediumtext", "comment" => ""],
+                       "profile-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "bdyear" => ["type" => "varchar(4)", "not null" => "1", "default" => "", "comment" => ""],
+                       "bd" => ["type" => "date", "not null" => "1", "default" => DBA::NULL_DATE, "comment" => ""],
+                       "notify_new_posts" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "fetch_further_information" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "ffi_keyword_blacklist" => ["type" => "text", "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "uid_name" => ["uid", "name(190)"],
+                       "self_uid" => ["self", "uid"],
+                       "alias_uid" => ["alias(32)", "uid"],
+                       "pending_uid" => ["pending", "uid"],
+                       "blocked_uid" => ["blocked", "uid"],
+                       "uid_rel_network_poll" => ["uid", "rel", "network", "poll(64)", "archive"],
+                       "uid_network_batch" => ["uid", "network", "batch(64)"],
+                       "addr_uid" => ["addr(32)", "uid"],
+                       "nurl_uid" => ["nurl(32)", "uid"],
+                       "nick_uid" => ["nick(32)", "uid"],
+                       "dfrn-id" => ["dfrn-id(64)"],
+                       "issued-id" => ["issued-id(64)"],
+               ]
+       ],
+       "conv" => [
+               "comment" => "private messages",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "A unique identifier for this conversation"],
+                       "recips" => ["type" => "text", "comment" => "sender_handle;recipient_handle"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "Owner User id"],
+                       "creator" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "handle of creator"],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "creation timestamp"],
+                       "updated" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "edited timestamp"],
+                       "subject" => ["type" => "text", "comment" => "subject of initial message"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "uid" => ["uid"],
+               ]
+       ],
+       "conversation" => [
+               "comment" => "Raw data and structure information for messages",
+               "fields" => [
+                       "item-uri" => ["type" => "varbinary(255)", "not null" => "1", "primary" => "1", "comment" => "Original URI of the item - unrelated to the table with the same name"],
+                       "reply-to-uri" => ["type" => "varbinary(255)", "not null" => "1", "default" => "", "comment" => "URI to which this item is a reply"],
+                       "conversation-uri" => ["type" => "varbinary(255)", "not null" => "1", "default" => "", "comment" => "GNU Social conversation URI"],
+                       "conversation-href" => ["type" => "varbinary(255)", "not null" => "1", "default" => "", "comment" => "GNU Social conversation link"],
+                       "protocol" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "255", "comment" => "The protocol of the item"],
+                       "source" => ["type" => "mediumtext", "comment" => "Original source"],
+                       "received" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Receiving date"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["item-uri"],
+                       "conversation-uri" => ["conversation-uri"],
+                       "received" => ["received"],
+               ]
+       ],
+       "diaspora-interaction" => [
+               "comment" => "Signed Diaspora Interaction",
+               "fields" => [
+                       "uri-id" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "relation" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"],
+                       "interaction" => ["type" => "mediumtext", "comment" => "The Diaspora interaction"]
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["uri-id"]
+               ]
+       ],
+       "event" => [
+               "comment" => "Events",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "Owner User id"],
+                       "cid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "contact_id (ID of the contact in contact table)"],
+                       "uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "creation time"],
+                       "edited" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "last edit time"],
+                       "start" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "event start time"],
+                       "finish" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "event end time"],
+                       "summary" => ["type" => "text", "comment" => "short description or title of the event"],
+                       "desc" => ["type" => "text", "comment" => "event description"],
+                       "location" => ["type" => "text", "comment" => "event location"],
+                       "type" => ["type" => "varchar(20)", "not null" => "1", "default" => "", "comment" => "event or birthday"],
+                       "nofinish" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "if event does have no end this is 1"],
+                       "adjust" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => "adjust to timezone of the recipient (0 or 1)"],
+                       "ignore" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "0 or 1"],
+                       "allow_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed contact.id '<19><78>'"],
+                       "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed groups"],
+                       "deny_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied contact.id"],
+                       "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied groups"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "uid_start" => ["uid", "start"],
+               ]
+       ],
+       "fcontact" => [
+               "comment" => "Diaspora compatible contacts - used in the Diaspora implementation",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "unique id"],
+                       "url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "photo" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "request" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "nick" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "addr" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "batch" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "notify" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "poll" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "confirm" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "priority" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
+                       "alias" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "pubkey" => ["type" => "text", "comment" => ""],
+                       "updated" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "addr" => ["addr(32)"],
+                       "url" => ["UNIQUE", "url(190)"],
+               ]
+       ],
+       "fsuggest" => [
+               "comment" => "friend suggestion stuff",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
+                       "cid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => ""],
+                       "name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "request" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "photo" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "note" => ["type" => "text", "comment" => ""],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+               ]
+       ],
+       "gcign" => [
+               "comment" => "contacts ignored by friend suggestions",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "Local User id"],
+                       "gcid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["gcontact" => "id"], "comment" => "gcontact.id of ignored contact"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "uid" => ["uid"],
+                       "gcid" => ["gcid"],
+               ]
+       ],
+       "gcontact" => [
+               "comment" => "global contacts",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Name that this contact is known by"],
+                       "nick" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Nick- and user name of the contact"],
+                       "url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Link to the contacts profile page"],
+                       "nurl" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "photo" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Link to the profile photo"],
+                       "connect" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "updated" => ["type" => "datetime", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "last_contact" => ["type" => "datetime", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "last_failure" => ["type" => "datetime", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "location" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "about" => ["type" => "text", "comment" => ""],
+                       "keywords" => ["type" => "text", "comment" => "puplic keywords (interests)"],
+                       "gender" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""],
+                       "birthday" => ["type" => "varchar(32)", "not null" => "1", "default" => DBA::NULL_DATE, "comment" => ""],
+                       "community" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 if contact is forum account"],
+                       "contact-type" => ["type" => "tinyint", "not null" => "1", "default" => "-1", "comment" => ""],
+                       "hide" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 = should be hidden from search"],
+                       "nsfw" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 = contact posts nsfw content"],
+                       "network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => "social network protocol"],
+                       "addr" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "notify" => ["type" => "varchar(255)", "comment" => ""],
+                       "alias" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "generation" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "server_url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "baseurl of the contacts server"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "nurl" => ["UNIQUE", "nurl(190)"],
+                       "name" => ["name(64)"],
+                       "nick" => ["nick(32)"],
+                       "addr" => ["addr(64)"],
+                       "hide_network_updated" => ["hide", "network", "updated"],
+                       "updated" => ["updated"],
+               ]
+       ],
+       "glink" => [
+               "comment" => "'friends of friends' linkages derived from poco",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "cid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => ""],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
+                       "gcid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["gcontact" => "id"], "comment" => ""],
+                       "zcid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["gcontact" => "id"], "comment" => ""],
+                       "updated" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "cid_uid_gcid_zcid" => ["UNIQUE", "cid", "uid", "gcid", "zcid"],
+                       "gcid" => ["gcid"],
+               ]
+       ],
+       "group" => [
+               "comment" => "privacy groups, group info",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "Owner User id"],
+                       "visible" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 indicates the member list is not private"],
+                       "deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 indicates the group has been deleted"],
+                       "name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "human readable name of group"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "uid" => ["uid"],
+               ]
+       ],
+       "group_member" => [
+               "comment" => "privacy groups, member info",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "gid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["group" => "id"], "comment" => "groups.id of the associated group"],
+                       "contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "contact.id of the member assigned to the associated group"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "contactid" => ["contact-id"],
+                       "gid_contactid" => ["UNIQUE", "gid", "contact-id"],
+               ]
+       ],
+       "gserver" => [
+               "comment" => "Global servers",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "nurl" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "version" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "site_name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "info" => ["type" => "text", "comment" => ""],
+                       "register_policy" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => ""],
+                       "registered-users" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => "Number of registered users"],
+                       "poco" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "noscrape" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
+                       "platform" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "relay-subscribe" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Has the server subscribed to the relay system"],
+                       "relay-scope" => ["type" => "varchar(10)", "not null" => "1", "default" => "", "comment" => "The scope of messages that the server wants to get"],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "last_poco_query" => ["type" => "datetime", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "last_contact" => ["type" => "datetime", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "last_failure" => ["type" => "datetime", "default" => DBA::NULL_DATETIME, "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "nurl" => ["UNIQUE", "nurl(190)"],
+               ]
+       ],
+       "gserver-tag" => [
+               "comment" => "Tags that the server has subscribed",
+               "fields" => [
+                       "gserver-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["gserver" => "id"], "primary" => "1",
+                               "comment" => "The id of the gserver"],
+                       "tag" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "primary" => "1", "comment" => "Tag that the server has subscribed"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["gserver-id", "tag"],
+                       "tag" => ["tag"],
+               ]
+       ],
+       "hook" => [
+               "comment" => "addon hook registry",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "hook" => ["type" => "varbinary(100)", "not null" => "1", "default" => "", "comment" => "name of hook"],
+                       "file" => ["type" => "varbinary(200)", "not null" => "1", "default" => "", "comment" => "relative filename of hook handler"],
+                       "function" => ["type" => "varbinary(200)", "not null" => "1", "default" => "", "comment" => "function name of hook handler"],
+                       "priority" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => "not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "hook_file_function" => ["UNIQUE", "hook", "file", "function"],
+               ]
+       ],
+       "intro" => [
+               "comment" => "",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
+                       "fid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["fcontact" => "id"], "comment" => ""],
+                       "contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => ""],
+                       "knowyou" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "duplex" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "note" => ["type" => "text", "comment" => ""],
+                       "hash" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "datetime" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "blocked" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => ""],
+                       "ignore" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+               ]
+       ],
+       "item" => [
+               "comment" => "Structure for all posts",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "relation" => ["thread" => "iid"]],
+                       "guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "A unique identifier for this item"],
+                       "uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "uri-id" => ["type" => "int unsigned", "relation" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"],
+                       "uri-hash" => ["type" => "varchar(80)", "not null" => "1", "default" => "", "comment" => "RIPEMD-128 hash from uri"],
+                       "parent" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["item" => "id"], "comment" => "item.id of the parent to this item if it is a reply of some form; otherwise this must be set to the id of this item"],
+                       "parent-uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "uri of the parent to this item"],
+                       "parent-uri-id" => ["type" => "int unsigned", "relation" => ["item-uri" => "id"], "comment" => "Id of the item-uri table that contains the parent uri"],
+                       "thr-parent" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "If the parent of this item is not the top-level item in the conversation, the uri of the immediate parent; otherwise set to parent-uri"],
+                       "thr-parent-id" => ["type" => "int unsigned", "relation" => ["item-uri" => "id"], "comment" => "Id of the item-uri table that contains the thread parent uri"],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Creation timestamp."],
+                       "edited" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of last edit (default is created)"],
+                       "commented" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of last comment/reply to this item"],
+                       "received" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "datetime"],
+                       "changed" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date that something in the conversation changed, indicating clients should fetch the conversation again"],
+                       "gravity" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => "Network from where the item comes from"],
+                       "owner-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "Link to the contact table with uid=0 of the owner of this item"],
+                       "author-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "Link to the contact table with uid=0 of the author of this item"],
+                       "icid" => ["type" => "int unsigned", "relation" => ["item-content" => "id"], "comment" => "Id of the item-content table entry that contains the whole item content"],
+                       "iaid" => ["type" => "int unsigned", "relation" => ["item-activity" => "id"], "comment" => "Id of the item-activity table entry that contains the activity data"],
+                       "extid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "post-type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "Post type (personal note, bookmark, ...)"],
+                       "global" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "private" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "distribution is restricted"],
+                       "visible" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "moderated" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item has been deleted"],
+                       // User specific fields. Eventually they will move to user-item
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "Owner id which owns this copy of the item"],
+                       "contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "contact.id"],
+                       "wall" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "This item was posted to the wall of uid"],
+                       "origin" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item originated at this site"],
+                       "pubmail" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "starred" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item has been favourited"],
+                       "unseen" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => "item has not been seen"],
+                       "mention" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "The owner of this item was mentioned in it"],
+                       "forum_mode" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "psid" => ["type" => "int unsigned", "relation" => ["permissionset" => "id"], "comment" => "ID of the permission set of this post"],
+                       // It has to be decided whether these fields belong to the user or the structure
+                       "resource-id" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => "Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type"],
+                       "event-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["event" => "id"], "comment" => "Used to link to the event.id"],
+                       // Could possibly be replaced by the "attach" table?
+                       "attach" => ["type" => "mediumtext", "comment" => "JSON structure representing attachments to this item"],
+                       // Deprecated fields. Will be removed in upcoming versions
+                       "allow_cid" => ["type" => "mediumtext", "comment" => "Deprecated"],
+                       "allow_gid" => ["type" => "mediumtext", "comment" => "Deprecated"],
+                       "deny_cid" => ["type" => "mediumtext", "comment" => "Deprecated"],
+                       "deny_gid" => ["type" => "mediumtext", "comment" => "Deprecated"],
+                       "postopts" => ["type" => "text", "comment" => "Deprecated"],
+                       "inform" => ["type" => "mediumtext", "comment" => "Deprecated"],
+                       "type" => ["type" => "varchar(20)", "comment" => "Deprecated"],
+                       "bookmark" => ["type" => "boolean", "comment" => "Deprecated"],
+                       "file" => ["type" => "mediumtext", "comment" => "Deprecated"],
+                       "location" => ["type" => "varchar(255)", "comment" => "Deprecated"],
+                       "coord" => ["type" => "varchar(255)", "comment" => "Deprecated"],
+                       "tag" => ["type" => "mediumtext", "comment" => "Deprecated"],
+                       "plink" => ["type" => "varchar(255)", "comment" => "Deprecated"],
+                       "title" => ["type" => "varchar(255)", "comment" => "Deprecated"],
+                       "content-warning" => ["type" => "varchar(255)", "comment" => "Deprecated"],
+                       "body" => ["type" => "mediumtext", "comment" => "Deprecated"],
+                       "app" => ["type" => "varchar(255)", "comment" => "Deprecated"],
+                       "verb" => ["type" => "varchar(100)", "comment" => "Deprecated"],
+                       "object-type" => ["type" => "varchar(100)", "comment" => "Deprecated"],
+                       "object" => ["type" => "text", "comment" => "Deprecated"],
+                       "target-type" => ["type" => "varchar(100)", "comment" => "Deprecated"],
+                       "target" => ["type" => "text", "comment" => "Deprecated"],
+                       "author-name" => ["type" => "varchar(255)", "comment" => "Deprecated"],
+                       "author-link" => ["type" => "varchar(255)", "comment" => "Deprecated"],
+                       "author-avatar" => ["type" => "varchar(255)", "comment" => "Deprecated"],
+                       "owner-name" => ["type" => "varchar(255)", "comment" => "Deprecated"],
+                       "owner-link" => ["type" => "varchar(255)", "comment" => "Deprecated"],
+                       "owner-avatar" => ["type" => "varchar(255)", "comment" => "Deprecated"],
+                       "rendered-hash" => ["type" => "varchar(32)", "comment" => "Deprecated"],
+                       "rendered-html" => ["type" => "mediumtext", "comment" => "Deprecated"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "guid" => ["guid(191)"],
+                       "uri" => ["uri(191)"],
+                       "parent" => ["parent"],
+                       "parent-uri" => ["parent-uri(191)"],
+                       "extid" => ["extid(191)"],
+                       "uid_id" => ["uid", "id"],
+                       "uid_contactid_id" => ["uid", "contact-id", "id"],
+                       "uid_created" => ["uid", "created"],
+                       "uid_commented" => ["uid", "commented"],
+                       "uid_unseen_contactid" => ["uid", "unseen", "contact-id"],
+                       "uid_network_received" => ["uid", "network", "received"],
+                       "uid_network_commented" => ["uid", "network", "commented"],
+                       "uid_thrparent" => ["uid", "thr-parent(190)"],
+                       "uid_parenturi" => ["uid", "parent-uri(190)"],
+                       "uid_contactid_created" => ["uid", "contact-id", "created"],
+                       "authorid_created" => ["author-id", "created"],
+                       "ownerid" => ["owner-id"],
+                       "uid_uri" => ["uid", "uri(190)"],
+                       "resource-id" => ["resource-id"],
+                       "deleted_changed" => ["deleted", "changed"],
+                       "uid_wall_changed" => ["uid", "wall", "changed"],
+                       "uid_eventid" => ["uid", "event-id"],
+                       "icid" => ["icid"],
+                       "iaid" => ["iaid"],
+                       "psid_wall" => ["psid", "wall"],
+               ]
+       ],
+       "item-activity" => [
+               "comment" => "Activities for items",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "relation" => ["thread" => "iid"]],
+                       "uri" => ["type" => "varchar(255)", "comment" => ""],
+                       "uri-id" => ["type" => "int unsigned", "relation" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"],
+                       "uri-hash" => ["type" => "varchar(80)", "not null" => "1", "default" => "", "comment" => "RIPEMD-128 hash from uri"],
+                       "activity" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""]
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "uri-hash" => ["UNIQUE", "uri-hash"],
+                       "uri" => ["uri(191)"],
+                       "uri-id" => ["uri-id"]
+               ]
+       ],
+       "item-content" => [
+               "comment" => "Content for all posts",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "relation" => ["thread" => "iid"]],
+                       "uri" => ["type" => "varchar(255)", "comment" => ""],
+                       "uri-id" => ["type" => "int unsigned", "relation" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"],
+                       "uri-plink-hash" => ["type" => "varchar(80)", "not null" => "1", "default" => "", "comment" => "RIPEMD-128 hash from uri"],
+                       "title" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "item title"],
+                       "content-warning" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "body" => ["type" => "mediumtext", "comment" => "item body content"],
+                       "location" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "text location where this item originated"],
+                       "coord" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "longitude/latitude pair representing location where this item originated"],
+                       "language" => ["type" => "text", "comment" => "Language information about this post"],
+                       "app" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "application which generated this item"],
+                       "rendered-hash" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""],
+                       "rendered-html" => ["type" => "mediumtext", "comment" => "item.body converted to html"],
+                       "object-type" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => "ActivityStreams object type"],
+                       "object" => ["type" => "text", "comment" => "JSON encoded object structure unless it is an implied object (normal post)"],
+                       "target-type" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => "ActivityStreams target type if applicable (URI)"],
+                       "target" => ["type" => "text", "comment" => "JSON encoded target structure if used"],
+                       "plink" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "permalink or URL to a displayable copy of the message at its source"],
+                       "verb" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => "ActivityStreams verb"]
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "uri-plink-hash" => ["UNIQUE", "uri-plink-hash"],
+                       "uri" => ["uri(191)"],
+                       "uri-id" => ["uri-id"]
+               ]
+       ],
+       "item-delivery-data" => [
+               "comment" => "Delivery data for items",
+               "fields" => [
+                       "iid" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "relation" => ["item" => "id"], "comment" => "Item id"],
+                       "postopts" => ["type" => "text", "comment" => "External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery"],
+                       "inform" => ["type" => "mediumtext", "comment" => "Additional receivers of the linked item"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["iid"],
+               ]
+       ],
+       "item-uri" => [
+               "comment" => "URI and GUID for items",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"],
+                       "uri" => ["type" => "varbinary(255)", "not null" => "1", "comment" => "URI of an item"],
+                       "guid" => ["type" => "varbinary(255)", "comment" => "A unique identifier for an item"]
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "uri" => ["UNIQUE", "uri"],
+                       "guid" => ["guid"]
+               ]
+       ],
+       "locks" => [
+               "comment" => "",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "name" => ["type" => "varchar(128)", "not null" => "1", "default" => "", "comment" => ""],
+                       "locked" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "pid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => "Process ID"],
+                       "expires" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "datetime of cache expiration"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "name_expires" => ["name", "expires"]
+               ]
+       ],
+       "mail" => [
+               "comment" => "private messages",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "Owner User id"],
+                       "guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "A unique identifier for this private message"],
+                       "from-name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "name of the sender"],
+                       "from-photo" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "contact photo link of the sender"],
+                       "from-url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "profile linke of the sender"],
+                       "contact-id" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "relation" => ["contact" => "id"], "comment" => "contact.id"],
+                       "convid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["conv" => "id"], "comment" => "conv.id"],
+                       "title" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "body" => ["type" => "mediumtext", "comment" => ""],
+                       "seen" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "if message visited it is 1"],
+                       "reply" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "replied" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "unknown" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "if sender not in the contact table this is 1"],
+                       "uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "parent-uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "creation time of the private message"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "uid_seen" => ["uid", "seen"],
+                       "convid" => ["convid"],
+                       "uri" => ["uri(64)"],
+                       "parent-uri" => ["parent-uri(64)"],
+                       "contactid" => ["contact-id(32)"],
+               ]
+       ],
+       "mailacct" => [
+               "comment" => "Mail account data for fetching mails",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
+                       "server" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "port" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "ssltype" => ["type" => "varchar(16)", "not null" => "1", "default" => "", "comment" => ""],
+                       "mailbox" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "user" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "pass" => ["type" => "text", "comment" => ""],
+                       "reply_to" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "action" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "movetofolder" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "pubmail" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "last_check" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+               ]
+       ],
+       "manage" => [
+               "comment" => "table of accounts that can manage each other",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
+                       "mid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "uid_mid" => ["UNIQUE", "uid", "mid"],
+               ]
+       ],
+       "notify" => [
+               "comment" => "notifications",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "hash" => ["type" => "varchar(64)", "not null" => "1", "default" => "", "comment" => ""],
+                       "type" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "photo" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "date" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "msg" => ["type" => "mediumtext", "comment" => ""],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "Owner User id"],
+                       "link" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "iid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["item" => "id"], "comment" => "item.id"],
+                       "parent" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["item" => "id"], "comment" => ""],
+                       "seen" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "verb" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => ""],
+                       "otype" => ["type" => "varchar(10)", "not null" => "1", "default" => "", "comment" => ""],
+                       "name_cache" => ["type" => "tinytext", "comment" => "Cached bbcode parsing of name"],
+                       "msg_cache" => ["type" => "mediumtext", "comment" => "Cached bbcode parsing of msg"]
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "hash_uid" => ["hash", "uid"],
+                       "seen_uid_date" => ["seen", "uid", "date"],
+                       "uid_date" => ["uid", "date"],
+                       "uid_type_link" => ["uid", "type", "link(190)"],
+               ]
+       ],
+       "notify-threads" => [
+               "comment" => "",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "notify-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["notify" => "id"], "comment" => ""],
+                       "master-parent-item" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["item" => "id"],
+                               "comment" => ""],
+                       "parent-item" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "receiver-uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"],
+                               "comment" => "User id"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+               ]
+       ],
+       "oembed" => [
+               "comment" => "cache for OEmbed queries",
+               "fields" => [
+                       "url" => ["type" => "varbinary(255)", "not null" => "1", "primary" => "1", "comment" => "page url"],
+                       "maxwidth" => ["type" => "mediumint unsigned", "not null" => "1", "primary" => "1", "comment" => "Maximum width passed to Oembed"],
+                       "content" => ["type" => "mediumtext", "comment" => "OEmbed data of the page"],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "datetime of creation"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["url", "maxwidth"],
+                       "created" => ["created"],
+               ]
+       ],
+       "openwebauth-token" => [
+               "comment" => "Store OpenWebAuth token to verify contacts",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
+                       "type" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => "Verify type"],
+                       "token" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "A generated token"],
+                       "meta" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "datetime of creation"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+               ]
+       ],
+       "parsed_url" => [
+               "comment" => "cache for 'parse_url' queries",
+               "fields" => [
+                       "url" => ["type" => "varbinary(255)", "not null" => "1", "primary" => "1", "comment" => "page url"],
+                       "guessing" => ["type" => "boolean", "not null" => "1", "default" => "0", "primary" => "1", "comment" => "is the 'guessing' mode active?"],
+                       "oembed" => ["type" => "boolean", "not null" => "1", "default" => "0", "primary" => "1", "comment" => "is the data the result of oembed?"],
+                       "content" => ["type" => "mediumtext", "comment" => "page data"],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "datetime of creation"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["url", "guessing", "oembed"],
+                       "created" => ["created"],
+               ]
+       ],
+       "participation" => [
+               "comment" => "Storage for participation messages from Diaspora",
+               "fields" => [
+                       "iid" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "relation" => ["item" => "id"], "comment" => ""],
+                       "server" => ["type" => "varchar(60)", "not null" => "1", "primary" => "1", "comment" => ""],
+                       "cid" => ["type" => "int unsigned", "not null" => "1", "relation" => ["contact" => "id"], "comment" => ""],
+                       "fid" => ["type" => "int unsigned", "not null" => "1", "relation" => ["fcontact" => "id"], "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["iid", "server"]
+               ]
+       ],
+       "pconfig" => [
+               "comment" => "personal (per user) configuration storage",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
+                       "cat" => ["type" => "varbinary(50)", "not null" => "1", "default" => "", "comment" => ""],
+                       "k" => ["type" => "varbinary(100)", "not null" => "1", "default" => "", "comment" => ""],
+                       "v" => ["type" => "mediumtext", "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "uid_cat_k" => ["UNIQUE", "uid", "cat", "k"],
+               ]
+       ],
+       "permissionset" => [
+               "comment" => "",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "Owner id of this permission set"],
+                       "allow_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed contact.id '<19><78>'"],
+                       "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed groups"],
+                       "deny_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied contact.id"],
+                       "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied groups"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "uid_allow_cid_allow_gid_deny_cid_deny_gid" => ["allow_cid(50)", "allow_gid(30)", "deny_cid(50)", "deny_gid(30)"],
+               ]
+       ],
+       "photo" => [
+               "comment" => "photo storage",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "Owner User id"],
+                       "contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "contact.id"],
+                       "guid" => ["type" => "char(16)", "not null" => "1", "default" => "", "comment" => "A unique identifier for this photo"],
+                       "resource-id" => ["type" => "char(32)", "not null" => "1", "default" => "", "comment" => ""],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "creation date"],
+                       "edited" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "last edited date"],
+                       "title" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "desc" => ["type" => "text", "comment" => ""],
+                       "album" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "The name of the album to which the photo belongs"],
+                       "filename" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "type" => ["type" => "varchar(30)", "not null" => "1", "default" => "image/jpeg"],
+                       "height" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "width" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "datasize" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "data" => ["type" => "mediumblob", "not null" => "1", "comment" => ""],
+                       "scale" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "profile" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "allow_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed contact.id '<19><78>'"],
+                       "allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed groups"],
+                       "deny_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied contact.id"],
+                       "deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied groups"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "contactid" => ["contact-id"],
+                       "uid_contactid" => ["uid", "contact-id"],
+                       "uid_profile" => ["uid", "profile"],
+                       "uid_album_scale_created" => ["uid", "album(32)", "scale", "created"],
+                       "uid_album_resource-id_created" => ["uid", "album(32)", "resource-id", "created"],
+                       "resource-id" => ["resource-id"],
+               ]
+       ],
+       "poll" => [
+               "comment" => "Currently unused table for storing poll results",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
+                       "q0" => ["type" => "text", "comment" => ""],
+                       "q1" => ["type" => "text", "comment" => ""],
+                       "q2" => ["type" => "text", "comment" => ""],
+                       "q3" => ["type" => "text", "comment" => ""],
+                       "q4" => ["type" => "text", "comment" => ""],
+                       "q5" => ["type" => "text", "comment" => ""],
+                       "q6" => ["type" => "text", "comment" => ""],
+                       "q7" => ["type" => "text", "comment" => ""],
+                       "q8" => ["type" => "text", "comment" => ""],
+                       "q9" => ["type" => "text", "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "uid" => ["uid"],
+               ]
+       ],
+       "poll_result" => [
+               "comment" => "data for polls - currently unused",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "poll_id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["poll" => "id"]],
+                       "choice" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "poll_id" => ["poll_id"],
+               ]
+       ],
+       "process" => [
+               "comment" => "Currently running system processes",
+               "fields" => [
+                       "pid" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "comment" => ""],
+                       "command" => ["type" => "varbinary(32)", "not null" => "1", "default" => "", "comment" => ""],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["pid"],
+                       "command" => ["command"],
+               ]
+       ],
+       "profile" => [
+               "comment" => "user profiles data",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "Owner User id"],
+                       "profile-name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Name of the profile"],
+                       "is-default" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Mark this profile as default profile"],
+                       "hide-friends" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Hide friend list from viewers of this profile"],
+                       "name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "pdesc" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Title or description"],
+                       "dob" => ["type" => "varchar(32)", "not null" => "1", "default" => "0000-00-00", "comment" => "Day of birth"],
+                       "address" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "locality" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "region" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "postal-code" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""],
+                       "country-name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "hometown" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "gender" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""],
+                       "marital" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "with" => ["type" => "text", "comment" => ""],
+                       "howlong" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "sexual" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "politic" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "religion" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "pub_keywords" => ["type" => "text", "comment" => ""],
+                       "prv_keywords" => ["type" => "text", "comment" => ""],
+                       "likes" => ["type" => "text", "comment" => ""],
+                       "dislikes" => ["type" => "text", "comment" => ""],
+                       "about" => ["type" => "text", "comment" => ""],
+                       "summary" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "music" => ["type" => "text", "comment" => ""],
+                       "book" => ["type" => "text", "comment" => ""],
+                       "tv" => ["type" => "text", "comment" => ""],
+                       "film" => ["type" => "text", "comment" => ""],
+                       "interest" => ["type" => "text", "comment" => ""],
+                       "romance" => ["type" => "text", "comment" => ""],
+                       "work" => ["type" => "text", "comment" => ""],
+                       "education" => ["type" => "text", "comment" => ""],
+                       "contact" => ["type" => "text", "comment" => ""],
+                       "homepage" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "xmpp" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "photo" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "thumb" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "publish" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "publish default profile in local directory"],
+                       "net-publish" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "publish profile in global directory"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "uid_is-default" => ["uid", "is-default"],
+               ]
+       ],
+       "profile_check" => [
+               "comment" => "DFRN remote auth use",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
+                       "cid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "contact.id"],
+                       "dfrn_id" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "sec" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "expire" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+               ]
+       ],
+       "push_subscriber" => [
+               "comment" => "Used for OStatus: Contains feed subscribers",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
+                       "callback_url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "topic" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "nickname" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "push" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => "Retrial counter"],
+                       "last_update" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of last successful trial"],
+                       "next_try" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Next retrial date"],
+                       "renewed" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of last subscription renewal"],
+                       "secret" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "next_try" => ["next_try"],
+               ]
+       ],
+       "queue" => [
+               "comment" => "Queue for messages that couldn't be delivered",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "cid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "Message receiver"],
+                       "network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => "Receiver's network"],
+                       "guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Unique GUID of the message"],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date, when the message was created"],
+                       "last" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of last trial"],
+                       "next" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Next retrial date"],
+                       "retrial" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => "Retrial counter"],
+                       "content" => ["type" => "mediumtext", "comment" => ""],
+                       "batch" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "last" => ["last"],
+                       "next" => ["next"],
+               ]
+       ],
+       "register" => [
+               "comment" => "registrations requiring admin approval",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "hash" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
+                       "password" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "language" => ["type" => "varchar(16)", "not null" => "1", "default" => "", "comment" => ""],
+                       "note" => ["type" => "text", "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+               ]
+       ],
+       "search" => [
+               "comment" => "",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
+                       "term" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "uid" => ["uid"],
+               ]
+       ],
+       "session" => [
+               "comment" => "web session storage",
+               "fields" => [
+                       "id" => ["type" => "bigint unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "sid" => ["type" => "varbinary(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "data" => ["type" => "text", "comment" => ""],
+                       "expire" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "sid" => ["sid(64)"],
+                       "expire" => ["expire"],
+               ]
+       ],
+       "sign" => [
+               "comment" => "Diaspora signatures",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "iid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["item" => "id"], "comment" => "item.id"],
+                       "signed_text" => ["type" => "mediumtext", "comment" => ""],
+                       "signature" => ["type" => "text", "comment" => ""],
+                       "signer" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "iid" => ["UNIQUE", "iid"],
+               ]
+       ],
+       "term" => [
+               "comment" => "item taxonomy (categories, tags, etc.) table",
+               "fields" => [
+                       "tid" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
+                       "oid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["item" => "id"], "comment" => ""],
+                       "otype" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "term" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "received" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "global" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["tid"],
+                       "oid_otype_type_term" => ["oid", "otype", "type", "term(32)"],
+                       "uid_otype_type_term_global_created" => ["uid", "otype", "type", "term(32)", "global", "created"],
+                       "uid_otype_type_url" => ["uid", "otype", "type", "url(64)"],
+                       "guid" => ["guid(64)"],
+               ]
+       ],
+       "thread" => [
+               "comment" => "Thread related data",
+               "fields" => [
+                       "iid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => ["item" => "id"],
+                               "comment" => "sequential ID"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
+                       "contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => ""],
+                       "owner-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "Item owner"],
+                       "author-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "Item author"],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "edited" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "commented" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "received" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "changed" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "wall" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "private" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "pubmail" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "moderated" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "visible" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "starred" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "ignored" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "post-type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "Post type (personal note, bookmark, ...)"],
+                       "unseen" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => ""],
+                       "deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "origin" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "forum_mode" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "mention" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
+                       "bookmark" => ["type" => "boolean", "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["iid"],
+                       "uid_network_commented" => ["uid", "network", "commented"],
+                       "uid_network_created" => ["uid", "network", "created"],
+                       "uid_contactid_commented" => ["uid", "contact-id", "commented"],
+                       "uid_contactid_created" => ["uid", "contact-id", "created"],
+                       "contactid" => ["contact-id"],
+                       "ownerid" => ["owner-id"],
+                       "authorid" => ["author-id"],
+                       "uid_created" => ["uid", "created"],
+                       "uid_commented" => ["uid", "commented"],
+                       "uid_wall_created" => ["uid", "wall", "created"],
+                       "private_wall_origin_commented" => ["private", "wall", "origin", "commented"],
+               ]
+       ],
+       "tokens" => [
+               "comment" => "OAuth usage",
+               "fields" => [
+                       "id" => ["type" => "varchar(40)", "not null" => "1", "primary" => "1", "comment" => ""],
+                       "secret" => ["type" => "text", "comment" => ""],
+                       "client_id" => ["type" => "varchar(20)", "not null" => "1", "default" => "", "relation" => ["clients" => "client_id"]],
+                       "expires" => ["type" => "int", "not null" => "1", "default" => "0", "comment" => ""],
+                       "scope" => ["type" => "varchar(200)", "not null" => "1", "default" => "", "comment" => ""],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+               ]
+       ],
+       "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", "relation" => ["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)"],
+               ]
+       ],
+       "userd" => [
+               "comment" => "Deleted usernames",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+                       "username" => ["type" => "varchar(255)", "not null" => "1", "comment" => ""],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "username" => ["username(32)"],
+               ]
+       ],
+       "user-contact" => [
+               "comment" => "User specific public contact data",
+               "fields" => [
+                       "cid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => ["contact" => "id"], "comment" => "Contact id of the linked public contact"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => ["user" => "uid"], "comment" => "User id"],
+                       "blocked" => ["type" => "boolean", "comment" => "Contact is completely blocked for this user"],
+                       "ignored" => ["type" => "boolean", "comment" => "Posts from this contact are ignored"],
+                       "collapsed" => ["type" => "boolean", "comment" => "Posts from this contact are collapsed"]
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["uid", "cid"]
+               ]
+       ],
+       "user-item" => [
+               "comment" => "User specific item data",
+               "fields" => [
+                       "iid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => ["item" => "id"], "comment" => "Item id"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => ["user" => "uid"], "comment" => "User id"],
+                       "hidden" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Marker to hide an item from the user"],
+                       "ignored" => ["type" => "boolean", "comment" => "Ignore this thread if set"]
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["uid", "iid"]
+               ]
+       ],
+       "worker-ipc" => [
+               "comment" => "Inter process communication between the frontend and the worker",
+               "fields" => [
+                       "key" => ["type" => "int", "not null" => "1", "primary" => "1", "comment" => ""],
+                       "jobs" => ["type" => "boolean", "comment" => "Flag for outstanding jobs"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["key"],
+               ],
+               "engine" => "MEMORY",
+       ],
+       "workerqueue" => [
+               "comment" => "Background tasks queue entries",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "Auto incremented worker task id"],
+                       "parameter" => ["type" => "mediumblob", "comment" => "Task command"],
+                       "priority" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "Task priority"],
+                       "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Creation date"],
+                       "pid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => "Process id of the worker"],
+                       "executed" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Execution date"],
+                       "next_try" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Next retrial date"],
+                       "retrial" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => "Retrial counter"],
+                       "done" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Marked 1 when the task was done - will be deleted later"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "pid" => ["pid"],
+                       "parameter" => ["parameter(64)"],
+                       "priority_created_next_try" => ["priority", "created", "next_try"],
+                       "done_executed_next_try" => ["done", "executed", "next_try"]
+               ]
+       ]
+];
index 39a28158c1353c77b33d340d77d1c2bce5080805..e3b537fcf0564bf00cef53f21b133b3213c0101d 100644 (file)
@@ -214,11 +214,12 @@ function admin_content(App $a)
 
        $r = q("SELECT `name` FROM `addon` WHERE `plugin_admin` = 1 ORDER BY `name`");
        $aside_tools['addons_admin'] = [];
+       $addons_admin = [];
        foreach ($r as $h) {
                $addon = $h['name'];
                $aside_tools['addons_admin'][] = ["admin/addons/" . $addon, $addon, "addon"];
                // temp addons with admin
-               $a->addons_admin[] = $addon;
+               $addons_admin[] = $addon;
        }
 
        $t = get_markup_template('admin/aside.tpl');
@@ -243,7 +244,7 @@ function admin_content(App $a)
                                $o = admin_page_users($a);
                                break;
                        case 'addons':
-                               $o = admin_page_addons($a);
+                               $o = admin_page_addons($a, $addons_admin);
                                break;
                        case 'themes':
                                $o = admin_page_themes($a);
@@ -932,7 +933,7 @@ function admin_page_summary(App $a)
                '$platform' => FRIENDICA_PLATFORM,
                '$codename' => FRIENDICA_CODENAME,
                '$build' => Config::get('system', 'build'),
-               '$addons' => [L10n::t('Active addons'), $a->addons],
+               '$addons' => [L10n::t('Active addons'), Addon::getEnabledList()],
                '$serversettings' => $server_settings,
                '$showwarning' => $showwarning,
                '$warningtext' => $warningtext
@@ -1956,10 +1957,11 @@ function admin_page_users(App $a)
  *
  * The returned string returned hulds the HTML code of the page.
  *
- * @param App $a
+ * @param App   $a
+ * @param array $addons_admin A list of admin addon names
  * @return string
  */
-function admin_page_addons(App $a)
+function admin_page_addons(App $a, array $addons_admin)
 {
        /*
         * Single addon
@@ -1971,27 +1973,25 @@ function admin_page_addons(App $a)
                        return '';
                }
 
-               if (x($_GET, "a") && $_GET['a'] == "t") {
+               if (defaults($_GET, 'a', '') == "t") {
                        BaseModule::checkFormSecurityTokenRedirectOnError('/admin/addons', 'admin_themes', 't');
 
                        // Toggle addon status
-                       $idx = array_search($addon, $a->addons);
-                       if ($idx !== false) {
-                               unset($a->addons[$idx]);
+                       if (Addon::isEnabled($addon)) {
                                Addon::uninstall($addon);
                                info(L10n::t("Addon %s disabled.", $addon));
                        } else {
-                               $a->addons[] = $addon;
                                Addon::install($addon);
                                info(L10n::t("Addon %s enabled.", $addon));
                        }
-                       Config::set("system", "addon", implode(", ", $a->addons));
+
+                       Addon::saveEnabledList();
                        $a->internalRedirect('admin/addons');
                        return ''; // NOTREACHED
                }
 
                // display addon details
-               if (in_array($addon, $a->addons)) {
+               if (Addon::isEnabled($addon)) {
                        $status = "on";
                        $action = L10n::t("Disable");
                } else {
@@ -2007,7 +2007,7 @@ function admin_page_addons(App $a)
                }
 
                $admin_form = "";
-               if (in_array($addon, $a->addons_admin)) {
+               if (in_array($addon, $addons_admin)) {
                        require_once "addon/$addon/$addon.php";
                        $func = $addon . '_addon_admin';
                        $func($a, $admin_form);
@@ -2058,7 +2058,7 @@ function admin_page_addons(App $a)
                                $show_addon = true;
 
                                // If the addon is unsupported, then only show it, when it is enabled
-                               if ((strtolower($info["status"]) == "unsupported") && !in_array($id, $a->addons)) {
+                               if ((strtolower($info["status"]) == "unsupported") && !Addon::isEnabled($id)) {
                                        $show_addon = false;
                                }
 
@@ -2068,7 +2068,7 @@ function admin_page_addons(App $a)
                                }
 
                                if ($show_addon) {
-                                       $addons[] = [$id, (in_array($id, $a->addons) ? "on" : "off"), $info];
+                                       $addons[] = [$id, (Addon::isEnabled($id) ? "on" : "off"), $info];
                                }
                        }
                }
index 7cdeb85f71985d17c3c47469112710974c61b3fc..81ab79c722e09c895ea752608bc33a94df0f7e3a 100644 (file)
@@ -15,9 +15,9 @@ use Friendica\Database\DBA;
 use Friendica\Model\Event;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
+use Friendica\Module\Login;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
-use Friendica\Module\Login;
 
 require_once 'include/items.php';
 
@@ -66,8 +66,8 @@ function events_post(App $a)
        // The default setting for the `private` field in event_store() is false, so mirror that
        $private_event = false;
 
-       $start  = NULL_DATE;
-       $finish = NULL_DATE;
+       $start  = DBA::NULL_DATETIME;
+       $finish = DBA::NULL_DATETIME;
 
        if ($start_text) {
                $start = $start_text;
@@ -111,7 +111,7 @@ function events_post(App $a)
                $a->internalRedirect($onerror_path);
        }
 
-       if (!$summary || ($start === NULL_DATE)) {
+       if (!$summary || ($start === DBA::NULL_DATETIME)) {
                notice(L10n::t('Event title and start time are required.') . EOL);
                if (intval($_REQUEST['preview'])) {
                        echo L10n::t('Event title and start time are required.');
index f2cb5c50b6fe1b55f9ad07053da15d1d2dcc03c0..bf3f7942f9eae3f4d8088f52a36ed2a49174ade3 100644 (file)
@@ -31,15 +31,7 @@ function friendica_init(App $a)
                        $admin = false;
                }
 
-               $visible_addons = [];
-               if (is_array($a->addons) && count($a->addons)) {
-                       $r = q("SELECT * FROM `addon` WHERE `hidden` = 0");
-                       if (DBA::isResult($r)) {
-                               foreach ($r as $rr) {
-                                       $visible_addons[] = $rr['name'];
-                               }
-                       }
-               }
+               $visible_addons = Addon::getVisibleList();
 
                Config::load('feature_lock');
                $locked_features = [];
@@ -91,16 +83,7 @@ function friendica_content(App $a)
        $o .= L10n::t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca');
        $o .= '</p>' . PHP_EOL;
 
-       $visible_addons = [];
-       if (is_array($a->addons) && count($a->addons)) {
-               $r = q("SELECT * FROM `addon` WHERE `hidden` = 0");
-               if (DBA::isResult($r)) {
-                       foreach ($r as $rr) {
-                               $visible_addons[] = $rr['name'];
-                       }
-               }
-       }
-
+       $visible_addons = Addon::getVisibleList();
        if (count($visible_addons)) {
                $o .= '<p>' . L10n::t('Installed addons/apps:') . '</p>' . PHP_EOL;
                $sorted = $visible_addons;
index 734b5f19ee8ba0d31ae6a9aeb6e799f19d411ab5..a4a49ec785ad1b4e5dfda67a1430bff5adfec849 100644 (file)
@@ -18,10 +18,10 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
+use Friendica\Module\Login;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
-use Friendica\Module\Login;
 
 function profiles_init(App $a) {
 
@@ -252,7 +252,7 @@ function profiles_post(App $a) {
                $with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : '');
 
                if (! strlen($howlong)) {
-                       $howlong = NULL_DATE;
+                       $howlong = DBA::NULL_DATETIME;
                } else {
                        $howlong = DateTimeFormat::convert($howlong, 'UTC', date_default_timezone_get());
                }
@@ -619,7 +619,7 @@ function profiles_content(App $a) {
                        '$gender' => ContactSelector::gender($r[0]['gender']),
                        '$marital' => ['selector' => ContactSelector::maritalStatus($r[0]['marital']), 'value' => $r[0]['marital']],
                        '$with' => ['with', L10n::t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), L10n::t('Examples: cathy123, Cathy Williams, cathy@example.com')],
-                       '$howlong' => ['howlong', L10n::t('Since [date]:'), ($r[0]['howlong'] <= NULL_DATE ? '' : DateTimeFormat::local($r[0]['howlong']))],
+                       '$howlong' => ['howlong', L10n::t('Since [date]:'), ($r[0]['howlong'] <= DBA::NULL_DATETIME ? '' : DateTimeFormat::local($r[0]['howlong']))],
                        '$sexual' => ['selector' => ContactSelector::sexualPreference($r[0]['sexual']), 'value' => $r[0]['sexual']],
                        '$about' => ['about', L10n::t('Tell us about yourself...'), $r[0]['about']],
                        '$xmpp' => ['xmpp', L10n::t("XMPP \x28Jabber\x29 address:"), $r[0]['xmpp'], L10n::t("The XMPP address will be propagated to your contacts so that they can follow you.")],
index 970c5b7ee469d905833154acd350423bee1af780..52c5f42cf08bb3c59420a515a2199fcfb7f8626c 100644 (file)
@@ -20,11 +20,10 @@ use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\User;
+use Friendica\Module\Login;
 use Friendica\Protocol\Email;
 use Friendica\Util\Network;
 use Friendica\Util\Temporal;
-use Friendica\Util\Security;
-use Friendica\Module\Login;
 
 function get_theme_config_file($theme)
 {
@@ -830,7 +829,7 @@ function settings_content(App $a)
                $mail_pubmail      = ((DBA::isResult($r)) ? $r[0]['pubmail'] : 0);
                $mail_action       = ((DBA::isResult($r)) ? $r[0]['action'] : 0);
                $mail_movetofolder = ((DBA::isResult($r)) ? $r[0]['movetofolder'] : '');
-               $mail_chk          = ((DBA::isResult($r)) ? $r[0]['last_check'] : NULL_DATE);
+               $mail_chk          = ((DBA::isResult($r)) ? $r[0]['last_check'] : DBA::NULL_DATETIME);
 
 
                $tpl = get_markup_template('settings/connectors.tpl');
index e312d8721dc7f077c9da839d7110d8ebfd2f1a03..e184f6c631fa568976b43910768eba2f99e89353 100644 (file)
@@ -50,11 +50,8 @@ class App
        public $argv;
        public $argc;
        public $module;
-       public $hooks = [];
        public $timezone;
        public $interactive = true;
-       public $addons;
-       public $addons_admin = [];
        public $identities;
        public $is_mobile = false;
        public $is_tablet = false;
@@ -360,7 +357,7 @@ class App
                Core\Config::load();
 
                if ($this->getMode()->has(App\Mode::DBAVAILABLE)) {
-                       Core\Addon::loadHooks();
+                       Core\Hook::loadHooks();
 
                        $this->loadAddonConfig();
                }
@@ -576,7 +573,11 @@ class App
 
                $stamp1 = microtime(true);
 
-               DBA::connect($db_host, $db_user, $db_pass, $db_data, $charset);
+               if (DBA::connect($db_host, $db_user, $db_pass, $db_data, $charset)) {
+                       // Loads DB_UPDATE_VERSION constant
+                       Database\DBStructure::definition(false);
+               }
+
                unset($db_host, $db_user, $db_pass, $db_data, $charset);
 
                $this->saveTimestamp($stamp1, 'network');
index d2f89ce279de91867fe1edf9de53c3a8c8514620..c3f559c7087720ae972df14c341039f718045f58 100644 (file)
@@ -8,15 +8,20 @@ use Friendica\App;
 use Friendica\BaseObject;
 use Friendica\Database\DBA;
 
-require_once 'include/dba.php';
-
 /**
  * Some functions to handle addons
  */
 class Addon extends BaseObject
 {
        /**
-        * @brief Synchronise addons:
+        * List of the names of enabled addons
+        *
+        * @var array
+        */
+       private static $addons = [];
+
+       /**
+        * @brief Synchronize addons:
         *
         * system.addon contains a comma-separated list of names
         * of addons which are used on this system.
@@ -27,15 +32,13 @@ class Addon extends BaseObject
         * call the install procedure and add it to the database.
         *
         */
-       public static function check()
+       public static function loadAddons()
        {
-               $a = self::getApp();
+               $installed_addons = [];
 
                $r = DBA::select('addon', [], ['installed' => 1]);
                if (DBA::isResult($r)) {
-                       $installed = DBA::toArray($r);
-               } else {
-                       $installed = [];
+                       $installed_addons = DBA::toArray($r);
                }
 
                $addons = Config::get('system', 'addon');
@@ -45,31 +48,23 @@ class Addon extends BaseObject
                        $addons_arr = explode(',', str_replace(' ', '', $addons));
                }
 
-               $a->addons = $addons_arr;
+               self::$addons = $addons_arr;
 
                $installed_arr = [];
 
-               if (count($installed)) {
-                       foreach ($installed as $i) {
-                               if (!in_array($i['name'], $addons_arr)) {
-                                       self::uninstall($i['name']);
-                               } else {
-                                       $installed_arr[] = $i['name'];
-                               }
+               foreach ($installed_addons as $addon) {
+                       if (!self::isEnabled($addon['name'])) {
+                               self::uninstall($addon['name']);
+                       } else {
+                               $installed_arr[] = $addon['name'];
                        }
                }
 
-               if (count($addons_arr)) {
-                       foreach ($addons_arr as $p) {
-                               if (!in_array($p, $installed_arr)) {
-                                       self::install($p);
-                               }
+               foreach (self::$addons as $p) {
+                       if (!in_array($p, $installed_arr)) {
+                               self::install($p);
                        }
                }
-
-               self::loadHooks();
-
-               return;
        }
 
        /**
@@ -88,6 +83,8 @@ class Addon extends BaseObject
                        $func = $addon . '_uninstall';
                        $func();
                }
+
+               unset(self::$addons[$idx]);
        }
 
        /**
@@ -110,10 +107,10 @@ class Addon extends BaseObject
                        $func = $addon . '_install';
                        $func();
 
-                       $addon_admin = (function_exists($addon."_addon_admin") ? 1 : 0);
+                       $addon_admin = (function_exists($addon . "_addon_admin") ? 1 : 0);
 
                        DBA::insert('addon', ['name' => $addon, 'installed' => true,
-                                               'timestamp' => $t, 'plugin_admin' => $addon_admin]);
+                               'timestamp' => $t, 'plugin_admin' => $addon_admin]);
 
                        // we can add the following with the previous SQL
                        // once most site tables have been updated.
@@ -122,6 +119,10 @@ class Addon extends BaseObject
                        if (file_exists('addon/' . $addon . '/.hidden')) {
                                DBA::update('addon', ['hidden' => true], ['name' => $addon]);
                        }
+
+                       if (!self::isEnabled($addon)) {
+                               self::$addons[] = $addon;
+                       }
                        return true;
                } else {
                        logger("Addons: FAILED installing " . $addon);
@@ -174,165 +175,6 @@ class Addon extends BaseObject
                }
        }
 
-       /**
-        * @brief check if addon is enabled
-        *
-        * @param string $addon
-        * @return boolean
-        */
-       public static function isEnabled($addon)
-       {
-               return DBA::exists('addon', ['installed' => true, 'name' => $addon]);
-       }
-
-
-       /**
-        * @brief registers a hook.
-        *
-        * @param string $hook the name of the hook
-        * @param string $file the name of the file that hooks into
-        * @param string $function the name of the function that the hook will call
-        * @param int $priority A priority (defaults to 0)
-        * @return mixed|bool
-        */
-       public static function registerHook($hook, $file, $function, $priority = 0)
-       {
-               $file = str_replace(self::getApp()->getBasePath() . DIRECTORY_SEPARATOR, '', $file);
-
-               $condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
-               $exists = DBA::exists('hook', $condition);
-               if ($exists) {
-                       return true;
-               }
-
-               $r = DBA::insert('hook', ['hook' => $hook, 'file' => $file, 'function' => $function, 'priority' => $priority]);
-
-               return $r;
-       }
-
-       /**
-        * @brief unregisters a hook.
-        *
-        * @param string $hook the name of the hook
-        * @param string $file the name of the file that hooks into
-        * @param string $function the name of the function that the hook called
-        * @return array
-        */
-       public static function unregisterHook($hook, $file, $function)
-       {
-               $relative_file = str_replace(self::getApp()->getBasePath() . DIRECTORY_SEPARATOR, '', $file);
-
-               // This here is only needed for fixing a problem that existed on the develop branch
-               $condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
-               DBA::delete('hook', $condition);
-
-               $condition = ['hook' => $hook, 'file' => $relative_file, 'function' => $function];
-               $r = DBA::delete('hook', $condition);
-               return $r;
-       }
-
-       /**
-        * Load hooks
-        */
-       public static function loadHooks()
-       {
-               $a = self::getApp();
-               $a->hooks = [];
-               $r = DBA::select('hook', ['hook', 'file', 'function'], [], ['order' => ['priority' => 'desc', 'file']]);
-
-               while ($rr = DBA::fetch($r)) {
-                       if (! array_key_exists($rr['hook'], $a->hooks)) {
-                               $a->hooks[$rr['hook']] = [];
-                       }
-                       $a->hooks[$rr['hook']][] = [$rr['file'],$rr['function']];
-               }
-               DBA::close($r);
-       }
-
-       /**
-        * @brief Forks a hook.
-        *
-        * Use this function when you want to fork a hook via the worker.
-        *
-        * @param string $name of the hook to call
-        * @param string|array $data to transmit to the callback handler
-        */
-       public static function forkHooks($priority, $name, $data = null)
-       {
-               $a = self::getApp();
-
-               if (is_array($a->hooks) && array_key_exists($name, $a->hooks)) {
-                       foreach ($a->hooks[$name] as $hook) {
-                               Worker::add($priority, 'ForkHook', $name, $hook, $data);
-                       }
-               }
-       }
-
-       /**
-        * @brief Calls a hook.
-        *
-        * Use this function when you want to be able to allow a hook to manipulate
-        * the provided data.
-        *
-        * @param string $name of the hook to call
-        * @param string|array &$data to transmit to the callback handler
-        */
-       public static function callHooks($name, &$data = null)
-       {
-               $a = self::getApp();
-
-               if (is_array($a->hooks) && array_key_exists($name, $a->hooks)) {
-                       foreach ($a->hooks[$name] as $hook) {
-                               self::callSingleHook($a, $name, $hook, $data);
-                       }
-               }
-       }
-
-       /**
-        * @brief Calls a single hook.
-        *
-        * @param App $a
-        * @param string         $name of the hook to call
-        * @param array          $hook Hook data
-        * @param string|array   &$data to transmit to the callback handler
-        */
-       public static function callSingleHook(App $a, $name, $hook, &$data = null)
-       {
-               // Don't run a theme's hook if the user isn't using the theme
-               if (strpos($hook[0], 'view/theme/') !== false && strpos($hook[0], 'view/theme/' . $a->getCurrentTheme()) === false) {
-                       return;
-               }
-
-               @include_once($hook[0]);
-               if (function_exists($hook[1])) {
-                       $func = $hook[1];
-                       $func($a, $data);
-               } else {
-                       // remove orphan hooks
-                       $condition = ['hook' => $name, 'file' => $hook[0], 'function' => $hook[1]];
-                       DBA::delete('hook', $condition, ['cascade' => false]);
-               }
-       }
-
-       /**
-        * check if an app_menu hook exist for addon $name.
-        * Return true if the addon is an app
-        */
-       public static function isApp($name)
-       {
-               $a = self::getApp();
-
-               if (is_array($a->hooks) && (array_key_exists('app_menu', $a->hooks))) {
-                       foreach ($a->hooks['app_menu'] as $hook) {
-                               if ($hook[0] == 'addon/'.$name.'/'.$name.'.php') {
-                                       return true;
-                               }
-                       }
-               }
-
-               return false;
-       }
-
        /**
         * @brief Parse addon comment in search of addon infos.
         *
@@ -401,4 +243,97 @@ class Addon extends BaseObject
                }
                return $info;
        }
+
+       /**
+        * Checks if the provided addon is enabled
+        *
+        * @param string $addon
+        * @return boolean
+        */
+       public static function isEnabled($addon)
+       {
+               return in_array($addon, self::$addons);
+       }
+
+       /**
+        * Returns a list of the enabled addon names
+        *
+        * @return array
+        */
+       public static function getEnabledList()
+       {
+               return self::$addons;
+       }
+
+       /**
+        * Saves the current enabled addon list in the system.addon config key
+        *
+        * @return boolean
+        */
+       public static function saveEnabledList()
+       {
+               return Config::set("system", "addon", implode(", ", self::$addons));
+       }
+
+       /**
+        * Returns the list of non-hidden enabled addon names
+        *
+        * @return array
+        */
+       public static function getVisibleList()
+       {
+               $visible_addons = [];
+               $stmt = DBA::select('addon', ['name'], ['hidden' => false, 'installed' => true]);
+               if (DBA::isResult($stmt)) {
+                       foreach (DBA::toArray($stmt) as $addon) {
+                               $visible_addons[] = $addon['name'];
+                       }
+               }
+
+               return $visible_addons;
+       }
+
+       /**
+        * Shim of Hook::register left for backward compatibility purpose.
+        *
+        * @see Hook::register
+        * @deprecated since version 2018.12
+        * @param string $hook     the name of the hook
+        * @param string $file     the name of the file that hooks into
+        * @param string $function the name of the function that the hook will call
+        * @param int    $priority A priority (defaults to 0)
+        * @return mixed|bool
+        */
+       public static function registerHook($hook, $file, $function, $priority = 0)
+       {
+               return Hook::register($hook, $file, $function, $priority);
+       }
+
+       /**
+        * Shim of Hook::unregister left for backward compatibility purpose.
+        *
+        * @see Hook::unregister
+        * @deprecated since version 2018.12
+        * @param string $hook     the name of the hook
+        * @param string $file     the name of the file that hooks into
+        * @param string $function the name of the function that the hook called
+        * @return boolean
+        */
+       public static function unregisterHook($hook, $file, $function)
+       {
+               return Hook::unregister($hook, $file, $function);
+       }
+
+       /**
+        * Shim of Hook::callAll left for backward-compatibility purpose.
+        *
+        * @see Hook::callAll
+        * @deprecated since version 2018.12
+        * @param string       $name  of the hook to call
+        * @param string|array &$data to transmit to the callback handler
+        */
+       public static function callHooks($name, &$data = null)
+       {
+               Hook::callAll($name, $data);
+       }
 }
index 76d078341f74c0658391f8a53e20fb1950e300a7..5371cc91ecb42e23d3b9e372d30819c615b35812 100644 (file)
@@ -5,17 +5,17 @@
 
 namespace Friendica\Core;
 
-use Friendica\Core\Addon;
 use Friendica\BaseObject;
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Database\DBA;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Database\DBA;
+use Friendica\Util\DateTimeFormat;
 
 /**
 * Handle Authentification, Session and Cookies
-*/    
+*/
 class Authentication extends BaseObject
 {
        /**
@@ -81,7 +81,7 @@ class Authentication extends BaseObject
                $a->user = $user_record;
 
                if ($interactive) {
-                       if ($a->user['login_date'] <= NULL_DATE) {
+                       if ($a->user['login_date'] <= DBA::NULL_DATETIME) {
                                $_SESSION['return_path'] = 'profile_photo/new';
                                $a->module = 'profile_photo';
                                info(L10n::t("Welcome ") . $a->user['username'] . EOL);
diff --git a/src/Core/Hook.php b/src/Core/Hook.php
new file mode 100644 (file)
index 0000000..85ed98e
--- /dev/null
@@ -0,0 +1,191 @@
+<?php
+/**
+ * @file src/Core/Hook.php
+ */
+namespace Friendica\Core;
+
+use Friendica\App;
+use Friendica\BaseObject;
+use Friendica\Database\DBA;
+
+/**
+ * Some functions to handle hooks
+ */
+class Hook extends BaseObject
+{
+       /**
+        * Array of registered hooks
+        *
+        * Format:
+        * [
+        *              ["<hook name>"] => [
+        *                      0 => "<hook file>",
+        *                      1 => "<hook function name>"
+        *              ],
+        *              ...
+        * ]
+        *
+        * @var array
+        */
+       private static $hooks = [];
+
+       /**
+        * Load hooks
+        */
+       public static function loadHooks()
+       {
+               self::$hooks = [];
+               $stmt = DBA::select('hook', ['hook', 'file', 'function'], [], ['order' => ['priority' => 'desc', 'file']]);
+
+               while ($hook = DBA::fetch($stmt)) {
+                       if (!array_key_exists($hook['hook'], self::$hooks)) {
+                               self::$hooks[$hook['hook']] = [];
+                       }
+                       self::$hooks[$hook['hook']][] = [$hook['file'], $hook['function']];
+               }
+               DBA::close($stmt);
+       }
+
+       /**
+        * Registers a hook.
+        *
+        * @param string $hook     the name of the hook
+        * @param string $file     the name of the file that hooks into
+        * @param string $function the name of the function that the hook will call
+        * @param int    $priority A priority (defaults to 0)
+        * @return mixed|bool
+        */
+       public static function register($hook, $file, $function, $priority = 0)
+       {
+               $file = str_replace(self::getApp()->getBasePath() . DIRECTORY_SEPARATOR, '', $file);
+
+               $condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
+               if (DBA::exists('hook', $condition)) {
+                       return true;
+               }
+
+               $result = DBA::insert('hook', ['hook' => $hook, 'file' => $file, 'function' => $function, 'priority' => $priority]);
+
+               return $result;
+       }
+
+       /**
+        * Unregisters a hook.
+        *
+        * @param string $hook     the name of the hook
+        * @param string $file     the name of the file that hooks into
+        * @param string $function the name of the function that the hook called
+        * @return boolean
+        */
+       public static function unregister($hook, $file, $function)
+       {
+               $relative_file = str_replace(self::getApp()->getBasePath() . DIRECTORY_SEPARATOR, '', $file);
+
+               // This here is only needed for fixing a problem that existed on the develop branch
+               $condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
+               DBA::delete('hook', $condition);
+
+               $condition = ['hook' => $hook, 'file' => $relative_file, 'function' => $function];
+               $result = DBA::delete('hook', $condition);
+               return $result;
+       }
+
+       /**
+        * Returns the list of callbacks for a single hook
+        *
+        * @param  string $name Name of the hook
+        * @return array
+        */
+       public static function getByName($name)
+       {
+               $return = [];
+
+               if (isset(self::$hooks[$name])) {
+                       $return = self::$hooks[$name];
+               }
+
+               return $return;
+       }
+
+       /**
+        * @brief Forks a hook.
+        *
+        * Use this function when you want to fork a hook via the worker.
+        *
+        * @param integer $priority of the hook
+        * @param string  $name     of the hook to call
+        * @param mixed   $data     to transmit to the callback handler
+        */
+       public static function fork($priority, $name, $data = null)
+       {
+               if (array_key_exists($name, self::$hooks)) {
+                       foreach (self::$hooks[$name] as $hook) {
+                               Worker::add($priority, 'ForkHook', $name, $hook, $data);
+                       }
+               }
+       }
+
+       /**
+        * @brief Calls a hook.
+        *
+        * Use this function when you want to be able to allow a hook to manipulate
+        * the provided data.
+        *
+        * @param string       $name  of the hook to call
+        * @param string|array &$data to transmit to the callback handler
+        */
+       public static function callAll($name, &$data = null)
+       {
+               if (array_key_exists($name, self::$hooks)) {
+                       foreach (self::$hooks[$name] as $hook) {
+                               self::callSingle(self::getApp(), $name, $hook, $data);
+                       }
+               }
+       }
+
+       /**
+        * @brief Calls a single hook.
+        *
+        * @param App $a
+        * @param string         $name of the hook to call
+        * @param array          $hook Hook data
+        * @param string|array   &$data to transmit to the callback handler
+        */
+       public static function callSingle(App $a, $name, $hook, &$data = null)
+       {
+               // Don't run a theme's hook if the user isn't using the theme
+               if (strpos($hook[0], 'view/theme/') !== false && strpos($hook[0], 'view/theme/' . $a->getCurrentTheme()) === false) {
+                       return;
+               }
+
+               @include_once($hook[0]);
+               if (function_exists($hook[1])) {
+                       $func = $hook[1];
+                       $func($a, $data);
+               } else {
+                       // remove orphan hooks
+                       $condition = ['hook' => $name, 'file' => $hook[0], 'function' => $hook[1]];
+                       DBA::delete('hook', $condition, ['cascade' => false]);
+               }
+       }
+
+       /**
+        * Checks if an app_menu hook exist for the provided addon name.
+        * Return true if the addon is an app
+        *
+        * @param string $name Name of the addon
+        * @return boolean
+        */
+       public static function isAddonApp($name)
+       {
+               if (array_key_exists('app_menu', self::$hooks)) {
+                       foreach (self::$hooks['app_menu'] as $hook) {
+                               if ($hook[0] == 'addon/' . $name . '/' . $name . '.php') {
+                                       return true;
+                               }
+                       }
+               }
+
+               return false;
+       }
+}
index 54f3ec06157ce32eb5c12f9a3e047012da61c29a..18aabec08a07c800be2b7d74195a36fd5ff867b3 100644 (file)
@@ -180,7 +180,7 @@ class UserImport
                        }
                        if ($contact['uid'] == $olduid && $contact['self'] == '0') {
                                // set contacts 'avatar-date' to NULL_DATE to let worker to update urls
-                               $contact["avatar-date"] = NULL_DATE;
+                               $contact["avatar-date"] = DBA::NULL_DATETIME;
 
                                switch ($contact['network']) {
                                        case Protocol::DFRN:
index 723cd809da44d3230721afd1eb4e06cf5a17ffb7..a06a11043daf16752701e5acff4a585cc2ea5208 100644 (file)
@@ -4,11 +4,11 @@
  */
 namespace Friendica\Core;
 
+use Friendica\BaseObject;
 use Friendica\Database\DBA;
 use Friendica\Model\Process;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\BaseObject;
 
 require_once 'include/dba.php';
 
@@ -154,7 +154,7 @@ class Worker
        private static function totalEntries()
        {
                return DBA::count('workerqueue', ["`executed` <= ? AND NOT `done` AND `next_try` < ?",
-                       NULL_DATE, DateTimeFormat::utcNow()]);
+                       DBA::NULL_DATETIME, DateTimeFormat::utcNow()]);
        }
 
        /**
@@ -164,7 +164,7 @@ class Worker
         */
        private static function highestPriority()
        {
-               $condition = ["`executed` <= ? AND NOT `done` AND `next_try` < ?", NULL_DATE, DateTimeFormat::utcNow()];
+               $condition = ["`executed` <= ? AND NOT `done` AND `next_try` < ?", DBA::NULL_DATETIME, DateTimeFormat::utcNow()];
                $workerqueue = DBA::selectFirst('workerqueue', ['priority'], $condition, ['order' => ['priority']]);
                if (DBA::isResult($workerqueue)) {
                        return $workerqueue["priority"];
@@ -183,7 +183,7 @@ class Worker
        private static function processWithPriorityActive($priority)
        {
                $condition = ["`priority` <= ? AND `executed` > ? AND NOT `done` AND `next_try` < ?",
-                       $priority, NULL_DATE, DateTimeFormat::utcNow()];
+                       $priority, DBA::NULL_DATETIME, DateTimeFormat::utcNow()];
                return DBA::exists('workerqueue', $condition);
        }
 
@@ -553,7 +553,7 @@ class Worker
                $entries = DBA::select(
                        'workerqueue',
                        ['id', 'pid', 'executed', 'priority', 'parameter'],
-                       ['`executed` > ? AND NOT `done` AND `pid` != 0', NULL_DATE],
+                       ['`executed` > ? AND NOT `done` AND `pid` != 0', DBA::NULL_DATETIME],
                        ['order' => ['priority', 'created']]
                );
 
@@ -561,7 +561,7 @@ class Worker
                        if (!posix_kill($entry["pid"], 0)) {
                                DBA::update(
                                        'workerqueue',
-                                       ['executed' => NULL_DATE, 'pid' => 0],
+                                       ['executed' => DBA::NULL_DATETIME, 'pid' => 0],
                                        ['id' => $entry["id"]]
                                );
                        } else {
@@ -597,7 +597,7 @@ class Worker
                                        }
                                        DBA::update(
                                                'workerqueue',
-                                               ['executed' => NULL_DATE, 'created' => DateTimeFormat::utcNow(), 'priority' => $new_priority, 'pid' => 0],
+                                               ['executed' => DBA::NULL_DATETIME, 'created' => DateTimeFormat::utcNow(), 'priority' => $new_priority, 'pid' => 0],
                                                ['id' => $entry["id"]]
                                        );
                                } else {
@@ -809,7 +809,7 @@ class Worker
                                'workerqueue',
                                ['id'],
                                ["`executed` <= ? AND `priority` < ? AND NOT `done` AND `next_try` < ?",
-                               NULL_DATE, $highest_priority, DateTimeFormat::utcNow()],
+                               DBA::NULL_DATETIME, $highest_priority, DateTimeFormat::utcNow()],
                                ['limit' => $limit, 'order' => ['priority', 'created']]
                        );
 
@@ -826,7 +826,7 @@ class Worker
                                        'workerqueue',
                                        ['id'],
                                        ["`executed` <= ? AND `priority` > ? AND NOT `done` AND `next_try` < ?",
-                                       NULL_DATE, $highest_priority, DateTimeFormat::utcNow()],
+                                       DBA::NULL_DATETIME, $highest_priority, DateTimeFormat::utcNow()],
                                        ['limit' => $limit, 'order' => ['priority', 'created']]
                                );
 
@@ -846,7 +846,7 @@ class Worker
                                'workerqueue',
                                ['id'],
                                ["`executed` <= ? AND NOT `done` AND `next_try` < ?",
-                               NULL_DATE, DateTimeFormat::utcNow()],
+                               DBA::NULL_DATETIME, DateTimeFormat::utcNow()],
                                ['limit' => $limit, 'order' => ['priority', 'created']]
                        );
 
@@ -912,7 +912,7 @@ class Worker
        {
                $mypid = getmypid();
 
-               DBA::update('workerqueue', ['executed' => NULL_DATE, 'pid' => 0], ['pid' => $mypid, 'done' => false]);
+               DBA::update('workerqueue', ['executed' => DBA::NULL_DATETIME, 'pid' => 0], ['pid' => $mypid, 'done' => false]);
        }
 
        /**
@@ -1147,7 +1147,7 @@ class Worker
 
                logger('Defer execution ' . $retrial . ' of id ' . $id . ' to ' . $next, LOGGER_DEBUG);
 
-               $fields = ['retrial' => $retrial + 1, 'next_try' => $next, 'executed' => NULL_DATE, 'pid' => 0];
+               $fields = ['retrial' => $retrial + 1, 'next_try' => $next, 'executed' => DBA::NULL_DATETIME, 'pid' => 0];
                DBA::update('workerqueue', $fields, ['id' => $id]);
        }
 
index 8fd117e5d2c56f742b399dcf93d8ea2988218317..6249537c06d7661c7f286e9e4bdf6c38b9fc25d0 100644 (file)
@@ -24,6 +24,15 @@ require_once 'include/dba.php';
  */
 class DBA
 {
+       /**
+        * Lowest possible date value
+        */
+       const NULL_DATE     = '0001-01-01';
+       /**
+        * Lowest possible datetime value
+        */
+       const NULL_DATETIME = '0001-01-01 00:00:00';
+
        public static $connected = false;
 
        private static $server_info = '';
index 50566dc877c00bdd35d8f28859107321f44ba3c1..9abae944ae0e873d8b67a065a95f49fc2f49a07c 100644 (file)
@@ -5,8 +5,8 @@
 namespace Friendica\Database;
 
 use Exception;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Util\DateTimeFormat;
 
@@ -22,6 +22,13 @@ require_once 'include/text.php';
  */
 class DBStructure
 {
+       /**
+        * Database structure definition loaded from config/dbstructure.php
+        *
+        * @var array
+        */
+       private static $definition = [];
+
        /*
         * Converts all tables from MyISAM to InnoDB
         */
@@ -166,7 +173,7 @@ class DBStructure
        }
 
        public static function printStructure() {
-               $database = self::definition();
+               $database = self::definition(false);
 
                echo "-- ------------------------------------------\n";
                echo "-- ".FRIENDICA_PLATFORM." ".FRIENDICA_VERSION." (".FRIENDICA_CODENAME,")\n";
@@ -822,43 +829,40 @@ class DBStructure
        }
 
        /**
-        * Loads the database structure definition from the /config/dbstructure.json file
-        *
-        * Expected format:
-        * "table_name": {
-        *   "comment": "meaningful table comment",
-        *   "fields": {
-        *     "field_name1": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "meaningful field comment"},
-        *     "field_name2": {"type": "varchar(50)", "not null": "1", "default": "", "comment": "meaningful field comment"},
-        *   },
-        *   "indexes": {
-        *     "PRIMARY": ["field_name1"],
-        *     "name": ["UNIQUE", "field_name2"]
-        *   }
-        * }
+        * Loads the database structure definition from the config/dbstructure.php file.
+        * On first pass, defines DB_UPDATE_VERSION constant.
         *
+        * @see config/dbstructure.php
+        * @param boolean $with_addons_structure Whether to tack on addons additional tables
         * @return array
         * @throws Exception
         */
-       public static function definition() {
-               $a = \Friendica\BaseObject::getApp();
+       public static function definition($with_addons_structure = true)
+       {
+               if (!self::$definition) {
+                       $a = \Friendica\BaseObject::getApp();
 
-               $filename = $a->getBasePath() . '/config/dbstructure.json';
+                       $filename = $a->getBasePath() . '/config/dbstructure.php';
 
-               if (!is_readable($filename)) {
-                       throw new Exception('Missing database structure config file config/dbstructure.json');
-               }
+                       if (!is_readable($filename)) {
+                               throw new Exception('Missing database structure config file config/dbstructure.php');
+                       }
 
-               $json = file_get_contents($filename);
+                       $definition = require $filename;
 
-               $database = json_decode($json, true);
+                       if (!$definition) {
+                               throw new Exception('Corrupted database structure config file config/dbstructure.php');
+                       }
 
-               if (!$database) {
-                       throw new Exception('Corrupted database structure config file config/dbstructure.json');
+                       self::$definition = $definition;
+               } else {
+                       $definition = self::$definition;
                }
 
-               Addon::callHooks('dbstructure_definition', $database);
+               if ($with_addons_structure) {
+                       Hook::callAll('dbstructure_definition', $definition);
+               }
 
-               return $database;
+               return $definition;
        }
 }
index 1a5c97834ad35e8eed0f2bcf5a30fb242602ddec..3524cd4ce10eff1fb7ac30c04f38948d337256e7 100644 (file)
@@ -8,7 +8,6 @@ use Friendica\BaseObject;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
@@ -17,8 +16,8 @@ use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
 use Friendica\Protocol\ActivityPub;
-use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\DFRN;
+use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
@@ -594,9 +593,9 @@ class Contact extends BaseObject
                        return;
                }
 
-               if ($contact['term-date'] <= NULL_DATE) {
+               if ($contact['term-date'] <= DBA::NULL_DATETIME) {
                        DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
-                       DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]);
+                       DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), DBA::NULL_DATETIME]);
                } else {
                        /* @todo
                         * We really should send a notification to the owner after 2-3 weeks
@@ -629,7 +628,7 @@ class Contact extends BaseObject
         */
        public static function unmarkForArchival(array $contact)
        {
-               $condition = ['`id` = ? AND (`term-date` > ? OR `archive`)', $contact['id'], NULL_DATE];
+               $condition = ['`id` = ? AND (`term-date` > ? OR `archive`)', $contact['id'], DBA::NULL_DATETIME];
                $exists = DBA::exists('contact', $condition);
 
                // We don't need to update, we never marked this contact for archival
@@ -646,7 +645,7 @@ class Contact extends BaseObject
                }
 
                // It's a miracle. Our dead contact has inexplicably come back to life.
-               $fields = ['term-date' => NULL_DATE, 'archive' => false];
+               $fields = ['term-date' => DBA::NULL_DATETIME, 'archive' => false];
                DBA::update('contact', $fields, ['id' => $contact['id']]);
                DBA::update('contact', $fields, ['nurl' => normalise_link($contact['url'])]);
 
index 452017e69d3a04bcfbd2269d851b1db69340f9ee..e9a4d4b3fd7d1792f5f44e3bb1c1208dc3f6a85e 100644 (file)
@@ -257,10 +257,10 @@ class Event extends BaseObject
 
                $event['created']   = DateTimeFormat::utc(defaults($arr, 'created'  , 'now'));
                $event['edited']    = DateTimeFormat::utc(defaults($arr, 'edited'   , 'now'));
-               $event['start']     = DateTimeFormat::utc(defaults($arr, 'start'    , NULL_DATE));
-               $event['finish']    = DateTimeFormat::utc(defaults($arr, 'finish'   , NULL_DATE));
-               if ($event['finish'] < NULL_DATE) {
-                       $event['finish'] = NULL_DATE;
+               $event['start']     = DateTimeFormat::utc(defaults($arr, 'start'    , DBA::NULL_DATETIME));
+               $event['finish']    = DateTimeFormat::utc(defaults($arr, 'finish'   , DBA::NULL_DATETIME));
+               if ($event['finish'] < DBA::NULL_DATETIME) {
+                       $event['finish'] = DBA::NULL_DATETIME;
                }
                $private = intval(defaults($arr, 'private', 0));
 
index 681c1c37096473fa96679edbb402086591222a67..20e6f0751ed8867d7eacb76998107d42481ee248 100644 (file)
@@ -176,7 +176,7 @@ class GContact
                        if (!isset($gcontact['network']) && ($gcnt["network"] != Protocol::STATUSNET)) {
                                $gcontact['network'] = $gcnt["network"];
                        }
-                       if ($gcontact['updated'] <= NULL_DATE) {
+                       if ($gcontact['updated'] <= DBA::NULL_DATETIME) {
                                $gcontact['updated'] = $gcnt["updated"];
                        }
                        if (!isset($gcontact['server_url']) && (normalise_link($gcnt["server_url"]) != normalise_link($gcnt["url"]))) {
@@ -457,7 +457,7 @@ class GContact
                        intval($uid),
                        intval($uid),
                        intval($uid),
-                       DBA::escape(NULL_DATE),
+                       DBA::NULL_DATETIME,
                        $sql_network,
                        intval($start),
                        intval($limit)
@@ -486,7 +486,7 @@ class GContact
                        intval($uid),
                        intval($uid),
                        intval($uid),
-                       DBA::escape(NULL_DATE),
+                       DBA::NULL_DATETIME,
                        $sql_network,
                        intval($start),
                        intval($limit)
index 4de49022cb1fd0bf8743e3fbdb9c7e4be4c38959..53b98fb625ab636b6ae1bdc479663437c84b8876 100644 (file)
@@ -774,7 +774,7 @@ class Profile
                                $profile['marital']['with'] = $a->profile['with'];
                        }
 
-                       if (strlen($a->profile['howlong']) && $a->profile['howlong'] >= NULL_DATE) {
+                       if (strlen($a->profile['howlong']) && $a->profile['howlong'] >= DBA::NULL_DATETIME) {
                                $profile['howlong'] = Temporal::getRelativeDate($a->profile['howlong'], L10n::t('for %1$d %2$s'));
                        }
 
index 9680d359d09637c1007a302b46f3d36d221b4827..e024878a5821d7f33d6777ec581501e3ba5d2abb 100644 (file)
@@ -21,7 +21,7 @@ class PushSubscriber
        public static function publishFeed($uid, $default_priority = PRIORITY_HIGH)
        {
                $condition = ['push' => 0, 'uid' => $uid];
-               DBA::update('push_subscriber', ['push' => 1, 'next_try' => NULL_DATE], $condition);
+               DBA::update('push_subscriber', ['push' => 1, 'next_try' => DBA::NULL_DATETIME], $condition);
 
                self::requeue($default_priority);
        }
@@ -114,10 +114,10 @@ class PushSubscriber
                        $days = round((time() -  strtotime($subscriber['renewed'])) / (60 * 60 * 24));
 
                        if ($days > 60) {
-                               DBA::update('push_subscriber', ['push' => -1, 'next_try' => NULL_DATE], ['id' => $id]);
+                               DBA::update('push_subscriber', ['push' => -1, 'next_try' => DBA::NULL_DATETIME], ['id' => $id]);
                                logger('Delivery error: Subscription ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' is marked as ended.', LOGGER_DEBUG);
                        } else {
-                               DBA::update('push_subscriber', ['push' => 0, 'next_try' => NULL_DATE], ['id' => $id]);
+                               DBA::update('push_subscriber', ['push' => 0, 'next_try' => DBA::NULL_DATETIME], ['id' => $id]);
                                logger('Delivery error: Giving up ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' for now.', LOGGER_DEBUG);
                        }
                } else {
@@ -146,7 +146,7 @@ class PushSubscriber
                }
 
                // set last_update to the 'created' date of the last item, and reset push=0
-               $fields = ['push' => 0, 'next_try' => NULL_DATE, 'last_update' => $last_update];
+               $fields = ['push' => 0, 'next_try' => DBA::NULL_DATETIME, 'last_update' => $last_update];
                DBA::update('push_subscriber', $fields, ['id' => $id]);
                logger('Subscriber ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' is marked as vital', LOGGER_DEBUG);
        }
index 271740a4f5d28eddec6ffba15ae6883a4ef423e7..fb0bf0edeeab4341cd84b67a0a74c8ba88104264 100644 (file)
@@ -8,6 +8,7 @@ use Friendica\Content\ContactSelector;
 use Friendica\Content\Nav;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Widget;
+use Friendica\Core\ACL;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
@@ -15,11 +16,10 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model;
+use Friendica\Module\Login;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
-use Friendica\Core\ACL;
-use Friendica\Module\Login;
 
 /**
  *  Manages and show Contacts and their content
@@ -522,9 +522,9 @@ class Contact extends BaseModule
 
                        $insecure = L10n::t('Private communications are not available for this contact.');
 
-                       $last_update = (($contact['last-update'] <= NULL_DATE) ? L10n::t('Never') : DateTimeFormat::local($contact['last-update'], 'D, j M Y, g:i A'));
+                       $last_update = (($contact['last-update'] <= DBA::NULL_DATETIME) ? L10n::t('Never') : DateTimeFormat::local($contact['last-update'], 'D, j M Y, g:i A'));
 
-                       if ($contact['last-update'] > NULL_DATE) {
+                       if ($contact['last-update'] > DBA::NULL_DATETIME) {
                                $last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? L10n::t('(Update was successful)') : L10n::t('(Update was not successful)'));
                        }
                        $lblsuggest = (($contact['network'] === Protocol::DFRN) ? L10n::t('Suggest friends') : '');
@@ -536,7 +536,7 @@ class Contact extends BaseModule
                        // tabs
                        $tab_str = self::getTabsHTML($a, $contact, 3);
 
-                       $lost_contact = (($contact['archive'] && $contact['term-date'] > NULL_DATE && $contact['term-date'] < DateTimeFormat::utcNow()) ? L10n::t('Communications lost with this contact!') : '');
+                       $lost_contact = (($contact['archive'] && $contact['term-date'] > DBA::NULL_DATETIME && $contact['term-date'] < DateTimeFormat::utcNow()) ? L10n::t('Communications lost with this contact!') : '');
 
                        $fetch_further_information = null;
                        if ($contact['network'] == Protocol::FEED) {
index 70428ab8403f6db43be55c8c7c9ecf83bfeb46db..85d7a3b8c1b5f4cc6d475a6d5882acbb32bce5fd 100644 (file)
@@ -771,7 +771,7 @@ class Post extends BaseObject
                         * Hmmm, code depending on the presence of a particular addon?
                         * This should be better if done by a hook
                         */
-                       if (in_array('qcomment', $a->addons)) {
+                       if (Addon::isEnabled('qcomment')) {
                                $qc = ((local_user()) ? PConfig::get(local_user(), 'qcomment', 'words') : null);
                                $qcomment = (($qc) ? explode("\n", $qc) : null);
                        }
index 0e4d58d1c19348f67aa2af88510bcd2aa265c908..bb7ccd564aa166bf8b08f7405b6d60d56bc82299 100644 (file)
@@ -113,7 +113,7 @@ class PortableContact
                        $connect_url = '';
                        $name = '';
                        $network = '';
-                       $updated = NULL_DATE;
+                       $updated = DBA::NULL_DATETIME;
                        $location = '';
                        $about = '';
                        $keywords = '';
@@ -317,7 +317,7 @@ class PortableContact
 
                $contact = ["url" => $profile];
 
-               if ($gcontacts[0]["created"] <= NULL_DATE) {
+               if ($gcontacts[0]["created"] <= DBA::NULL_DATETIME) {
                        $contact['created'] = DateTimeFormat::utcNow();
                }
 
@@ -522,7 +522,7 @@ class PortableContact
                // Maybe there aren't any entries. Then check if it is a valid feed
                if ($last_updated == "") {
                        if ($xpath->query('/atom:feed')->length > 0) {
-                               $last_updated = NULL_DATE;
+                               $last_updated = DBA::NULL_DATETIME;
                        }
                }
 
@@ -931,7 +931,7 @@ class PortableContact
 
                $gserver = DBA::selectFirst('gserver', [], ['nurl' => normalise_link($server_url)]);
                if (DBA::isResult($gserver)) {
-                       if ($gserver["created"] <= NULL_DATE) {
+                       if ($gserver["created"] <= DBA::NULL_DATETIME) {
                                $fields = ['created' => DateTimeFormat::utcNow()];
                                $condition = ['nurl' => normalise_link($server_url)];
                                DBA::update('gserver', $fields, $condition);
@@ -954,12 +954,12 @@ class PortableContact
 
                        // See discussion under https://forum.friendi.ca/display/0b6b25a8135aabc37a5a0f5684081633
                        // It can happen that a zero date is in the database, but storing it again is forbidden.
-                       if ($last_contact < NULL_DATE) {
-                               $last_contact = NULL_DATE;
+                       if ($last_contact < DBA::NULL_DATETIME) {
+                               $last_contact = DBA::NULL_DATETIME;
                        }
 
-                       if ($last_failure < NULL_DATE) {
-                               $last_failure = NULL_DATE;
+                       if ($last_failure < DBA::NULL_DATETIME) {
+                               $last_failure = DBA::NULL_DATETIME;
                        }
 
                        if (!$force && !self::updateNeeded($gserver["created"], "", $last_failure, $last_contact)) {
@@ -976,8 +976,8 @@ class PortableContact
                        $register_policy = -1;
                        $registered_users = 0;
 
-                       $last_contact = NULL_DATE;
-                       $last_failure = NULL_DATE;
+                       $last_contact = DBA::NULL_DATETIME;
+                       $last_failure = DBA::NULL_DATETIME;
                }
                logger("Server ".$server_url." is outdated or unknown. Start discovery. Force: ".$force." Created: ".$gserver["created"]." Failure: ".$last_failure." Contact: ".$last_contact, LOGGER_DEBUG);
 
@@ -1794,7 +1794,7 @@ class PortableContact
                        $connect_url = '';
                        $name = '';
                        $network = '';
-                       $updated = NULL_DATE;
+                       $updated = DBA::NULL_DATETIME;
                        $location = '';
                        $about = '';
                        $keywords = '';
index 0cc759da140c2fd3556eba00a352d7b9cc2ad76a..bc7639b3b740f102b2f6b32e162413c1e961f7ca 100644 (file)
@@ -11,6 +11,7 @@ use DateTimeZone;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Database\DBA;
 
 require_once 'boot.php';
 require_once 'include/text.php';
@@ -290,7 +291,7 @@ class Temporal
 
                $abs = strtotime($localtime);
 
-               if (is_null($posted_date) || $posted_date <= NULL_DATE || $abs === false) {
+               if (is_null($posted_date) || $posted_date <= DBA::NULL_DATETIME || $abs === false) {
                        return L10n::t('never');
                }
 
index b6dd896cd77e9770c54354e62a92caeaee8f6ddc..9510063337f5da31756ed3a5c1613976c7256a28 100644 (file)
@@ -7,6 +7,7 @@ namespace Friendica\Worker;
 use Friendica\BaseObject;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -45,7 +46,7 @@ class Cron
                logger('cron: start');
 
                // Fork the cron jobs in separate parts to avoid problems when one of them is crashing
-               Addon::forkHooks($a->queue['priority'], "cron");
+               Hook::fork($a->queue['priority'], "cron");
 
                // run queue delivery process in the background
                Worker::add(PRIORITY_NEGLIGIBLE, "Queue");
@@ -203,7 +204,7 @@ class Cron
                foreach ($contacts as $contact) {
 
                        if ($manual_id) {
-                               $contact['last-update'] = NULL_DATE;
+                               $contact['last-update'] = DBA::NULL_DATETIME;
                        }
 
                        // Friendica and OStatus are checked once a day
index bd34449729392f575ad53169dc1750cb590ce5ad..a564bd0b0d19cca39f6bc0d010bbe145b2d304b8 100644 (file)
@@ -108,7 +108,7 @@ class CronJobs
        private static function expireAndRemoveUsers()
        {
                // expire any expired regular accounts. Don't expire forums.
-               $condition = ["NOT `account_expired` AND `account_expires_on` > ? AND `account_expires_on` < UTC_TIMESTAMP() AND `page-flags` = 0", NULL_DATE];
+               $condition = ["NOT `account_expired` AND `account_expires_on` > ? AND `account_expires_on` < UTC_TIMESTAMP() AND `page-flags` = 0", DBA::NULL_DATETIME];
                DBA::update('user', ['account_expired' => true], $condition);
 
                // Remove any freshly expired account
index b6096b5849405d11b2f68fec6a81c245157a44ad..de2133bdc804f4bff06017e57a2357980702cca0 100644 (file)
@@ -7,8 +7,8 @@
 namespace Friendica\Worker;
 
 use Friendica\BaseObject;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
@@ -17,13 +17,13 @@ require_once 'include/dba.php';
 
 class Expire
 {
-       public static function execute($param = '', $hook_name = '')
+       public static function execute($param = '', $hook_function = '')
        {
                $a = BaseObject::getApp();
 
                require_once 'include/items.php';
 
-               Addon::loadHooks();
+               Hook::loadHooks();
 
                if ($param == 'delete') {
                        logger('Delete expired items', LOGGER_DEBUG);
@@ -62,11 +62,11 @@ class Expire
                                logger('Expire items for user '.$user['uid'].' ('.$user['username'].') - done ', LOGGER_DEBUG);
                        }
                        return;
-               } elseif (!empty($hook_name) && ($param == 'hook') && is_array($a->hooks) && array_key_exists("expire", $a->hooks)) {
-                       foreach ($a->hooks["expire"] as $hook) {
-                               if ($hook[1] == $hook_name) {
+               } elseif ($param == 'hook' && !empty($hook_function)) {
+                       foreach (Hook::getByName('expire') as $hook) {
+                               if ($hook[1] == $hook_function) {
                                        logger("Calling expire hook '" . $hook[1] . "'", LOGGER_DEBUG);
-                                       Addon::callSingleHook($a, $hook_name, $hook, $data);
+                                       Hook::callSingle($a, 'expire', $hook, $data);
                                }
                        }
                        return;
@@ -86,13 +86,10 @@ class Expire
                DBA::close($r);
 
                logger('expire: calling hooks');
-
-               if (is_array($a->hooks) && array_key_exists('expire', $a->hooks)) {
-                       foreach ($a->hooks['expire'] as $hook) {
-                               logger("Calling expire hook for '" . $hook[1] . "'", LOGGER_DEBUG);
-                               Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
-                                               'Expire', 'hook', $hook[1]);
-                       }
+               foreach (Hook::getByName('expire') as $hook) {
+                       logger("Calling expire hook for '" . $hook[1] . "'", LOGGER_DEBUG);
+                       Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
+                                       'Expire', 'hook', $hook[1]);
                }
 
                logger('expire: end');
index 3654bdd3cad173aae526a244adfa91a76330cf9c..586d1496e685331a2442c471190aed3f45a0a44e 100644 (file)
@@ -5,7 +5,7 @@
 
 namespace Friendica\Worker;
 
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
 
 Class ForkHook
 {
@@ -13,6 +13,6 @@ Class ForkHook
        {
                $a = \Friendica\BaseObject::getApp();
 
-               Addon::callSingleHook($a, $name, $hook, $data);
+               Hook::callSingle($a, $name, $hook, $data);
        }
 }
index 3edc15c3b80496cbfbbf2997260af33a637cfad9..31000a26f29e3eb88d737e160032e1b365181ee6 100644 (file)
@@ -7,10 +7,12 @@ namespace Friendica\Worker;
 use Friendica\BaseObject;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\PushSubscriber;
@@ -20,7 +22,6 @@ use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\Salmon;
-use Friendica\Model\Conversation;
 
 require_once 'include/dba.php';
 require_once 'include/items.php';
@@ -501,7 +502,7 @@ class Notifier
                logger('notifier: calling hooks for ' . $cmd . ' ' . $item_id, LOGGER_DEBUG);
 
                if ($normal_mode) {
-                       Addon::forkHooks($a->queue['priority'], 'notifier_normal', $target_item);
+                       Hook::fork($a->queue['priority'], 'notifier_normal', $target_item);
                }
 
                Addon::callHooks('notifier_end',$target_item);
index be6d5a549ebc6709a5f94ea5e8c95e8e35a892c9..5227c7983d58f98433ee046d6c4d7108bae17428 100644 (file)
@@ -12,8 +12,8 @@ use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
-use Friendica\Protocol\Email;
 use Friendica\Protocol\ActivityPub;
+use Friendica\Protocol\Email;
 use Friendica\Protocol\PortableContact;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
@@ -121,7 +121,7 @@ class OnePoll
                        $hub_update = false;
                }
 
-               $last_update = (($contact['last-update'] <= NULL_DATE)
+               $last_update = (($contact['last-update'] <= DBA::NULL_DATETIME)
                        ? DateTimeFormat::utc('now - 7 days', DateTimeFormat::ATOM)
                        : DateTimeFormat::utc($contact['last-update'], DateTimeFormat::ATOM)
                );
@@ -252,7 +252,7 @@ class OnePoll
                                self::updateContact($contact, $fields);
 
                                Contact::markForArchival($contact);
-                       } elseif ($contact['term-date'] > NULL_DATE) {
+                       } elseif ($contact['term-date'] > DBA::NULL_DATETIME) {
                                logger("$url back from the dead - removing mark for death");
                                Contact::unmarkForArchival($contact);
                        }
index b0e7a3a60434c678d734382efcd5e4c76f2418cf..d51ba5b6a5ebab9b21f004b2335286232c8c9f18 100644 (file)
@@ -26,7 +26,7 @@ trait VFSTrait
                $this->setConfigFile('config.ini.php');
                $this->setConfigFile('settings.ini.php');
                $this->setConfigFile('local.ini.php');
-               $this->setConfigFile('dbstructure.json');
+               $this->setConfigFile('dbstructure.php');
        }
 
        protected function setConfigFile($filename)
index d889e241e22061f56b549857a82995ce023c8957..6a0ed1af205af8312297bc9f0c2ed06495f143e7 100644 (file)
@@ -20,7 +20,7 @@ require_once 'include/dba.php';
  * This function is responsible for doing post update changes to the data
  * (not the structure) in the database.
  *
- * Database structure changes are done in src/Database/DBStructure.php
+ * Database structure changes are done in config/dbstructure.php
  *
  * If there is a need for a post process to a structure change, update this file
  * by adding a new function at the end with the number of the new DB_UPDATE_VERSION.
@@ -31,8 +31,8 @@ require_once 'include/dba.php';
  * You are currently on version 4711 and you are preparing changes that demand an update script.
  *
  * 1. Create a function "update_4712()" here in the update.php
- * 2. Apply the needed structural changes in src/Database/DBStructure.php
- * 3. Set DB_UPDATE_VERSION in boot.php to 4712.
+ * 2. Apply the needed structural changes in config/dbStructure.php
+ * 3. Set DB_UPDATE_VERSION in config/dbstructure.php to 4712.
  *
  * If you need to run a script before the database update, name the function "pre_update_4712()"
  */