Updated dns service

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

diff --git a/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc b/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc
index b1a2f38b63a6ebe2a2fda82a364c1219442148ed..6dc1ab6c6bacb3af87db2c0e4a44780df247a000 100644 (file)
--- a/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc
+++ b/gosa-plugins/dns/admin/systems/services/dns/class_servDNS.inc
@@ -209,8 +209,7 @@ class servdns extends goService
        */
       if(preg_match("/^editZone_/",$name)&&!$once){
         $once =true;
-        $tmp = preg_replace("/^editZone_/","",$name);
-        $tmp = base64_decode(preg_replace("/_.*$/","",$tmp));
+        $tmp = postDecode(preg_replace("/^editZone_/","",$name));
         $this->dialog= new servdnseditZone($this->config,$this->dn,$this->Zones[$tmp]);
       }
 
@@ -219,8 +218,7 @@ class servdns extends goService
       if(preg_match("/^delZone_/",$name)&&!$once){
 
         $once =true;
-        $tmp = preg_replace("/^delZone_/","",$name);
-        $tmp = base64_decode(preg_replace("/_.*$/","",$tmp));
+        $tmp = postDecode(preg_replace("/^delZone_/","",$name));
      
         /* Initiate deletion
          */ 
@@ -229,14 +227,14 @@ class servdns extends goService
     }
 
     if(isset($_GET['act']) && $_GET['act'] == "edit" && isset($_GET['id'])){
-      $id = base64_decode($_GET['id']);
+      $id = postDecode($_GET['id']);
       if(isset($this->Zones[$id])){
          $this->dialog= new servdnseditZone($this->config,$this->dn,$this->Zones[$id]);
       }
     }
 
     if(isset($_GET['act']) && $_GET['act'] == "edit" && isset($_GET['id'])){
-      $id = base64_decode($_GET['id']);
+      $id = postDecode($_GET['id']);
       if(isset($this->Zones[$id])){
          $this->dialog= new servdnseditZone($this->config,$this->dn,$this->Zones[$id]);
       }
@@ -257,19 +255,19 @@ class servdns extends goService
 
     /* Add entries to divlist
      */
-    $editImg = "<input type='image' src='images/lists/edit.png' name='editZone_%s'>";
+    $editImg = image('images/lists/edit.png','editZone_%s');
     if($this->acl_is_removeable()){
-      $editImg.= "<input type='image' src='images/lists/trash.png' name='delZone_%s'>";
+      $editImg.= image('images/lists/trash.png','delZone_%s');
     }
 
-    $link = "<a href='?plug=".$_GET['plug']."&act=edit&id=%s'>%s</a>";
+    $link = "<a href='?plug=".$_GET['plug']."&amp;act=edit&amp;id=%s'>%s</a>";
     foreach($this->Zones as $zone => $values ){
       $ZoneList->AddEntry(array(
-            array("string" => sprintf($link,base64_encode($zone),($zone))),
-            array("string" => sprintf($link,base64_encode($zone),_("Reverse zone")." : ".($values['ReverseZone']))),
+            array("string" => sprintf($link,postEncode($zone),($zone))),
+            array("string" => sprintf($link,postEncode($zone),_("Reverse zone")." : ".($values['ReverseZone']))),
             array("string" => _("TTL")." : ".$values['sOAttl']),
             array("string" => _("Class")." : ".$values['dNSClass']),
-            array("string" =>str_replace("%s",base64_encode($zone),$editImg))
+            array("string" =>str_replace("%s",postEncode($zone),$editImg))
             ));
     }    
 

diff --git a/gosa-plugins/dns/admin/systems/services/dns/servdns.tpl b/gosa-plugins/dns/admin/systems/services/dns/servdns.tpl
index e70556c810421fa6c319b77dc5d86c1d93c24be8..7d3aa99776dfcdd5a28c18f981972e57f256745b 100644 (file)
--- a/gosa-plugins/dns/admin/systems/services/dns/servdns.tpl
+++ b/gosa-plugins/dns/admin/systems/services/dns/servdns.tpl
@@ -1,60 +1,67 @@
+
+
 {if $dns_take_over}
  <table summary="" width="100%">
   <tr>
    <td style='width:100%;'>
-    <h3>{t}DNS take over initiated{/t}</h3>
-    {$warning}
-    {t}This includes 'all' DNS zones that are located within this server. Please double check if your really want to do this.{/t}
-    <p>{$warning2}<br>
-     <button type='submit' name='cancel_take_over'>{msgPool type=cancelButton}</button>
+    <h3>{t}DNS take over initiated{/t}
+    </h3>
+    {$warning}{t}This includes 'all' DNS zones that are located within this server. Please double check if your really want to do this.{/t}
+    <p>
+     {$warning2}
+     <br>
+     <button type='submit' name='cancel_take_over'>
+     {msgPool type=cancelButton}</button>
     </p>
     <p>
      {t}Following objects will be taken over{/t}&nbsp;:
     </p>
     <p>
-     <pre>{$info}</pre>
+     <pre>
+      {$info}
+     </pre>
     </p>
    </td>
   </tr>
  </table>
-{else}
+ {else}
+ <table summary="" width="100%">
+  
+  {if $dns_server_list_cnt}
+   <tr>
+    <td style='width:100%;'>
+     <b>{t}Take over DNS configuration from{/t}</b>&nbsp;
+     <select name='take_over_src' size=1>
+      {html_options options=$dns_server_list}
+     </select>
+     <button type='submit' name='take_over'>{t}Take over{/t}</button>
+    </td>
+   </tr>
+  {/if}
 
-<table summary="" width="100%">
- {if $dns_server_list_cnt}
   <tr>
    <td style='width:100%;'>
-    <b>{t}Take over DNS configuration from{/t}</b>&nbsp;
-    <select name='take_over_src' size=1>
-     {html_options options=$dns_server_list}
-    </select>
-    <button type='submit' name='take_over'>{t}Take over{/t}</button>
-   </td>
-  </tr>
- {/if}
-  <tr>
-   <td style='width:100%;'>
-
     <h3>{t}Zones{/t}</h3>
     {$ZoneList}
     {if $is_createable}
      <button type='submit' name='AddZone'>{msgPool type=addButton}</button>
-    {else}
+     {else}
      <input type="button" value="{msgPool type=addButton}" disabled>
     {/if}
-  </td>
- </tr>
-</table>
+   </td>
+  </tr>
+ </table>
 
  <script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-   focus_field('AddZone');
+  <!-- // First input field on page   
+   focus_field('AddZone');  
   -->
  </script>
+ 
 {/if}
 
 <hr>
-
-<div style="width:100%; text-align:right;">
- <button type='submit' name='SaveService'>{msgPool type=saveButton}</button> 
+<div class="plugin-actions">
+ <button type='submit' name='SaveService'>{msgPool type=saveButton}</button>
  <button type='submit' name='CancelService'>{msgPool type=cancelButton}</button>
 </div>