Added Requests table, and updated plan quota in Limits.

2 files changed, 25 insertions, 3 deletions

diff --git a/res/sql/Data.sql b/res/sql/Data.sql
index 2d37072b..d913b6a8 100644
--- a/res/sql/Data.sql
+++ b/res/sql/Data.sql
@@ -113,8 +113,7 @@ INSERT INTO `Host_Config` (`hostnum`,`application`,`name`,`value`,`timestamp`) V
 -- ORDER BY:  `plan`
 
 /*!40000 ALTER TABLE `Limits` DISABLE KEYS */;
-INSERT INTO `Limits` VALUES ('BASIC','The Lavabit basic account plan.',0,0,0,0,1,1,1,1,30,1,1,'REJECT,DELETE,MARK',1,'REJECT,DELETE,MARK',1,'DELETE,MARK',0,'DELETE,MARK',1,'DELETE,MARK',1,'DELETE,MARK','DELETE',0,1,1048576,33554432,1,1048576,33554432,1,8,256,1,8,1024,1,8,1024,1,1),('ENHANCED','The Lavabit enhanced account plan.',0,0,1,1,1,1,1,1,30,1,1,'REJECT,DELETE,MARK',1,'REJECT,DELETE,MARK',1,'DELETE,MARK',1,'DELETE,MARK',1,'DELETE,MARK',1,'DELETE,MARK','DELETE',1,1,1048576,67108864,1,1048576,67108864,1,8,512,1,8,1024,1,8,1024,1,1),('PERSONAL','The Lavabit personal account plan.',0,0,0,1,1,1,1,1,30,1,1,'REJECT,DELETE,MARK',1,'REJECT,DELETE,MARK',1,'DELETE,MARK',0,'DELETE,MARK',1,'DELETE,MARK',1,'DELETE,MARK','DELETE',1,1,1048576,67108864,1,1048576,67108864,1,8,256,1,8,1024,1,8,1024,1,1),('PREMIUM','The Lavabit premium account plan.',0,0,1,1,1,1,1,1,30,1,1,'REJECT,DELETE,MARK',1,'REJECT,DELETE,MARK',1,'DELETE,MARK',1,'DELETE,MARK',1,'DELETE,MARK',1,'DELETE,MARK','DELETE',1,1,1048576,134217728,1,1048576,134217728,1,8,768,1,8,8196,1,8,8196,1,1), ('STANDARD','The Lavabit standard account plan.',0,1,1,1,1,1,1,1,30,1,1,'REJECT,DELETE,MARK',1,'REJECT,DELETE,MARK',1,'DELETE,MARK',0,'MARK',1,'DELETE,MARK',1,'DELETE,MARK','DELETE',1,1,1048576,67108864,1,1048576,67108864,1,8,128,1,8,8192,1,8,8192,1,1),
-('PREMIER','The Lavabit premier account plan.',0,1,1,1,1,1,1,1,30,1,1,'REJECT,DELETE,MARK',1,'REJECT,DELETE,MARK',1,'DELETE,MARK',0,'MARK',1,'DELETE,MARK',1,'DELETE,MARK','DELETE',1,1,1048576,134217728,1,1048576,134217728,1,8,128,1,8,8192,1,8,8192,1,1);
+INSERT INTO `Limits` (`plan`, `description`, `corporate`, `paid`, `secure`, `forwarded`, `rollout`, `bounces`, `greylist`, `greytime_min`, `greytime_max`, `filters`, `rbl`, `rblaction_list`, `spf`, `spfaction_list`, `dkim`, `dkimaction_list`, `spam`, `spamaction_list`, `virus`, `virusaction_list`, `phish`, `phishaction_list`, `wormaction_list`, `autoreply`, `send_size_limit`, `send_size_limit_min`, `send_size_limit_max`, `recv_size_limit`, `recv_size_limit_min`, `recv_size_limit_max`, `daily_send_limit`, `daily_send_limit_min`, `daily_send_limit_max`, `daily_recv_limit`, `daily_recv_limit_min`, `daily_recv_limit_max`, `daily_recv_limit_ip`, `daily_recv_limit_ip_min`, `daily_recv_limit_ip_max`, `quota`, `tls`, `password`) VALUES ('BASIC','The Lavabit basic account plan.',0,0,0,0,1,1,1,1,30,1,1,'REJECT,DELETE,MARK',1,'REJECT,DELETE,MARK',1,'DELETE,MARK',0,'DELETE,MARK',1,'DELETE,MARK',1,'DELETE,MARK','DELETE',0,1,1048576,33554432,1,1048576,33554432,1,8,256,1,8,1024,1,8,1024,134217728,1,1),('ENHANCED','The Lavabit enhanced account plan.',0,0,1,1,1,1,1,1,30,1,1,'REJECT,DELETE,MARK',1,'REJECT,DELETE,MARK',1,'DELETE,MARK',1,'DELETE,MARK',1,'DELETE,MARK',1,'DELETE,MARK','DELETE',1,1,1048576,67108864,1,1048576,67108864,1,8,512,1,8,1024,1,8,1024,1073741824,1,1),('PERSONAL','The Lavabit personal account plan.',0,0,0,1,1,1,1,1,30,1,1,'REJECT,DELETE,MARK',1,'REJECT,DELETE,MARK',1,'DELETE,MARK',0,'DELETE,MARK',1,'DELETE,MARK',1,'DELETE,MARK','DELETE',1,1,1048576,67108864,1,1048576,67108864,1,8,256,1,8,1024,1,8,1024,1073741824,1,1),('PREMIER','The Lavabit premier account plan.',0,1,1,1,1,1,1,1,30,1,1,'REJECT,DELETE,MARK',1,'REJECT,DELETE,MARK',1,'DELETE,MARK',0,'MARK',1,'DELETE,MARK',1,'DELETE,MARK','DELETE',1,1,1048576,134217728,1,1048576,134217728,1,8,128,1,8,8192,1,8,8192,21474836480,1,1),('PREMIUM','The Lavabit premium account plan.',0,0,1,1,1,1,1,1,30,1,1,'REJECT,DELETE,MARK',1,'REJECT,DELETE,MARK',1,'DELETE,MARK',1,'DELETE,MARK',1,'DELETE,MARK',1,'DELETE,MARK','DELETE',1,1,1048576,134217728,1,1048576,134217728,1,8,768,1,8,8196,1,8,8196,8589934592,1,1),('STANDARD','The Lavabit standard account plan.',0,1,1,1,1,1,1,1,30,1,1,'REJECT,DELETE,MARK',1,'REJECT,DELETE,MARK',1,'DELETE,MARK',0,'MARK',1,'DELETE,MARK',1,'DELETE,MARK','DELETE',1,1,1048576,67108864,1,1048576,67108864,1,8,128,1,8,8192,1,8,8192,5368709120,1,1);
 /*!40000 ALTER TABLE `Limits` ENABLE KEYS */;
 
 --
diff --git a/res/sql/Migration.sql b/res/sql/Migration.sql
index 51c8d8e1..cb4aa937 100644
--- a/res/sql/Migration.sql
+++ b/res/sql/Migration.sql
@@ -73,4 +73,27 @@ CREATE TABLE `Realms` (
 ALTER TABLE `Realms` 
 ADD COLUMN `rotated` TINYINT(1) NOT NULL DEFAULT '0' AFTER `shard`;
 
-ALTER TABLE `Codes` ADD COLUMN `years` tinyint(2) NOT NULL DEFAULT '1' AFTER `plan`;
\ No newline at end of file
+ALTER TABLE `Codes` ADD COLUMN `years` TINYINT(2) NOT NULL DEFAULT '1' AFTER `plan`;
+
+ALTER TABLE `Limits` ADD COLUMN `quota` BIGINT(20) NOT NULL DEFAULT '21474836480' AFTER `daily_recv_limit_ip_max`;
+DROP TABLE IF EXISTS `Requests`;
+CREATE TABLE `Requests` (
+  `requestnum` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `usernum` bigint(20) unsigned NOT NULL,
+  `requester` bigint(20) unsigned DEFAULT NULL,
+  `requested` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `reviewer` bigint(20) unsigned DEFAULT NULL,
+  `reviewed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `action` enum('RESET','DELETE') NOT NULL,
+  `disposition` enum('PENDING', 'APPROVED','REJECTED') DEFAULT 'PENDING',
+  `notes` text,
+  `filename` varchar(255) NOT NULL,
+  `attachment` mediumblob,
+  PRIMARY KEY (`requestnum`),
+  KEY `IX_REQUESTNUM` (`requestnum`),
+  CONSTRAINT `Requests_ibfk_1` FOREIGN KEY (`usernum`) REFERENCES `Users` (`usernum`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `Requests_ibfk_2` FOREIGN KEY (`requester`) REFERENCES `Users` (`usernum`) ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT `Requests_ibfk_4` FOREIGN KEY (`reviewer`) REFERENCES `Users` (`usernum`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 MAX_ROWS=4294967295 AVG_ROW_LENGTH=1000 COMMENT='Store administrative action requests which require approval.';
+
+