force mail attribute in inetOrgPerson for new accounts
This commit is contained in:
parent
1250d0c845
commit
1cb9b17cf3
|
@ -300,6 +300,9 @@ class kolabUser extends baseModule {
|
||||||
elseif (isset($_SESSION[$this->base]->module['inetOrgPerson']) && !$_SESSION[$this->base]->module['inetOrgPerson']->attributes['userPassword'][0]) {
|
elseif (isset($_SESSION[$this->base]->module['inetOrgPerson']) && !$_SESSION[$this->base]->module['inetOrgPerson']->attributes['userPassword'][0]) {
|
||||||
StatusMessage('ERROR', _("Please enter a user password on this page: %s"), '', array($_SESSION[$this->base]->module['inetOrgPerson']->get_alias()));
|
StatusMessage('ERROR', _("Please enter a user password on this page: %s"), '', array($_SESSION[$this->base]->module['inetOrgPerson']->get_alias()));
|
||||||
}
|
}
|
||||||
|
if (!$_SESSION[$this->base]->module['inetOrgPerson']->attributes['mail'][0]) {
|
||||||
|
StatusMessage('ERROR', _("Please enter an email address on this page: %s"), '', array($_SESSION[$this->base]->module['inetOrgPerson']->get_alias()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
$return = array();
|
$return = array();
|
||||||
// check if account is marked for deletion
|
// check if account is marked for deletion
|
||||||
|
@ -622,6 +625,7 @@ class kolabUser extends baseModule {
|
||||||
if ($_SESSION[$this->base]->isNewAccount) {
|
if ($_SESSION[$this->base]->isNewAccount) {
|
||||||
if (isset($_SESSION[$this->base]->module['posixAccount']) && !$_SESSION[$this->base]->module['posixAccount']->attributes['userPassword'][0]) return false;
|
if (isset($_SESSION[$this->base]->module['posixAccount']) && !$_SESSION[$this->base]->module['posixAccount']->attributes['userPassword'][0]) return false;
|
||||||
elseif (isset($_SESSION[$this->base]->module['inetOrgPerson']) && !$_SESSION[$this->base]->module['inetOrgPerson']->attributes['userPassword'][0]) return false;
|
elseif (isset($_SESSION[$this->base]->module['inetOrgPerson']) && !$_SESSION[$this->base]->module['inetOrgPerson']->attributes['userPassword'][0]) return false;
|
||||||
|
if (!$_SESSION[$this->base]->module['inetOrgPerson']->attributes['mail'][0]) return false;
|
||||||
return $this->inputCorrect;
|
return $this->inputCorrect;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
Loading…
Reference in New Issue