![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/ogroups/class_phonequeue.inc b/plugins/admin/ogroups/class_phonequeue.inc
index 4e0a4738632a2a4a17229354eec80fc95fc9b522..d10c3c747a58281d89d7002026ed1af54647306b 100644 (file)
var $goFonQueueAnnounceHoldtime="yes";
var $telephoneNumber =array();
var $goFonQueueMember =array();
- var $goFonDialOption ="tThH";
+ var $goFonDialOption ="";
var $goFonQueueRetry =5;
+ var $goFonQueueStrategyOptions=array();
+ var $goFonQueueStrategyOptionsR=array();
+
+
var $old_phone_numbers =array();
/* attribute list for save action */
var $attributes= array( "goFonTimeOut","goFonMaxLen","goFonAnnounceFrequency","goFonDialOption_t","goFonDialOption_T",
- "goFonDialOption_h","goFonDialOption_r",
+ "goFonDialOption_h","goFonDialOption_r","cn",
"goFonDialOption_H","goFonMusiconHold","goFonWelcomeMusic","goFonQueueReportHold","goFonQueueYouAreNext",
"goFonQueueThereAre","goFonQueueCallsWaiting","goFonQueueThankYou","goFonQueueMinutes","goFonQueueSeconds","goFonQueueLessThan",
"telephoneNumber","goFonQueueLanguage","goFonQueueStrategy","goFonQueueAnnounceHoldtime","goFonQueueAnnounce","goFonDialOption","goFonQueueRetry");
$this->goFonQueueAnnounceHoldtime=false;
}
$this->old_phone_numbers = $this->telephoneNumber;
+
+ $types= array('ringall' =>_("ring all"),
+ 'roundrobin' =>_("round robin"),
+ 'leastrecent'=>_("least recently called"),
+ 'fewestcalls'=>_("fewest completed calls"),
+ 'random' =>_("random"),
+ 'rrmemory' =>_("round robin with memory"));
+
+ $i = 0;
+ foreach($types as $type => $name){
+ $i++;
+ $this->goFonQueueStrategyOptions[$i] =$name;
+ $this->goFonQueueStrategyOptionsR[$i] =$type;
+ $tmp[$type] = $i;
+ }
+
+ $this->goFonQueueStrategy= $tmp[$this->goFonQueueStrategy];
+
+
}
$display= $this->show_header(_("Remove the phone queue from this Account"),
_("Phone queue is enabled for this group. You can disable it by clicking below."));
} else {
- $display= $this->show_header(_("Create phone queue"), _("For this group the phone queues are disabled. You can enable them by clicking below."));
+ $display= $this->show_header(_("Create phone queue"),
+ _("For this group the phone queues are disabled. You can enable them by clicking below."));
return ($display);
}
}
}
}
-
$smarty= get_smarty();
$smarty->assign("goFonQueueLanguageOptions",array('de'=>_('German'),'ur'=>_('Uruguai')));
- $types= array('ringall' =>_("ring all"),
- 'roundrobin' =>_("round robin"),
- 'leastrecent'=>_("least recently called"),
- 'fewestcalls'=>_("fewest completed calls"),
- 'random' =>_("random"),
- 'rrmemory' =>_("round robin with memory"));
- sort($types);
- $smarty->assign("goFonQueueStrategyOptions", $types);
+ $smarty->assign("goFonQueueStrategyOptions", $this->goFonQueueStrategyOptions);
foreach($this->attributes as $key => $val){
$smarty->assign($val,$this->$val);
$message[] = $this->is_number_used();
}
- if($this->generate_mysql_entension_entries()){
- $message[] = $this->generate_mysql_entension_entries();
+ if($this->generate_mysql_table_entries()){
+ $message[] = $this->generate_mysql_table_entries();
}
if(!((is_numeric($this->goFonTimeOut))||(empty($this->goFonTimeOut)))){
- function generate_mysql_entension_entries($save = false)
+ function generate_mysql_table_entries($save = false)
{
$SQL = array();
-
+
+ if(!isset($_SESSION['config']->data['SERVERS']['FON'])){
+ return(_("There is currently no asterisk server defined. Possibly you are missing a server that handles the asterisk management (goFonServer).\nYour Settings can't be saved to asterisk Database."));
+ return(false);
+ }
+
// Get Configuration for Mysql database Server
$a_SETUP = $_SESSION['config']->data['SERVERS']['FON'];
$s_parameter ="";
$i = 0;
$prio = 11;
- if(empty($this->cn)){
- $this->cn = $this->parent->by_object['ogroup']->cn;
- $this->attrs['cn'][0] = $this->parent->by_object['ogroup']->cn;
+ $delete = array();
+ if(!empty($this->parent->by_object['ogroup'])){
+ $new_cn = $this->parent->by_object['ogroup']->cn;
}
+ $old_cn = $this->cn;
+
+ $delete[]= "DELETE FROM ".$a_SETUP['EXT_TABLE']." WHERE exten='".$new_cn."';\n";
+ $delete[]= "DELETE FROM ".$a_SETUP['QUEUE_TABLE']." WHERE name='".$new_cn."'; \n";
+ $delete[]= "DELETE FROM ".$a_SETUP['QUEUE_MEMBER_TABLE']." WHERE queue_name='".$new_cn."';\n";
+ $delete[]= "DELETE FROM ".$a_SETUP['EXT_TABLE']." WHERE exten='".$old_cn."';\n";
+ $delete[]= "DELETE FROM ".$a_SETUP['QUEUE_TABLE']." WHERE name='".$old_cn."'; \n";
+ $delete[]= "DELETE FROM ".$a_SETUP['QUEUE_MEMBER_TABLE']." WHERE queue_name='".$old_cn."';\n";
// Delete old Entries
- $delete = array();
if(is_array($this->old_phone_numbers)){
foreach($this->old_phone_numbers as $phone){
$delete[]= "DELETE FROM ".$a_SETUP['EXT_TABLE']." WHERE exten='".$phone."';\n";
}
}
- $delete[]= "DELETE FROM ".$a_SETUP['EXT_TABLE']." WHERE exten='".$this->attrs['cn'][0]."';\n";
- $delete[]= "DELETE FROM ".$a_SETUP['QUEUE_TABLE']." WHERE name=\"".$this->attrs['cn'][0]."\"; \n";
- $delete[]= "DELETE FROM ".$a_SETUP['QUEUE_MEMBER_TABLE']." WHERE queue_name=\"".$this->attrs['cn'][0]."\";\n";
/* Perform queries to delte old entries */
foreach($delete as $query){
}
}
+ $this->attrs['cn'][0] = $new_cn;
+
/* Append new Member for this queue */
$i = 0;
$queueuser =array();
foreach($this->parent->by_object['ogroup']->memberList as $member){
- if(in_array("goFonAccount",$member['objectClass'])){
- $i ++ ;
- $queueuser[$i]['queue_name'] = $this->attrs['cn'][0];
- $queueuser[$i]['interface'] = "SIP/".$member['uid'][0];
- $queueuser[$i]['penalty'] = 1;
+ if(isset($member['objectClass'])){
+ if(in_array("goFonAccount",$member['objectClass'])){
+ $i ++ ;
+ $queueuser[$i]['queue_name'] = $this->attrs['cn'][0];
+ $queueuser[$i]['interface'] = "SIP/".$member['uid'][0];
+ $queueuser[$i]['penalty'] = 1;
+ }
}
}
}
}
-
/* generate Extension entries, with priority */
$queueusers=0;
foreach($this->parent->by_object['ogroup']->memberList as $member){
- if(in_array("goFonAccount",$member['objectClass'])){
- $queueusers++;
+ if(isset($member['objectClass'])){
+ if(in_array("goFonAccount",$member['objectClass'])){
+ $queueusers++;
+ }
}
}
$i = 0;
+
+ $i_insert_only_once = false;
+
foreach($this->telephoneNumber as $num){
// If there are no member in a Queue
// A Queue is not deleted directly, it is stored until the o group is deleted
- $a_ext[$i]['context'] = 'GOsa';
- $a_ext[$i]['exten'] = $this->attrs['cn'][0];
- $a_ext[$i]['priority'] = 1;
- $a_ext[$i]['app'] = "Goto";
- $a_ext[$i]['appdata'] = $num."|1";
- $i ++ ;
+ if($i_insert_only_once == false){
+ $i_insert_only_once = true;
+ $a_ext[$i]['context'] = 'GOsa';
+ $a_ext[$i]['exten'] = $this->attrs['cn'][0];
+ $a_ext[$i]['priority'] = 1;
+ $a_ext[$i]['app'] = "Goto";
+ $a_ext[$i]['appdata'] = $num."|1";
+ $i ++ ;
+ }
if($queueusers == 0){
$a_ext[$i]['context'] = 'GOsa';
$a_ext[$i]['exten'] = $num;
$a_ext[$i]['priority'] = 5;
$a_ext[$i]['app'] = "SetVar";
- $a_ext[$i]['appdata'] = $prio;
+ $a_ext[$i]['appdata'] = "QUEUE_PRIO=".$prio;
$i ++ ;
$a_ext[$i]['context'] = 'GOsa';
$a_ext[$i]['exten'] = $num;
$queue["name"] = $this->attrs['cn'][0];
$queue["timeout"] = $this->goFonTimeOut;
$queue["maxlen"] = $this->goFonMaxLen;
- $queue["strategy" ] = $this->goFonQueueStrategy;
+ $queue["strategy" ] = $this->goFonQueueStrategyOptionsR[$this->goFonQueueStrategy];
$queue["queue_thankyou"] = $this->goFonQueueThankYou;
$queue["queue_reporthold"] = $this->goFonQueueReportHold;
$queue["announce_frequency"] = $this->goFonAnnounceFrequency;
}
}
+ @mysql_close($r_con);
return(false);
}
{
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
- $ldap->search("(|(objectClass=goFonAccount)(objectClass=goFonQueue))", array("telephoneNumber","cn","uid"));
+ $ldap->search("(|(objectClass=goFonAccount)(objectClass=goFonQueue)(objectClass=goFonConference))", array("telephoneNumber","cn","uid"));
while($attrs = $ldap->fetch()) {
unset($attrs['telephoneNumber']['count']);
foreach($attrs['telephoneNumber'] as $tele){
if(!$this->is_account) return;
$ldap= $this->config->get_ldap_link();
+ $this->generate_mysql_table_entries(true);
+
plugin::save();
$this->attrs['goFonDialOption'] = "";
- foreach(array("goFonDialOption_t","goFonDialOption_T","goFonDialOption_r","goFonDialOption_h","goFonDialOption_H") as $val){
+ foreach(array("goFonDialOption_t","goFonDialOption_T","goFonDialOption_r","goFonDialOption_h","goFonDialOption_H","cn") as $val){
$this->attrs['goFonDialOption'].=$this->$val;
unset($this->attrs[$val]);
}
- $this->generate_mysql_entension_entries(true);
if($this->attrs['goFonDialOption']=="") $this->attrs['goFonDialOption']=array();
if($this->goFonQueueAnnounceHoldtime != "no" ){
}else{
$this->attrs['goFonQueueAnnounceHoldtime'] = "no";
}
-
+
+ $this->attrs['goFonQueueStrategy'] = $this->goFonQueueStrategyOptionsR[$this->goFonQueueStrategy];
+
/* Save data to LDAP */
$ldap->cd($this->dn);
$ldap->modify($this->attrs);
return( sprintf(_("Can't select database %s on %s."),$a_SETUP['DB'],$a_SETUP['SERVER']));
}
+ /* Remove all temporary attributes */
$tmp = array_flip($this->attributes);
- foreach(array("goFonDialOption_t","goFonDialOption_T","goFonDialOption_r","goFonDialOption_h","goFonDialOption_H") as $val){
+ foreach(array("goFonDialOption_t","goFonDialOption_T","goFonDialOption_r","goFonDialOption_h","goFonDialOption_H","cn") as $val){
unset($this->$val);
unset($this->attrs[$val]);
unset($tmp[$val]);