From 5f1b95f6475379c22b639d2f5430a36a2cb5bb2b Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 24 Mar 2010 14:34:42 +0000
Subject: [PATCH] Replaced <ima by {image} -colwidth => colspan

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17126 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../environment/class_environment.inc         | 23 +++++++++----------
 .../goto/personal/environment/environment.tpl |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/gosa-plugins/goto/personal/environment/class_environment.inc b/gosa-plugins/goto/personal/environment/class_environment.inc
index 0060589cc..f537c61ff 100644
--- a/gosa-plugins/goto/personal/environment/class_environment.inc
+++ b/gosa-plugins/goto/personal/environment/class_environment.inc
@@ -712,8 +712,7 @@ class environment extends plugin
         if((preg_match("/^gotoShareDel_/",$name)) && ($once)){
           $once = false;  
           $key  = preg_replace("/^gotoShareDel_/","",$name);
-          $key  = preg_replace("/_+[xy]$/","",$key);
-          $key  = base64_decode($key);
+          $key  = postDecode($key);
           if(isset($this->gotoShares[$key])) {
             unset($this->gotoShares[$key]);
           }
@@ -728,8 +727,7 @@ class environment extends plugin
         if((preg_match("/^gotoShareResetPwd_/",$name)) && ($once)){
           $once = false;
           $key  = preg_replace("/^gotoShareResetPwd_/","",$name);
-          $key  = preg_replace("/_+[xy]$/","",$key);
-          $key  = base64_decode($key);
+          $key  = postDecode($key);
           $this->gotoShares[$key]['PwdHash'] = "";
           if(preg_match("/^!/",$this->gotoShares[$key]['server'])){
             unset($this->gotoShares[$key]);
@@ -776,9 +774,10 @@ class environment extends plugin
 
         /* Create pwd reset images */
         if($this->gotoShares[$key]['PwdHash'] != ""){
-          $img.= "<input type='image' name='gotoShareResetPwd_".base64_encode($key)." 
-            'src='plugins/goto/images/list_reset_password.png' alt='"._("Reset password hash")."' 
-            title='"._("Reset password hash")."'>";
+          $img.= 
+            image('plugins/goto/images/list_reset_password.png',
+                'gotoShareResetPwd_'.postEncode($key),
+                _("Reset password hash"));
         }
         $field1 = array("string" => "<font style=\"color:#C0C0C0\">".$value."</font>" , "attach" => "style='".$color."'");
         $field2 = array("string" => $img   , "attach" => "style='border-right:0px;'");
@@ -786,13 +785,13 @@ class environment extends plugin
 
         /* Create pwd reset img && delete image */
         if($this->gotoShares[$key]['PwdHash'] != ""){
-          $img.= "<input type='image' name='gotoShareResetPwd_".base64_encode($key)." 
-            'src='plugins/goto/images/list_reset_password.png' alt='"._("Reset password hash")."' 
-            title='"._("Reset password hash")."'>";
+          $img.= 
+            image('plugins/goto/images/list_reset_password.png',
+                'gotoShareResetPwd_'.postEncode($key),
+                _("Reset password hash"));
           $img.= "&nbsp;";
         }
-        $img.= "<input type='image' name='gotoShareDel_".base64_encode($key)." 'src='images/lists/trash.png' alt='".msgPool::delButton()."' 
-          title='"._("Delete share entry")."'>";
+        $img.= image('images/lists/trash.png',"gotoShareDel_".postEncode($key),msgPool::delButton());
         $field1 = array("string" => $value , "attach" => "style='".$color."'");
         $field2 = array("string" => $img   , "attach" => "style='border-right:0px;'");
       }
diff --git a/gosa-plugins/goto/personal/environment/environment.tpl b/gosa-plugins/goto/personal/environment/environment.tpl
index 4dda07498..0d06288f0 100644
--- a/gosa-plugins/goto/personal/environment/environment.tpl
+++ b/gosa-plugins/goto/personal/environment/environment.tpl
@@ -112,7 +112,7 @@
    <table summary="{t}Kiosk profile settings{/t}">
     {if $kiosk_enabled}
     <tr>
-     <td colwidth=2>
+     <td colspan=2>
       <label for="kiosk_server">{t}Kiosk profile{/t}</label>
      </td>
     </tr>
-- 
2.30.2