Fixed queue creation and deletion

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1081 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/ogroups/class_phonequeue.inc b/plugins/admin/ogroups/class_phonequeue.inc
index 2dd49709d9fcbc3f7e546bab02c8eb5ceb4ab8a2..78950fd286f64b2b82b148cc4f7cd07273b937ee 100644 (file)
--- a/plugins/admin/ogroups/class_phonequeue.inc
+++ b/plugins/admin/ogroups/class_phonequeue.inc
@@ -7,29 +7,29 @@ class phonequeue extends plugin
   var $cn= "";
 
 
-  var $goFonTimeOut             =""; 
-  var $goFonMaxLen              ="";
-  var $goFonAnnounceFrequency   ="";
-  var $goFonDialOption_t        ="";
-  var $goFonDialOption_T        ="";
-  var $goFonDialOption_h        ="";
+  var $goFonTimeOut             ="5"; 
+  var $goFonMaxLen              ="20";
+  var $goFonAnnounceFrequency   ="90";
+  var $goFonDialOption_t        ="t";
+  var $goFonDialOption_T        ="T";
+  var $goFonDialOption_h        ="h";
   var $goFonAnnounce            ="";
-  var $goFonDialOption_H        ="";
-  var $goFonMusiconHold         ="";
-  var $goFonWelcomeMusic        ="";
+  var $goFonDialOption_H        ="H";
+  var $goFonMusiconHold         ="vm-for";
+  var $goFonWelcomeMusic        ="random";
   var $goFonQueueReportHold     ="";
-  var $goFonQueueYouAreNext     ="";
-  var $goFonQueueThereAre       ="";
-  var $goFonQueueCallsWaiting   ="";
-  var $goFonQueueThankYou       ="";
-  var $goFonQueueMinutes        =""; 
-  var $goFonQueueSeconds        ="";
-  var $goFonLanguage            ="";
-  var $goFonStrategy            ="";
-  var $goFonAnnounceHoldtime    ="";
+  var $goFonQueueYouAreNext     ="queue-youarenext";
+  var $goFonQueueThereAre       ="queue-therare";
+  var $goFonQueueCallsWaiting   ="queue-callswaiting";
+  var $goFonQueueThankYou       ="queue-thankyou";
+  var $goFonQueueMinutes        ="queue-minutes"; 
+  var $goFonQueueSeconds        ="queue-seconds";
+  var $goFonLanguage            ="queue-holdtime";
+  var $goFonStrategy            ="rrmemory";
+  var $goFonAnnounceHoldtime    ="yes";
   var $telephoneNumber          =array();
   var $goFonQueueMember         =array(); 
-  var $goFonDialOption          ="";
+  var $goFonDialOption          ="tThH";
 
   var $old_phone_numbers        =array();
 
@@ -51,8 +51,10 @@ class phonequeue extends plugin
     /* Save initial account state */
     $this->initially_was_account= $this->is_account;
 
-    $this->telephoneNumber=$this->attrs['telephoneNumber'];
-    unset($this->telephoneNumber['count']); 
+    if(isset($this->attrs['telephoneNumber'])){
+      $this->telephoneNumber=$this->attrs['telephoneNumber'];
+      unset($this->telephoneNumber['count']); 
+    }
 
 
     for($i = 0; $i < strlen($this->goFonDialOption); $i++){
@@ -157,6 +159,9 @@ class phonequeue extends plugin
   function check()
   {
     $message= array();
+  //  if(empty($this->description)){
+  //    $message[] = _("You must specify a description for this queue");
+  //  }
 
     if($this->is_number_used()){
       $message[] = $this->is_number_used();
@@ -230,10 +235,13 @@ class phonequeue extends plugin
       
       // Delete old Entries 
       $delete = array();
-      foreach($this->old_phone_numbers as $phone){
-        $delete[]= "DELETE FROM ".$a_SETUP['EXT_TABLE']." WHERE exten='".$phone."';\n";
+      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['QUEUE_TABLE']." WHERE name=\"".$this->attrs['cn'][0]."\"; \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 */
@@ -276,6 +284,12 @@ class phonequeue extends plugin
         
         $prio --;
         $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 ++ ; 
+        $a_ext[$i]['context']  = 'GOsa';
         $a_ext[$i]['exten']    = $num;
         $a_ext[$i]['priority'] = 1;
         $a_ext[$i]['app']      = "Wait";
@@ -504,6 +518,12 @@ class phonequeue extends plugin
       return( sprintf(_("Can't select database %s on %s."),$a_SETUP['DB'],$a_SETUP['SERVER']));
     }
 
+
+    foreach(array("goFonDialOption_t","goFonDialOption_T","goFonDialOption_h","goFonDialOption_H") as $val){
+      unset($this->$val);
+      unset($this->attrs[$val]);
+    }    
+
     $i = 0;
     $prio = 11;
 
@@ -522,6 +542,7 @@ class phonequeue extends plugin
     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";
 

diff --git a/plugins/admin/ogroups/tabs_ogroups.inc b/plugins/admin/ogroups/tabs_ogroups.inc
index e14f2be9636a547b870b6f17d89fe884be29b230..02593ea36d102044c33194248095011d75e9da6f 100644 (file)
--- a/plugins/admin/ogroups/tabs_ogroups.inc
+++ b/plugins/admin/ogroups/tabs_ogroups.inc
@@ -41,11 +41,13 @@ class ogrouptabs extends tabs
           } 
  
           /* Add a user tab used for mail distribution lists */
-          if (preg_match('/kolab/i', $this->config->current['MAILMETHOD'])){
-            require_once("class_mailogroup.inc");
-            $this->by_name['mailogroup']= _("Mail");
-            $this->by_object['mailogroup']= new mailogroup($this->config, $this->dn);
-            $this->by_object['mailogroup']->parent= &$this;
+          if(isset($this->config->current['MAILMETHOD'])){
+            if (preg_match('/kolab/i', $this->config->current['MAILMETHOD'])){
+              require_once("class_mailogroup.inc");
+              $this->by_name['mailogroup']= _("Mail");
+              $this->by_object['mailogroup']= new mailogroup($this->config, $this->dn);
+              $this->by_object['mailogroup']->parent= &$this;
+            }
           }
 
           break;