From ddddf1017477d50e074e6ce97031348291e959f5 Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Thu, 31 Jan 2013 21:17:27 +0000
Subject: [PATCH] Style + bugs

---
 bureau/admin/hta_edit.php     |  2 +-
 bureau/admin/hta_edituser.php | 45 ++++++++++++++++++++++-------------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/bureau/admin/hta_edit.php b/bureau/admin/hta_edit.php
index 1083de69..640cc2d4 100644
--- a/bureau/admin/hta_edit.php
+++ b/bureau/admin/hta_edit.php
@@ -70,7 +70,7 @@ for($i=0;$i<count($r);$i++){
 	<tr class="lst<?php echo $col; ?>">
 		<td align="center"><input type="checkbox" class="inc" name="d[]" value="<?php echo $r[$i]?>" /></td>
 		<td>
-<div class="ina"><a href="hta_edituser.php?user=<?php echo $r[$i]?>&amp;dir=<?php echo $dir?>"><img src="icon/encrypted.png" alt="<?php __("Change this user's password"); ?>" /><?php __("Change this user's password"); ?></a></div>
+<div class="ina"><a href="hta_edituser.php?user=<?php echo urlencode($r[$i])?>&amp;dir=<?php echo urlencode($dir); ?>"><img src="icon/encrypted.png" alt="<?php __("Change this user's password"); ?>" /><?php __("Change this user's password"); ?></a></div>
 </td>
 		<td><?php echo $r[$i]; ?></td>
 	</tr>
diff --git a/bureau/admin/hta_edituser.php b/bureau/admin/hta_edituser.php
index 454eccd8..75cd7752 100644
--- a/bureau/admin/hta_edituser.php
+++ b/bureau/admin/hta_edituser.php
@@ -40,24 +40,37 @@ getFields($fields);
 <h3><?php printf(_("Editing user %s in the protected folder %s"),$user,$dir); ?></h3>
 <hr id="topbar"/>
 <br />
-<?php
-if (isset($error) && $error) {
-	echo "<p class=\"error\">$error</p>";
-}
-?>
+
+<?php if (!empty($error) ) { echo "<p class=\"error\">$error</p>"; } ?>
+
 <form method="post" action="hta_doedituser.php" name="main" id="main">
-<table border="1" cellspacing="0" cellpadding="4">
-<tr><td><input type="hidden" name="dir" value="<?php echo $dir ?>">
-<input type="hidden" name="user" value="<?php echo $user ?>">
-<?php __("Folder"); ?></td><td><code><?php echo $dir; ?></code></td></tr>
-<tr><td><?php __("User"); ?></td><td><code><?php echo $user; ?></code></td></tr>
-<tr><td><label for="newpass"><?php __("New password"); ?></label></td><td><input type="password" class="int" name="newpass" id="newpass" value="" size="20" maxlength="64" /><?php display_div_generate_password(DEFAULT_PASS_SIZE,"#newpass","#newpassconf"); ?></td></tr>
-<tr><td><label for="newpassconf"><?php __("Confirm password"); ?></label></td><td><input type="password" class="int" name="newpassconf" id="newpassconf" value="" size="20" maxlength="64" /></td></tr>
-<tr><td colspan="2"><input type="submit" class="inb" value="<?php __("Change the password"); ?>" /></td></tr>
-</table>
+  <input type="hidden" name="dir" value="<?php echo $dir ?>">
+  <input type="hidden" name="user" value="<?php echo $user ?>">
+  <table border="1" cellspacing="0" cellpadding="4" class='tedit'>
+    <tr>
+      <th><?php __("Folder"); ?></th>
+      <td><code><?php echo $dir; ?></code></td>
+    </tr>
+    <tr>
+      <th><?php __("User"); ?></th>
+      <td><code><?php echo $user; ?></code></td>
+    </tr>
+    <tr>
+      <th><label for="newpass"><?php __("New password"); ?></label></th>
+      <td><input type="password" class="int" name="newpass" id="newpass" value="" size="20" maxlength="64" /><?php display_div_generate_password(DEFAULT_PASS_SIZE,"#newpass","#newpassconf"); ?></td>
+    </tr>
+    <tr>
+      <th><label for="newpassconf"><?php __("Confirm password"); ?></label></th>
+      <td><input type="password" class="int" name="newpassconf" id="newpassconf" value="" size="20" maxlength="64" /></td>
+    </tr>
+  </table>
+  <br/>
+  <input type="submit" class="inb" value="<?php __("Change the password"); ?>" />
 </form>
+
 <script type="text/javascript">
-document.forms['main'].newpass.focus();
-document.forms['main'].setAttribute('autocomplete', 'off');
+  document.forms['main'].newpass.focus();
+  document.forms['main'].setAttribute('autocomplete', 'off');
 </script>
+
 <?php include_once("foot.php"); ?>