some generals bugs fixed, automatic fillout / hint / Disable phoneAccount when no...

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

diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc
index 451ed7ae61e1b521b235f56015632334f94788fe..188dab5c6af3259056d58f8faed4b8ebf2ba39a0 100644 (file)
--- a/plugins/gofon/phoneaccount/class_phoneAccount.inc
+++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc
@@ -26,6 +26,8 @@ class phoneAccount extends plugin
   var $macrostillavailable    = false;
   var $generate_error         = "";
   var $a_old_telenums           = array();
+  var $uid;
+  var $cn;
 
   /* CLI vars */
   var $cli_summary            = "Manage users phone account";
@@ -132,17 +134,8 @@ class phoneAccount extends plugin
             /* Set all attrs */
             $id = $data[0];
             $this->macroarray[$attrs['dn']][$id]['var']    ="var".$id;
-            $string= $data[3];
-            $string = preg_replace("/%uid/",$this->attrs['uid'][0],$data[3]);
-            for($i = 0 ; $i < 10; $i++){
-              if(isset($this->attrs['telephoneNumber'][$i])){
-                $string = preg_replace("/%telephoneNumber_".($i+1)."/",$this->attrs['telephoneNumber'][$i],$string);
-              }
-            }
-            $string = preg_replace("/%cn/",$this->attrs['cn'][0],$string);
-            $this->macroarray[$attrs['dn']][$id]['choosen']= $string; 
-
-            $this->macroarray[$attrs['dn']][$id]['id']     = $id;
+            $this->macroarray[$attrs['dn']][$id]['choosen']=$data[3]; 
+            $this->macroarray[$attrs['dn']][$id]['id']     =$id;
             $this->macroarray[$attrs['dn']][$id]['name']   =$data[1];
             $this->macroarray[$attrs['dn']][$id]['type']   =$data[2];
             $this->macroarray[$attrs['dn']][$id]['default']=$data[3];
@@ -397,8 +390,8 @@ class phoneAccount extends plugin
         // hint
         $s_entry_hint['context']  = 'GOsa';
         $s_entry_hint['exten']    = $s_telenums;
-        $s_entry_hint['app']      = 'hint';
-        $s_entry_hint['appdata']  = 'SIP/'.$this->uid;
+        $s_entry_hint['priority']      = 'hint';
+        $s_entry_hint['app']  = 'SIP/'.$this->uid;
 
         // If no macro is selected use Dial
         if($this->macro!="none"){ 
@@ -477,6 +470,10 @@ class phoneAccount extends plugin
     $this->parent->by_object['user']->is_modified=TRUE;
     $this->is_modified=TRUE; 
 
+    $this->uid = $this->parent->by_object['user']->uid;
+    $this->cn  = $this->parent->by_object['user']->cn;
+
+
     /* Do we need to flip is_account state? */
     if (isset($_POST['modify_state'])){
       $this->is_account= !$this->is_account;
@@ -508,6 +505,31 @@ class phoneAccount extends plugin
       /* for every single parameter-> display textfile,combo, or true false switch*/
 
 
+      /* Automatic fill out */
+      if(isset($_POST['fillout'])){
+      
+        foreach($this->phoneNumbers as $phonenum){
+          $tmp[] = $phonenum;
+        }
+
+        /* Go through all params */
+        foreach($this->macroarray[$this->macro] as $key => $paras){
+          
+          $string = $paras['default'];
+         
+          $string=str_replace("%uid",$this->uid,$string);
+          $string=str_replace("%cn",$this->cn,$string);
+
+          for($i = 0 ; $i < 10; $i++){
+            if(isset($tmp[$i])){
+              $string = preg_replace("/%telephoneNumber_".($i+1)."/",$tmp[$i],$string);
+            }
+          }
+
+          $this->macroarray[$this->macro][$key]['choosen']=$string;
+        }
+      }
+
       foreach($this->macroarray[$this->macro] as $paras){
 
         /* get al vars */
@@ -575,8 +597,13 @@ class phoneAccount extends plugin
         $display= $this->show_header(_("Remove phone account"),
             _("This account has phone features enabled. You can disable them by clicking below."));
       } else {
+        if(empty($this->uid)){
+        $display= $this->show_header(_("Create phone account"),
+            _("This account has phone features disabled. You can't enable them while no uid is set."),TRUE,TRUE);
+        }else{
         $display= $this->show_header(_("Create phone account"),
             _("This account has phone features disabled. You can enable them by clicking below."));
+        }
         return ($display);
       }
     }

diff --git a/plugins/gofon/phoneaccount/generic.tpl b/plugins/gofon/phoneaccount/generic.tpl
index 0f7329943bc3c19697c501e392e4089774dacc7b..133d6cae384abb55055fca7d0bc6d17f185befb2 100644 (file)
--- a/plugins/gofon/phoneaccount/generic.tpl
+++ b/plugins/gofon/phoneaccount/generic.tpl
@@ -64,6 +64,7 @@
                                <option disabled>&nbsp;</option>
                                         </select>
                                         <input type="submit" name="refresh" value="{t}refresh{/t}" {$goFonMacroACL}>
+                                        <input type="submit" name="fillout" value="{t}fill out{/t}" {$goFonMacroACL}>
                                </td>
                        </tr>
                </table>