Added acl check for conferences

[gosa.git] / plugins / admin / ogroups / class_phonequeue.inc

diff --git a/plugins/admin/ogroups/class_phonequeue.inc b/plugins/admin/ogroups/class_phonequeue.inc
index 8d901b400fb72c31054ba0c87cd5763220d8312d..96fbdf170027e37f002438fe51641631b04d50f2 100644 (file)
--- a/plugins/admin/ogroups/class_phonequeue.inc
+++ b/plugins/admin/ogroups/class_phonequeue.inc
@@ -25,12 +25,13 @@ class phonequeue extends plugin
   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 $old_phone_numbers        =array();
@@ -39,7 +40,7 @@ class phonequeue extends plugin
   var $attributes= array( "goFonTimeOut","goFonMaxLen","goFonAnnounceFrequency","goFonDialOption_t","goFonDialOption_T",
       "goFonDialOption_h","goFonDialOption_r",
       "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");
@@ -364,7 +365,7 @@ class phonequeue extends plugin
           $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;
@@ -391,7 +392,7 @@ class phonequeue extends plugin
         $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"]            = "";
@@ -470,7 +471,7 @@ class phonequeue extends plugin
   {
     $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){