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

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

Revision: 3619
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3619&view=rev
Author:   tim_schofield
Date:     2010-07-13 18:12:40 +0000 (Tue, 13 Jul 2010)

Log Message:
-----------
Move version number to config table in database

Modified Paths:
--------------
    trunk/config.distrib.php
    trunk/doc/Change.log.html
    trunk/includes/session.inc
    trunk/sql/mysql/upgrade3.11.1-3.12.sql

Modified: trunk/config.distrib.php
===================================================================
--- trunk/config.distrib.php	2010-07-13 18:12:18 UTC (rev 3618)
+++ trunk/config.distrib.php	2010-07-13 18:12:40 UTC (rev 3619)
@@ -13,7 +13,7 @@
 
 // webERP version
 
-$Version = '3.13-rc0 UTF-8 capable';
+// $Version = '3.13-rc0 UTF-8 capable';
 
 // The timezone of the business - this allows the possibility of having
 // the web-server on a overseas machine but record local time

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-07-13 18:12:18 UTC (rev 3618)
+++ trunk/doc/Change.log.html	2010-07-13 18:12:40 UTC (rev 3619)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>13/07/10 Tim: Move version number to config table in database</p>
 <p>13/07/10 Gjergj Sheldija: MiscFunctions.php - Correctly show sourceforge logo only when an internet connection exists</p>
 <p>13/07/10 Tim: MRPDemandTypes.php - Bug fixes, correctly do the workflow, fix sql quoting errors and layout changes</p>
 <p>13/07/10 Tim: MRPDemands.php - Bug fixes, correctly do the workflow, fix sql quoting errors and layout changes</p>

Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc	2010-07-13 18:12:18 UTC (rev 3618)
+++ trunk/includes/session.inc	2010-07-13 18:12:40 UTC (rev 3619)
@@ -95,7 +95,7 @@
 		echo '<br /><br /><br />';
 		prnMsg(_('Your user role does not have any access defined for webERP. There is an error in the security setup for this user account'),'error');
 		include($PathPrefix . 'includes/footer.inc');
-		    exit;
+			exit;
 
 	case  UL_NOTVALID:
 		$demo_text = '<font size="3" color="red"><b>' .  _('incorrect password') . '</b></font><br /><b>' . _('The user/password combination') . '<br />' . _('is not a valid user of the system') . '</b>';
@@ -277,13 +277,16 @@
 	$debug = 0;
 }
 function CryptPass( $Password ) {
-    	global $CryptFunction;
-    	if ( $CryptFunction == 'sha1' ) {
-    		return sha1($Password);
-    	} elseif ( $CryptFunction == 'md5' ) {
-    		return md5($Password);
+		global $CryptFunction;
+		if ( $CryptFunction == 'sha1' ) {
+			return sha1($Password);
+		} elseif ( $CryptFunction == 'md5' ) {
+			return md5($Password);
 	} else {
-    		return $Password;
-    	}
+			return $Password;
+		}
  }
+
+$Version = $_SESSION['VersionNumber'];
+
 ?>

Modified: trunk/sql/mysql/upgrade3.11.1-3.12.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11.1-3.12.sql	2010-07-13 18:12:18 UTC (rev 3618)
+++ trunk/sql/mysql/upgrade3.11.1-3.12.sql	2010-07-13 18:12:40 UTC (rev 3619)
@@ -278,4 +278,6 @@
 INSERT INTO `suppliertype` VALUES(1, 'Default');
 ALTER TABLE `suppliers` ADD COLUMN `supptype` tinyint(4) NOT NULL DEFAULT 1 AFTER `address6`;
 
-ALTER TABLE `loctransfers` CHANGE COLUMN `shipqty` `shipqty` double NOT NULL DEFAULT 0.0;
\ No newline at end of file
+ALTER TABLE `loctransfers` CHANGE COLUMN `shipqty` `shipqty` double NOT NULL DEFAULT 0.0;
+
+INSERT INTO `config` VALUES ('VersionNumber', '3.12');
\ No newline at end of file


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