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

allow $user, $firstname, $lastname wildcards

This commit is contained in:
Roland Gruber 2013-12-28 10:48:54 +00:00
parent 25d6611231
commit a855be6f63
1 changed files with 53 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
lam/lib/modules/inetOrgPerson.inc
View File

@ -800,11 +800,12 @@ class inetOrgPerson extends baseModule implements passwordService {
), ),
'mail' => array ( 'mail' => array (
"Headline" => _("Email address"), 'attr' => 'mail', "Headline" => _("Email address"), 'attr' => 'mail',
"Text" => _("The user's email address.") "Text" => _("The user's email address.") . ' ' . _('You can use "$user", "$firstname" and "$lastname" as wildcards for user name, first and last name.')
), ),
'mailList' => array ( 'mailList' => array (
"Headline" => _("Email address"), 'attr' => 'mail', "Headline" => _("Email address"), 'attr' => 'mail',
"Text" => _("The user's email address.") . ' ' . _('Multiple values are separated by semicolon.') "Text" => _("The user's email address.") . ' ' . _('Multiple values are separated by semicolon.')
. ' ' . _('You can use "$user", "$firstname" and "$lastname" as wildcards for user name, first and last name.')
), ),
"mailPassword" => array ( "mailPassword" => array (
"Headline" => _("Send password via mail"), "Headline" => _("Send password via mail"),
@ -985,6 +986,22 @@ class inetOrgPerson extends baseModule implements passwordService {
if (!$this->getAccountContainer()->isNewAccount && !in_array('inetOrgPerson', $this->getAccountContainer()->attributes_orig['objectClass'])) { if (!$this->getAccountContainer()->isNewAccount && !in_array('inetOrgPerson', $this->getAccountContainer()->attributes_orig['objectClass'])) {
return array(); return array();
} }
// replace $user in email
if (!empty($this->attributes['mail'][0])) {
$user = null;
if ($this->getAccountContainer()->getAccountModule('posixAccount') != null) {
$attrs = $this->getAccountContainer()->getAccountModule('posixAccount')->getAttributes();
$user = $attrs['uid'][0];
}
elseif (!empty($this->attributes['uid'][0])) {
$user = $this->attributes['uid'][0];
}
if (!empty($user)) {
foreach ($this->attributes['mail'] as &$mail) {
$mail = str_replace('$user', $user, $mail);
}
}
}
$return = $this->getAccountContainer()->save_module_attributes($this->attributes, $this->orig); $return = $this->getAccountContainer()->save_module_attributes($this->attributes, $this->orig);
// postalAddress, registeredAddress, facsimileTelephoneNumber and jpegPhoto need special removing // postalAddress, registeredAddress, facsimileTelephoneNumber and jpegPhoto need special removing
if (isset($return[$this->getAccountContainer()->dn_orig]['remove']['postalAddress'])) { if (isset($return[$this->getAccountContainer()->dn_orig]['remove']['postalAddress'])) {
@ -1023,6 +1040,7 @@ class inetOrgPerson extends baseModule implements passwordService {
*/ */
function process_attributes() { function process_attributes() {
$errors = array(); $errors = array();
$replacements = array('$lastname' => 'sn', '$firstname' => 'givenName');
// add parent object classes // add parent object classes
if ($this->getAccountContainer()->isNewAccount) { if ($this->getAccountContainer()->isNewAccount) {
if (!in_array('organizationalPerson', $this->attributes['objectClass'])) { if (!in_array('organizationalPerson', $this->attributes['objectClass'])) {
@ -1046,6 +1064,15 @@ class inetOrgPerson extends baseModule implements passwordService {
} }
if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideEMailAddress')) { if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideEMailAddress')) {
$this->processMultiValueInputTextField('mail', $errors, 'email'); $this->processMultiValueInputTextField('mail', $errors, 'email');
if (!empty($this->attributes['mail'])) {
foreach ($this->attributes['mail'] as &$mail) {
foreach ($replacements as $wildcard => $key) {
if (!empty($this->attributes[$key][0])) {
$mail = str_replace($wildcard, $this->attributes[$key][0], $mail);
}
}
}
}
} }
if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideTelephoneNumber')) { if (!$this->isBooleanConfigOptionSet('inetOrgPerson_hideTelephoneNumber')) {
$this->processMultiValueInputTextField('telephoneNumber', $errors, 'telephone'); $this->processMultiValueInputTextField('telephoneNumber', $errors, 'telephone');
@ -2056,6 +2083,7 @@ class inetOrgPerson extends baseModule implements passwordService {
*/ */
function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) { function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
$errors = array(); $errors = array();
$replacements = array();
// get list of existing users // get list of existing users
$existingUsers = searchLDAPByAttribute('uid', '*', 'inetOrgPerson', array('uid'), array('user')); $existingUsers = searchLDAPByAttribute('uid', '*', 'inetOrgPerson', array('uid'), array('user'));
for ($e = 0; $e < sizeof($existingUsers); $e++) { for ($e = 0; $e < sizeof($existingUsers); $e++) {
@ -2066,6 +2094,7 @@ class inetOrgPerson extends baseModule implements passwordService {
// last name // last name
if (get_preg($rawAccounts[$i][$ids['inetOrgPerson_lastName']], 'realname')) { if (get_preg($rawAccounts[$i][$ids['inetOrgPerson_lastName']], 'realname')) {
$partialAccounts[$i]['sn'] = trim($rawAccounts[$i][$ids['inetOrgPerson_lastName']]); $partialAccounts[$i]['sn'] = trim($rawAccounts[$i][$ids['inetOrgPerson_lastName']]);
$replacements['$lastname'] = $partialAccounts[$i]['sn'];
} }
else { else {
$errMsg = $this->messages['lastname'][1]; $errMsg = $this->messages['lastname'][1];
@ -2076,6 +2105,7 @@ class inetOrgPerson extends baseModule implements passwordService {
if ($rawAccounts[$i][$ids['inetOrgPerson_firstName']] != "") { if ($rawAccounts[$i][$ids['inetOrgPerson_firstName']] != "") {
if (get_preg($rawAccounts[$i][$ids['inetOrgPerson_firstName']], 'realname')) { if (get_preg($rawAccounts[$i][$ids['inetOrgPerson_firstName']], 'realname')) {
$partialAccounts[$i]['givenName'] = trim($rawAccounts[$i][$ids['inetOrgPerson_firstName']]); $partialAccounts[$i]['givenName'] = trim($rawAccounts[$i][$ids['inetOrgPerson_firstName']]);
$replacements['$firstname'] = $partialAccounts[$i]['givenName'];
} }
else { else {
$errMsg = $this->messages['givenName'][1]; $errMsg = $this->messages['givenName'][1];
@ -2083,6 +2113,25 @@ class inetOrgPerson extends baseModule implements passwordService {
$errors[] = $errMsg; $errors[] = $errMsg;
} }
} }
if (!in_array('posixAccount', $selectedModules)) {
// uid
if (isset($ids['inetOrgPerson_userName']) && !empty($rawAccounts[$i][$ids['inetOrgPerson_userName']])) {
if (in_array($rawAccounts[$i][$ids['inetOrgPerson_userName']], $existingUsers)) {
$errMsg = $this->messages['uid'][3];
array_push($errMsg, array($i));
$errors[] = $errMsg;
}
elseif (get_preg($rawAccounts[$i][$ids['inetOrgPerson_userName']], 'username')) {
$partialAccounts[$i]['uid'] = $rawAccounts[$i][$ids['inetOrgPerson_userName']];
$replacements['$user'] = $partialAccounts[$i]['uid'];
}
else {
$errMsg = $this->messages['uid'][1];
array_push($errMsg, array($i));
$errors[] = $errMsg;
}
}
}
// initials // initials
if (isset($ids['inetOrgPerson_initials']) && ($rawAccounts[$i][$ids['inetOrgPerson_initials']] != "")) { if (isset($ids['inetOrgPerson_initials']) && ($rawAccounts[$i][$ids['inetOrgPerson_initials']] != "")) {
$partialAccounts[$i]['initials'] = preg_split('/;[ ]*/', $rawAccounts[$i][$ids['inetOrgPerson_initials']]); $partialAccounts[$i]['initials'] = preg_split('/;[ ]*/', $rawAccounts[$i][$ids['inetOrgPerson_initials']]);
@ -2285,6 +2334,9 @@ class inetOrgPerson extends baseModule implements passwordService {
} }
// eMail // eMail
if (isset($ids['inetOrgPerson_email']) && ($rawAccounts[$i][$ids['inetOrgPerson_email']] != "")) { if (isset($ids['inetOrgPerson_email']) && ($rawAccounts[$i][$ids['inetOrgPerson_email']] != "")) {
foreach ($replacements as $wildcard => $value) {
$rawAccounts[$i][$ids['inetOrgPerson_email']] = str_replace($wildcard, $value, $rawAccounts[$i][$ids['inetOrgPerson_email']]);
}
$mailList = preg_split('/;[ ]*/', trim($rawAccounts[$i][$ids['inetOrgPerson_email']])); $mailList = preg_split('/;[ ]*/', trim($rawAccounts[$i][$ids['inetOrgPerson_email']]));
$partialAccounts[$i]['mail'] = $mailList; $partialAccounts[$i]['mail'] = $mailList;
for ($x = 0; $x < sizeof($mailList); $x++) { for ($x = 0; $x < sizeof($mailList); $x++) {
@ -2327,22 +2379,6 @@ class inetOrgPerson extends baseModule implements passwordService {
$partialAccounts[$i]['cn'] = $partialAccounts[$i]['sn']; $partialAccounts[$i]['cn'] = $partialAccounts[$i]['sn'];
} }
} }
// uid
if (isset($ids['inetOrgPerson_userName']) && !empty($rawAccounts[$i][$ids['inetOrgPerson_userName']])) {
if (in_array($rawAccounts[$i][$ids['inetOrgPerson_userName']], $existingUsers)) {
$errMsg = $this->messages['uid'][3];
array_push($errMsg, array($i));
$errors[] = $errMsg;
}
elseif (get_preg($rawAccounts[$i][$ids['inetOrgPerson_userName']], 'username')) {
$partialAccounts[$i]['uid'] = $rawAccounts[$i][$ids['inetOrgPerson_userName']];
}
else {
$errMsg = $this->messages['uid'][1];
array_push($errMsg, array($i));
$errors[] = $errMsg;
}
}
// password // password
if (($rawAccounts[$i][$ids['inetOrgPerson_userPassword']] != "") && (get_preg($rawAccounts[$i][$ids['inetOrgPerson_userPassword']], 'password'))) { if (($rawAccounts[$i][$ids['inetOrgPerson_userPassword']] != "") && (get_preg($rawAccounts[$i][$ids['inetOrgPerson_userPassword']], 'password'))) {
$partialAccounts[$i]['userPassword'] = pwd_hash($rawAccounts[$i][$ids['inetOrgPerson_userPassword']], true, $this->moduleSettings['posixAccount_pwdHash'][0]); $partialAccounts[$i]['userPassword'] = pwd_hash($rawAccounts[$i][$ids['inetOrgPerson_userPassword']], true, $this->moduleSettings['posixAccount_pwdHash'][0]);