gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

set pwdexpiration to '' if it is '0000-00-00'

Browse Source
This commit is contained in:
Uwe Steinmann 2017-02-14 21:05:29 +01:00
parent 8988bc0098
commit a761b0b417
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
utils/xmlimport.php
View File

@ -114,6 +114,8 @@ function insert_user($user) { /* {{{ */
$logger->info("User '".$user['attributes']['login']."' already exists"); $logger->info("User '".$user['attributes']['login']."' already exists");
} else { } else {
if(in_array('users', $sections)) { if(in_array('users', $sections)) {
if(substr($user['attributes']['pwdexpiration'], 0, 10) == '0000-00-00')
$user['attributes']['pwdexpiration'] = '';
$newUser = $dms->addUser( $newUser = $dms->addUser(
$user['attributes']['login'], $user['attributes']['login'],
$user['attributes']['pwd'], $user['attributes']['pwd'],
@ -230,6 +232,7 @@ function insert_role($role) { /* {{{ */
$logger->err("Could not add role"); $logger->err("Could not add role");
return false; return false;
} }
/*
if($aro = SeedDMS_Aro::getInstance($newRole, $dms)) { if($aro = SeedDMS_Aro::getInstance($newRole, $dms)) {
$logger->info("Added aro"); $logger->info("Added aro");
if($role['acos']) { if($role['acos']) {
@ -251,6 +254,7 @@ function insert_role($role) { /* {{{ */
$logger->err("Could not add Aro"); $logger->err("Could not add Aro");
return false; return false;
} }
*/
} else { } else {
$newRole = null; $newRole = null;
} }
@ -1852,6 +1856,7 @@ require_once("SeedDMS/Core.php");
$db = new SeedDMS_Core_DatabaseAccess($settings->_dbDriver, $settings->_dbHostname, $settings->_dbUser, $settings->_dbPass, $settings->_dbDatabase); $db = new SeedDMS_Core_DatabaseAccess($settings->_dbDriver, $settings->_dbHostname, $settings->_dbUser, $settings->_dbPass, $settings->_dbDatabase);
$db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\""); $db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostname . "\"");
$db->_debug = 1;
$dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir); $dms = new SeedDMS_Core_DMS($db, $settings->_contentDir.$settings->_contentOffsetDir);
if(!$settings->_doNotCheckDBVersion && !$dms->checkVersion()) { if(!$settings->_doNotCheckDBVersion && !$dms->checkVersion()) {