From 4e7919fdd17f57421156dd447218329d4a97b630 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 24 May 2005 12:21:04 +0000
Subject: [PATCH] w3c

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@377 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 plugins/personal/connectivity/class_connectivity.inc |  2 +-
 plugins/personal/connectivity/main.inc               |  6 +++---
 plugins/personal/samba/class_sambaAccount.inc        |  3 +++
 plugins/personal/samba/samba3.tpl                    | 10 +++++-----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/plugins/personal/connectivity/class_connectivity.inc b/plugins/personal/connectivity/class_connectivity.inc
index ed5943db3..6c760ad67 100644
--- a/plugins/personal/connectivity/class_connectivity.inc
+++ b/plugins/personal/connectivity/class_connectivity.inc
@@ -56,7 +56,7 @@ class connectivity extends plugin
         }
       }
       if (!$enabled){
-        $display= "<img src=\"images/stop.png\" align=center>&nbsp;<b>".
+        $display= "<img alt=\"\" src=\"images/stop.png\" align=\"middle\">&nbsp;<b>".
           _("This account has no connectivity extensions.")."</b>";
         $display.= back_to_main();
         return ($display);
diff --git a/plugins/personal/connectivity/main.inc b/plugins/personal/connectivity/main.inc
index f511faf67..d8ab9df48 100644
--- a/plugins/personal/connectivity/main.inc
+++ b/plugins/personal/connectivity/main.inc
@@ -116,13 +116,13 @@ if (!$remove_lock){
       $display.= "<input type=submit name=\"edit_finish\" value=\""._("Finish")."\">\n";
       $display.= "&nbsp;";
       $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
-      $info= "<img align=\"center\" src=\"".get_template_path('images/closedlock.png').
+      $info= "<img align=\"middle\" src=\"".get_template_path('images/closedlock.png').
              "\"> ".$ui->dn."&nbsp;";
     } else {
-      $info= "<img align=\"center\" src=\"".get_template_path('images/openlock.png').
+      $info= "<img align=\"middle\" src=\"".get_template_path('images/openlock.png').
              "\"> ".$ui->dn."&nbsp;";
       if ($editacl != "#none#"){
-        $info.= "<img align=\"center\" src=\"".get_template_path('images/lamp.png').
+        $info.= "<img align=\"middle\" src=\"".get_template_path('images/lamp.png').
                 "\">"._("Click the 'Edit' button below to change informations in this dialog");
         $display.= "<input type=submit name=\"edit\" value=\""._("Edit")."\">\n";
       }
diff --git a/plugins/personal/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc
index 60d6977b3..23b11d53b 100644
--- a/plugins/personal/samba/class_sambaAccount.inc
+++ b/plugins/personal/samba/class_sambaAccount.inc
@@ -466,8 +466,11 @@ class sambaAccount extends plugin
       /* Set checkboxes to checked or unchecked state */
       $smarty->assign("tslogin", $this->mungedObject->getTsLogin()?"checked":"");
       $smarty->assign("tsloginACL", chkacl($this->acl,"tslogin"));
+
       $smarty->assign("inherit", $this->mungedObject->getInheritMode()?"checked":"");
       $smarty->assign("inheritACL", chkacl($this->acl,"inherit"));
+
+
       $smarty->assign("connectclientdrives",
                       $this->mungedObject->getConnectClientDrives()?"checked":"");
       $smarty->assign("connectclientdrivesACL", chkacl($this->acl,"connectclientdrives"));
diff --git a/plugins/personal/samba/samba3.tpl b/plugins/personal/samba/samba3.tpl
index fa69000ed..6fa18b403 100644
--- a/plugins/personal/samba/samba3.tpl
+++ b/plugins/personal/samba/samba3.tpl
@@ -89,13 +89,13 @@
     <tr>
      <td>{t}Initial program{/t}</td>
      <td>
-      <input name="CtxInitialProgram" id="CtxInitialProgram" size=35 maxlength=60 {$CtxInitialProgramACL} value="{$CtxInitialProgram}" {$CtxInitialProgramMode}>
+      <input name="CtxInitialProgram" id="CtxInitialProgram" size=35 maxlength=60 {if $CtxInitialProgramACL==""}{$CtxInitialProgramMode}{/if} value="{$CtxInitialProgram}" {$CtxInitialProgramACL}>
      </td>
     </tr>
     <tr>
      <td>{t}Working directory{/t}</td>
      <td>
-      <input name="CtxWorkDirectory" id="CtxWorkDirectory" size=35 maxlength=60 {$CtxWorkDirectoryACL} value="{$CtxWorkDirectory}" {$CtxInitialProgramMode}>
+      <input name="CtxWorkDirectory" id="CtxWorkDirectory" size=35 maxlength=60 {if $CtxWorkDirectoryACL==""}{$CtxInitialProgramMode}{/if} value="{$CtxWorkDirectory}" {$CtxInitialProgramACL}>
      </td>
     </tr>
    </table>
@@ -116,7 +116,7 @@
       {t}Connection{/t}
      </td>
      <td>
-      <input name="CtxMaxConnectionTime" id="CtxMaxConnectionTime" size=5 maxlength=5 {$CtxMaxConnectionTimeACL} value="{$CtxMaxConnectionTime}" {$CtxMaxConnectionTimeMode}>
+      <input name="CtxMaxConnectionTime" id="CtxMaxConnectionTime" size=5 maxlength=5 {if $CtxMaxConnectionTimeACL==""}{$CtxMaxConnectionTimeMode}{/if} value="{$CtxMaxConnectionTime}" {$CtxMaxConnectionTimeACL}>
      </td>
     </tr>
     <tr>
@@ -125,7 +125,7 @@
       {t}Disconnection{/t}
      </td>
      <td>
-      <input name="CtxMaxDisconnectionTime" id="CtxMaxDisconnectionTime" size=5 maxlength=5 {$CtxMaxDisconnectionTimeACL} value="{$CtxMaxDisconnectionTime}" {$CtxMaxDisconnectionTimeMode}>
+      <input name="CtxMaxDisconnectionTime" id="CtxMaxDisconnectionTime" size=5 maxlength=5 {if $CtxMaxDisconnectionTimeACL ==""}{$CtxMaxDisconnectionTimeMode}{/if} value="{$CtxMaxDisconnectionTime}" {$CtxMaxDisconnectionTimeACL}>
      </td>
     </tr>
     <tr>
@@ -134,7 +134,7 @@
       {t}IDLE{/t}
      </td>
      <td>
-      <input name="CtxMaxIdleTime" id="CtxMaxIdleTime" size=5 maxlength=5 {$CtxMaxIdleTimeACL} value="{$CtxMaxIdleTime}" {$CtxMaxIdleTimeMode}>
+      <input name="CtxMaxIdleTime" id="CtxMaxIdleTime" size=5 maxlength=5 {if $CtxMaxIdleTimeACL==""}{$CtxMaxIdleTimeMode}{/if} value="{$CtxMaxIdleTime}" {$CtxMaxIdleTimeACL}>
      </td>
     </tr>
    </table>
-- 
2.30.2