SF.net SVN: postfixadmin: [143] trunk

[<Gin...@us...>]

Revision: 143
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=143&view=rev
Author:   GingerDog
Date:     2007-10-09 09:23:09 -0700 (Tue, 09 Oct 2007)

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

Modified Paths:
--------------
    trunk/admin/edit-admin.php
    trunk/templates/admin_edit-admin.tpl

Modified: trunk/admin/edit-admin.php
===================================================================
--- trunk/admin/edit-admin.php	2007-10-09 16:19:41 UTC (rev 142)
+++ trunk/admin/edit-admin.php	2007-10-09 16:23:09 UTC (rev 143)
@@ -71,24 +71,25 @@
 
     // has the password changed?
     $originalPassword = $admin_details['password'];
-    if($fPassword != $originalPassword) {  
-        // if it has, ensure both fields are the same...
-        if ($fPassword == $fPassword2)
-        {
-            if(strlen($fPassword) >= $CONF['min_password_length']) {
-                $fPassword = pacrypt($fPassword);
+    if($fPassword != '') {
+        if($fPassword != $originalPassword) {  
+            // if it has, ensure both fields are the same...
+            if ($fPassword == $fPassword2)
+            {
+                if(strlen($fPassword) >= $CONF['min_password_length']) {
+                    $fPassword = pacrypt($fPassword);
+                }
+                else {
+                    $error = 1;
+                    flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']));
+                }
             }
             else {
                 $error = 1;
-                flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']));
+                $pAdminEdit_admin_password_text = $PALANG['pAdminEdit_admin_password_text_error'];
             }
         }
-        else {
-            $error = 1;
-            $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)

Modified: trunk/templates/admin_edit-admin.tpl
===================================================================
--- trunk/templates/admin_edit-admin.tpl	2007-10-09 16:19:41 UTC (rev 142)
+++ trunk/templates/admin_edit-admin.tpl	2007-10-09 16:23:09 UTC (rev 143)
@@ -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><input class="flat" type="password" autocomplete="off" name="fPassword" value="<?php echo $tPassword; ?>"/></td>
+      <td><?php print $PALANG['pAdminEdit_admin_password']; ?>:</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><input class="flat" type="password" name="fPassword2" /></td>
+      <td><?php print $PALANG['pAdminEdit_admin_password2']; ?>:</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>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.