SF.net SVN: postfixadmin: [185] trunk/edit-mailbox.php

[<chr...@us...>]

Revision: 185
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=185&view=rev
Author:   christian_boltz
Date:     2007-11-03 17:53:13 -0700 (Sat, 03 Nov 2007)

Log Message:
-----------
- fix: password was always changed when editing a mailbox.
  Thanks to Ryan Wagoner for pointing this out.
- first usage of db_update function ;-)

Modified Paths:
--------------
    trunk/edit-mailbox.php

Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php	2007-11-04 00:50:09 UTC (rev 184)
+++ trunk/edit-mailbox.php	2007-11-04 00:53:13 UTC (rev 185)
@@ -96,7 +96,9 @@
 
    if($fPassword != $user_details['password']){
       if($fPassword == $fPassword2) {
-         $fPassword = pacrypt($fPassword);
+         if ($fPassword != "") {
+            $formvars['password'] = pacrypt($fPassword);
+         }
       }
       else {
          flash_error($PALANG['pEdit_mailbox_password_text_error']);
@@ -137,8 +139,13 @@
          $fActive = 0;
       }
 
-      $result = db_query ("UPDATE $table_mailbox SET name='$fName',password='$fPassword',quota=$quota,modified=NOW(),active=$sqlActive WHERE username='$fUsername' AND domain='$fDomain'");
-      if ($result['rows'] != 1) {
+      $formvars['name'] = $fName;
+      $formvars['quota'] =$quota;
+      $formvars['active']=$sqlActive;
+
+      $result = db_update ('mailbox', "username='$fUsername' AND domain='$fDomain'", $formvars, array('modified'));
+
+      if ($result != 1) {
          $tMessage = $PALANG['pEdit_mailbox_result_error'];
       }
       else {


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