diff --git a/database.sql b/database.sql
index b7a250bcb1..8babeb4d4f 100644
--- a/database.sql
+++ b/database.sql
@@ -11,11 +11,10 @@ CREATE TABLE IF NOT EXISTS `addon` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
 	`name` varchar(255) NOT NULL DEFAULT '',
 	`version` varchar(255) NOT NULL DEFAULT '',
-	`installed` tinyint(1) NOT NULL DEFAULT '0',
-	`hidden` tinyint(1) NOT NULL DEFAULT '0',
-	`timestamp` bigint(20) NOT NULL DEFAULT '0',
-	`plugin_admin` tinyint(1) NOT NULL DEFAULT '0'	
-
+	`installed` tinyint(1) NOT NULL DEFAULT 0,
+	`hidden` tinyint(1) NOT NULL DEFAULT 0,
+	`timestamp` bigint(20) NOT NULL DEFAULT 0,
+	`plugin_admin` tinyint(1) NOT NULL DEFAULT 0
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -23,19 +22,18 @@ CREATE TABLE IF NOT EXISTS `addon` (
 --
 CREATE TABLE IF NOT EXISTS `attach` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(11) NOT NULL DEFAULT '0',
+	`uid` int(11) NOT NULL DEFAULT 0,
 	`hash` varchar(64) NOT NULL DEFAULT '',
 	`filename` varchar(255) NOT NULL DEFAULT '',
 	`filetype` varchar(64) NOT NULL DEFAULT '',
-	`filesize` int(11) NOT NULL DEFAULT '0',
+	`filesize` int(11) NOT NULL DEFAULT 0,
 	`data` longblob NOT NULL,
 	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`allow_cid` mediumtext NOT NULL,
 	`allow_gid` mediumtext NOT NULL,
 	`deny_cid` mediumtext NOT NULL,
-	`deny_gid` mediumtext NOT NULL	
-
+	`deny_gid` mediumtext NOT NULL
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -45,9 +43,8 @@ CREATE TABLE IF NOT EXISTS `auth_codes` (
 	`id` varchar(40) NOT NULL PRIMARY KEY,
 	`client_id` varchar(20) NOT NULL DEFAULT '',
 	`redirect_uri` varchar(200) NOT NULL DEFAULT '',
-	`expires` int(11) NOT NULL DEFAULT '0',
-	`scope` varchar(250) NOT NULL DEFAULT ''	
-
+	`expires` int(11) NOT NULL DEFAULT 0,
+	`scope` varchar(250) NOT NULL DEFAULT ''
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -56,9 +53,8 @@ CREATE TABLE IF NOT EXISTS `auth_codes` (
 CREATE TABLE IF NOT EXISTS `cache` (
 	`k` varchar(255) NOT NULL PRIMARY KEY,
 	`v` text NOT NULL,
-	`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00'	
+	`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	 INDEX `updated` (`updated`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -68,10 +64,9 @@ CREATE TABLE IF NOT EXISTS `challenge` (
 	`id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
 	`challenge` varchar(255) NOT NULL DEFAULT '',
 	`dfrn-id` varchar(255) NOT NULL DEFAULT '',
-	`expire` int(11) NOT NULL DEFAULT '0',
+	`expire` int(11) NOT NULL DEFAULT 0,
 	`type` varchar(255) NOT NULL DEFAULT '',
-	`last_update` varchar(255) NOT NULL DEFAULT ''	
-
+	`last_update` varchar(255) NOT NULL DEFAULT ''
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -83,8 +78,7 @@ CREATE TABLE IF NOT EXISTS `clients` (
 	`redirect_uri` varchar(200) NOT NULL DEFAULT '',
 	`name` text,
 	`icon` text,
-	`uid` int(11) NOT NULL DEFAULT '0'	
-
+	`uid` int(11) NOT NULL DEFAULT 0
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -94,9 +88,8 @@ CREATE TABLE IF NOT EXISTS `config` (
 	`id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
 	`cat` varchar(255) NOT NULL DEFAULT '',
 	`k` varchar(255) NOT NULL DEFAULT '',
-	`v` text NOT NULL	
+	`v` text NOT NULL,
 	 INDEX `cat_k` (`cat`(30),`k`(30))
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -104,12 +97,12 @@ CREATE TABLE IF NOT EXISTS `config` (
 --
 CREATE TABLE IF NOT EXISTS `contact` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(11) NOT NULL DEFAULT '0',
+	`uid` int(11) NOT NULL DEFAULT 0,
 	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`self` tinyint(1) NOT NULL DEFAULT '0',
-	`remote_self` tinyint(1) NOT NULL DEFAULT '0',
-	`rel` tinyint(1) NOT NULL DEFAULT '0',
-	`duplex` tinyint(1) NOT NULL DEFAULT '0',
+	`self` tinyint(1) NOT NULL DEFAULT 0,
+	`remote_self` tinyint(1) NOT NULL DEFAULT 0,
+	`rel` tinyint(1) NOT NULL DEFAULT 0,
+	`duplex` tinyint(1) NOT NULL DEFAULT 0,
 	`network` varchar(255) NOT NULL DEFAULT '',
 	`name` varchar(255) NOT NULL DEFAULT '',
 	`nick` varchar(255) NOT NULL DEFAULT '',
@@ -136,10 +129,10 @@ CREATE TABLE IF NOT EXISTS `contact` (
 	`poll` text NOT NULL,
 	`confirm` text NOT NULL,
 	`poco` text NOT NULL,
-	`aes_allow` tinyint(1) NOT NULL DEFAULT '0',
-	`ret-aes` tinyint(1) NOT NULL DEFAULT '0',
-	`usehub` tinyint(1) NOT NULL DEFAULT '0',
-	`subhub` tinyint(1) NOT NULL DEFAULT '0',
+	`aes_allow` tinyint(1) NOT NULL DEFAULT 0,
+	`ret-aes` tinyint(1) NOT NULL DEFAULT 0,
+	`usehub` tinyint(1) NOT NULL DEFAULT 0,
+	`subhub` tinyint(1) NOT NULL DEFAULT 0,
 	`hub-verify` varchar(255) NOT NULL DEFAULT '',
 	`last-update` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`success_update` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -147,27 +140,26 @@ CREATE TABLE IF NOT EXISTS `contact` (
 	`uri-date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`avatar-date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`term-date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`priority` tinyint(3) NOT NULL DEFAULT '0',
-	`blocked` tinyint(1) NOT NULL DEFAULT '1',
-	`readonly` tinyint(1) NOT NULL DEFAULT '0',
-	`writable` tinyint(1) NOT NULL DEFAULT '0',
-	`forum` tinyint(1) NOT NULL DEFAULT '0',
-	`prv` tinyint(1) NOT NULL DEFAULT '0',
-	`hidden` tinyint(1) NOT NULL DEFAULT '0',
-	`archive` tinyint(1) NOT NULL DEFAULT '0',
-	`pending` tinyint(1) NOT NULL DEFAULT '1',
-	`rating` tinyint(1) NOT NULL DEFAULT '0',
+	`priority` tinyint(3) NOT NULL DEFAULT 0,
+	`blocked` tinyint(1) NOT NULL DEFAULT 1,
+	`readonly` tinyint(1) NOT NULL DEFAULT 0,
+	`writable` tinyint(1) NOT NULL DEFAULT 0,
+	`forum` tinyint(1) NOT NULL DEFAULT 0,
+	`prv` tinyint(1) NOT NULL DEFAULT 0,
+	`hidden` tinyint(1) NOT NULL DEFAULT 0,
+	`archive` tinyint(1) NOT NULL DEFAULT 0,
+	`pending` tinyint(1) NOT NULL DEFAULT 1,
+	`rating` tinyint(1) NOT NULL DEFAULT 0,
 	`reason` text NOT NULL,
-	`closeness` tinyint(2) NOT NULL DEFAULT '99',
+	`closeness` tinyint(2) NOT NULL DEFAULT 99,
 	`info` mediumtext NOT NULL,
-	`profile-id` int(11) NOT NULL DEFAULT '0',
+	`profile-id` int(11) NOT NULL DEFAULT 0,
 	`bdyear` varchar(4) NOT NULL DEFAULT '',
 	`bd` date NOT NULL DEFAULT '0000-00-00',
-	`notify_new_posts` tinyint(1) NOT NULL DEFAULT '0',
-	`fetch_further_information` tinyint(1) NOT NULL DEFAULT '0',
-	`ffi_keyword_blacklist` mediumtext NOT NULL	
+	`notify_new_posts` tinyint(1) NOT NULL DEFAULT 0,
+	`fetch_further_information` tinyint(1) NOT NULL DEFAULT 0,
+	`ffi_keyword_blacklist` mediumtext NOT NULL,
 	 INDEX `uid` (`uid`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -177,13 +169,12 @@ CREATE TABLE IF NOT EXISTS `conv` (
 	`id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
 	`guid` varchar(64) NOT NULL DEFAULT '',
 	`recips` mediumtext NOT NULL,
-	`uid` int(11) NOT NULL DEFAULT '0',
+	`uid` int(11) NOT NULL DEFAULT 0,
 	`creator` varchar(255) NOT NULL DEFAULT '',
 	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`subject` mediumtext NOT NULL	
+	`subject` mediumtext NOT NULL,
 	 INDEX `uid` (`uid`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -192,9 +183,8 @@ CREATE TABLE IF NOT EXISTS `conv` (
 CREATE TABLE IF NOT EXISTS `deliverq` (
 	`id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
 	`cmd` varchar(32) NOT NULL DEFAULT '',
-	`item` int(11) NOT NULL DEFAULT '0',
-	`contact` int(11) NOT NULL DEFAULT '0'	
-
+	`item` int(11) NOT NULL DEFAULT 0,
+	`contact` int(11) NOT NULL DEFAULT 0
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -202,10 +192,9 @@ CREATE TABLE IF NOT EXISTS `deliverq` (
 --
 CREATE TABLE IF NOT EXISTS `dsprphotoq` (
 	`id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(11) NOT NULL DEFAULT '0',
+	`uid` int(11) NOT NULL DEFAULT 0,
 	`msg` mediumtext NOT NULL,
-	`attempt` tinyint(4) NOT NULL DEFAULT '0'	
-
+	`attempt` tinyint(4) NOT NULL DEFAULT 0
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -213,8 +202,8 @@ CREATE TABLE IF NOT EXISTS `dsprphotoq` (
 --
 CREATE TABLE IF NOT EXISTS `event` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(11) NOT NULL DEFAULT '0',
-	`cid` int(11) NOT NULL DEFAULT '0',
+	`uid` int(11) NOT NULL DEFAULT 0,
+	`cid` int(11) NOT NULL DEFAULT 0,
 	`uri` varchar(255) NOT NULL DEFAULT '',
 	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -224,15 +213,14 @@ CREATE TABLE IF NOT EXISTS `event` (
 	`desc` text NOT NULL,
 	`location` text NOT NULL,
 	`type` varchar(255) NOT NULL DEFAULT '',
-	`nofinish` tinyint(1) NOT NULL DEFAULT '0',
-	`adjust` tinyint(1) NOT NULL DEFAULT '1',
-	`ignore` tinyint(1) unsigned NOT NULL DEFAULT '0',
+	`nofinish` tinyint(1) NOT NULL DEFAULT 0,
+	`adjust` tinyint(1) NOT NULL DEFAULT 1,
+	`ignore` tinyint(1) unsigned NOT NULL DEFAULT 0,
 	`allow_cid` mediumtext NOT NULL,
 	`allow_gid` mediumtext NOT NULL,
 	`deny_cid` mediumtext NOT NULL,
-	`deny_gid` mediumtext NOT NULL	
+	`deny_gid` mediumtext NOT NULL,
 	 INDEX `uid` (`uid`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -250,13 +238,12 @@ CREATE TABLE IF NOT EXISTS `fcontact` (
 	`notify` varchar(255) NOT NULL DEFAULT '',
 	`poll` varchar(255) NOT NULL DEFAULT '',
 	`confirm` varchar(255) NOT NULL DEFAULT '',
-	`priority` tinyint(1) NOT NULL DEFAULT '0',
+	`priority` tinyint(1) NOT NULL DEFAULT 0,
 	`network` varchar(32) NOT NULL DEFAULT '',
 	`alias` varchar(255) NOT NULL DEFAULT '',
 	`pubkey` text NOT NULL,
-	`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00'	
+	`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	 INDEX `addr` (`addr`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -264,10 +251,9 @@ CREATE TABLE IF NOT EXISTS `fcontact` (
 --
 CREATE TABLE IF NOT EXISTS `ffinder` (
 	`id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(10) unsigned NOT NULL DEFAULT '0',
-	`cid` int(10) unsigned NOT NULL DEFAULT '0',
-	`fid` int(10) unsigned NOT NULL DEFAULT '0'	
-
+	`uid` int(10) unsigned NOT NULL DEFAULT 0,
+	`cid` int(10) unsigned NOT NULL DEFAULT 0,
+	`fid` int(10) unsigned NOT NULL DEFAULT 0
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -277,9 +263,8 @@ CREATE TABLE IF NOT EXISTS `fserver` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
 	`server` varchar(255) NOT NULL DEFAULT '',
 	`posturl` varchar(255) NOT NULL DEFAULT '',
-	`key` text NOT NULL	
+	`key` text NOT NULL,
 	 INDEX `server` (`server`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -287,15 +272,14 @@ CREATE TABLE IF NOT EXISTS `fserver` (
 --
 CREATE TABLE IF NOT EXISTS `fsuggest` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(11) NOT NULL DEFAULT '0',
-	`cid` int(11) NOT NULL DEFAULT '0',
+	`uid` int(11) NOT NULL DEFAULT 0,
+	`cid` int(11) NOT NULL DEFAULT 0,
 	`name` varchar(255) NOT NULL DEFAULT '',
 	`url` varchar(255) NOT NULL DEFAULT '',
 	`request` varchar(255) NOT NULL DEFAULT '',
 	`photo` varchar(255) NOT NULL DEFAULT '',
 	`note` text NOT NULL,
-	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00'	
-
+	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00'
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -303,11 +287,10 @@ CREATE TABLE IF NOT EXISTS `fsuggest` (
 --
 CREATE TABLE IF NOT EXISTS `gcign` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(11) NOT NULL DEFAULT '0',
-	`gcid` int(11) NOT NULL DEFAULT '0'	
-	 INDEX `uid` (`uid`)
+	`uid` int(11) NOT NULL DEFAULT 0,
+	`gcid` int(11) NOT NULL DEFAULT 0,
+	 INDEX `uid` (`uid`),
 	 INDEX `gcid` (`gcid`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -326,9 +309,8 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
 	`keywords` text NOT NULL,
 	`gender` varchar(32) NOT NULL DEFAULT '',
 	`network` varchar(255) NOT NULL DEFAULT '',
-	`generation` tinyint(3) NOT NULL DEFAULT '0'	
+	`generation` tinyint(3) NOT NULL DEFAULT 0,
 	 INDEX `nurl` (`nurl`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -336,15 +318,14 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
 --
 CREATE TABLE IF NOT EXISTS `glink` (
 	`id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
-	`cid` int(11) NOT NULL DEFAULT '0',
-	`uid` int(11) NOT NULL DEFAULT '0',
-	`gcid` int(11) NOT NULL DEFAULT '0',
-	`zcid` int(11) NOT NULL DEFAULT '0',
-	`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00'	
-	 INDEX `cid_uid_gcid_zcid` (`cid`,`uid`,`gcid`,`zcid`)
-	 INDEX `gcid` (`gcid`)
+	`cid` int(11) NOT NULL DEFAULT 0,
+	`uid` int(11) NOT NULL DEFAULT 0,
+	`gcid` int(11) NOT NULL DEFAULT 0,
+	`zcid` int(11) NOT NULL DEFAULT 0,
+	`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+	 INDEX `cid_uid_gcid_zcid` (`cid`,`uid`,`gcid`,`zcid`),
+	 INDEX `gcid` (`gcid`),
 	 INDEX `zcid` (`zcid`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -352,12 +333,11 @@ CREATE TABLE IF NOT EXISTS `glink` (
 --
 CREATE TABLE IF NOT EXISTS `group` (
 	`id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(10) unsigned NOT NULL DEFAULT '0',
-	`visible` tinyint(1) NOT NULL DEFAULT '0',
-	`deleted` tinyint(1) NOT NULL DEFAULT '0',
-	`name` varchar(255) NOT NULL DEFAULT ''	
+	`uid` int(10) unsigned NOT NULL DEFAULT 0,
+	`visible` tinyint(1) NOT NULL DEFAULT 0,
+	`deleted` tinyint(1) NOT NULL DEFAULT 0,
+	`name` varchar(255) NOT NULL DEFAULT '',
 	 INDEX `uid` (`uid`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -365,11 +345,10 @@ CREATE TABLE IF NOT EXISTS `group` (
 --
 CREATE TABLE IF NOT EXISTS `group_member` (
 	`id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(10) unsigned NOT NULL DEFAULT '0',
-	`gid` int(10) unsigned NOT NULL DEFAULT '0',
-	`contact-id` int(10) unsigned NOT NULL DEFAULT '0'	
+	`uid` int(10) unsigned NOT NULL DEFAULT 0,
+	`gid` int(10) unsigned NOT NULL DEFAULT 0,
+	`contact-id` int(10) unsigned NOT NULL DEFAULT 0,
 	 INDEX `uid_gid_contactid` (`uid`,`gid`,`contact-id`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -377,9 +356,8 @@ CREATE TABLE IF NOT EXISTS `group_member` (
 --
 CREATE TABLE IF NOT EXISTS `guid` (
 	`id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
-	`guid` varchar(255) NOT NULL DEFAULT ''	
+	`guid` varchar(255) NOT NULL DEFAULT '',
 	 INDEX `guid` (`guid`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -390,9 +368,8 @@ CREATE TABLE IF NOT EXISTS `hook` (
 	`hook` varchar(255) NOT NULL DEFAULT '',
 	`file` varchar(255) NOT NULL DEFAULT '',
 	`function` varchar(255) NOT NULL DEFAULT '',
-	`priority` int(11) unsigned NOT NULL DEFAULT '0'	
+	`priority` int(11) unsigned NOT NULL DEFAULT 0,
 	 INDEX `hook_file_function` (`hook`(30),`file`(60),`function`(30))
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -400,17 +377,16 @@ CREATE TABLE IF NOT EXISTS `hook` (
 --
 CREATE TABLE IF NOT EXISTS `intro` (
 	`id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(10) unsigned NOT NULL DEFAULT '0',
-	`fid` int(11) NOT NULL DEFAULT '0',
-	`contact-id` int(11) NOT NULL DEFAULT '0',
-	`knowyou` tinyint(1) NOT NULL DEFAULT '0',
-	`duplex` tinyint(1) NOT NULL DEFAULT '0',
+	`uid` int(10) unsigned NOT NULL DEFAULT 0,
+	`fid` int(11) NOT NULL DEFAULT 0,
+	`contact-id` int(11) NOT NULL DEFAULT 0,
+	`knowyou` tinyint(1) NOT NULL DEFAULT 0,
+	`duplex` tinyint(1) NOT NULL DEFAULT 0,
 	`note` text NOT NULL,
 	`hash` varchar(255) NOT NULL DEFAULT '',
 	`datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`blocked` tinyint(1) NOT NULL DEFAULT '1',
-	`ignore` tinyint(1) NOT NULL DEFAULT '0'	
-
+	`blocked` tinyint(1) NOT NULL DEFAULT 1,
+	`ignore` tinyint(1) NOT NULL DEFAULT 0
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -420,12 +396,12 @@ CREATE TABLE IF NOT EXISTS `item` (
 	`id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
 	`guid` varchar(255) NOT NULL DEFAULT '',
 	`uri` varchar(255) NOT NULL DEFAULT '',
-	`uid` int(10) unsigned NOT NULL DEFAULT '0',
-	`contact-id` int(11) NOT NULL DEFAULT '0',
+	`uid` int(10) unsigned NOT NULL DEFAULT 0,
+	`contact-id` int(11) NOT NULL DEFAULT 0,
 	`type` varchar(255) NOT NULL DEFAULT '',
-	`wall` tinyint(1) NOT NULL DEFAULT '0',
-	`gravity` tinyint(1) NOT NULL DEFAULT '0',
-	`parent` int(10) unsigned NOT NULL DEFAULT '0',
+	`wall` tinyint(1) NOT NULL DEFAULT 0,
+	`gravity` tinyint(1) NOT NULL DEFAULT 0,
+	`parent` int(10) unsigned NOT NULL DEFAULT 0,
 	`parent-uri` varchar(255) NOT NULL DEFAULT '',
 	`extid` varchar(255) NOT NULL DEFAULT '',
 	`thr-parent` varchar(255) NOT NULL DEFAULT '',
@@ -451,7 +427,7 @@ CREATE TABLE IF NOT EXISTS `item` (
 	`postopts` text NOT NULL,
 	`plink` varchar(255) NOT NULL DEFAULT '',
 	`resource-id` varchar(255) NOT NULL DEFAULT '',
-	`event-id` int(11) NOT NULL DEFAULT '0',
+	`event-id` int(11) NOT NULL DEFAULT 0,
 	`tag` mediumtext NOT NULL,
 	`attach` mediumtext NOT NULL,
 	`inform` mediumtext NOT NULL,
@@ -462,56 +438,55 @@ CREATE TABLE IF NOT EXISTS `item` (
 	`allow_gid` mediumtext NOT NULL,
 	`deny_cid` mediumtext NOT NULL,
 	`deny_gid` mediumtext NOT NULL,
-	`private` tinyint(1) NOT NULL DEFAULT '0',
-	`pubmail` tinyint(1) NOT NULL DEFAULT '0',
-	`moderated` tinyint(1) NOT NULL DEFAULT '0',
-	`visible` tinyint(1) NOT NULL DEFAULT '0',
-	`spam` tinyint(1) NOT NULL DEFAULT '0',
-	`starred` tinyint(1) NOT NULL DEFAULT '0',
-	`bookmark` tinyint(1) NOT NULL DEFAULT '0',
-	`unseen` tinyint(1) NOT NULL DEFAULT '1',
-	`deleted` tinyint(1) NOT NULL DEFAULT '0',
-	`origin` tinyint(1) NOT NULL DEFAULT '0',
-	`forum_mode` tinyint(1) NOT NULL DEFAULT '0',
-	`last-child` tinyint(1) unsigned NOT NULL DEFAULT '1',
-	`mention` tinyint(1) NOT NULL DEFAULT '0',
+	`private` tinyint(1) NOT NULL DEFAULT 0,
+	`pubmail` tinyint(1) NOT NULL DEFAULT 0,
+	`moderated` tinyint(1) NOT NULL DEFAULT 0,
+	`visible` tinyint(1) NOT NULL DEFAULT 0,
+	`spam` tinyint(1) NOT NULL DEFAULT 0,
+	`starred` tinyint(1) NOT NULL DEFAULT 0,
+	`bookmark` tinyint(1) NOT NULL DEFAULT 0,
+	`unseen` tinyint(1) NOT NULL DEFAULT 1,
+	`deleted` tinyint(1) NOT NULL DEFAULT 0,
+	`origin` tinyint(1) NOT NULL DEFAULT 0,
+	`forum_mode` tinyint(1) NOT NULL DEFAULT 0,
+	`last-child` tinyint(1) unsigned NOT NULL DEFAULT 1,
+	`mention` tinyint(1) NOT NULL DEFAULT 0,
 	`network` varchar(32) NOT NULL DEFAULT '',
 	`rendered-hash` varchar(32) NOT NULL DEFAULT '',
 	`rendered-html` mediumtext NOT NULL,
-	`global` tinyint(1) NOT NULL DEFAULT '0'	
-	 INDEX `guid` (`guid`)
-	 INDEX `uri` (`uri`)
-	 INDEX `parent` (`parent`)
-	 INDEX `parent-uri` (`parent-uri`)
-	 INDEX `extid` (`extid`)
-	 INDEX `uid_id` (`uid`,`id`)
-	 INDEX `uid_created` (`uid`,`created`)
-	 INDEX `uid_unseen` (`uid`,`unseen`)
-	 INDEX `uid_network_received` (`uid`,`network`,`received`)
-	 INDEX `uid_received` (`uid`,`received`)
-	 INDEX `uid_network_commented` (`uid`,`network`,`commented`)
-	 INDEX `uid_commented` (`uid`,`commented`)
-	 INDEX `uid_title` (`uid`,`title`)
-	 INDEX `uid_thrparent` (`uid`,`thr-parent`)
-	 INDEX `uid_parenturi` (`uid`,`parent-uri`)
-	 INDEX `uid_contactid_created` (`uid`,`contact-id`,`created`)
-	 INDEX `wall_body` (`wall`,`body`(6))
-	 INDEX `uid_visible_moderated_created` (`uid`,`visible`,`moderated`,`created`)
-	 INDEX `uid_uri` (`uid`,`uri`)
-	 INDEX `uid_wall_created` (`uid`,`wall`,`created`)
-	 INDEX `resource-id` (`resource-id`)
-	 INDEX `uid_type` (`uid`,`type`)
-	 INDEX `uid_starred` (`uid`,`starred`)
-	 INDEX `contactid_allowcid_allowpid_denycid_denygid` (`contact-id`,`allow_cid`(10),`allow_gid`(10),`deny_cid`(10),`deny_gid`(10))
-	 INDEX `uid_wall_parent_created` (`uid`,`wall`,`parent`,`created`)
-	 INDEX `uid_type_changed` (`uid`,`type`,`changed`)
-	 INDEX `contactid_verb` (`contact-id`,`verb`)
-	 INDEX `deleted_changed` (`deleted`,`changed`)
-	 INDEX `uid_wall_changed` (`uid`,`wall`,`changed`)
-	 INDEX `uid_eventid` (`uid`,`event-id`)
-	 INDEX `uid_authorlink` (`uid`,`author-link`)
+	`global` tinyint(1) NOT NULL DEFAULT 0,
+	 INDEX `guid` (`guid`),
+	 INDEX `uri` (`uri`),
+	 INDEX `parent` (`parent`),
+	 INDEX `parent-uri` (`parent-uri`),
+	 INDEX `extid` (`extid`),
+	 INDEX `uid_id` (`uid`,`id`),
+	 INDEX `uid_created` (`uid`,`created`),
+	 INDEX `uid_unseen` (`uid`,`unseen`),
+	 INDEX `uid_network_received` (`uid`,`network`,`received`),
+	 INDEX `uid_received` (`uid`,`received`),
+	 INDEX `uid_network_commented` (`uid`,`network`,`commented`),
+	 INDEX `uid_commented` (`uid`,`commented`),
+	 INDEX `uid_title` (`uid`,`title`),
+	 INDEX `uid_thrparent` (`uid`,`thr-parent`),
+	 INDEX `uid_parenturi` (`uid`,`parent-uri`),
+	 INDEX `uid_contactid_created` (`uid`,`contact-id`,`created`),
+	 INDEX `wall_body` (`wall`,`body`(6)),
+	 INDEX `uid_visible_moderated_created` (`uid`,`visible`,`moderated`,`created`),
+	 INDEX `uid_uri` (`uid`,`uri`),
+	 INDEX `uid_wall_created` (`uid`,`wall`,`created`),
+	 INDEX `resource-id` (`resource-id`),
+	 INDEX `uid_type` (`uid`,`type`),
+	 INDEX `uid_starred` (`uid`,`starred`),
+	 INDEX `contactid_allowcid_allowpid_denycid_denygid` (`contact-id`,`allow_cid`(10),`allow_gid`(10),`deny_cid`(10),`deny_gid`(10)),
+	 INDEX `uid_wall_parent_created` (`uid`,`wall`,`parent`,`created`),
+	 INDEX `uid_type_changed` (`uid`,`type`,`changed`),
+	 INDEX `contactid_verb` (`contact-id`,`verb`),
+	 INDEX `deleted_changed` (`deleted`,`changed`),
+	 INDEX `uid_wall_changed` (`uid`,`wall`,`changed`),
+	 INDEX `uid_eventid` (`uid`,`event-id`),
+	 INDEX `uid_authorlink` (`uid`,`author-link`),
 	 INDEX `uid_ownerlink` (`uid`,`owner-link`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -519,15 +494,14 @@ CREATE TABLE IF NOT EXISTS `item` (
 --
 CREATE TABLE IF NOT EXISTS `item_id` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
-	`iid` int(11) NOT NULL DEFAULT '0',
-	`uid` int(11) NOT NULL DEFAULT '0',
+	`iid` int(11) NOT NULL DEFAULT 0,
+	`uid` int(11) NOT NULL DEFAULT 0,
 	`sid` varchar(255) NOT NULL DEFAULT '',
-	`service` varchar(255) NOT NULL DEFAULT ''	
-	 INDEX `uid` (`uid`)
-	 INDEX `sid` (`sid`)
-	 INDEX `service` (`service`)
+	`service` varchar(255) NOT NULL DEFAULT '',
+	 INDEX `uid` (`uid`),
+	 INDEX `sid` (`sid`),
+	 INDEX `service` (`service`),
 	 INDEX `iid` (`iid`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -536,9 +510,8 @@ CREATE TABLE IF NOT EXISTS `item_id` (
 CREATE TABLE IF NOT EXISTS `locks` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
 	`name` varchar(128) NOT NULL DEFAULT '',
-	`locked` tinyint(1) NOT NULL DEFAULT '0',
-	`created` datetime DEFAULT '0000-00-00 00:00:00'	
-
+	`locked` tinyint(1) NOT NULL DEFAULT 0,
+	`created` datetime DEFAULT '0000-00-00 00:00:00'
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -546,29 +519,28 @@ CREATE TABLE IF NOT EXISTS `locks` (
 --
 CREATE TABLE IF NOT EXISTS `mail` (
 	`id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(10) unsigned NOT NULL DEFAULT '0',
+	`uid` int(10) unsigned NOT NULL DEFAULT 0,
 	`guid` varchar(64) NOT NULL DEFAULT '',
 	`from-name` varchar(255) NOT NULL DEFAULT '',
 	`from-photo` varchar(255) NOT NULL DEFAULT '',
 	`from-url` varchar(255) NOT NULL DEFAULT '',
 	`contact-id` varchar(255) NOT NULL DEFAULT '',
-	`convid` int(11) unsigned NOT NULL DEFAULT '0',
+	`convid` int(11) unsigned NOT NULL DEFAULT 0,
 	`title` varchar(255) NOT NULL DEFAULT '',
 	`body` mediumtext NOT NULL,
-	`seen` tinyint(1) NOT NULL DEFAULT '0',
-	`reply` tinyint(1) NOT NULL DEFAULT '0',
-	`replied` tinyint(1) NOT NULL DEFAULT '0',
-	`unknown` tinyint(1) NOT NULL DEFAULT '0',
+	`seen` tinyint(1) NOT NULL DEFAULT 0,
+	`reply` tinyint(1) NOT NULL DEFAULT 0,
+	`replied` tinyint(1) NOT NULL DEFAULT 0,
+	`unknown` tinyint(1) NOT NULL DEFAULT 0,
 	`uri` varchar(255) NOT NULL DEFAULT '',
 	`parent-uri` varchar(255) NOT NULL DEFAULT '',
-	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00'	
-	 INDEX `uid` (`uid`)
-	 INDEX `guid` (`guid`)
-	 INDEX `convid` (`convid`)
-	 INDEX `reply` (`reply`)
-	 INDEX `uri` (`uri`)
+	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+	 INDEX `uid` (`uid`),
+	 INDEX `guid` (`guid`),
+	 INDEX `convid` (`convid`),
+	 INDEX `reply` (`reply`),
+	 INDEX `uri` (`uri`),
 	 INDEX `parent-uri` (`parent-uri`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -576,19 +548,18 @@ CREATE TABLE IF NOT EXISTS `mail` (
 --
 CREATE TABLE IF NOT EXISTS `mailacct` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(11) NOT NULL DEFAULT '0',
+	`uid` int(11) NOT NULL DEFAULT 0,
 	`server` varchar(255) NOT NULL DEFAULT '',
-	`port` int(11) NOT NULL DEFAULT '0',
+	`port` int(11) NOT NULL DEFAULT 0,
 	`ssltype` varchar(16) NOT NULL DEFAULT '',
 	`mailbox` varchar(255) NOT NULL DEFAULT '',
 	`user` varchar(255) NOT NULL DEFAULT '',
 	`pass` text NOT NULL,
 	`reply_to` varchar(255) NOT NULL DEFAULT '',
-	`action` int(11) NOT NULL DEFAULT '0',
+	`action` int(11) NOT NULL DEFAULT 0,
 	`movetofolder` varchar(255) NOT NULL DEFAULT '',
-	`pubmail` tinyint(1) NOT NULL DEFAULT '0',
-	`last_check` datetime NOT NULL DEFAULT '0000-00-00 00:00:00'	
-
+	`pubmail` tinyint(1) NOT NULL DEFAULT 0,
+	`last_check` datetime NOT NULL DEFAULT '0000-00-00 00:00:00'
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -596,10 +567,9 @@ CREATE TABLE IF NOT EXISTS `mailacct` (
 --
 CREATE TABLE IF NOT EXISTS `manage` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(11) NOT NULL DEFAULT '0',
-	`mid` int(11) NOT NULL DEFAULT '0'	
+	`uid` int(11) NOT NULL DEFAULT 0,
+	`mid` int(11) NOT NULL DEFAULT 0,
 	 INDEX `uid_mid` (`uid`,`mid`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -608,20 +578,19 @@ CREATE TABLE IF NOT EXISTS `manage` (
 CREATE TABLE IF NOT EXISTS `notify` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
 	`hash` varchar(64) NOT NULL DEFAULT '',
-	`type` int(11) NOT NULL DEFAULT '0',
+	`type` int(11) NOT NULL DEFAULT 0,
 	`name` varchar(255) NOT NULL DEFAULT '',
 	`url` varchar(255) NOT NULL DEFAULT '',
 	`photo` varchar(255) NOT NULL DEFAULT '',
 	`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`msg` mediumtext NOT NULL,
-	`uid` int(11) NOT NULL DEFAULT '0',
+	`uid` int(11) NOT NULL DEFAULT 0,
 	`link` varchar(255) NOT NULL DEFAULT '',
-	`parent` int(11) NOT NULL DEFAULT '0',
-	`seen` tinyint(1) NOT NULL DEFAULT '0',
+	`parent` int(11) NOT NULL DEFAULT 0,
+	`seen` tinyint(1) NOT NULL DEFAULT 0,
 	`verb` varchar(255) NOT NULL DEFAULT '',
-	`otype` varchar(16) NOT NULL DEFAULT ''	
+	`otype` varchar(16) NOT NULL DEFAULT '',
 	 INDEX `uid` (`uid`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -629,13 +598,12 @@ CREATE TABLE IF NOT EXISTS `notify` (
 --
 CREATE TABLE IF NOT EXISTS `notify-threads` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
-	`notify-id` int(11) NOT NULL DEFAULT '0',
-	`master-parent-item` int(10) unsigned NOT NULL DEFAULT '0',
-	`parent-item` int(10) unsigned NOT NULL DEFAULT '0',
-	`receiver-uid` int(11) NOT NULL DEFAULT '0'	
-	 INDEX `master-parent-item` (`master-parent-item`)
+	`notify-id` int(11) NOT NULL DEFAULT 0,
+	`master-parent-item` int(10) unsigned NOT NULL DEFAULT 0,
+	`parent-item` int(10) unsigned NOT NULL DEFAULT 0,
+	`receiver-uid` int(11) NOT NULL DEFAULT 0,
+	 INDEX `master-parent-item` (`master-parent-item`),
 	 INDEX `receiver-uid` (`receiver-uid`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -643,12 +611,11 @@ CREATE TABLE IF NOT EXISTS `notify-threads` (
 --
 CREATE TABLE IF NOT EXISTS `pconfig` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(11) NOT NULL DEFAULT '0',
+	`uid` int(11) NOT NULL DEFAULT 0,
 	`cat` varchar(255) NOT NULL DEFAULT '',
 	`k` varchar(255) NOT NULL DEFAULT '',
-	`v` mediumtext NOT NULL	
+	`v` mediumtext NOT NULL,
 	 INDEX `uid_cat_k` (`uid`,`cat`(30),`k`(30))
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -656,8 +623,8 @@ CREATE TABLE IF NOT EXISTS `pconfig` (
 --
 CREATE TABLE IF NOT EXISTS `photo` (
 	`id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(10) unsigned NOT NULL DEFAULT '0',
-	`contact-id` int(10) unsigned NOT NULL DEFAULT '0',
+	`uid` int(10) unsigned NOT NULL DEFAULT 0,
+	`contact-id` int(10) unsigned NOT NULL DEFAULT 0,
 	`guid` varchar(64) NOT NULL DEFAULT '',
 	`resource-id` varchar(255) NOT NULL DEFAULT '',
 	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -667,20 +634,19 @@ CREATE TABLE IF NOT EXISTS `photo` (
 	`album` varchar(255) NOT NULL DEFAULT '',
 	`filename` varchar(255) NOT NULL DEFAULT '',
 	`type` varchar(128) NOT NULL DEFAULT 'image/jpeg',
-	`height` smallint(6) NOT NULL DEFAULT '0',
-	`width` smallint(6) NOT NULL DEFAULT '0',
-	`datasize` int(10) unsigned NOT NULL DEFAULT '0',
+	`height` smallint(6) NOT NULL DEFAULT 0,
+	`width` smallint(6) NOT NULL DEFAULT 0,
+	`datasize` int(10) unsigned NOT NULL DEFAULT 0,
 	`data` mediumblob NOT NULL,
-	`scale` tinyint(3) NOT NULL DEFAULT '0',
-	`profile` tinyint(1) NOT NULL DEFAULT '0',
+	`scale` tinyint(3) NOT NULL DEFAULT 0,
+	`profile` tinyint(1) NOT NULL DEFAULT 0,
 	`allow_cid` mediumtext NOT NULL,
 	`allow_gid` mediumtext NOT NULL,
 	`deny_cid` mediumtext NOT NULL,
-	`deny_gid` mediumtext NOT NULL	
-	 INDEX `uid` (`uid`)
-	 INDEX `resource-id` (`resource-id`)
+	`deny_gid` mediumtext NOT NULL,
+	 INDEX `uid` (`uid`),
+	 INDEX `resource-id` (`resource-id`),
 	 INDEX `guid` (`guid`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -688,7 +654,7 @@ CREATE TABLE IF NOT EXISTS `photo` (
 --
 CREATE TABLE IF NOT EXISTS `poll` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(11) NOT NULL DEFAULT '0',
+	`uid` int(11) NOT NULL DEFAULT 0,
 	`q0` mediumtext NOT NULL,
 	`q1` mediumtext NOT NULL,
 	`q2` mediumtext NOT NULL,
@@ -698,9 +664,8 @@ CREATE TABLE IF NOT EXISTS `poll` (
 	`q6` mediumtext NOT NULL,
 	`q7` mediumtext NOT NULL,
 	`q8` mediumtext NOT NULL,
-	`q9` mediumtext NOT NULL	
+	`q9` mediumtext NOT NULL,
 	 INDEX `uid` (`uid`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -708,11 +673,10 @@ CREATE TABLE IF NOT EXISTS `poll` (
 --
 CREATE TABLE IF NOT EXISTS `poll_result` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
-	`poll_id` int(11) NOT NULL DEFAULT '0',
-	`choice` int(11) NOT NULL DEFAULT '0'	
-	 INDEX `poll_id` (`poll_id`)
+	`poll_id` int(11) NOT NULL DEFAULT 0,
+	`choice` int(11) NOT NULL DEFAULT 0,
+	 INDEX `poll_id` (`poll_id`),
 	 INDEX `choice` (`choice`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -720,10 +684,10 @@ CREATE TABLE IF NOT EXISTS `poll_result` (
 --
 CREATE TABLE IF NOT EXISTS `profile` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(11) NOT NULL DEFAULT '0',
+	`uid` int(11) NOT NULL DEFAULT 0,
 	`profile-name` varchar(255) NOT NULL DEFAULT '',
-	`is-default` tinyint(1) NOT NULL DEFAULT '0',
-	`hide-friends` tinyint(1) NOT NULL DEFAULT '0',
+	`is-default` tinyint(1) NOT NULL DEFAULT 0,
+	`hide-friends` tinyint(1) NOT NULL DEFAULT 0,
 	`name` varchar(255) NOT NULL DEFAULT '',
 	`pdesc` varchar(255) NOT NULL DEFAULT '',
 	`dob` varchar(32) NOT NULL DEFAULT '0000-00-00',
@@ -758,10 +722,9 @@ CREATE TABLE IF NOT EXISTS `profile` (
 	`homepage` varchar(255) NOT NULL DEFAULT '',
 	`photo` varchar(255) NOT NULL DEFAULT '',
 	`thumb` varchar(255) NOT NULL DEFAULT '',
-	`publish` tinyint(1) NOT NULL DEFAULT '0',
-	`net-publish` tinyint(1) NOT NULL DEFAULT '0'	
+	`publish` tinyint(1) NOT NULL DEFAULT 0,
+	`net-publish` tinyint(1) NOT NULL DEFAULT 0,
 	 INDEX `hometown` (`hometown`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -769,12 +732,11 @@ CREATE TABLE IF NOT EXISTS `profile` (
 --
 CREATE TABLE IF NOT EXISTS `profile_check` (
 	`id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(10) unsigned NOT NULL DEFAULT '0',
-	`cid` int(10) unsigned NOT NULL DEFAULT '0',
+	`uid` int(10) unsigned NOT NULL DEFAULT 0,
+	`cid` int(10) unsigned NOT NULL DEFAULT 0,
 	`dfrn_id` varchar(255) NOT NULL DEFAULT '',
 	`sec` varchar(255) NOT NULL DEFAULT '',
-	`expire` int(11) NOT NULL DEFAULT '0'	
-
+	`expire` int(11) NOT NULL DEFAULT 0
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -782,14 +744,13 @@ CREATE TABLE IF NOT EXISTS `profile_check` (
 --
 CREATE TABLE IF NOT EXISTS `push_subscriber` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(11) NOT NULL DEFAULT '0',
+	`uid` int(11) NOT NULL DEFAULT 0,
 	`callback_url` varchar(255) NOT NULL DEFAULT '',
 	`topic` varchar(255) NOT NULL DEFAULT '',
 	`nickname` varchar(255) NOT NULL DEFAULT '',
-	`push` int(11) NOT NULL DEFAULT '0',
+	`push` int(11) NOT NULL DEFAULT 0,
 	`last_update` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`secret` varchar(255) NOT NULL DEFAULT ''	
-
+	`secret` varchar(255) NOT NULL DEFAULT ''
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -797,18 +758,17 @@ CREATE TABLE IF NOT EXISTS `push_subscriber` (
 --
 CREATE TABLE IF NOT EXISTS `queue` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
-	`cid` int(11) NOT NULL DEFAULT '0',
+	`cid` int(11) NOT NULL DEFAULT 0,
 	`network` varchar(32) NOT NULL DEFAULT '',
 	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`content` mediumtext NOT NULL,
-	`batch` tinyint(1) NOT NULL DEFAULT '0'	
-	 INDEX `cid` (`cid`)
-	 INDEX `created` (`created`)
-	 INDEX `last` (`last`)
-	 INDEX `network` (`network`)
+	`batch` tinyint(1) NOT NULL DEFAULT 0,
+	 INDEX `cid` (`cid`),
+	 INDEX `created` (`created`),
+	 INDEX `last` (`last`),
+	 INDEX `network` (`network`),
 	 INDEX `batch` (`batch`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -818,10 +778,9 @@ CREATE TABLE IF NOT EXISTS `register` (
 	`id` int(11) unsigned NOT NULL auto_increment PRIMARY KEY,
 	`hash` varchar(255) NOT NULL DEFAULT '',
 	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`uid` int(11) unsigned NOT NULL DEFAULT '0',
+	`uid` int(11) unsigned NOT NULL DEFAULT 0,
 	`password` varchar(255) NOT NULL DEFAULT '',
-	`language` varchar(16) NOT NULL DEFAULT ''	
-
+	`language` varchar(16) NOT NULL DEFAULT ''
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -829,11 +788,10 @@ CREATE TABLE IF NOT EXISTS `register` (
 --
 CREATE TABLE IF NOT EXISTS `search` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(11) NOT NULL DEFAULT '0',
-	`term` varchar(255) NOT NULL DEFAULT ''	
-	 INDEX `uid` (`uid`)
+	`uid` int(11) NOT NULL DEFAULT 0,
+	`term` varchar(255) NOT NULL DEFAULT '',
+	 INDEX `uid` (`uid`),
 	 INDEX `term` (`term`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -843,10 +801,9 @@ CREATE TABLE IF NOT EXISTS `session` (
 	`id` bigint(20) unsigned NOT NULL auto_increment PRIMARY KEY,
 	`sid` varchar(255) NOT NULL DEFAULT '',
 	`data` text NOT NULL,
-	`expire` int(10) unsigned NOT NULL DEFAULT '0'	
-	 INDEX `sid` (`sid`)
+	`expire` int(10) unsigned NOT NULL DEFAULT 0,
+	 INDEX `sid` (`sid`),
 	 INDEX `expire` (`expire`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -854,14 +811,13 @@ CREATE TABLE IF NOT EXISTS `session` (
 --
 CREATE TABLE IF NOT EXISTS `sign` (
 	`id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
-	`iid` int(10) unsigned NOT NULL DEFAULT '0',
-	`retract_iid` int(10) unsigned NOT NULL DEFAULT '0',
+	`iid` int(10) unsigned NOT NULL DEFAULT 0,
+	`retract_iid` int(10) unsigned NOT NULL DEFAULT 0,
 	`signed_text` mediumtext NOT NULL,
 	`signature` text NOT NULL,
-	`signer` varchar(255) NOT NULL DEFAULT ''	
-	 INDEX `iid` (`iid`)
+	`signer` varchar(255) NOT NULL DEFAULT '',
+	 INDEX `iid` (`iid`),
 	 INDEX `retract_iid` (`retract_iid`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -869,16 +825,15 @@ CREATE TABLE IF NOT EXISTS `sign` (
 --
 CREATE TABLE IF NOT EXISTS `spam` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
-	`uid` int(11) NOT NULL DEFAULT '0',
-	`spam` int(11) NOT NULL DEFAULT '0',
-	`ham` int(11) NOT NULL DEFAULT '0',
+	`uid` int(11) NOT NULL DEFAULT 0,
+	`spam` int(11) NOT NULL DEFAULT 0,
+	`ham` int(11) NOT NULL DEFAULT 0,
 	`term` varchar(255) NOT NULL DEFAULT '',
-	`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00'	
-	 INDEX `uid` (`uid`)
-	 INDEX `spam` (`spam`)
-	 INDEX `ham` (`ham`)
+	`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+	 INDEX `uid` (`uid`),
+	 INDEX `spam` (`spam`),
+	 INDEX `ham` (`ham`),
 	 INDEX `term` (`term`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -886,63 +841,61 @@ CREATE TABLE IF NOT EXISTS `spam` (
 --
 CREATE TABLE IF NOT EXISTS `term` (
 	`tid` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
-	`oid` int(10) unsigned NOT NULL DEFAULT '0',
-	`otype` tinyint(3) unsigned NOT NULL DEFAULT '0',
-	`type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+	`oid` int(10) unsigned NOT NULL DEFAULT 0,
+	`otype` tinyint(3) unsigned NOT NULL DEFAULT 0,
+	`type` tinyint(3) unsigned NOT NULL DEFAULT 0,
 	`term` varchar(255) NOT NULL DEFAULT '',
 	`url` varchar(255) NOT NULL DEFAULT '',
 	`guid` varchar(255) NOT NULL DEFAULT '',
 	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`received` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`global` tinyint(1) NOT NULL DEFAULT '0',
-	`aid` int(10) unsigned NOT NULL DEFAULT '0',
-	`uid` int(10) unsigned NOT NULL DEFAULT '0'	
-	 INDEX `oid_otype_type_term` (`oid`,`otype`,`type`,`term`)
-	 INDEX `uid_term_tid` (`uid`,`term`,`tid`)
-	 INDEX `type_term` (`type`,`term`)
-	 INDEX `uid_otype_type_term_global_created` (`uid`,`otype`,`type`,`term`,`global`,`created`)
-	 INDEX `otype_type_term_tid` (`otype`,`type`,`term`,`tid`)
+	`global` tinyint(1) NOT NULL DEFAULT 0,
+	`aid` int(10) unsigned NOT NULL DEFAULT 0,
+	`uid` int(10) unsigned NOT NULL DEFAULT 0,
+	 INDEX `oid_otype_type_term` (`oid`,`otype`,`type`,`term`),
+	 INDEX `uid_term_tid` (`uid`,`term`,`tid`),
+	 INDEX `type_term` (`type`,`term`),
+	 INDEX `uid_otype_type_term_global_created` (`uid`,`otype`,`type`,`term`,`global`,`created`),
+	 INDEX `otype_type_term_tid` (`otype`,`type`,`term`,`tid`),
 	 INDEX `guid` (`guid`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
 -- TABLE thread
 --
 CREATE TABLE IF NOT EXISTS `thread` (
-	`iid` int(10) unsigned NOT NULL DEFAULT '0' PRIMARY KEY,
-	`uid` int(10) unsigned NOT NULL DEFAULT '0',
-	`contact-id` int(11) unsigned NOT NULL DEFAULT '0',
+	`iid` int(10) unsigned NOT NULL DEFAULT 0 PRIMARY KEY,
+	`uid` int(10) unsigned NOT NULL DEFAULT 0,
+	`contact-id` int(11) unsigned NOT NULL DEFAULT 0,
 	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`commented` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`received` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`changed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`wall` tinyint(1) NOT NULL DEFAULT '0',
-	`private` tinyint(1) NOT NULL DEFAULT '0',
-	`pubmail` tinyint(1) NOT NULL DEFAULT '0',
-	`moderated` tinyint(1) NOT NULL DEFAULT '0',
-	`visible` tinyint(1) NOT NULL DEFAULT '0',
-	`spam` tinyint(1) NOT NULL DEFAULT '0',
-	`starred` tinyint(1) NOT NULL DEFAULT '0',
-	`ignored` tinyint(1) NOT NULL DEFAULT '0',
-	`bookmark` tinyint(1) NOT NULL DEFAULT '0',
-	`unseen` tinyint(1) NOT NULL DEFAULT '1',
-	`deleted` tinyint(1) NOT NULL DEFAULT '0',
-	`origin` tinyint(1) NOT NULL DEFAULT '0',
-	`forum_mode` tinyint(1) NOT NULL DEFAULT '0',
-	`mention` tinyint(1) NOT NULL DEFAULT '0',
-	`network` varchar(32) NOT NULL DEFAULT ''	
-	 INDEX `created` (`created`)
-	 INDEX `commented` (`commented`)
-	 INDEX `uid_network_commented` (`uid`,`network`,`commented`)
-	 INDEX `uid_network_created` (`uid`,`network`,`created`)
-	 INDEX `uid_contactid_commented` (`uid`,`contact-id`,`commented`)
-	 INDEX `uid_contactid_created` (`uid`,`contact-id`,`created`)
-	 INDEX `wall_private_received` (`wall`,`private`,`received`)
-	 INDEX `uid_created` (`uid`,`created`)
+	`wall` tinyint(1) NOT NULL DEFAULT 0,
+	`private` tinyint(1) NOT NULL DEFAULT 0,
+	`pubmail` tinyint(1) NOT NULL DEFAULT 0,
+	`moderated` tinyint(1) NOT NULL DEFAULT 0,
+	`visible` tinyint(1) NOT NULL DEFAULT 0,
+	`spam` tinyint(1) NOT NULL DEFAULT 0,
+	`starred` tinyint(1) NOT NULL DEFAULT 0,
+	`ignored` tinyint(1) NOT NULL DEFAULT 0,
+	`bookmark` tinyint(1) NOT NULL DEFAULT 0,
+	`unseen` tinyint(1) NOT NULL DEFAULT 1,
+	`deleted` tinyint(1) NOT NULL DEFAULT 0,
+	`origin` tinyint(1) NOT NULL DEFAULT 0,
+	`forum_mode` tinyint(1) NOT NULL DEFAULT 0,
+	`mention` tinyint(1) NOT NULL DEFAULT 0,
+	`network` varchar(32) NOT NULL DEFAULT '',
+	 INDEX `created` (`created`),
+	 INDEX `commented` (`commented`),
+	 INDEX `uid_network_commented` (`uid`,`network`,`commented`),
+	 INDEX `uid_network_created` (`uid`,`network`,`created`),
+	 INDEX `uid_contactid_commented` (`uid`,`contact-id`,`commented`),
+	 INDEX `uid_contactid_created` (`uid`,`contact-id`,`created`),
+	 INDEX `wall_private_received` (`wall`,`private`,`received`),
+	 INDEX `uid_created` (`uid`,`created`),
 	 INDEX `uid_commented` (`uid`,`commented`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -952,10 +905,9 @@ CREATE TABLE IF NOT EXISTS `tokens` (
 	`id` varchar(40) NOT NULL PRIMARY KEY,
 	`secret` text NOT NULL,
 	`client_id` varchar(20) NOT NULL DEFAULT '',
-	`expires` int(11) NOT NULL DEFAULT '0',
+	`expires` int(11) NOT NULL DEFAULT 0,
 	`scope` varchar(200) NOT NULL DEFAULT '',
-	`uid` int(11) NOT NULL DEFAULT '0'	
-
+	`uid` int(11) NOT NULL DEFAULT 0
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -968,9 +920,8 @@ CREATE TABLE IF NOT EXISTS `unique_contacts` (
 	`name` varchar(255) NOT NULL DEFAULT '',
 	`avatar` varchar(255) NOT NULL DEFAULT '',
 	`location` varchar(255) NOT NULL DEFAULT '',
-	`about` text NOT NULL	
+	`about` text NOT NULL,
 	 INDEX `url` (`url`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -989,38 +940,37 @@ CREATE TABLE IF NOT EXISTS `user` (
 	`register_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`login_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`default-location` varchar(255) NOT NULL DEFAULT '',
-	`allow_location` tinyint(1) NOT NULL DEFAULT '0',
+	`allow_location` tinyint(1) NOT NULL DEFAULT 0,
 	`theme` varchar(255) NOT NULL DEFAULT '',
 	`pubkey` text NOT NULL,
 	`prvkey` text NOT NULL,
 	`spubkey` text NOT NULL,
 	`sprvkey` text NOT NULL,
-	`verified` tinyint(1) unsigned NOT NULL DEFAULT '0',
-	`blocked` tinyint(1) unsigned NOT NULL DEFAULT '0',
-	`blockwall` tinyint(1) unsigned NOT NULL DEFAULT '0',
-	`hidewall` tinyint(1) unsigned NOT NULL DEFAULT '0',
-	`blocktags` tinyint(1) unsigned NOT NULL DEFAULT '0',
-	`unkmail` tinyint(1) NOT NULL DEFAULT '0',
-	`cntunkmail` int(11) NOT NULL DEFAULT '10',
-	`notify-flags` int(11) unsigned NOT NULL DEFAULT '65535',
-	`page-flags` int(11) unsigned NOT NULL DEFAULT '0',
-	`prvnets` tinyint(1) NOT NULL DEFAULT '0',
+	`verified` tinyint(1) unsigned NOT NULL DEFAULT 0,
+	`blocked` tinyint(1) unsigned NOT NULL DEFAULT 0,
+	`blockwall` tinyint(1) unsigned NOT NULL DEFAULT 0,
+	`hidewall` tinyint(1) unsigned NOT NULL DEFAULT 0,
+	`blocktags` tinyint(1) unsigned NOT NULL DEFAULT 0,
+	`unkmail` tinyint(1) NOT NULL DEFAULT 0,
+	`cntunkmail` int(11) NOT NULL DEFAULT 10,
+	`notify-flags` int(11) unsigned NOT NULL DEFAULT 65535,
+	`page-flags` int(11) unsigned NOT NULL DEFAULT 0,
+	`prvnets` tinyint(1) NOT NULL DEFAULT 0,
 	`pwdreset` varchar(255) NOT NULL DEFAULT '',
-	`maxreq` int(11) NOT NULL DEFAULT '10',
-	`expire` int(11) unsigned NOT NULL DEFAULT '0',
-	`account_removed` tinyint(1) NOT NULL DEFAULT '0',
-	`account_expired` tinyint(1) NOT NULL DEFAULT '0',
+	`maxreq` int(11) NOT NULL DEFAULT 10,
+	`expire` int(11) unsigned NOT NULL DEFAULT 0,
+	`account_removed` tinyint(1) NOT NULL DEFAULT 0,
+	`account_expired` tinyint(1) NOT NULL DEFAULT 0,
 	`account_expires_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`service_class` varchar(32) NOT NULL DEFAULT '',
-	`def_gid` int(11) NOT NULL DEFAULT '0',
+	`def_gid` int(11) NOT NULL DEFAULT 0,
 	`allow_cid` mediumtext NOT NULL,
 	`allow_gid` mediumtext NOT NULL,
 	`deny_cid` mediumtext NOT NULL,
 	`deny_gid` mediumtext NOT NULL,
-	`openidserver` text NOT NULL	
+	`openidserver` text NOT NULL,
 	 INDEX `nickname` (`nickname`)
-
 ) DEFAULT CHARSET=utf8;
 
 --
@@ -1028,8 +978,7 @@ CREATE TABLE IF NOT EXISTS `user` (
 --
 CREATE TABLE IF NOT EXISTS `userd` (
 	`id` int(11) NOT NULL auto_increment PRIMARY KEY,
-	`username` varchar(255) NOT NULL	
+	`username` varchar(255) NOT NULL,
 	 INDEX `username` (`username`)
-
 ) DEFAULT CHARSET=utf8;
 
diff --git a/include/dbstructure.php b/include/dbstructure.php
index 6bcff29462..f131abe64f 100644
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -219,9 +219,13 @@ function db_field_command($parameters, $create = true) {
 	if ($parameters["not null"])
 		$fieldstruct .= " NOT NULL";
 
-	if (isset($parameters["default"]))
-		$fieldstruct .= " DEFAULT '".$parameters["default"]."'";
-
+	if (isset($parameters["default"])){
+		if (strpos(strtolower($parameters["type"]),"int")!==false) {
+			$fieldstruct .= " DEFAULT ".$parameters["default"];
+		} else {
+			$fieldstruct .= " DEFAULT '".$parameters["default"]."'";
+		}
+	}
 	if ($parameters["extra"] != "")
 		$fieldstruct .= " ".$parameters["extra"];
 
@@ -237,20 +241,22 @@ function db_create_table($name, $fields, $verbose, $action, $indexes=null) {
 	$r = true;
 
 	$sql = "";
+	$sql_rows = array();
 	foreach($fields AS $fieldname => $field) {
-		if ($sql != "")
-			$sql .= ",\n";
-
-		$sql .= "\t`".dbesc($fieldname)."` ".db_field_command($field);
+		$sql_rows[] = "`".dbesc($fieldname)."` ".db_field_command($field);
 	}
 
 	if (!is_null($indexes)) {
+
 		foreach ($indexes AS $indexname => $fieldnames) {
-			$sql .= "\t".db_create_index($indexname, $fieldnames, "")."\n";
+			$sql_index = db_create_index($indexname, $fieldnames, "");
+			if (!is_null($sql_index)) $sql_rows[] = $sql_index;
 		}
 	}
 
-	$sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n", dbesc($name)).$sql."\n) DEFAULT CHARSET=utf8";
+	$sql = implode(",\n\t", $sql_rows);
+
+	$sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT CHARSET=utf8";
 
 	if ($verbose)
 		echo $sql.";\n";