gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 05:01:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-08-08 20:29:27 +02:00
commit 7f7bb2926d
7 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -49,6 +49,7 @@
fixes #239) fixes #239)
- make UserView look similar to UserList - make UserView look similar to UserList
- log correct ip even after a reverse proxy (Closes #206) - log correct ip even after a reverse proxy (Closes #206)
- fix sql error in table creation if sql mode is set to STRICT_TRANS_TABLE
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.3.27 Changes in version 4.3.27

2
inc/inc.ClassPasswordHistoryManager.php
View File

@ -48,7 +48,7 @@ class SeedDMS_PasswordHistoryManager {
function add($user, $pwd) { /* {{{ */ function add($user, $pwd) { /* {{{ */
$queryStr = "INSERT INTO tblUserPasswordHistory (userID, pwd, `date`) ". $queryStr = "INSERT INTO tblUserPasswordHistory (userID, pwd, `date`) ".
"VALUES (".$this->db->qstr($user->getId()).", ".$this->db->qstr($pwd).", CURRENT_TIMESTAMP)"; "VALUES (".$this->db->qstr($user->getId()).", ".$this->db->qstr($pwd).", ".$this->db->getCurrentDatetime().")";
if (!$this->db->getResult($queryStr)) { if (!$this->db->getResult($queryStr)) {
return false; return false;
} }

4
install/create_tables-innodb.sql
View File

@ -493,9 +493,9 @@ CREATE TABLE `tblSessions` (
`lastAccess` int(11) NOT NULL default '0', `lastAccess` int(11) NOT NULL default '0',
`theme` varchar(30) NOT NULL default '', `theme` varchar(30) NOT NULL default '',
`language` varchar(30) NOT NULL default '', `language` varchar(30) NOT NULL default '',
`clipboard` text default '', `clipboard` text default NULL,
`su` INTEGER DEFAULT NULL, `su` INTEGER DEFAULT NULL,
`splashmsg` text default '', `splashmsg` text default NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
CONSTRAINT `tblSessions_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE CONSTRAINT `tblSessions_user` FOREIGN KEY (`userID`) REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

6
install/create_tables-sqlite3.sql
View File

@ -37,7 +37,7 @@ CREATE TABLE `tblAttributeDefinitions` (
`minvalues` INTEGER NOT NULL default '0', `minvalues` INTEGER NOT NULL default '0',
`maxvalues` INTEGER NOT NULL default '0', `maxvalues` INTEGER NOT NULL default '0',
`valueset` TEXT default NULL, `valueset` TEXT default NULL,
`regex` TEXT DEFAULT '', `regex` TEXT DEFAULT NULL,
UNIQUE(`name`) UNIQUE(`name`)
) ; ) ;
@ -428,9 +428,9 @@ CREATE TABLE `tblSessions` (
`lastAccess` INTEGER NOT NULL default '0', `lastAccess` INTEGER NOT NULL default '0',
`theme` varchar(30) NOT NULL default '', `theme` varchar(30) NOT NULL default '',
`language` varchar(30) NOT NULL default '', `language` varchar(30) NOT NULL default '',
`clipboard` text default '', `clipboard` text default NULL,
`su` INTEGER DEFAULT NULL, `su` INTEGER DEFAULT NULL,
`splashmsg` text default '' `splashmsg` text default NULL
) ; ) ;
-- -------------------------------------------------------- -- --------------------------------------------------------

2
install/update-4.0.0/update.sql
View File

@ -12,7 +12,7 @@ ALTER TABLE tblDocumentContent ADD COLUMN `checksum` char(32);
ALTER TABLE tblUsers ADD COLUMN `quota` bigint; ALTER TABLE tblUsers ADD COLUMN `quota` bigint;
ALTER TABLE tblSessions ADD COLUMN `clipboard` text DEFAULT ''; ALTER TABLE tblSessions ADD COLUMN `clipboard` text DEFAULT NULL;
CREATE TABLE tblWorkflowStates ( CREATE TABLE tblWorkflowStates (
`id` int(11) NOT NULL auto_increment, `id` int(11) NOT NULL auto_increment,

4
install/update-4.3.0/update-sqlite3.sql
View File

@ -1,8 +1,8 @@
BEGIN; BEGIN;
ALTER TABLE tblSessions ADD COLUMN `splashmsg` TEXT DEFAULT ''; ALTER TABLE tblSessions ADD COLUMN `splashmsg` TEXT DEFAULT NULL;
ALTER TABLE tblAttributeDefinitions ADD COLUMN `regex` TEXT DEFAULT ''; ALTER TABLE tblAttributeDefinitions ADD COLUMN `regex` TEXT DEFAULT NULL;
UPDATE tblVersion set major=4, minor=3, subminor=0; UPDATE tblVersion set major=4, minor=3, subminor=0;

4
install/update-4.3.0/update.sql
View File

@ -1,8 +1,8 @@
START TRANSACTION; START TRANSACTION;
ALTER TABLE tblSessions ADD COLUMN `splashmsg` TEXT DEFAULT ''; ALTER TABLE tblSessions ADD COLUMN `splashmsg` TEXT DEFAULT NULL;
ALTER TABLE tblAttributeDefinitions ADD COLUMN `regex` TEXT DEFAULT ''; ALTER TABLE tblAttributeDefinitions ADD COLUMN `regex` TEXT DEFAULT NULL;
UPDATE tblVersion set major=4, minor=3, subminor=0; UPDATE tblVersion set major=4, minor=3, subminor=0;