WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed problem by optimations yesterday

This commit is contained in:
katagia 2004-09-19 09:50:31 +00:00
parent 2ed32f3ca0
commit bc73e501cc
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lam/lib/baseModule.inc
View File

@ -57,6 +57,11 @@ class baseModule {
/** contains all ldap attributes which are loaded from ldap */ /** contains all ldap attributes which are loaded from ldap */
var $orig; var $orig;
/** contains the last error messages of the module.
* Ths variable is needed because we don't want to make
* unnecesarry checks when a attributes wasn't changed */
var $errors;
/** /**
* Creates a new base module class * Creates a new base module class
* *

10
lam/lib/modules/posixGroup.inc
View File

@ -368,7 +368,7 @@ class posixGroup extends baseModule {
$errors['userPassword'][] = array('ERROR', _('Password'), _('Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and #*,.;:_-+!$%&/|?{[()]}= !')); $errors['userPassword'][] = array('ERROR', _('Password'), _('Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and #*,.;:_-+!$%&/|?{[()]}= !'));
} }
if ($post['genpass']) $this->userPassword(genpasswd()); if ($post['genpass']) $this->userPassword(genpasswd());
if ($this->attributes['gidNumber'][0]!=$post['gidNumber']) { if ($this->attributes['gidNumber'][0]!=$post['gidNumber'] || ($this->errors['gidNumber'][0]='ERROR')) {
// Check if GID is valid. If none value was entered, the next useable value will be inserted // Check if GID is valid. If none value was entered, the next useable value will be inserted
// load min and may uidNumber // load min and may uidNumber
$minID = intval($this->moduleSettings['posixGroup_minGID'][0]); $minID = intval($this->moduleSettings['posixGroup_minGID'][0]);
@ -426,7 +426,7 @@ class posixGroup extends baseModule {
} }
} }
} }
if ($this->attributes['cn'][0]!=$post['cn']) { if ($this->attributes['cn'][0]!=$post['cn'] || ($this->errors['cn'][0]='ERROR')) {
$this->attributes['cn'][0] = $post['cn']; $this->attributes['cn'][0] = $post['cn'];
if (($this->attributes['cn'][0] != $post['cn']) && ereg('[A-Z]$', $post['cn'])) if (($this->attributes['cn'][0] != $post['cn']) && ereg('[A-Z]$', $post['cn']))
$errors['cn'][] = array('WARN', _('Groupname'), _('You are using a capital letters. This can cause problems because windows isn\'t case-sensitive.')); $errors['cn'][] = array('WARN', _('Groupname'), _('You are using a capital letters. This can cause problems because windows isn\'t case-sensitive.'));
@ -477,7 +477,11 @@ class posixGroup extends baseModule {
} }
} }
// Return error-messages // Return error-messages
if (is_array($errors)) return $errors; if (count($errors)!=0) {
$this->errors = $errors;
return $errors;
}
else $this->errors = array();
// Go to additional group page when no error did ocour and button was pressed // Go to additional group page when no error did ocour and button was pressed
if ($post['adduser']) return 'user'; if ($post['adduser']) return 'user';
return 0; return 0;