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

allow same extension name in different OUs

This commit is contained in:
Roland Gruber 2012-05-20 09:21:33 +00:00
parent ae652ae8f6
commit 7d160946ab
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lam/HISTORY
View File

@ -2,6 +2,8 @@ June 2012
- quick (un)lock for users - quick (un)lock for users
- LAM Pro: - LAM Pro:
-> Custom fields module allows to manage custom LDAP attributes in Self Service -> Custom fields module allows to manage custom LDAP attributes in Self Service
- fixed bugs
-> Asterisk extensions with same name (3528288)
25.03.2012 3.7 25.03.2012 3.7

18
lam/lib/modules/asteriskExtension.inc
View File

@ -179,7 +179,7 @@ class asteriskExtension extends baseModule {
$this->messages['AstApplicationData'][0] = array('ERROR', _('Please enter the application data.')); $this->messages['AstApplicationData'][0] = array('ERROR', _('Please enter the application data.'));
$this->messages['AstContext'][0] = array('ERROR', _('Please enter the account context.')); $this->messages['AstContext'][0] = array('ERROR', _('Please enter the account context.'));
$this->messages['AstExtension'][0] = array('ERROR', _('Please enter the extension name.')); $this->messages['AstExtension'][0] = array('ERROR', _('Please enter the extension name.'));
$this->messages['AstExtension'][1] = array('ERROR', _('Extension with this name is already exists.')); $this->messages['AstExtension'][1] = array('ERROR', _('Extension with this name already exists.'));
$this->messages['AstPriority'][0] = array('ERROR', _('Please enter the priority.')); $this->messages['AstPriority'][0] = array('ERROR', _('Please enter the priority.'));
$this->messages['AstExtensionAstPriority'][0] = array('ERROR', _('This pair of extension name and priority already exists.')); $this->messages['AstExtensionAstPriority'][0] = array('ERROR', _('This pair of extension name and priority already exists.'));
$this->messages['member'][0] = array('ERROR', _('Please add at least one extension owner.')); $this->messages['member'][0] = array('ERROR', _('Please add at least one extension owner.'));
@ -716,8 +716,9 @@ class asteriskExtension extends baseModule {
} }
/** /**
* Search by extension name and retun true if fields with this extension name is presented * Search by extension name and retun true if fields with this extension name exists
* and false otherwise. * and false otherwise.
* Equal extension names are allowed in different OUs.
* *
* @return boolean true if there are entries with this extension name. * @return boolean true if there are entries with this extension name.
*/ */
@ -727,12 +728,15 @@ class asteriskExtension extends baseModule {
$entries = searchLDAPByAttribute("AstExtension", $extension, $searchClass, array('dn'), array($searchScope)); $entries = searchLDAPByAttribute("AstExtension", $extension, $searchClass, array('dn'), array($searchScope));
$isPresented = false; $exists = false;
if (count($entries) > 0) { for ($i = 0; $i < sizeof($entries); $i++) {
$isPresented = true; $dn = extractDNSuffix($entries[$i]['dn']);
if ($dn == $this->getAccountContainer()->dnSuffix) {
$exists = true;
break;
} }
}
return $isPresented; return $exists;
} }
/** /**