![[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 eceb7b3134cff1426b236fd1a9e48c3f3a9c2f86..827d2ad8a2309a5423a05e64214c9f073d56072e 100644 (file)
var $goFonWelcomeMusic ="gonicus-berlin-welcome";
var $goFonQueueReportHold ="yes";
var $goFonQueueYouAreNext ="queue-youarenext";
- var $goFonQueueThereAre ="queue-therare";
+ var $goFonQueueThereAre ="queue-thereare";
var $goFonQueueCallsWaiting ="queue-callswaiting";
var $goFonQueueThankYou ="queue-thankyou";
var $goFonQueueMinutes ="queue-minutes";
var $goFonQueueSeconds ="queue-seconds";
+ var $goFonQueueLessThan ="queue-lessthan";
var $goFonQueueLanguage ="queue-holdtime";
var $goFonQueueStrategy ="ringall";
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",
+ "goFonQueueThereAre","goFonQueueCallsWaiting","goFonQueueThankYou","goFonQueueMinutes","goFonQueueSeconds","goFonQueueLessThan",
"telephoneNumber","goFonQueueLanguage","goFonQueueStrategy","goFonQueueAnnounceHoldtime","goFonQueueAnnounce","goFonDialOption","goFonQueueRetry");
/* ObjectClass */
var $objectclasses= array("goFonQueue");
}
}
+ if($this->goFonQueueAnnounceHoldtime == "no"){
+ $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];
+
+
}
function execute()
{
+ /* Call parent execute */
+ plugin::execute();
+
/* Do we need to flip is_account state? */
if (isset($_POST['modify_state'])){
$this->is_account= !$this->is_account;
$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')));
- $smarty->assign("goFonQueueAnnounceHoldtimeOptions",array('no'=>_("No"),'yes'=>_('Yes')));
- $smarty->assign("goFonQueueStrategyOptions",array('ringall' =>_("ring all available channels until one answers"),
- 'roundrobin' =>_("take turns ringing each available interface"),
- 'leastrecent'=>_("ring interface which was least recently called by this queue"),
- 'fewestcalls'=>_("ring the one with fewest completed calls from this queue"),
- 'random' =>_("ring random interface"),
- 'rrmemory' =>_("round robin with memory, remember where we left off last ring pass")));
+ $smarty->assign("goFonQueueLanguageOptions",array('de'=>_('German')));
+ $smarty->assign("goFonQueueStrategyOptions", $this->goFonQueueStrategyOptions);
foreach($this->attributes as $key => $val){
$smarty->assign($val,$this->$val);
/* Check formular input */
function check()
{
- $message= array();
- #fixme workaround : Tab is not initialised correct
- if(!$this->is_account) return($message);
+ /* Call common method to give check the hook */
+ $message= plugin::check();
if($this->is_number_used()){
$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. Your settings can't be saved."));
+ }
+
// Get Configuration for Mysql database Server
$a_SETUP = $_SESSION['config']->data['SERVERS']['FON'];
$s_parameter ="";
// Check if we are connected correctly
if(!$r_con){
gosa_log(mysql_error());
- return (sprintf(_("The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql error."),
+ return (sprintf(_("The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql error."),
$a_SETUP['SERVER'],$a_SETUP['LOGIN']));
}
$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'] = 1;
- $a_ext[$i]['app'] = "Wait";
- $a_ext[$i]['appdata'] = "2";
+ $a_ext[$i]['app'] = "SetLanguage";
+ $a_ext[$i]['appdata'] = "de";
$i ++ ;
$a_ext[$i]['context'] = 'GOsa';
$a_ext[$i]['context'] = 'GOsa';
$a_ext[$i]['exten'] = $num;
$a_ext[$i]['priority'] = 2;
- $a_ext[$i]['app'] = "Set";
- $a_ext[$i]['appdata'] = "LANGUAGE|".$this->goFonQueueLanguage;
+ $a_ext[$i]['app'] = "SetLanguage";
+ $a_ext[$i]['appdata'] = $this->goFonQueueLanguage;
$i ++ ;
$a_ext[$i]['context'] = 'GOsa';
$a_ext[$i]['exten'] = $num;
$a_ext[$i]['context'] = 'GOsa';
$a_ext[$i]['exten'] = $num;
$a_ext[$i]['priority'] = 5;
+ $a_ext[$i]['app'] = "SetVar";
+ $a_ext[$i]['appdata'] = "QUEUE_PRIO=".$prio;
+ $i ++ ;
+ $a_ext[$i]['context'] = 'GOsa';
+ $a_ext[$i]['exten'] = $num;
+ $a_ext[$i]['priority'] = 6;
$a_ext[$i]['app'] = "Queue";
$a_ext[$i]['appdata'] = $this->attrs['cn'][0].
"|".
$this->goFonDialOption_r;
}
+ if($this->goFonQueueAnnounceHoldtime != false) {
+ $this->goFonQueueAnnounceHoldtime = "yes";
+ }else{
+ $this->goFonQueueAnnounceHoldtime = "no";
+ }
+
+
/* Generate Priority Entry */
$queue["announce"] = "";
$queue["monitor_join"] = "";
$queue["monitor_format"] = "";
$queue["queue_holdtime"] = $this->goFonQueueAnnounce;
- $queue["queue_lessthan"] = "";
+ $queue["queue_lessthan"] = $this->goFonQueueLessThan;
$queue["announce_round_seconds"]= "";
$queue["retry"] = $this->goFonQueueRetry;
$queue["wrapuptime"] = "";
$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){
$this->$val = false;
}
}
+ if(isset($_POST['goFonQueueAnnounceHoldtime'])){
+ $this->goFonQueueAnnounceHoldtime = "yes";
+ }else{
+ $this->goFonQueueAnnounceHoldtime = false;
+ }
+
}
}
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" ){
+ $this->attrs['goFonQueueAnnounceHoldtime'] = "yes";
+ }else{
+ $this->attrs['goFonQueueAnnounceHoldtime'] = "no";
+ }
+
+ $this->attrs['goFonQueueStrategy'] = $this->goFonQueueStrategyOptionsR[$this->goFonQueueStrategy];
+
/* Save data to LDAP */
$ldap->cd($this->dn);
- $ldap->modify($this->attrs);
+ $this->cleanup();
+ $ldap->modify ($this->attrs);
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), _("Saving phone queue failed"));
/* Optionally execute a command after we're done */
if ($this->initially_was_account == $this->is_account){
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]);
@DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
$this->attributes, "Save");
$ldap->cd($this->dn);
- $ldap->modify($this->attrs);
- show_ldap_error($ldap->get_error());
+ $this->cleanup();
+ $ldap->modify ($this->attrs);
+
+ show_ldap_error($ldap->get_error(), _("Removing phone queue failed"));
+ }
+
+
+ function getCopyDialog()
+ {
+ $str = "";
+ $str .= _("Phone number");
+ $str .= " <input type='text' name='telephoneNumber' value='".$this->telephoneNumber."'>";
+ return($str);
}
+
+ function saveCopyDialog()
+ {
+ if(isset($_POST['telephoneNumber'])){
+ $this->telephoneNumber = $_POST['telephoneNumber'];
+ }
+ }
+
+
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: