[Weberp-cvs] SF.net SVN: web-erp:[3486] trunk

[<tim...@us...>]

Revision: 3486
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3486&view=rev
Author:   tim_schofield
Date:     2010-06-09 14:42:02 +0000 (Wed, 09 Jun 2010)

Log Message:
-----------
UserSettings.php - Fix sql error for case when password is being updated.

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

Modified: trunk/UserSettings.php
===================================================================
--- trunk/UserSettings.php	2010-06-08 13:53:28 UTC (rev 3485)
+++ trunk/UserSettings.php	2010-06-09 14:42:02 UTC (rev 3486)
@@ -81,7 +81,7 @@
 					theme='" . $_POST['Theme'] . "',
 					language='" . $_POST['Language'] . "',
 					email='". $_POST['email'] ."',
-					pdflanguage=" . $_POST['PDFLanguage'] . "
+					pdflanguage=" . $_POST['PDFLanguage'] . ",
 					password='" . CryptPass($_POST['pass']) . "'
 				WHERE userid = '" . $_SESSION['UserID'] . "'";
 
@@ -97,7 +97,7 @@
 		$_SESSION['Theme'] = trim($_POST['Theme']); /*already set by session.inc but for completeness */
 		$theme = $_SESSION['Theme'];
 		$_SESSION['Language'] = trim($_POST['Language']);
-		
+
 		include ('includes/LanguageSetup.php');
 
 	}
@@ -122,8 +122,8 @@
 	<td>' . _('Maximum Number of Records to Display') . ":</td>
 	<td><input type='Text' class='number' name='DisplayRecordsMax' size=3 maxlength=3 VALUE=" . $_POST['DisplayRecordsMax'] . " ></td>
 	</tr>";
-	
-	
+
+
 echo '<tr>
 	<td>' . _('Language') . ":</td>
 	<td><select name='Language'>";
@@ -132,13 +132,13 @@
 
 
 	while (false != ($LanguageEntry = $LangDirHandle->read())){
-	
-		if (is_dir('locale/' . $LanguageEntry) 
-				AND $LanguageEntry != '..' 
+
+		if (is_dir('locale/' . $LanguageEntry)
+				AND $LanguageEntry != '..'
 				AND $LanguageEntry != 'CVS'
-				AND $LanguageEntry != '.svn' 
+				AND $LanguageEntry != '.svn'
 				AND $LanguageEntry!='.'){
-	
+
 			if ($_SESSION['Language'] == $LanguageEntry){
 				echo "<option selected VALUE='$LanguageEntry'>$LanguageEntry";
 			} else {
@@ -146,10 +146,10 @@
 			}
 		}
 	}
-	
+
 	echo '</select></td></tr>';
 
-	
+
 echo '<tr>
 	<td>' . _('Theme') . ":</td>
 	<td><select name='Theme'>";
@@ -195,7 +195,7 @@
 if (!isset($_POST['PDFLanguage'])){
 	$_POST['PDFLanguage']=0;
 }
-	
+
 echo '<tr><td>' . _('PDF Language Support') . ': </td><td><select name="PDFLanguage">';
 for($i=0;$i<=7;$i++){
 	if ($_POST['PDFLanguage']==$i){

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-06-08 13:53:28 UTC (rev 3485)
+++ trunk/doc/Change.log.html	2010-06-09 14:42:02 UTC (rev 3486)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>09/06/10 Tim: UserSettings.php - Fix sql error for case when password is being updated.</p>
 <p>08/06/10 Tim: Add option to exclude value information from GRN screen</p>
 <p>07/06/10 Tim: Various changes to correctly deal with suppliers uom plus layout changes to puirchase orders and goods received notes</p>
 <p>06/06/10 Zhiguo Yuan: WorkOrderReceive.php - Change to make rollup costs change when more labour or overheadcosts change</p>


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