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

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

Revision: 7872
          http://sourceforge.net/p/web-erp/reponame/7872
Author:   daintree
Date:     2017-12-05 05:55:16 +0000 (Tue, 05 Dec 2017)
Log Message:
-----------


Modified Paths:
--------------
    trunk/MailInventoryValuation.php
    trunk/ManualContents.php
    trunk/api/api_session.inc
    trunk/doc/Manual/ManualSupplierTenders.html
    trunk/includes/session.php

Modified: trunk/MailInventoryValuation.php
===================================================================
--- trunk/MailInventoryValuation.php	2017-12-02 23:30:00 UTC (rev 7871)
+++ trunk/MailInventoryValuation.php	2017-12-05 05:55:16 UTC (rev 7872)
@@ -244,7 +244,7 @@
 			include('includes/footer.php');
 			exit;
 
-	}else{
+	} else {
 			$Title = _('Print Inventory Valuation Error');
 			include('includes/header.php');
 			prnMsg(_('There are errors lead to mails not sent'),'error');
@@ -255,4 +255,4 @@
 	}
 
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/ManualContents.php
===================================================================
--- trunk/ManualContents.php	2017-12-02 23:30:00 UTC (rev 7871)
+++ trunk/ManualContents.php	2017-12-05 05:55:16 UTC (rev 7872)
@@ -9,8 +9,8 @@
 Selecting multiple sections is for printing.
 The outline of the Table of Contents is contained in the 'ManualOutline.php' file that can be easily translated.
 The individual topics in the manual are in straight html files that are called along with the header and foot from here.
-Each function in KwaMoja can initialise a $ViewTopic and $Bookmark variable, prior to including the header.php file.
-This will display the specified topic and bookmark if it exists when the user clicks on the Manual link in the KwaMoja main menu.
+Each function in webERP can initialise a $ViewTopic and $Bookmark variable, prior to including the header.php file.
+This will display the specified topic and bookmark if it exists when the user clicks on the Manual link in the webERP main menu.
 In this way the help can be easily broken into sections for online context-sensitive help.
 Comments beginning with Help Begin and Help End denote the beginning and end of a section that goes into the online help.
 What section is named after Help Begin: and there can be multiple sections separated with a comma.

Modified: trunk/api/api_session.inc
===================================================================
--- trunk/api/api_session.inc	2017-12-02 23:30:00 UTC (rev 7871)
+++ trunk/api/api_session.inc	2017-12-05 05:55:16 UTC (rev 7872)
@@ -56,7 +56,7 @@
     }
     return $hash;
  }
- 
+
  function VerifyPass($Password,$Hash) {
      if(PHP_VERSION_ID < 50500) {
          return (crypt($Password,$Hash)==$Hash);

Modified: trunk/doc/Manual/ManualSupplierTenders.html
===================================================================
--- trunk/doc/Manual/ManualSupplierTenders.html	2017-12-02 23:30:00 UTC (rev 7871)
+++ trunk/doc/Manual/ManualSupplierTenders.html	2017-12-05 05:55:16 UTC (rev 7872)
@@ -16,7 +16,7 @@
 		<p>Clicking on the "Select Suppliers" button brings up a screen to search for suppliers. Only suppliers with email addresses input will show in the supplier search screen. This is because the tendering system works by sending emails to everyone involved. You can choose as many suppliers as you want to send the tender request to.</p>
 	</li>
 	<li><h3>Items to be included in the tender</h3>
-		<p>Clicking on the "Select Item Details" button brings up an item search screen. You can search for any item currently set up on KwaMoja and select any quantity to be put for tender. You can select multiple items from one screen. Any number of otems can be on the tender.</p>
+		<p>Clicking on the "Select Item Details" button brings up an item search screen. You can search for any item currently set up on webERP and select any quantity to be put for tender. You can select multiple items from one screen. Any number of otems can be on the tender.</p>
 	</li>
 </ul>
 

Modified: trunk/includes/session.php
===================================================================
--- trunk/includes/session.php	2017-12-02 23:30:00 UTC (rev 7871)
+++ trunk/includes/session.php	2017-12-05 05:55:16 UTC (rev 7872)
@@ -133,9 +133,11 @@
 
 	header('Location: index.php');
 } elseif (isset($AllowAnyone)){ /* only do security checks if AllowAnyone is not true */
-	$_SESSION['AllowedPageSecurityTokens'] = array();
-	$_SESSION['DatabaseName'] = $DefaultDatabase;
-	$_SESSION['CompanyName'] = $DefaultDatabase;
+	if (!isset($_SESSION['DatabaseName'])){
+		$_SESSION['AllowedPageSecurityTokens'] = array();
+		$_SESSION['DatabaseName'] = $DefaultDatabase;
+		$_SESSION['CompanyName'] = $DefaultDatabase;
+	}
 	include_once ($PathPrefix . 'includes/ConnectDB_' . $DBType . '.inc');
 	include($PathPrefix . 'includes/GetConfig.php');
 } else {