[Web-erp-svn] SF.net SVN: web-erp:[4752] trunk

[<dai...@us...>]

Revision: 4752
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4752&view=rev
Author:   daintree
Date:     2011-11-24 09:10:21 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
only check password if it is !=\"\"

Modified Paths:
--------------
    trunk/UserSettings.php
    trunk/doc/Change.log

Modified: trunk/UserSettings.php
===================================================================
--- trunk/UserSettings.php	2011-11-23 09:22:39 UTC (rev 4751)
+++ trunk/UserSettings.php	2011-11-24 09:10:21 UTC (rev 4752)
@@ -35,15 +35,15 @@
 	}
  */
  	$UpdatePassword = 'N';
-	if ($_POST['Password'] != ''){
-		if ($_POST['Password'] != $_POST['PasswordCheck']){
+	
+	if ($_POST['PasswordCheck'] != ''){
+		if (mb_strlen($_POST['Password'])<5){
 			$InputError = 1;
-			prnMsg(_('The password and password confirmation fields entered do not match'),'error');
-		}else{
-			$UpdatePassword = 'Y';
+			prnMsg(_('The password entered must be at least 5 characters long'),'error');
+		} elseif (mb_strstr($_POST['Password'],$_SESSION['UserID'])!= False){
+			$InputError = 1;
+			prnMsg(_('The password cannot contain the user id'),'error');
 		}
-	}
-	if ($_POST['PasswordCheck'] != ''){
 		if ($_POST['Password'] != $_POST['PasswordCheck']){
 			$InputError = 1;
 			prnMsg(_('The password and password confirmation fields entered do not match'),'error');
@@ -51,13 +51,7 @@
 			$UpdatePassword = 'Y';
 		}
 	}
-	if (mb_strlen($_POST['Password'])<5){
-		$InputError = 1;
-		prnMsg(_('The password entered must be at least 5 characters long'),'error');
-	} elseif (mb_strstr($_POST['Password'],$_SESSION['UserID'])!= False){
-		$InputError = 1;
-		prnMsg(_('The password cannot contain the user id'),'error');
-	}
+	
 
 	if ($InputError != 1) {
 		// no errors

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2011-11-23 09:22:39 UTC (rev 4751)
+++ trunk/doc/Change.log	2011-11-24 09:10:21 UTC (rev 4752)
@@ -1,7 +1,8 @@
 webERP Change Log
 
-23/11/11 Phil: StockCategories number_formatting of minumum and maximum values of stock category properties
-23/11/11 Felix Lim: StockSerialItems.php closing quote typo.
+23/11/11 Phil: UserSettings.php - now only checks password if != ''
+22/11/11 Phil: StockCategories number_formatting of minumum and maximum values of stock category properties
+22/11/11 Felix Lim: StockSerialItems.php closing quote typo.
 21/11/11 Phil: UserSettings.php now checks for at least 5 character passwords WWW_Users.php CustLoginSetup.php and SupplierLoginSetup.php now also check for 4 character userids
 21/11/11 Felix Lim: WWW_users.php malfomed <input type="hidden" - with no closing >
 20/11/11 Phil: Shipments.php now only allows purchase order items to be added to a shipment where the shipment is authorised. Completed, rejected, cancelled orders no longer show.

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