gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.0.x' into develop

Browse Source
This commit is contained in:
Uwe Steinmann 2015-08-05 18:20:43 +02:00
commit 0d4a2164f3
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
install/create_tables-innodb.sql
View File

@ -65,9 +65,10 @@ CREATE TABLE `tblUsers` (
`loginfailures` tinyint(4) NOT NULL default '0',
`disabled` smallint(1) NOT NULL default '0',
`quota` bigint,
`homefolder` int(11) default '0',
`homefolder` int(11) default NULL,
PRIMARY KEY (`id`),
UNIQUE (`login`)
UNIQUE (`login`),
CONSTRAINT `tblUsers_homefolder` FOREIGN KEY (`homefolder`) REFERENCES `tblFolders` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- --------------------------------------------------------

2
install/create_tables-sqlite3.sql
View File

@ -62,7 +62,7 @@ CREATE TABLE `tblUsers` (
`loginfailures` INTEGER NOT NULL default '0',
`disabled` INTEGER NOT NULL default '0',
`quota` INTEGER,
`homefolder` INTEGER default '0',
`homefolder` INTEGER default NULL REFERENCES `tblFolders` (`id`),
UNIQUE (`login`)
);

2
install/update-5.0.0/update-sqlite3.sql
View File

@ -1,6 +1,6 @@
BEGIN;
ALTER TABLE tblUsers ADD COLUMN `homefolder` INTEGER DEFAULT 0;
ALTER TABLE tblUsers ADD COLUMN `homefolder` INTEGER DEFAULT NULL REFERENCES `tblFolders` (`id`);
UPDATE tblVersion set major=5, minor=0, subminor=0;

3
install/update-5.0.0/update.sql
View File

@ -1,6 +1,7 @@
START TRANSACTION;
ALTER TABLE tblUsers ADD COLUMN `homefolder` INTEGER DEFAULT 0;
ALTER TABLE `tblUsers` ADD COLUMN `homefolder` INTEGER DEFAULT NULL;
ALTER TABLE `tblUsers` ADD CONSTRAINT `tblUsers_homefolder` FOREIGN KEY (`homefolder`) REFERENCES `tblFolders` (`id`);
UPDATE tblVersion set major=5, minor=0, subminor=0;

1
utils/xmldump.php
View File

@ -408,6 +408,7 @@ if($users) {
echo " <attr name=\"hidden\">".$user->isHidden()."</attr>\n";
echo " <attr name=\"disabled\">".$user->isDisabled()."</attr>\n";
echo " <attr name=\"pwdexpiration\">".$user->getPwdExpiration()."</attr>\n";
echo " <attr name=\"homefolder\">".$user->getHomeFolder()."</attr>\n";
if($image = $user->getImage()) {
echo " <image id=\"".$image['id']."\">\n";
echo " <attr name=\"mimetype\">".$image['mimeType']."</attr>\n";