[geeklog-cvs] geeklog-1.3/public_html/admin user.php,1.87,1.88

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html/admin
In directory www:/tmp/cvs-serv15500

Modified Files:
	user.php 
Log Message:
Display a message when using the "changepw" button.


Index: user.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/user.php,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** user.php	14 Nov 2004 20:55:14 -0000	1.87
--- user.php	20 Nov 2004 12:16:11 -0000	1.88
***************
*** 226,229 ****
--- 226,230 ----
  * @param    int     $uid        ID of user to change password for
  * @param    string  $passwd     New password
+ * @return   string              HTML redirect or error message
  *
  */
***************
*** 237,248 ****
          $passwd = md5 ($passwd);
          $result = DB_change ($_TABLES['users'], 'passwd', "$passwd",
!                 'uid', $uid, $_CONF['site_admin_url'] . '/user.php?mode=none');
      } else {
          $retval .= COM_siteHeader ('menu');
          $retval .= COM_errorLog ('CHANGEPW ERROR: There was nothing to do!', 3);
          $retval .= COM_siteFooter ();
-         echo $retval;
-         exit;
      }
  }
  
--- 238,251 ----
          $passwd = md5 ($passwd);
          $result = DB_change ($_TABLES['users'], 'passwd', "$passwd",
!                              'uid', $uid);
! 
!         $retval .= COM_refresh ($_CONF['site_admin_url'] . '/user.php?msg=5');
      } else {
          $retval .= COM_siteHeader ('menu');
          $retval .= COM_errorLog ('CHANGEPW ERROR: There was nothing to do!', 3);
          $retval .= COM_siteFooter ();
      }
+ 
+     return $retval;
  }
  
***************
*** 716,721 ****
      }
  } else if (($mode == $LANG28[17]) && !empty ($LANG28[17])) { // change password
!     changepw (COM_applyFilter ($HTTP_POST_VARS['uid'], true),
!                                $HTTP_POST_VARS['passwd']);
  } else if ($mode == 'edit') {
      $display .= COM_siteHeader('menu', $LANG28[1]);
--- 719,724 ----
      }
  } else if (($mode == $LANG28[17]) && !empty ($LANG28[17])) { // change password
!     $display .= changepw (COM_applyFilter ($HTTP_POST_VARS['uid'], true),
!                           $HTTP_POST_VARS['passwd']);
  } else if ($mode == 'edit') {
      $display .= COM_siteHeader('menu', $LANG28[1]);