mirror of
https://git.code.sf.net/p/seeddms/code
synced 2024-11-26 15:32:13 +00:00
Merge branch 'seeddms-5.0.x' into develop
This commit is contained in:
commit
0d4a2164f3
|
@ -65,9 +65,10 @@ CREATE TABLE `tblUsers` (
|
||||||
`loginfailures` tinyint(4) NOT NULL default '0',
|
`loginfailures` tinyint(4) NOT NULL default '0',
|
||||||
`disabled` smallint(1) NOT NULL default '0',
|
`disabled` smallint(1) NOT NULL default '0',
|
||||||
`quota` bigint,
|
`quota` bigint,
|
||||||
`homefolder` int(11) default '0',
|
`homefolder` int(11) default NULL,
|
||||||
PRIMARY KEY (`id`),
|
PRIMARY KEY (`id`),
|
||||||
UNIQUE (`login`)
|
UNIQUE (`login`),
|
||||||
|
CONSTRAINT `tblUsers_homefolder` FOREIGN KEY (`homefolder`) REFERENCES `tblFolders` (`id`)
|
||||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
-- --------------------------------------------------------
|
||||||
|
|
|
@ -62,7 +62,7 @@ CREATE TABLE `tblUsers` (
|
||||||
`loginfailures` INTEGER NOT NULL default '0',
|
`loginfailures` INTEGER NOT NULL default '0',
|
||||||
`disabled` INTEGER NOT NULL default '0',
|
`disabled` INTEGER NOT NULL default '0',
|
||||||
`quota` INTEGER,
|
`quota` INTEGER,
|
||||||
`homefolder` INTEGER default '0',
|
`homefolder` INTEGER default NULL REFERENCES `tblFolders` (`id`),
|
||||||
UNIQUE (`login`)
|
UNIQUE (`login`)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
BEGIN;
|
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;
|
UPDATE tblVersion set major=5, minor=0, subminor=0;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
START TRANSACTION;
|
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;
|
UPDATE tblVersion set major=5, minor=0, subminor=0;
|
||||||
|
|
||||||
|
|
|
@ -408,6 +408,7 @@ if($users) {
|
||||||
echo " <attr name=\"hidden\">".$user->isHidden()."</attr>\n";
|
echo " <attr name=\"hidden\">".$user->isHidden()."</attr>\n";
|
||||||
echo " <attr name=\"disabled\">".$user->isDisabled()."</attr>\n";
|
echo " <attr name=\"disabled\">".$user->isDisabled()."</attr>\n";
|
||||||
echo " <attr name=\"pwdexpiration\">".$user->getPwdExpiration()."</attr>\n";
|
echo " <attr name=\"pwdexpiration\">".$user->getPwdExpiration()."</attr>\n";
|
||||||
|
echo " <attr name=\"homefolder\">".$user->getHomeFolder()."</attr>\n";
|
||||||
if($image = $user->getImage()) {
|
if($image = $user->getImage()) {
|
||||||
echo " <image id=\"".$image['id']."\">\n";
|
echo " <image id=\"".$image['id']."\">\n";
|
||||||
echo " <attr name=\"mimetype\">".$image['mimeType']."</attr>\n";
|
echo " <attr name=\"mimetype\">".$image['mimeType']."</attr>\n";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user