From 95743543fb8883f5e91fe0b90a52875d2375def1 Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 8 Aug 2005 05:42:34 +0000 Subject: [PATCH] Queue extension entry modified git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1070 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/ogroups/class_phonequeue.inc | 23 ++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/plugins/admin/ogroups/class_phonequeue.inc b/plugins/admin/ogroups/class_phonequeue.inc index d524a7bb2..1e7c6cdd3 100644 --- a/plugins/admin/ogroups/class_phonequeue.inc +++ b/plugins/admin/ogroups/class_phonequeue.inc @@ -166,13 +166,13 @@ class phonequeue extends plugin $message[] = $this->generate_mysql_entension_entries(); } - if(!is_numeric($this->goFonTimeOut)){ + if(!((is_numeric($this->goFonTimeOut))||(empty($this->goFonTimeOut)))){ $message[] = _("Timeout must be numeric"); } - if(!is_numeric($this->goFonMaxLen)){ + if(!((is_numeric($this->goFonMaxLen))||(empty($this->goFonMaxLen)))){ $message[] = _("Queue length must be numeric"); } - if(!is_numeric($this->goFonAnnounceFrequency)){ + if(!((is_numeric($this->goFonAnnounceFrequency))||(empty($this->goFonAnnounceFrequency)))){ $message[] = _("Announce frequency must be numeric"); } if(count($this->telephoneNumber)==0){ @@ -273,28 +273,35 @@ class phonequeue extends plugin /* generate Extension entries, with priority */ $i = 0; foreach($this->telephoneNumber as $num){ + $prio --; $a_ext[$i]['context'] = 'GOsa'; $a_ext[$i]['exten'] = $num; $a_ext[$i]['priority'] = 1; - $a_ext[$i]['app'] = "SetLanguage"; - $a_ext[$i]['appdata'] = $this->goFonLanguage; + $a_ext[$i]['app'] = "Wait"; + $a_ext[$i]['appdata'] = "2"; $i ++ ; $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->goFonLanguage; + $i ++ ; + $a_ext[$i]['context'] = 'GOsa'; + $a_ext[$i]['exten'] = $num; + $a_ext[$i]['priority'] = 3; $a_ext[$i]['app'] = "Playback"; $a_ext[$i]['appdata'] = $this->goFonWelcomeMusic; $i ++ ; $a_ext[$i]['context'] = 'GOsa'; $a_ext[$i]['exten'] = $num; - $a_ext[$i]['priority'] = 3; + $a_ext[$i]['priority'] = 4; $a_ext[$i]['app'] = "SetCIDName"; $a_ext[$i]['appdata'] = $this->attrs['description'][0]; $i ++ ; $a_ext[$i]['context'] = 'GOsa'; $a_ext[$i]['exten'] = $num; - $a_ext[$i]['priority'] = 4; + $a_ext[$i]['priority'] = 5; $a_ext[$i]['app'] = "Queue"; $a_ext[$i]['appdata'] = $this->attrs['cn'][0]. "|". @@ -310,7 +317,7 @@ class phonequeue extends plugin $i ++ ; $a_ext[$i]['context'] = 'GOsa'; $a_ext[$i]['exten'] = $num; - $a_ext[$i]['priority'] = 5; + $a_ext[$i]['priority'] = 6; $a_ext[$i]['app'] = "SetVar"; $a_ext[$i]['appdata'] = "Queue_Prio=".$prio; $i ++ ; -- 2.30.2