Code

Added patch from 2.5.
[gosa.git] / plugins / admin / systems / class_termDNS.inc
index 3c40b6bf9ba3a3e3ffa11b37da519b6fe9907320..f0712a6b23c67949d03f1d0204b7cbfe3ed42a35 100644 (file)
@@ -26,7 +26,7 @@ class termDNS extends plugin
   /* DNS attributes  
    */
   var $DNSattributes            = array("dNSClass","zoneName","dNSTTL");
-  var $DNS_is_Account           = false;
+  var $DNS_is_account           = false;
   var $initially_was_account = false;
   var $dnsEntry                 = array();
   var $DNSenabled               = false;
@@ -44,10 +44,10 @@ class termDNS extends plugin
     plugin::plugin ($config, $dn);
 
     if(isset($this->attrs['cn'][0])){
-      $this->OrigCn = $this->attrs['cn'][0];
-      $this->cn = $this->attrs['cn'][0];
+      $this->OrigCn = preg_replace("/\\\$\$/","",$this->attrs['cn'][0]);
+      $this->cn = preg_replace("/\\\$\$/","",$this->attrs['cn'][0]);
     }
-
+  
     /* Do we have autonet support? */
     if (isset($this->config->data['MAIN']['AUTO_NETWORK_HOOK'])){
       $this->autonet= true;
@@ -95,7 +95,6 @@ class termDNS extends plugin
       }else{
         $this->DNS_is_account = false;
       }
-   
     }
  
     /* Store initally account settings 
@@ -118,6 +117,12 @@ class termDNS extends plugin
   {
          /* Call parent execute */
     $smarty= get_smarty();
+
+    $tmp = $this->plInfo();
+    foreach($tmp['plProvidedAcls'] as $name => $translation){
+      $smarty->assign($name."ACL",$this->getacl($name));
+    }
+
     $display= "";
 
     $smarty->assign("staticAddress", ""); 
@@ -147,7 +152,7 @@ class termDNS extends plugin
     if($this->DNSenabled == false){
        
       /* Is IP address must ? */ 
-      $smarty->assign("DNS_is_account",false);  
+      $smarty->assign("DNS_enabled",false);  
       $smarty->assign("IPisMust",(($this->IPisMust)||($this->DNS_is_account)));
     
       /* Assign smarty all non DNs attributes */
@@ -164,9 +169,17 @@ class termDNS extends plugin
       $display.= $smarty->fetch(get_template_path('network.tpl', TRUE));
       return($display);
     }else{
-      $smarty->assign("DNS_is_account",true); 
+      $smarty->assign("DNS_enabled",true); 
     }
+
+    $accountACL = false; 
+    if($this->DNS_is_account && $this->acl_is_removeable()){
+      $accountACL = true;
+    }elseif(!$this->DNS_is_account && $this->acl_is_createable()){
+      $accountACL = true;
+    }
+    $smarty->assign("accountACL",$accountACL);
+
     /* Add new empty array to our record list */
     if(isset($_POST['AddNewRecord'])){
       $this->dnsEntry['RECORDS'][]  =array("type"=>"aRecord","value"=>"");
@@ -204,7 +217,7 @@ class termDNS extends plugin
     }
     
     /* Assign all needed vars */
-    $smarty->assign("DNSAccount",$this->DNS_is_account);
+    $smarty->assign("DNS_is_account",$this->DNS_is_account);
     $smarty->assign("Zones",$this->Zones);
     $smarty->assign("ZoneKeys",($this->Zones));
     $smarty->assign("IPisMust",(($this->IPisMust)||($this->DNS_is_account)));
@@ -221,62 +234,73 @@ class termDNS extends plugin
     return($display);
   }
 
+
   function remove_from_parent()
   {
-    /*
-    $ldap = $this->config->get_ldap_link();
-    $ldap->cd($this->orig_dn);
-    $ldap->search("(&(objectClass=dNSZone)(zoneName=*)(!(relativeDomainName=@)))",array("relativeDomainName","zoneName"));
-    while($attr = $ldap->fetch()){  
-      $ldap->cd($attr['dn']);
-      $ldap->rmDir($attr['dn']);
-      show_ldap_error($ldap->get_error(), sprintf(_("Removing of terminal/dns acoount with dn '%s' failed."),$this->dn));
+    if($this->initially_was_account){
+
+      $ldap = $this->config->get_ldap_link();
+
+      $tmp = array();
+      $this->dnsEntry['exists'] = false;
+      $tmp = getDNSHostEntriesDiff($this->config,$this->OrigCn,$this->dnsEntry,$this->cn);
+
+      /* Delete dns */
+      foreach($tmp['del'] as $dn => $del){
+        $ldap->cd($dn);
+        $ldap->rmdir_recursive($dn);
+      }
     }
-    */
   }
 
+
   /* Save data to object */
   function save_object()
   {
     /* Save all posted vars */
     plugin::save_object();
-    
-    /* Ge all non dns attributes (IP/MAC)*/
-    foreach($this->attributes as $attr){
-      if(isset($_POST[$attr])){
-        $this->$attr = $_POST[$attr];
-      }
-    }
 
-    /* Get dns attributes */
-    if(($this->DNSenabled) && (isset($_POST['network_tpl_posted']))){
+    if(isset($_POST['network_tpl_posted'])){
 
-      /* Check for posted record changes */
-      if(is_array($this->dnsEntry['RECORDS'])){
-        foreach($this->dnsEntry['RECORDS'] as $key => $value){
+      /* Ge all non dns attributes (IP/MAC)*/
+      foreach($this->attributes as $attr){
+        if(isset($_POST[$attr]) && $this->acl_is_writeable($attr)){
+          $this->$attr = $_POST[$attr];
+        }
+      }
 
-          /* Check if type has changed */
-          if(isset($_POST['RecordTypeSelectedFor_'.$key])){
-            $this->dnsEntry['RECORDS'][$key]['type'] = $_POST['RecordTypeSelectedFor_'.$key];
-          }
-          /* Check if value has changed */
-          if(isset($_POST['RecordValue_'.$key])){
-            $this->dnsEntry['RECORDS'][$key]['value'] = $_POST['RecordValue_'.$key];
+      /* Check if DNS should be enabled / disabled */
+      if($this->DNS_is_account && $this->acl_is_removeable() && !isset($_POST['DNS_is_account'])){
+        $this->DNS_is_account = false;
+      }elseif(!$this->DNS_is_account && $this->acl_is_createable() && isset($_POST['DNS_is_account'])){
+        $this->DNS_is_account = true;
+      }
+
+      /* Get dns attributes */
+      if(($this->DNSenabled) && (isset($_POST['network_tpl_posted']))){
+
+        /* Check for posted record changes */
+        if(is_array($this->dnsEntry['RECORDS']) && $this->acl_is_writeable("Records")){
+          foreach($this->dnsEntry['RECORDS'] as $key => $value){
+
+            /* Check if type has changed */
+            if(isset($_POST['RecordTypeSelectedFor_'.$key])){
+              $this->dnsEntry['RECORDS'][$key]['type'] = $_POST['RecordTypeSelectedFor_'.$key];
+            }
+            /* Check if value has changed */
+            if(isset($_POST['RecordValue_'.$key])){
+              $this->dnsEntry['RECORDS'][$key]['value'] = $_POST['RecordValue_'.$key];
+            }
           }
         }
-      }
-      /* Get all basic DNS attributes (TTL, Clas ..)*/
-      foreach($this->DNSattributes as $attr){
-        if(isset($_POST[$attr])){
-          $this->dnsEntry[$attr] = $_POST[$attr];
+        /* Get all basic DNS attributes (TTL, Clas ..)*/
+        foreach($this->DNSattributes as $attr){
+          if(isset($_POST[$attr]) && $this->acl_is_writeable($attr)){
+            $this->dnsEntry[$attr] = $_POST[$attr];
+          }
         }
-      }
 
-      /* Enable diable DNS */
-      if(isset($_POST['enableDNS'])){
-        $this->DNS_is_account = true;
-      }else{
-        $this->DNS_is_account = false;
+
       }
     }
   }
@@ -291,31 +315,21 @@ class termDNS extends plugin
     /* Check if ip must be given
      */  
     if(($this->IPisMust)||($this->DNS_is_account)){
-  
-      /* Check if ip is empty 
-       */
-      if ($this->ipHostNumber == "" && chkacl ($this->acl, "ipHostNumber") == ""){
+      if (empty($this->ipHostNumber)){
         $message[]= _("The required field 'IP-address' is not set.");
       }
 
-      /* check if given ip is valid ipi
-       */
-      $num="(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])";
-      if (!preg_match("/^$num\\.$num\\.$num\\.$num$/", $this->ipHostNumber)){
+      if (!is_ip($this->ipHostNumber)){
         $message[]= _("Wrong IP format in field IP-address.");
       }
     }
 
     /* Check if mac is empty 
      */
-    if ($this->macAddress == "" && chkacl ($this->acl, "macAddress") == ""){
+    if ($this->macAddress == "" ){
       $message[]= _("The required field 'MAC-address' is not set.");
     }
-
-    /* Check if given mac is valid mac 
-     */
-    $tr = count(split(":",$this->macAddress));
-    if($tr!=6){
+    if(!is_mac($this->macAddress)){
       $message[]=(_("The given macaddress is invalid. There must be 6 2byte segments seperated by ':'."));
     }
 
@@ -325,7 +339,7 @@ class termDNS extends plugin
       $checkArray = array();
       $onlyOnce   = array();
 
-      $onlyOnce['cNAMERecord'] = 0;
+      //  $onlyOnce['cNAMERecord'] = 0;
 
       /* Walk through all entries and detect duplicates or mismatches
        */  
@@ -397,12 +411,13 @@ class termDNS extends plugin
     /* If isn't DNS account but initially was DNS account 
        remove all DNS entries 
      */ 
-    if(!$this->DNSenabled){
+    if((!$this->DNSenabled) || ((!$this->DNS_is_account)&&(!$this->initially_was_account))){
       return;
     }else{
 
       /* Add ipHostNumber to aRecords
        */
+      $backup_dnsEntry = $this->dnsEntry;
       $this->dnsEntry['RECORDS'][] = array("type"=>"aRecord","value"=>$this->ipHostNumber);
 
       /* Create diff and follow instructions 
@@ -447,6 +462,8 @@ class termDNS extends plugin
       if($ldap->get_error() != "Success"){
         show_ldap_error($ldap->get_error(), sprintf(_("Saving of terminal/dns account with dn '%s' failed."),$this->dn));
       }
+
+      $this->dnsEntry =  $backup_dnsEntry;
     }
   }
 
@@ -477,7 +494,7 @@ class termDNS extends plugin
 
     $str.= "  <tr>".
            "    <td colspan=2 width='50%'></td><td>".
-           "      <input type='submit' value='"._("Add")."' name='AddNewRecord'>".
+           "      <input type='submit' value='"._("Add")."' name='AddNewRecord' id='AddNewRecord'>".
            "    </td>".
            "  </tr>".
            "</table>";
@@ -506,13 +523,31 @@ class termDNS extends plugin
   /* Return plugin informations for acl handling  */ 
   function plInfo()
   {
-    return (array(  
-          "plDescription"     => _("DNS"),
-          "plSelfModify"      => FALSE,
-          "plDepends"         => array("objectClass" => array("gotoWorkstation")),
-
+    $tmp =  array(
+        "plShortName"   => _("DNS"),
+        "plDescription" => _("DNS settings"),
+        "plSelfModify"  => FALSE,
+        "plDepends"     => array(),
+        "plPriority"    => 5,
+        "plSection"     => array("administration"),
+        "plCategory"    => array("workstation","terminal","phone","server","component","printer","winworkstation"),
+
+        "plProvidedAcls"=> array(
           "ipHostNumber"  => _("IP address"),
-          "macAddress"    => _("MAC address")));
+          "macAddress"    => _("MAC address"))
+        );
+
+    /* Hide all dns specific code, if dns is not available
+     */
+    $DNSenabled = false;
+    foreach($_SESSION['config']->data['TABS']['SERVERSERVICE'] as $tab){
+      if(preg_match("/^servdns$/",$tab['CLASS'])){
+        $tmp['plProvidedAcls']["Records"]        = _("DNS records");
+        $tmp['plProvidedAcls']["zoneName"]       = _("Zone name");
+        $tmp['plProvidedAcls']["dNSTTL"]         = _("TTL");
+      }
+    }
+    return($tmp);
   }
 }