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

applied Pavel's patch to fix automatic extension name

This commit is contained in:
Roland Gruber 2012-01-30 18:43:54 +00:00
parent 4c1076be8e
commit 5d18525cb6
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lam/lib/modules/asteriskExtensionNewUI.inc
View File

@ -670,9 +670,11 @@ class asteriskExtensionNewUI extends baseModule {
$searchClass = "AsteriskExtension"; $searchClass = "AsteriskExtension";
$searchScope = 'asteriskExtNewUI'; $searchScope = 'asteriskExtNewUI';
$suggeted_extension = ''; //default empty value
if( isset($this->extensionRows[0]['astextension'][0]) ){
$suggeted_extension = $this->extensionRows[0]['astextension'][0];
}else{
$entries = searchLDAPByAttribute(null, null, $searchClass, array('astextension'), array($searchScope)); $entries = searchLDAPByAttribute(null, null, $searchClass, array('astextension'), array($searchScope));
$entries = $this->array_sort($entries, 'astextension'); $entries = $this->array_sort($entries, 'astextension');
if (isset($entries[sizeof($entries) - 1]['astextension'][0])) { if (isset($entries[sizeof($entries) - 1]['astextension'][0])) {
@ -680,8 +682,20 @@ class asteriskExtensionNewUI extends baseModule {
} else { } else {
$greater_ext_name = 0; $greater_ext_name = 0;
} }
//naive THERY naive, so in future here mast be somthing more complcated and safe if(is_numeric($greater_ext_name)){
return $greater_ext_name + 1; $suggeted_extension = $greater_ext_name + 1;
}else{
$ptn = "/(?P<name>[A-Za-z0-9]+)_(?P<digit>\d+)/";
if(preg_match_all($ptn, $greater_ext_name, $matches, PREG_PATTERN_ORDER)){
$next_digit = $matches['digit'][0] + 1;
$suggeted_extension = $matches['name'][0] . '_' . $next_digit;
}else{
$suggeted_extension = $greater_ext_name . '_1';
}
}
}
return $suggeted_extension;
} }
/** /**