added central password service

This commit is contained in:
Roland Gruber 2009-10-10 12:53:41 +00:00
parent 9ea91629c3
commit 861e022538
1 changed files with 5 additions and 7 deletions

View File

@ -261,13 +261,11 @@ class kolabUser extends baseModule {
if ($this->getAccountContainer()->getAccountModule('posixAccount') != null) { if ($this->getAccountContainer()->getAccountModule('posixAccount') != null) {
$attrsP = $this->getAccountContainer()->getAccountModule('posixAccount')->getAttributes(); $attrsP = $this->getAccountContainer()->getAccountModule('posixAccount')->getAttributes();
if (!isset($attrsP['userPassword'][0]) || ($attrsP['userPassword'][0] == '')) { if (!isset($attrsP['userPassword'][0]) || ($attrsP['userPassword'][0] == '')) {
StatusMessage('ERROR', _("Please enter a user password on this page: %s"), '', array($this->getAccountContainer()->getAccountModule('posixAccount')->get_alias())); StatusMessage('ERROR', _("Please enter a user password."));
} }
} }
elseif ($this->getAccountContainer()->getAccountModule('inetOrgPerson') != null) { elseif (!isset($attrsI['userPassword'][0]) || ($attrsI['userPassword'][0] == '')) {
if (!isset($attrsI['userPassword'][0]) || ($attrsI['userPassword'][0] == '')) { StatusMessage('ERROR', _("Please enter a user password."));
StatusMessage('ERROR', _("Please enter a user password on this page: %s"), '', array($this->getAccountContainer()->getAccountModule('inetOrgPerson')->get_alias()));
}
} }
} }
if (!$attrsI['mail'][0]) { if (!$attrsI['mail'][0]) {
@ -597,8 +595,8 @@ class kolabUser extends baseModule {
$attrsP = $this->getAccountContainer()->getAccountModule('posixAccount')->getAttributes(); $attrsP = $this->getAccountContainer()->getAccountModule('posixAccount')->getAttributes();
if (!$attrsP['userPassword'][0]) return false; if (!$attrsP['userPassword'][0]) return false;
} }
elseif ($this->getAccountContainer()->getAccountModule('inetOrgPerson') != null) { elseif (!$attrsI['userPassword'][0]) {
if (!$attrsI['userPassword'][0]) return false; return false;
} }
} }
} }