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

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

Revision: 7048
          http://sourceforge.net/p/web-erp/reponame/7048
Author:   daintree
Date:     2014-12-28 09:33:08 +0000 (Sun, 28 Dec 2014)
Log Message:
-----------
formatting

Modified Paths:
--------------
    trunk/CustomerTransInquiry.php
    trunk/ProductSpecs.php
    trunk/SalesPeople.php
    trunk/includes/session.inc

Modified: trunk/CustomerTransInquiry.php
===================================================================
--- trunk/CustomerTransInquiry.php	2014-12-27 23:36:39 UTC (rev 7047)
+++ trunk/CustomerTransInquiry.php	2014-12-28 09:33:08 UTC (rev 7048)
@@ -15,9 +15,8 @@
 
 echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
 echo '<div>';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
-echo '<table class="selection">
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+	<table class="selection">
 		<tr>
 			<td>' . _('Type') . ':</td>
 			<td><select tabindex="1" name="TransType"> ';

Modified: trunk/ProductSpecs.php
===================================================================
--- trunk/ProductSpecs.php	2014-12-27 23:36:39 UTC (rev 7047)
+++ trunk/ProductSpecs.php	2014-12-28 09:33:08 UTC (rev 7048)
@@ -86,25 +86,25 @@
 if (!isset($KeyValue) OR $KeyValue=='') {
 	//prompt user for Key Value
 	echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .  '" method="post">
-		<div>
-		<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
-		<table class="selection">
-		<tr>
-			<td>' . _('Enter Specification Name') .':</td>
-			<td><input type="text" name="KeyValue" size="25" maxlength="25" /></td>
-		</tr>
-		</table>
-		</div>
-		<div>
-		<input type="submit" name="pickspec" value="' . _('Submit') . '" />
-		</div>
+			<div>
+			<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+			<table class="selection">
+				<tr>
+					<td>' . _('Enter Specification Name') .':</td>
+					<td><input type="text" name="KeyValue" size="25" maxlength="25" /></td>
+				</tr>
+			</table>
+			</div>
+			<div>
+				<input type="submit" name="pickspec" value="' . _('Submit') . '" />
+			</div>
 		</form>
 		<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .  '" method="post">
-		<div>
-		<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
-		<table class="selection">
-		<tr>
-			<td>' . _('Or Select Existing Specification') .':</td>';
+			<div>
+				<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+				<table class="selection">
+				<tr>
+					<td>' . _('Or Select Existing Specification') .':</td>';
 	$SQLSpecSelect="SELECT DISTINCT(keyval),
 							description
 						FROM prodspecs LEFT OUTER JOIN stockmaster
@@ -117,12 +117,12 @@
 	while ($MyRowSelection=DB_fetch_array($ResultSelection)){
 		echo '<option value="' . $MyRowSelection['keyval'] . '">' . $MyRowSelection['keyval'].' - ' .htmlspecialchars($MyRowSelection['description'], ENT_QUOTES,'UTF-8', false)  . '</option>';
 	}
-	echo '</select></td>';
-	echo '</tr>
+	echo 	'</select></td>
+			</tr>
 		</table>
 		</div>
 		<div>
-		<input type="submit" name="pickspec" value="' . _('Submit') . '" />
+			<input type="submit" name="pickspec" value="' . _('Submit') . '" />
 		</div>
 		</form>';
 
@@ -155,18 +155,18 @@
 	$result = DB_query($sql);
 	echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
     echo '<div>';
-	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-	echo '<table class="selection">';
-	echo '<tr>
-			<th class="ascending">' . _('Add') . '</th>
-			<th class="ascending">' . _('Name') . '</th>
-			<th class="ascending">' . _('Method') . '</th>
-			<th class="ascending">' . _('Units') . '</th>
-			<th>' . _('Possible Values') . '</th>
-			<th>' . _('Target Value') . '</th>
-			<th>' . _('Range Min') . '</th>
-			<th>' . _('Range Max') . '</th>
-		</tr>';
+	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+		<table class="selection">
+			<tr>
+				<th class="ascending">' . _('Add') . '</th>
+				<th class="ascending">' . _('Name') . '</th>
+				<th class="ascending">' . _('Method') . '</th>
+				<th class="ascending">' . _('Units') . '</th>
+				<th>' . _('Possible Values') . '</th>
+				<th>' . _('Target Value') . '</th>
+				<th>' . _('Range Min') . '</th>
+				<th>' . _('Range Max') . '</th>
+			</tr>';
 	$k=0;
 	$x=0;
 	while ($myrow=DB_fetch_array($result)) {

Modified: trunk/SalesPeople.php
===================================================================
--- trunk/SalesPeople.php	2014-12-27 23:36:39 UTC (rev 7047)
+++ trunk/SalesPeople.php	2014-12-28 09:33:08 UTC (rev 7048)
@@ -5,8 +5,12 @@
 $Title = _('Sales People Maintenance');
 $ViewTopic = 'SalesPeople';
 $BookMark = 'SalesPeople';
-if(isset($_GET['SelectedSalesPerson'])) {$BookMark = 'SalespeopleEdit';}// For Edit's screen.
-if(isset($_GET['delete'])) {$BookMark = 'SalespeopleDelete';}// For Delete's ERROR Message Report.
+if(isset($_GET['SelectedSalesPerson'])) {
+	$BookMark = 'SalespeopleEdit';
+}// For Edit's screen.
+if(isset($_GET['delete'])) {
+	$BookMark = 'SalespeopleDelete';
+}// For Delete's ERROR Message Report.
 include('includes/header.inc');
 
 if (isset($_GET['SelectedSalesPerson'])){

Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc	2014-12-27 23:36:39 UTC (rev 7047)
+++ trunk/includes/session.inc	2014-12-28 09:33:08 UTC (rev 7048)
@@ -15,7 +15,7 @@
 }
 include($PathPrefix . 'config.php');
 
-if (isset($dbuser)) {
+if (isset($dbuser)) { //this gets past an upgrade issue where old versions used lower case variable names
 	$DBUser=$dbuser;
 	$DBPassword=$dbpassword;
 	$DBType=$dbType;
@@ -102,7 +102,7 @@
 	}
 
 	/*  Need to set the theme to make login screen nice */
-	$Theme = (isset($_SESSION['Theme'])) ? $_SESSION['Theme'] : 'gel';
+	$Theme = (isset($_SESSION['Theme'])) ? $_SESSION['Theme'] : 'xenos';
 	switch ($rc) {
 	case  UL_OK; //user logged in successfully
 		include($PathPrefix . 'includes/LanguageSetup.php'); //set up the language