better channel/entity permission structures

1 files changed, 298 insertions, 4 deletions

diff --git a/database.sql b/database.sql
index 299569310..f475fc6a2 100644
--- a/database.sql
+++ b/database.sql
@@ -1,10 +1,29 @@
+-- phpMyAdmin SQL Dump
+-- version 3.3.10.4
+-- http://www.phpmyadmin.net
+--
+-- Host: newdb.macgirvin.com
+-- Generation Time: Sep 04, 2012 at 07:07 PM
+-- Server version: 5.1.53
+-- PHP Version: 5.3.13
+
 SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
 
+
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
 /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
 /*!40101 SET NAMES utf8 */;
 
+--
+-- Database: `mpse1`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `account`
+--
 
 CREATE TABLE IF NOT EXISTS `account` (
   `account_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -33,6 +52,12 @@ CREATE TABLE IF NOT EXISTS `account` (
   KEY `account_default_entity` (`account_default_entity`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `addon`
+--
+
 CREATE TABLE IF NOT EXISTS `addon` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` char(255) NOT NULL,
@@ -47,6 +72,12 @@ CREATE TABLE IF NOT EXISTS `addon` (
   KEY `installed` (`installed`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `attach`
+--
+
 CREATE TABLE IF NOT EXISTS `attach` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `aid` int(10) unsigned NOT NULL DEFAULT '0',
@@ -68,6 +99,12 @@ CREATE TABLE IF NOT EXISTS `attach` (
   KEY `hash` (`hash`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `auth_codes`
+--
+
 CREATE TABLE IF NOT EXISTS `auth_codes` (
   `id` varchar(40) NOT NULL,
   `client_id` varchar(20) NOT NULL,
@@ -77,6 +114,12 @@ CREATE TABLE IF NOT EXISTS `auth_codes` (
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `cache`
+--
+
 CREATE TABLE IF NOT EXISTS `cache` (
   `k` char(255) NOT NULL,
   `v` text NOT NULL,
@@ -84,6 +127,12 @@ CREATE TABLE IF NOT EXISTS `cache` (
   PRIMARY KEY (`k`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `challenge`
+--
+
 CREATE TABLE IF NOT EXISTS `challenge` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `challenge` char(255) NOT NULL,
@@ -94,6 +143,12 @@ CREATE TABLE IF NOT EXISTS `challenge` (
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `clients`
+--
+
 CREATE TABLE IF NOT EXISTS `clients` (
   `client_id` varchar(20) NOT NULL,
   `pw` varchar(20) NOT NULL,
@@ -104,6 +159,12 @@ CREATE TABLE IF NOT EXISTS `clients` (
   PRIMARY KEY (`client_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `config`
+--
+
 CREATE TABLE IF NOT EXISTS `config` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `cat` char(255) CHARACTER SET ascii NOT NULL,
@@ -113,6 +174,12 @@ CREATE TABLE IF NOT EXISTS `config` (
   UNIQUE KEY `access` (`cat`,`k`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `contact`
+--
+
 CREATE TABLE IF NOT EXISTS `contact` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `aid` int(10) unsigned NOT NULL DEFAULT '0',
@@ -192,6 +259,12 @@ CREATE TABLE IF NOT EXISTS `contact` (
   KEY `aid` (`aid`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `conv`
+--
+
 CREATE TABLE IF NOT EXISTS `conv` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `guid` char(64) NOT NULL,
@@ -206,6 +279,12 @@ CREATE TABLE IF NOT EXISTS `conv` (
   KEY `updated` (`updated`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `deliverq`
+--
+
 CREATE TABLE IF NOT EXISTS `deliverq` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `cmd` char(32) NOT NULL,
@@ -216,6 +295,12 @@ CREATE TABLE IF NOT EXISTS `deliverq` (
   KEY `contact` (`contact`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `entity`
+--
+
 CREATE TABLE IF NOT EXISTS `entity` (
   `entity_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `entity_account_id` int(10) unsigned NOT NULL DEFAULT '0',
@@ -229,8 +314,6 @@ CREATE TABLE IF NOT EXISTS `entity` (
   `entity_startpage` char(255) NOT NULL DEFAULT '',
   `entity_pubkey` text NOT NULL,
   `entity_prvkey` text NOT NULL,
-  `entity_privacyflags` int(10) unsigned NOT NULL DEFAULT '0',
-  `entity_postflags` int(10) unsigned NOT NULL DEFAULT '0',
   `entity_notifyflags` int(10) unsigned NOT NULL DEFAULT '65535',
   `entity_pageflags` int(10) unsigned NOT NULL DEFAULT '0',
   `entity_max_anon_mail` int(10) unsigned NOT NULL DEFAULT '10',
@@ -241,6 +324,14 @@ CREATE TABLE IF NOT EXISTS `entity` (
   `entity_allow_gid` mediumtext NOT NULL,
   `entity_deny_cid` mediumtext NOT NULL,
   `entity_deny_gid` mediumtext NOT NULL,
+  `entity_r_stream` tinyint(3) unsigned NOT NULL DEFAULT '128',
+  `entity_r_profile` tinyint(3) unsigned NOT NULL DEFAULT '128',
+  `entity_r_photos` tinyint(3) unsigned NOT NULL DEFAULT '128',
+  `entity_r_abook` tinyint(3) unsigned NOT NULL DEFAULT '128',
+  `entity_w_stream` tinyint(3) unsigned NOT NULL DEFAULT '128',
+  `entity_w_wall` tinyint(3) unsigned NOT NULL DEFAULT '128',
+  `entity_w_comment` tinyint(3) unsigned NOT NULL DEFAULT '128',
+  `entity_w_mail` tinyint(3) unsigned NOT NULL DEFAULT '128',
   PRIMARY KEY (`entity_id`),
   KEY `entity_account_id` (`entity_account_id`),
   KEY `entity_name` (`entity_name`),
@@ -249,16 +340,27 @@ CREATE TABLE IF NOT EXISTS `entity` (
   KEY `entity_timezone` (`entity_timezone`),
   KEY `entity_location` (`entity_location`),
   KEY `entity_theme` (`entity_theme`),
-  KEY `entity_privacyflags` (`entity_privacyflags`),
   KEY `entity_notifyflags` (`entity_notifyflags`),
   KEY `entity_pageflags` (`entity_pageflags`),
   KEY `entity_max_anon_mail` (`entity_max_anon_mail`),
   KEY `entity_max_friend_req` (`entity_max_friend_req`),
   KEY `entity_default_gid` (`entity_default_gid`),
   KEY `entity_primary` (`entity_primary`),
-  KEY `entity_postflags` (`entity_postflags`)
+  KEY `entity_r_stream` (`entity_r_stream`),
+  KEY `entity_r_profile` (`entity_r_profile`),
+  KEY `entity_r_photos` (`entity_r_photos`),
+  KEY `entity_w_stream` (`entity_w_stream`),
+  KEY `entity_w_wall` (`entity_w_wall`),
+  KEY `entity_w_comment` (`entity_w_comment`),
+  KEY `entity_w_mail` (`entity_w_mail`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `event`
+--
+
 CREATE TABLE IF NOT EXISTS `event` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `uid` int(11) NOT NULL,
@@ -291,6 +393,12 @@ CREATE TABLE IF NOT EXISTS `event` (
   KEY `ignore` (`ignore`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `fcontact`
+--
+
 CREATE TABLE IF NOT EXISTS `fcontact` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `url` char(255) NOT NULL,
@@ -313,6 +421,12 @@ CREATE TABLE IF NOT EXISTS `fcontact` (
   KEY `network` (`network`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `ffinder`
+--
+
 CREATE TABLE IF NOT EXISTS `ffinder` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uid` int(10) unsigned NOT NULL,
@@ -324,6 +438,12 @@ CREATE TABLE IF NOT EXISTS `ffinder` (
   KEY `fid` (`fid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `fserver`
+--
+
 CREATE TABLE IF NOT EXISTS `fserver` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `server` char(255) NOT NULL,
@@ -335,6 +455,12 @@ CREATE TABLE IF NOT EXISTS `fserver` (
   KEY `posturl` (`posturl`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `fsuggest`
+--
+
 CREATE TABLE IF NOT EXISTS `fsuggest` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `uid` int(11) NOT NULL,
@@ -348,6 +474,12 @@ CREATE TABLE IF NOT EXISTS `fsuggest` (
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `gcign`
+--
+
 CREATE TABLE IF NOT EXISTS `gcign` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `uid` int(11) NOT NULL,
@@ -357,6 +489,12 @@ CREATE TABLE IF NOT EXISTS `gcign` (
   KEY `gcid` (`gcid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `gcontact`
+--
+
 CREATE TABLE IF NOT EXISTS `gcontact` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `name` char(255) NOT NULL,
@@ -370,6 +508,12 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
   KEY `url` (`url`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `glink`
+--
+
 CREATE TABLE IF NOT EXISTS `glink` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `cid` int(11) NOT NULL,
@@ -385,6 +529,12 @@ CREATE TABLE IF NOT EXISTS `glink` (
   KEY `updated` (`updated`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `group`
+--
+
 CREATE TABLE IF NOT EXISTS `group` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uid` int(10) unsigned NOT NULL,
@@ -397,6 +547,12 @@ CREATE TABLE IF NOT EXISTS `group` (
   KEY `deleted` (`deleted`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `group_member`
+--
+
 CREATE TABLE IF NOT EXISTS `group_member` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uid` int(10) unsigned NOT NULL,
@@ -408,6 +564,12 @@ CREATE TABLE IF NOT EXISTS `group_member` (
   KEY `contact-id` (`contact-id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `guid`
+--
+
 CREATE TABLE IF NOT EXISTS `guid` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `guid` char(64) NOT NULL,
@@ -415,6 +577,12 @@ CREATE TABLE IF NOT EXISTS `guid` (
   KEY `guid` (`guid`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `hook`
+--
+
 CREATE TABLE IF NOT EXISTS `hook` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `hook` char(255) NOT NULL,
@@ -425,6 +593,12 @@ CREATE TABLE IF NOT EXISTS `hook` (
   KEY `hook` (`hook`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `hubloc`
+--
+
 CREATE TABLE IF NOT EXISTS `hubloc` (
   `hubloc_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `hubloc_guid` char(255) NOT NULL DEFAULT '',
@@ -442,6 +616,12 @@ CREATE TABLE IF NOT EXISTS `hubloc` (
   KEY `hubloc_url_sig` (`hubloc_url_sig`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `intro`
+--
+
 CREATE TABLE IF NOT EXISTS `intro` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uid` int(10) unsigned NOT NULL,
@@ -464,6 +644,12 @@ CREATE TABLE IF NOT EXISTS `intro` (
   KEY `contact-id` (`contact-id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `item`
+--
+
 CREATE TABLE IF NOT EXISTS `item` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uri` char(255) CHARACTER SET ascii NOT NULL,
@@ -553,6 +739,12 @@ CREATE TABLE IF NOT EXISTS `item` (
   FULLTEXT KEY `deny_gid` (`deny_gid`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `item_id`
+--
+
 CREATE TABLE IF NOT EXISTS `item_id` (
   `iid` int(11) NOT NULL,
   `uid` int(11) NOT NULL,
@@ -564,6 +756,12 @@ CREATE TABLE IF NOT EXISTS `item_id` (
   KEY `service` (`service`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `locks`
+--
+
 CREATE TABLE IF NOT EXISTS `locks` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` char(128) NOT NULL,
@@ -571,6 +769,12 @@ CREATE TABLE IF NOT EXISTS `locks` (
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `mail`
+--
+
 CREATE TABLE IF NOT EXISTS `mail` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `aid` int(10) unsigned NOT NULL DEFAULT '0',
@@ -604,6 +808,12 @@ CREATE TABLE IF NOT EXISTS `mail` (
   KEY `aid` (`aid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `manage`
+--
+
 CREATE TABLE IF NOT EXISTS `manage` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `uid` int(11) NOT NULL,
@@ -613,6 +823,12 @@ CREATE TABLE IF NOT EXISTS `manage` (
   KEY `mid` (`mid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `notify`
+--
+
 CREATE TABLE IF NOT EXISTS `notify` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `hash` char(64) NOT NULL,
@@ -639,6 +855,12 @@ CREATE TABLE IF NOT EXISTS `notify` (
   KEY `otype` (`otype`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `notify-threads`
+--
+
 CREATE TABLE IF NOT EXISTS `notify-threads` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `notify-id` int(11) NOT NULL,
@@ -650,6 +872,12 @@ CREATE TABLE IF NOT EXISTS `notify-threads` (
   KEY `receiver-uid` (`receiver-uid`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `pconfig`
+--
+
 CREATE TABLE IF NOT EXISTS `pconfig` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `uid` int(11) NOT NULL DEFAULT '0',
@@ -660,6 +888,12 @@ CREATE TABLE IF NOT EXISTS `pconfig` (
   UNIQUE KEY `access` (`uid`,`cat`,`k`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `photo`
+--
+
 CREATE TABLE IF NOT EXISTS `photo` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `aid` int(10) unsigned NOT NULL DEFAULT '0',
@@ -694,6 +928,12 @@ CREATE TABLE IF NOT EXISTS `photo` (
   KEY `aid` (`aid`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `profile`
+--
+
 CREATE TABLE IF NOT EXISTS `profile` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `aid` int(10) unsigned NOT NULL DEFAULT '0',
@@ -753,6 +993,12 @@ CREATE TABLE IF NOT EXISTS `profile` (
   FULLTEXT KEY `prv_keywords` (`prv_keywords`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `profile_check`
+--
+
 CREATE TABLE IF NOT EXISTS `profile_check` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uid` int(10) unsigned NOT NULL,
@@ -768,6 +1014,12 @@ CREATE TABLE IF NOT EXISTS `profile_check` (
   KEY `expire` (`expire`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `queue`
+--
+
 CREATE TABLE IF NOT EXISTS `queue` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `cid` int(11) NOT NULL,
@@ -784,6 +1036,12 @@ CREATE TABLE IF NOT EXISTS `queue` (
   KEY `batch` (`batch`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `register`
+--
+
 CREATE TABLE IF NOT EXISTS `register` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `hash` char(255) NOT NULL,
@@ -797,6 +1055,12 @@ CREATE TABLE IF NOT EXISTS `register` (
   KEY `uid` (`uid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `session`
+--
+
 CREATE TABLE IF NOT EXISTS `session` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   `sid` char(255) NOT NULL,
@@ -807,6 +1071,12 @@ CREATE TABLE IF NOT EXISTS `session` (
   KEY `expire` (`expire`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `spam`
+--
+
 CREATE TABLE IF NOT EXISTS `spam` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `uid` int(11) NOT NULL,
@@ -821,6 +1091,12 @@ CREATE TABLE IF NOT EXISTS `spam` (
   KEY `term` (`term`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `term`
+--
+
 CREATE TABLE IF NOT EXISTS `term` (
   `tid` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `aid` int(10) unsigned NOT NULL DEFAULT '0',
@@ -839,6 +1115,12 @@ CREATE TABLE IF NOT EXISTS `term` (
   KEY `aid` (`aid`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `tokens`
+--
+
 CREATE TABLE IF NOT EXISTS `tokens` (
   `id` varchar(40) NOT NULL,
   `secret` text NOT NULL,
@@ -852,6 +1134,12 @@ CREATE TABLE IF NOT EXISTS `tokens` (
   KEY `uid` (`uid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `user`
+--
+
 CREATE TABLE IF NOT EXISTS `user` (
   `uid` int(11) NOT NULL AUTO_INCREMENT,
   `account_id` int(10) unsigned NOT NULL,
@@ -911,6 +1199,12 @@ CREATE TABLE IF NOT EXISTS `user` (
   KEY `account_id` (`account_id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `userd`
+--
+
 CREATE TABLE IF NOT EXISTS `userd` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `username` char(255) NOT NULL,