X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_servDNSeditZoneEntries.inc;h=152aef84d89f777a32a73cc00590c835cc9c0f42;hb=d6a17677f5553b6ccef1e49bf600d67e02c2773d;hp=e6dfc96dd19dfa9d894f8782b5e0b594436c4a89;hpb=8b34a655f1decd1dc48989df8a65d9f242bd1039;p=gosa.git

diff --git a/plugins/admin/systems/class_servDNSeditZoneEntries.inc b/plugins/admin/systems/class_servDNSeditZoneEntries.inc
index e6dfc96dd..152aef84d 100644
--- a/plugins/admin/systems/class_servDNSeditZoneEntries.inc
+++ b/plugins/admin/systems/class_servDNSeditZoneEntries.inc
@@ -46,8 +46,11 @@ class servDNSeditZoneEntries extends plugin
       $this->Devices[$attrs['relativeDomainName'][0]]['OrigCn'] = $attrs['relativeDomainName'][0];
     }
 
-    if(!count($this->Devices)){
-      $this->disableDialog = true;
+    $ldap->cat($this->dn,array("objectClass"));
+
+    $this->disableDialog = true;
+    if(count($this->Devices)|| $ldap->count()){
+      $this->disableDialog = false;
     }
   }
 
@@ -69,13 +72,13 @@ class servDNSeditZoneEntries extends plugin
 
       /* Add new host entry
        */
-      if((preg_match("/^UserRecord_/",$name)) && ($once)){
+      if((preg_match("/^UserRecord_?/",$name)) && ($once)){
         $once = false;
         $entry = getDNSHostEntries($this->config,"",true);     
         $entry['exists']    = true;
-        $entry['zoneName']  = $this->zoneName; 
+        $entry['zoneName']  = strtoupper($this->attrs['cn'][0])."/".$this->zoneName; 
         $entry['RECORDS'][] = array("type" => "aRecord" , "value"=>"");
-        $this->Devices['New Entry'] = $entry;
+        $this->Devices[_("New entry")] = $entry;
       }
 
       if(count($tmp2) != 2) continue;
@@ -194,6 +197,9 @@ class servDNSeditZoneEntries extends plugin
     $names = array();
     foreach($this->Devices as $DevName => $device){
 
+      /* Don't need to check empty values ... */
+      if(!count($device['RECORDS'])) continue;
+
       /* Checking entry name
        */
       if((!is_uid($DevName)) | (empty($DevName))){
@@ -226,9 +232,9 @@ class servDNSeditZoneEntries extends plugin
 
       /* Names should be written in lowercase
        */
-      if(strtolower($DevName) != $DevName){
-        $message[] = sprintf(_("The host name '%s' should be written in lowercase."), $DevName);
-      }
+#      if(strtolower($DevName) != $DevName){
+#        $message[] = sprintf(_("The host name '%s' should be written in lowercase."), $DevName);
+#      }
 
       /* Check records
        */                 
@@ -383,7 +389,7 @@ class servDNSeditZoneEntries extends plugin
           <input type='text'  value='".$record['value']."' name='ValueSelection_".$name."' style='width:250px;'>
         </td>
         <td style='width:50px;text-align:right;'>
-          <input type='image' name='AddRecord_".$name."'   src='images/crossref.png' alt='"._("Add")."' title='"._("Add")."'>
+          <input type='image' name='AddRecord_".$name."'   src='images/list_new.png' alt='"._("Add")."' title='"._("Add")."'>
           <input type='image' name='RemoveRecord_".$name."' src='images/edittrash.png'      alt='"._("Remove")."' title='"._("Remove")."'>
         </td>
       </tr>";