Updated samba plugin, show domain infos in an extra tab

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

diff --git a/gosa-plugins/goto/personal/environment/class_environment.inc b/gosa-plugins/goto/personal/environment/class_environment.inc
index c6f82a34a4c0346c4dc53fa5e53571771b847288..c7befa3ce85d78d4f2bcf1bae7727005be865175 100644 (file)
--- a/gosa-plugins/goto/personal/environment/class_environment.inc
+++ b/gosa-plugins/goto/personal/environment/class_environment.inc
@@ -1240,7 +1240,7 @@ class environment extends plugin
     /* Prepare HotPlug devices */
     $this->attrs['gotoHotplugDeviceDN'] = array();
     foreach($this->gotoHotplugDevices as $name => $device){
-      $this->attrs['gotoHotplugDeviceDN'][]= $device['dn'];
+      $this->attrs['gotoHotplugDeviceDN'][]= LDAP::fix($device['dn']);
     }
 
     /* Prepare LogonScripts */

diff --git a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
index bd3b566868d63343e7ff38f1a278806a14b6c7ea..b8c2c082ebb15c4fa22df46f0e3ef1d0b1ed1229 100644 (file)
--- a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
+++ b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
@@ -977,8 +977,7 @@ class sambaAccount extends plugin
     }
 
     $str =
-      "\n<table style='width:100%;'><tr><td style='width:50%; border-right: solid 1px #B0B0B0;'>".
-      "\n<table>".
+      "\n<table style='width:100%;'>".
       "\n<tr><td><b>"._("Domain attributes")."</b></td></tr>". 
       "\n<tr><td>"._("Min password length").":           </td><td>".$sambaMinPwdLength."</td></tr>". 
       "\n<tr><td>"._("Min password length").":           </td><td>".$sambaMinPwdLength."</td></tr>". 
@@ -990,7 +989,7 @@ class sambaAccount extends plugin
       "\n<tr><td>"._("Bad lockout attempt").":           </td><td>".$sambaLockoutThreshold."</td></tr>".
       "\n<tr><td>"._("Disconnect time").":               </td><td>".$sambaForceLogoff."</td></tr>".
       "\n<tr><td>"._("Refuse machine password change").":</td><td>".$sambaRefuseMachinePwdChange."</td></tr>".
-      "\n</table></td><td style='vertical-align: top;'><table>".
+      "\n<tr><td>&nbsp;</td></tr>". 
       "\n<tr><td><b>"._("User attributes")."</b></td></tr>". 
       "\n<tr><td>"._("Last failed login").":             </td><td>".$sambaBadPasswordTime."</td></tr>".
       "\n<tr><td>"._("Logon attempts").":                </td><td>".$sambaBadPasswordCount."</td></tr>".
@@ -1000,7 +999,7 @@ class sambaAccount extends plugin
       "\n<tr><td>"._("Automatic logoff").":              </td><td>".$sambaKickoffTime."</td></tr>".
       "\n<tr><td>"._("Password expires").":              </td><td>".$sambaPwdMustChange."</td></tr>".
       "\n<tr><td>"._("Password change available").":     </td><td>".$sambaPwdCanChange."</td></tr>".
-      "\n</table></td></tr></table>";
+      "\n</table>";
     return($str);
   }
 
@@ -1103,7 +1102,9 @@ class sambaAccount extends plugin
       plugin::save_object();
 
       if(isset($_POST['display_information'])){
-        $this->display_information = !$this->display_information;
+        msg_dialog::display(_("Information"), 
+          $this->get_samba_information(),
+          INFO_DIALOG);
       }
 
       /* Take care about access options */

diff --git a/gosa-plugins/samba/personal/samba/samba3.tpl b/gosa-plugins/samba/personal/samba/samba3.tpl
index 44e30b0068e31998bf32a6739ff905c266c12b9f..4974b52f81fc80e14524decbdba181f232dc6630 100644 (file)
--- a/gosa-plugins/samba/personal/samba/samba3.tpl
+++ b/gosa-plugins/samba/personal/samba/samba3.tpl
@@ -66,20 +66,9 @@
 <table style='width:100%;'>
  <tr>
   <td>{t}Show information{/t}
-   {if $display_information}
-    <input type='submit' name='display_information' value='{t}Hide{/t}'>
-   {else}
     <input type='submit' name='display_information' value='{t}Show{/t}'>
-   {/if}
   </td> 
  </tr>
- {if $display_information}
- <tr>
-  <td>
-    {$samba_information}
-  </td>
- </tr>
- {/if}
 </table>
 <p class="seperator">&nbsp;</p>