X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=doc%2FtableStructure.sql;h=cf46d04279689851c1696f9b3f639fbd57b596c8;hb=88047e0882509ea034f8f90317278ac1e6672362;hp=6b2806da4cf1f46159ccf67a0cb6bcb2dfca9e16;hpb=50c8c66dc1d3245e8eaedf17e273f8c0522f1435;p=gigi.git diff --git a/doc/tableStructure.sql b/doc/tableStructure.sql index 6b2806da..cf46d042 100644 --- a/doc/tableStructure.sql +++ b/doc/tableStructure.sql @@ -13,6 +13,7 @@ CREATE TABLE `users` ( `regid` int(5) NOT NULL DEFAULT '0', `locid` int(7) NOT NULL DEFAULT '0', `listme` int(1) NOT NULL DEFAULT '0', + `contactinfo` varchar(255) NOT NULL DEFAULT '', `admin` tinyint(1) NOT NULL DEFAULT '0', `language` varchar(5) NOT NULL DEFAULT '', `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', @@ -43,7 +44,7 @@ CREATE TABLE `domains` ( KEY `memid` (`memid`), KEY `domain` (`domain`), KEY `stats_domains_deleted` (`deleted`) -) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1; +) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; DROP TABLE IF EXISTS `emails`; CREATE TABLE `emails` ( @@ -60,7 +61,7 @@ CREATE TABLE `emails` ( KEY `stats_email_hash` (`hash`), KEY `stats_email_deleted` (`deleted`), KEY `email` (`email`) -) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1; +) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; DROP TABLE IF EXISTS `emailPinglog`; CREATE TABLE `emailPinglog` ( @@ -70,7 +71,7 @@ CREATE TABLE `emailPinglog` ( `type` enum('fast', 'active') NOT NULL, `status` enum('open', 'success', 'failed') NOT NULL, `result` varchar(255) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; DROP TABLE IF EXISTS `pingconfig`; CREATE TABLE `pingconfig` ( @@ -78,8 +79,9 @@ CREATE TABLE `pingconfig` ( `domainid` int(11) NOT NULL, `type` enum('email', 'ssl', 'http', 'dns') NOT NULL, `info` varchar(255) NOT NULL, + `reping` enum('y','n') NOT NULL DEFAULT 'n', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; DROP TABLE IF EXISTS `domainPinglog`; @@ -87,13 +89,14 @@ CREATE TABLE `domainPinglog` ( `when` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, `configId` int(13) NOT NULL, `state` enum('open', 'success', 'failed') NOT NULL, - `result` varchar(255) NOT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1; + `challenge` varchar(16), + `result` varchar(255) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; DROP TABLE IF EXISTS `baddomains`; CREATE TABLE `baddomains` ( `domain` varchar(255) NOT NULL DEFAULT '' -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; DROP TABLE IF EXISTS `alerts`; @@ -104,7 +107,7 @@ CREATE TABLE `alerts` ( `regional` tinyint(1) NOT NULL DEFAULT '0', `radius` tinyint(1) NOT NULL DEFAULT '0', PRIMARY KEY (`memid`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; DROP TABLE IF EXISTS `user_agreements`; CREATE TABLE `user_agreements` ( @@ -117,7 +120,7 @@ CREATE TABLE `user_agreements` ( `method` varchar(100) NOT NULL, `comment` varchar(100) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1; +) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; DROP TABLE IF EXISTS `certs`; CREATE TABLE `certs` ( @@ -151,7 +154,7 @@ CREATE TABLE `certs` ( KEY `serial` (`serial`), KEY `stats_emailcerts_expire` (`expire`), KEY `emailcrt` (`crt_name`) -) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1; +) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; DROP TABLE IF EXISTS `clientcerts`; CREATE TABLE `clientcerts` ( @@ -159,7 +162,7 @@ CREATE TABLE `clientcerts` ( `disablelogin` int(1) NOT NULL DEFAULT '0', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1; +) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; DROP TABLE IF EXISTS `profiles`; CREATE TABLE `profiles` ( @@ -171,7 +174,7 @@ CREATE TABLE `profiles` ( `name` varchar(100) NOT NULL, PRIMARY KEY (`id`), UNIQUE (`keyname`) -) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1; +) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; INSERT INTO `profiles` SET rootcert=0, keyname='client', name='ssl-client (unassured)', keyUsage='digitalSignature, keyEncipherment, keyAgreement', extendedKeyUsage='clientAuth'; INSERT INTO `profiles` SET rootcert=0, keyname='mail', name='mail (unassured)', keyUsage='digitalSignature, keyEncipherment, keyAgreement', extendedKeyUsage='emailProtection'; INSERT INTO `profiles` SET rootcert=0, keyname='client-mail', name='ssl-client + mail (unassured)', keyUsage='digitalSignature, keyEncipherment, keyAgreement', extendedKeyUsage='clientAuth, emailProtection'; @@ -188,7 +191,7 @@ CREATE TABLE `subjectAlternativeNames` ( `certId` int(11) NOT NULL, `contents` varchar(50) NOT NULL, `type` enum('email','DNS') NOT NULL -) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1; +) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; @@ -204,7 +207,7 @@ CREATE TABLE `jobs` ( `executeTo` VARCHAR(11), PRIMARY KEY (`id`), KEY `state` (`state`) -) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1; +) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; DROP TABLE IF EXISTS `notary`; @@ -212,23 +215,28 @@ CREATE TABLE `notary` ( `id` int(11) NOT NULL AUTO_INCREMENT, `from` int(11) NOT NULL DEFAULT '0', `to` int(11) NOT NULL DEFAULT '0', - `awarded` int(3) NOT NULL DEFAULT '0', +# total points that have been entered `points` int(3) NOT NULL DEFAULT '0', - `method` enum('Face to Face Meeting','Trusted Third Parties','Thawte Points Transfer','Administrative Increase','CT Magazine - Germany','Temporary Increase','Unknown','TOPUP','TTP-Assisted') NOT NULL DEFAULT 'Face to Face Meeting', +# awarded and the "experience points" are calculated virtually +# Face to Face is default, TOPUP is for the remaining 30Points after two TTP +# TTP is default ttp assurance + `method` enum('Face to Face Meeting', 'TOPUP', 'TTP-Assisted') NOT NULL DEFAULT 'Face to Face Meeting', `location` varchar(255) NOT NULL DEFAULT '', `date` varchar(255) NOT NULL DEFAULT '', +# date when assurance was entered `when` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +#? `expire` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +#????????????????? `sponsor` int(11) NOT NULL DEFAULT '0', +# date when assurance was deleted (or 0) `deleted` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`id`), KEY `from` (`from`), KEY `to` (`to`), - KEY `from_2` (`from`), - KEY `to_2` (`to`), KEY `stats_notary_when` (`when`), KEY `stats_notary_method` (`method`) -) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1; +) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; DROP TABLE IF EXISTS `cats_passed`; @@ -239,7 +247,7 @@ CREATE TABLE `cats_passed` ( `pass_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE KEY `test_passed` (`user_id`,`variant_id`,`pass_date`) -) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1; +) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; # -------------------------------------------------------- @@ -253,4 +261,23 @@ CREATE TABLE `cats_type` ( `type_text` varchar(255) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `type_text` (`type_text`) -) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1; +) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; + +DROP TABLE IF EXISTS `arbitrations`; +CREATE TABLE IF NOT EXISTS `arbitrations` ( + `user` int(11) NOT NULL, + `arbitration` varchar(20) NOT NULL, + PRIMARY KEY (`user`,`arbitration`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +DROP TABLE IF EXISTS `user_groups`; +CREATE TABLE IF NOT EXISTS `user_groups` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `user` int(11) NOT NULL, + `permission` enum('supporter','arbitrator','blockedassuree','blockedassurer','ttp-assuer','ttp-applicant', 'codesigning') NOT NULL, + `granted` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `deleted` timestamp NULL DEFAULT NULL, + `grantedby` int(11) NOT NULL, + `revokedby` int(11) DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8;