fix edit-admin to not use the db password to pre-populate the field - as per emails with Christian Boltz

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@143 a1433add-5e2c-0410-b055-b7f2511e0802

admin/edit-admin.php

@@ -71,6 +71,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
 
     // has the password changed?
     $originalPassword = $admin_details['password'];
+    if($fPassword != '') {
         if($fPassword != $originalPassword) {  
             // if it has, ensure both fields are the same...
             if ($fPassword == $fPassword2)
@@ -88,7 +89,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
                 $pAdminEdit_admin_password_text = $PALANG['pAdminEdit_admin_password_text_error'];
             }
         }
-
+    }
     $fDomains = array();
     if (array_key_exists('fDomains', $_POST)) $fDomains = escape_string ($_POST['fDomains']);
     if ($error != 1)

templates/admin_edit-admin.tpl

@@ -4,27 +4,27 @@
    <tr>
       <td colspan="3"><h3><?php print $PALANG['pAdminEdit_admin_welcome']; ?></h3></td></tr>
    <tr>
-      <td><?php print $PALANG['pAdminEdit_admin_username'] . ":"; ?></td>
+      <td><?php print $PALANG['pAdminEdit_admin_username']; ?>:</td>
       <td><?php print $username; ?></td>
       <td>&nbsp;</td>
    </tr>
    <tr>
-      <td><?php print $PALANG['pAdminEdit_admin_password'] . ":"; ?></td>
+      <td><?php print $PALANG['pAdminEdit_admin_password']; ?>:</td>
-      <td><input class="flat" type="password" autocomplete="off" name="fPassword" value="<?php echo $tPassword; ?>"/></td>
+      <td><input class="flat" type="password" autocomplete="off" name="fPassword" value=""/></td>
       <td><?php print $pAdminEdit_admin_password_text; ?></td>
    </tr>
    <tr>
-      <td><?php print $PALANG['pAdminEdit_admin_password2'] . ":"; ?></td>
+      <td><?php print $PALANG['pAdminEdit_admin_password2']; ?>:</td>
-      <td><input class="flat" type="password" name="fPassword2" /></td>
+      <td><input class="flat" type="password" name="fPassword2" value="" /></td>
       <td>&nbsp;</td>
    </tr>
    <tr>
-      <td><?php print $PALANG['pAdminEdit_admin_active'] . ":"; ?></td>
+      <td><?php print $PALANG['pAdminEdit_admin_active']; ?>:</td>
       <td><input class="flat" type="checkbox" name="fActive" <?php print (!empty ($tActive)) ? 'checked' : ''; ?> /></td>
       <td>&nbsp;</td>
    </tr>
    <tr>
-      <td><?php print $PALANG['pAdminEdit_admin_super_admin'] . ":"; ?></td>
+      <td><?php print $PALANG['pAdminEdit_admin_super_admin']; ?>:</td>
       <td><input class="flat" type="checkbox" name="fSadmin" <?php print (!empty ($tSadmin)) ? 'checked' : ''; ?> /></td>
       <td>&nbsp;</td>
    </tr>