X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_phoneGeneric.inc;h=76718175b7e3a42f7933ce8ac1d0bf54b27b05e3;hb=7f51b7c557fe5fb3c73b5bde15856fbfdb08efbb;hp=97325ea6709d5f071d8cbde8dea27c19b85f8467;hpb=802a256cdbbdd5212e7c9a69cf53fc6a7c79c0fb;p=gosa.git

diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc
index 97325ea67..76718175b 100644
--- a/plugins/admin/systems/class_phoneGeneric.inc
+++ b/plugins/admin/systems/class_phoneGeneric.inc
@@ -53,10 +53,10 @@ class phoneGeneric extends plugin
 
   var $objectclasses= array("top", "goFonHardware");
 
-  function phonegeneric ($config, $dn= NULL)
+  function phonegeneric ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
-    $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses);
+    plugin::plugin ($config, $dn, $parent);
+    $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses, true);
 
     /* Set base */
     if ($this->dn == "new"){
@@ -106,6 +106,31 @@ class phoneGeneric extends plugin
       return($display);
     }
 
+    /* Base select dialog */
+    $once = true;
+    foreach($_POST as $name => $value){
+      if(preg_match("/^chooseBase/",$name) && $once){
+        $once = false;
+        $this->dialog = new baseSelectDialog($this->config);
+        $this->dialog->setCurrentBase($this->base);
+      }
+    }
+
+    /* Dialog handling */
+    if(is_object($this->dialog)){
+      /* Must be called before save_object */
+      $this->dialog->save_object();
+
+      if($this->dialog->isClosed()){
+        $this->dialog = false;
+      }elseif($this->dialog->isSelected()){
+        $this->base = $this->dialog->isSelected();
+        $this->dialog= false;
+      }else{
+        return($this->dialog->execute());
+      }
+    }
+
     /* handle Permit Add*/
     if(isset($_POST['goFonPermitAdd'])){
       if(isset($_POST['goFonPermitNew'])){
@@ -168,6 +193,7 @@ class phoneGeneric extends plugin
     /* Fill templating stuff */
     $smarty= get_smarty();
     $smarty->assign("bases", $this->config->idepartments);
+    $smarty->assign("staticAddress","<font class=\"must\">*</font>");// $this->config->idepartments);
 
     /* Create Arrays for samrty select boxes */
     $smarty->assign("categories",     array("SIP","IAX","CAPI"));
@@ -194,6 +220,7 @@ class phoneGeneric extends plugin
       $smarty->assign($attr."ACL", chkacl($this->acl, $attr));
     }
     $smarty->assign("base_select", $this->base);
+    $smarty->assign("baseACL", chkacl($this->acl,"base"));
    
     $smarty->assign("goFonDefaultIPs",array("dynamic"=>_("dynamic"),"network"=>_("Networksettings")));
  
@@ -215,8 +242,9 @@ class phoneGeneric extends plugin
       return;
     }
 
+    $this->netConfigDNS->remove_from_parent();
     $ldap->rmdir($this->dn);
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Removing phone failed"));
     $this->handle_post_events("remove");
 
     /* Delete references to object groups */
@@ -227,7 +255,6 @@ class phoneGeneric extends plugin
       unset($og->member[$this->dn]);
       $og->save ();
     }
-    $this->netConfigDNS->remove_from_parent();
   }
 
 
@@ -246,24 +273,20 @@ class phoneGeneric extends plugin
   /* Check supplied data */
   function check()
   {
-    $message= $this->netConfigDNS->check();
+    /* Call common method to give check the hook */
+    $message= plugin::check();
+    $message= array_merge($message, $this->netConfigDNS->check());
+
     $this->dn= "cn=".$this->cn.",ou=phones,ou=systems,".$this->base;
 
     /* To check for valid ip*/
-    $num="(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])";
-
-//    if(in_array("goFonDefaultIP",$this->usedattrs[$this->selected_categorie])){
-//      if (!preg_match("/^$num\\.$num\\.$num\\.$num$/", $this->goFonDefaultIP)){
-//       $message[]= _("Wrong IP format in field goFonDefaultIP.");
-//      }
-//    }
-    
-//    /* Check for valid number */
-//    if(in_array("goFonDefaultIP",$this->usedattrs[$this->selected_categorie])){
-//      if((strlen($this->goFonQualify))!=(strlen((int)($this->goFonQualify)))){
-//        $message[]= _("The given value for 'Response timeout' is not a valid number.");
-//      } 
-//    }
+    if($this->netConfigDNS->ipHostNumber == ""){
+       $message[]= _("The required field IP address is empty.");
+    } else {
+      if (!is_ip($this->netConfigDNS->ipHostNumber)){
+        $message[]= _("The field IP address contains an invalid address.");
+      }
+    }
 
     if ($this->cn == "" && chkacl ($this->acl, "cn") == ""){
       $message[]= _("The required field 'Phone name' is not set.");
@@ -339,6 +362,8 @@ class phoneGeneric extends plugin
       $this->attrs['goFonDefaultIP'] = $this->netConfigDNS->ipHostNumber;
     }    
 
+    $this->attrs = $this->netConfigDNS->getVarsForSaving($this->attrs);
+
     /* Write back to ldap */
     $ldap= $this->config->get_ldap_link();
     if ($this->orig_dn == 'new'){
@@ -353,7 +378,9 @@ class phoneGeneric extends plugin
       }
 
       $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
+      $this->cleanup();
+      $ldap->modify ($this->attrs); 
+
       // $user_phone_reload   
       $ldap->cd ($this->config->current['BASE']); 
       $user_phone_assignment = $ldap->fetch($ldap->search("(&(objectClass=goFonAccount)(goFonHardware=".$this->cn."))",array("uid")));
@@ -365,10 +392,10 @@ class phoneGeneric extends plugin
       }
       $this->handle_post_events("modify");
     }
-    
+    $this->netConfigDNS->cn = $this->cn;    
     $this->netConfigDNS->save($this->dn);
+    show_ldap_error($ldap->get_error(), _("Saving phone failed"));
 
-    show_ldap_error($ldap->get_error());
     /* Optionally execute a command after we're done */
     $this->postcreate();
   }