mirror of
https://github.com/nuxsmin/sysPass.git
synced 2026-03-11 10:56:58 +01:00
Merge branch 'v1.1'
This commit is contained in:
nuxsmin
@@ -19,8 +19,8 @@ DROP TABLE IF EXISTS `accFiles`;
|
||||
CREATE TABLE `accFiles` (
|
||||
`accfile_id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`accfile_accountId` smallint(5) unsigned NOT NULL,
|
||||
`accfile_name` varchar(100) NOT NULL,
|
||||
`accfile_type` varchar(100) NOT NULL,
|
||||
`accfile_name` VARCHAR(100) NOT NULL,
|
||||
`accfile_type` VARCHAR(100) NOT NULL,
|
||||
`accfile_size` int(11) NOT NULL,
|
||||
`accfile_content` mediumblob NOT NULL,
|
||||
`accfile_extension` varchar(10) NOT NULL,
|
||||
@@ -73,8 +73,8 @@ CREATE TABLE `accHistory` (
|
||||
`acchistory_isModify` bit(1) DEFAULT NULL,
|
||||
`acchistory_isDeleted` bit(1) DEFAULT NULL,
|
||||
`acchistory_mPassHash` varbinary(128) NOT NULL,
|
||||
`accHistory_otherUserEdit` bit(1) DEFAULT NULL,
|
||||
`accHistory_otherGroupEdit` varchar(45) DEFAULT NULL,
|
||||
`accHistory_otherUserEdit` BIT(1) DEFAULT NULL,
|
||||
`accHistory_otherGroupEdit` VARCHAR(45) DEFAULT NULL,
|
||||
PRIMARY KEY (`acchistory_id`),
|
||||
KEY `IDX_accountId` (`acchistory_accountId`)
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
|
||||
@@ -85,15 +85,18 @@ CREATE TABLE `accHistory` (
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `accUsers`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `accUsers` (
|
||||
`accuser_id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`accuser_accountId` int(10) unsigned NOT NULL,
|
||||
`accuser_userId` int(10) unsigned NOT NULL,
|
||||
`accuser_id` INT(11) NOT NULL AUTO_INCREMENT,
|
||||
`accuser_accountId` INT(10) UNSIGNED NOT NULL,
|
||||
`accuser_userId` INT(10) UNSIGNED NOT NULL,
|
||||
PRIMARY KEY (`accuser_id`),
|
||||
KEY `idx_account` (`accuser_accountId`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
|
||||
)
|
||||
ENGINE =InnoDB
|
||||
AUTO_INCREMENT =0
|
||||
DEFAULT CHARSET =utf8;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
@@ -111,7 +114,7 @@ CREATE TABLE `accounts` (
|
||||
`account_customerId` int(10) unsigned NOT NULL,
|
||||
`account_name` varchar(50) NOT NULL,
|
||||
`account_categoryId` tinyint(3) unsigned NOT NULL,
|
||||
`account_login` varchar(50) DEFAULT NULL,
|
||||
`account_login` VARCHAR(50) DEFAULT NULL,
|
||||
`account_url` varchar(255) DEFAULT NULL,
|
||||
`account_pass` varbinary(32) NOT NULL,
|
||||
`account_IV` varbinary(32) NOT NULL,
|
||||
@@ -120,8 +123,8 @@ CREATE TABLE `accounts` (
|
||||
`account_countDecrypt` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`account_dateAdd` datetime NOT NULL,
|
||||
`account_dateEdit` datetime NOT NULL,
|
||||
`account_otherGroupEdit` bit(1) DEFAULT b'0',
|
||||
`account_otherUserEdit` bit(1) DEFAULT b'0',
|
||||
`account_otherGroupEdit` BIT(1) DEFAULT b'0',
|
||||
`account_otherUserEdit` BIT(1) DEFAULT b'0',
|
||||
PRIMARY KEY (`account_id`),
|
||||
KEY `IDX_categoryId` (`account_categoryId`),
|
||||
KEY `IDX_userId` (`account_userGroupId`,`account_userId`),
|
||||
@@ -140,7 +143,7 @@ DROP TABLE IF EXISTS `categories`;
|
||||
CREATE TABLE `categories` (
|
||||
`category_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`category_name` varchar(50) NOT NULL,
|
||||
`category_description` varchar(255) DEFAULT NULL,
|
||||
`category_description` VARCHAR(255) DEFAULT NULL,
|
||||
PRIMARY KEY (`category_id`)
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
@@ -153,8 +156,12 @@ DROP TABLE IF EXISTS `config`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `config` (
|
||||
`config_parameter` varchar(50) CHARACTER SET utf8 COLLATE utf8_spanish_ci NOT NULL,
|
||||
`config_value` varchar(128) CHARACTER SET utf8 COLLATE utf8_spanish_ci NOT NULL,
|
||||
`config_parameter` VARCHAR(50)
|
||||
CHARACTER SET utf8
|
||||
COLLATE utf8_spanish_ci NOT NULL,
|
||||
`config_value` VARCHAR(128)
|
||||
CHARACTER SET utf8
|
||||
COLLATE utf8_spanish_ci NOT NULL,
|
||||
UNIQUE KEY `vacParameter` (`config_parameter`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
@@ -185,10 +192,10 @@ DROP TABLE IF EXISTS `log`;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `log` (
|
||||
`log_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`log_date` int(10) unsigned NOT NULL,
|
||||
`log_date` INT(10) UNSIGNED NOT NULL,
|
||||
`log_login` varchar(25) NOT NULL,
|
||||
`log_userId` tinyint(3) unsigned NOT NULL,
|
||||
`log_ipAddress` varchar(45) NOT NULL,
|
||||
`log_ipAddress` VARCHAR(45) NOT NULL,
|
||||
`log_action` varchar(50) NOT NULL,
|
||||
`log_description` text NOT NULL,
|
||||
PRIMARY KEY (`log_id`)
|
||||
@@ -207,16 +214,16 @@ CREATE TABLE `usrData` (
|
||||
`user_name` varchar(80) NOT NULL,
|
||||
`user_groupId` tinyint(3) unsigned NOT NULL,
|
||||
`user_secGroupId` tinyint(3) unsigned DEFAULT NULL,
|
||||
`user_login` varchar(50) NOT NULL,
|
||||
`user_login` VARCHAR(50) NOT NULL,
|
||||
`user_pass` varbinary(40) NOT NULL,
|
||||
`user_mPass` varbinary(32) DEFAULT NULL,
|
||||
`user_mPass` VARBINARY(32) DEFAULT NULL,
|
||||
`user_mIV` varbinary(32) NOT NULL,
|
||||
`user_email` varchar(80) DEFAULT NULL,
|
||||
`user_email` VARCHAR(80) DEFAULT NULL,
|
||||
`user_notes` text,
|
||||
`user_count` int(10) unsigned NOT NULL DEFAULT '0',
|
||||
`user_profileId` tinyint(4) NOT NULL,
|
||||
`user_lastLogin` datetime DEFAULT NULL,
|
||||
`user_lastUpdate` datetime DEFAULT NULL,
|
||||
`user_lastLogin` DATETIME DEFAULT NULL,
|
||||
`user_lastUpdate` DATETIME DEFAULT NULL,
|
||||
`user_lastUpdateMPass` int(11) unsigned NOT NULL DEFAULT '0',
|
||||
`user_isAdminApp` bit(1) NOT NULL DEFAULT b'0',
|
||||
`user_isAdminAcc` bit(1) NOT NULL DEFAULT b'0',
|
||||
@@ -224,7 +231,7 @@ CREATE TABLE `usrData` (
|
||||
`user_isDisabled` bit(1) NOT NULL DEFAULT b'0',
|
||||
`user_hashSalt` varbinary(40) NOT NULL,
|
||||
`user_isMigrate` bit(1) DEFAULT b'0',
|
||||
`user_isChangePass` bit(1) DEFAULT b'0',
|
||||
`user_isChangePass` BIT(1) DEFAULT b'0',
|
||||
PRIMARY KEY (`user_id`),
|
||||
UNIQUE KEY `IDX_login` (`user_login`),
|
||||
KEY `IDX_pass` (`user_pass`)
|
||||
@@ -251,17 +258,20 @@ CREATE TABLE `usrGroups` (
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `usrPassRecover`;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET @saved_cs_client = @@character_set_client */;
|
||||
/*!40101 SET character_set_client = utf8 */;
|
||||
CREATE TABLE `usrPassRecover` (
|
||||
`userpassr_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`userpassr_userId` smallint(5) unsigned NOT NULL,
|
||||
`userpassr_hash` varbinary(40) NOT NULL,
|
||||
`userpassr_date` int(10) unsigned NOT NULL,
|
||||
`userpassr_used` bit(1) NOT NULL,
|
||||
`userpassr_id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||
`userpassr_userId` SMALLINT(5) UNSIGNED NOT NULL,
|
||||
`userpassr_hash` VARBINARY(40) NOT NULL,
|
||||
`userpassr_date` INT(10) UNSIGNED NOT NULL,
|
||||
`userpassr_used` BIT(1) NOT NULL,
|
||||
PRIMARY KEY (`userpassr_id`),
|
||||
KEY `IDX_userId` (`userpassr_userId`,`userpassr_date`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
|
||||
KEY `IDX_userId` (`userpassr_userId`, `userpassr_date`)
|
||||
)
|
||||
ENGINE =InnoDB
|
||||
AUTO_INCREMENT =0
|
||||
DEFAULT CHARSET =utf8;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
--
|
||||
@@ -291,9 +301,9 @@ CREATE TABLE `usrProfiles` (
|
||||
`userProfile_pFiles` bit(1) DEFAULT b'0',
|
||||
`userProfile_pConfigMenu` bit(1) DEFAULT b'0',
|
||||
`userProfile_pUsersMenu` bit(1) DEFAULT b'0',
|
||||
`userProfile_pAppMgmtMenu` bit(1) DEFAULT b'0',
|
||||
`userProfile_pAppMgmtCategories` bit(1) DEFAULT b'0',
|
||||
`userProfile_pAppMgmtCustomers` bit(1) DEFAULT b'0',
|
||||
`userProfile_pAppMgmtMenu` BIT(1) DEFAULT b'0',
|
||||
`userProfile_pAppMgmtCategories` BIT(1) DEFAULT b'0',
|
||||
`userProfile_pAppMgmtCustomers` BIT(1) DEFAULT b'0',
|
||||
PRIMARY KEY (`userprofile_id`)
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
|
||||
/*!40101 SET character_set_client = @saved_cs_client */;
|
||||
|
||||
Reference in New Issue
Block a user