merges from trunk

timschofield · Jul 12, 2011 · 19b79d8 · 19b79d8
2 parents d7eb31a + 4a927b0
commit 19b79d8
Show file tree

Hide file tree

Showing 267 changed files with 1,380 additions and 1,676 deletions.
diff --git a/AccountGroups.php b/AccountGroups.php
@@ -2,8 +2,6 @@
 /* $Revision: 1.23 $ */
 /* $Id$*/
 
-//$PageSecurity = 10;
-
 include('includes/session.inc');
 
 $title = _('Account Groups');
@@ -262,21 +260,21 @@ function CheckForRecursiveGroup ($ParentGroupName, $GroupName, $db) {
 			<td>' . $myrow[2] . '</td>
 			<td>' . $PandLText . '</td>
 			<td>' . $myrow[4] . '</td>';
-		echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '&amp;SelectedAccountGroup=' . htmlentities($myrow[0], ENT_QUOTES,'UTF-8') . '">' . _('Edit') . '</a></td>';
-		echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '&amp;SelectedAccountGroup=' . htmlentities($myrow[0], ENT_QUOTES,'UTF-8') . '&amp;delete=1">' . _('Delete') .'</a></td></tr>';
+		echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?SelectedAccountGroup=' . htmlentities($myrow[0], ENT_QUOTES,'UTF-8') . '">' . _('Edit') . '</a></td>';
+		echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?SelectedAccountGroup=' . htmlentities($myrow[0], ENT_QUOTES,'UTF-8') . '&amp;delete=1">' . _('Delete') .'</a></td></tr>';
 
 	} //END WHILE LIST LOOP
 	echo '</table>';
 } //end of ifs and buts!
 
 
 if (isset($_POST['SelectedAccountGroup']) OR isset($_GET['SelectedAccountGroup'])) {
-	echo '<br /><div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '?' . SID .'">' . _('Review Account Groups') . '</a></div>';
+	echo '<br /><div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '">' . _('Review Account Groups') . '</a></div>';
 }
 
 if (! isset($_GET['delete'])) {
 
-	echo '<br /><form method="post" id="AccountGroups" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '">';
+	echo '<br /><form method="post" id="AccountGroups" action="' . $_SERVER['PHP_SELF'] . '">';
 	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
 

diff --git a/AccountSections.php b/AccountSections.php
@@ -2,8 +2,6 @@
 /* $Revision: 1.7 $ */
 /* $Id$*/
 
-//$PageSecurity = 10;
-
 include('includes/session.inc');
 
 $title = _('Account Sections');
@@ -194,11 +192,11 @@
 		}
 
 		echo '<td>' . $myrow[0] . '</td><td>' . $myrow[1] . '</td>';
-		echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '&amp;SelectedSectionID=' . $myrow[0] . '">' . _('Edit') . '</a></td>';
+		echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?SelectedSectionID=' . $myrow[0] . '">' . _('Edit') . '</a></td>';
 		if ( $myrow[0] == '1' || $myrow[0] == '2' ) {
 			echo '<td><b>'._('Restricted').'</b></td>';
 		} else {
-			echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '&amp;SelectedSectionID=' . $myrow[0] . '&amp;delete=1">' . _('Delete') .'</a></td>';
+			echo '<td><a href="' . $_SERVER['PHP_SELF'] . '?SelectedSectionID=' . $myrow[0] . '&amp;delete=1">' . _('Delete') .'</a></td>';
 		}
 		echo '</tr>';
 	} //END WHILE LIST LOOP
@@ -207,7 +205,7 @@
 
 
 if (isset($_POST['SelectedSectionID']) or isset($_GET['SelectedSectionID'])) {
-	echo '<div class="centre"><a href=' . $_SERVER['PHP_SELF'] . '?' . SID .'>' . _('Review Account Sections') . '</a></div>';
+	echo '<div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '">' . _('Review Account Sections') . '</a></div>';
 }
 
 if (! isset($_GET['delete'])) {

diff --git a/AddCustomerNotes.php b/AddCustomerNotes.php
@@ -1,7 +1,7 @@
 <?php
 /* $Revision: 1.4 $ */
 /* $Id$*/
-//$PageSecurity = 3;
+
 include('includes/session.inc');
 $title = _('Customer Notes');
 include('includes/header.inc');
@@ -17,7 +17,7 @@
 } elseif (isset($_GET['DebtorNo'])){
 	$DebtorNo = $_GET['DebtorNo'];
 }
-echo "<a href='" . $rootpath . '/SelectCustomer.php?' . SID .'&DebtorNo='.$DebtorNo."'>" . _('Back to Select Customer') . '</a><br />';
+echo "<a href='" . $rootpath . '/SelectCustomer.php?DebtorNo='.$DebtorNo."'>" . _('Back to Select Customer') . '</a><br />';
 if ( isset($_POST['submit']) ) {
 
 	//initialise no input errors assumed initially before we test
@@ -128,10 +128,10 @@
 				$myrow[3],
 				$myrow[2],
 				$myrow[5],
-				$_SERVER['PHP_SELF'] . "?" . SID,
+				$_SERVER['PHP_SELF'] . '?',
 				$myrow[0],
 				$myrow[1],
-				$_SERVER['PHP_SELF'] . "?" . SID,
+				$_SERVER['PHP_SELF'] . '?',
 				$myrow[0],
 				$myrow[1]);
 
@@ -140,13 +140,13 @@
 	echo '</table>';
 }
 if (isset($Id)) {
-	echo '<div class="centre"><a href="'.$_SERVER['PHP_SELF'] . '?' . SID .'&DebtorNo='.$DebtorNo.'"><?='._('Review all notes for this Customer').'</a></div>';
+	echo '<div class="centre"><a href="'.$_SERVER['PHP_SELF'] . '?DebtorNo='.$DebtorNo.'"><?='._('Review all notes for this Customer').'</a></div>';
 }
 echo '<br />';
 
 if (!isset($_GET['delete'])) {
 
-	echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '&DebtorNo='.$DebtorNo.'">';
+	echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?DebtorNo='.$DebtorNo.'">';
 	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
 	if (isset($Id)) {
@@ -206,4 +206,4 @@
 } //end if record deleted no point displaying form to add record
 
 include('includes/footer.inc');
-?>
+?>
diff --git a/AddCustomerTypeNotes.php b/AddCustomerTypeNotes.php
@@ -1,7 +1,7 @@
 <?php
 /* $Revision: 1.3 $ */
 /* $Id$*/
-//$PageSecurity = 3;
+
 include('includes/session.inc');
 $title = _('Customer Type (Group) Notes');
 include('includes/header.inc');
@@ -17,7 +17,7 @@
 } elseif (isset($_GET['DebtorType'])){
 	$DebtorType = $_GET['DebtorType'];
 }
-echo "<a href='" . $rootpath . '/SelectCustomer.php?' . SID .'&DebtorType='.$DebtorType."'>" . _('Back to Select Customer') . '</a><br />';
+echo '<a href="' . $rootpath . '/SelectCustomer.php?DebtorType='.$DebtorType.'">' . _('Back to Select Customer') . '</a><br />';
 if ( isset($_POST['submit']) ) {
 
 	//initialise no input errors assumed initially before we test
@@ -126,10 +126,10 @@
 				$myrow[3],
 				$myrow[2],
 				$myrow[5],
-				$_SERVER['PHP_SELF'] . "?" . SID,
+				$_SERVER['PHP_SELF'] . '?',
 				$myrow[0],
 				$myrow[1],
-				$_SERVER['PHP_SELF'] . "?" . SID,
+				$_SERVER['PHP_SELF'] . '?',
 				$myrow[0],
 				$myrow[1]);
 
@@ -138,14 +138,14 @@
 	echo '</table>';
 }
 if (isset($Id)) {  ?>
-	<div class="cantre"><a href="<?php echo $_SERVER['PHP_SELF'] . '?' . SID .'&DebtorType='.$DebtorType;?>"><?=_('Review all notes for this Customer Type')?></a></div>
+	<div class="cantre"><a href="<?php echo $_SERVER['PHP_SELF'] . '?DebtorType='.$DebtorType;?>"><?=_('Review all notes for this Customer Type')?></a></div>
 <?php } ?>
 <br />
 
 <?php
 if (!isset($_GET['delete'])) {
 
-	echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '&DebtorType='.$DebtorType.'">';
+	echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?DebtorType='.$DebtorType.'">';
 	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
 	if (isset($Id)) {
@@ -196,4 +196,4 @@
 } //end if record deleted no point displaying form to add record
 
 include('includes/footer.inc');
-?>
+?>
diff --git a/AgedDebtors.php b/AgedDebtors.php
@@ -4,7 +4,6 @@
 
 /* $Revision: 1.20 $ */
 
-//$PageSecurity = 2;
 include('includes/session.inc');
 
 if (isset($_POST['PrintPDF'])

diff --git a/AgedSuppliers.php b/AgedSuppliers.php
@@ -4,7 +4,6 @@
 
 /* $Revision: 1.13 $ */
 
-//$PageSecurity = 2;
 include('includes/session.inc');
 
 If (isset($_POST['PrintPDF'])
@@ -105,9 +104,9 @@
 	  $title = _('Aged Supplier Account Analysis') . ' - ' . _('Problem Report') ;
 	  include("includes/header.inc");
 	  prnMsg(_('The Supplier details could not be retrieved by the SQL because') .  ' ' . DB_error_msg($db),'error');
-	   echo "<br /><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
+	   echo '<br /><a href="'.$rootpath.'/index.php">' . _('Back to the menu') . '</a>';
 	   if ($debug==1){
-		echo "<br />$SQL";
+		echo '<br />'.$SQL;
 	   }
 	   include('includes/footer.inc');
 	   exit;
@@ -280,7 +279,7 @@
 
 	/*if $FromCriteria is not set then show a form to allow input	*/
 
-		echo "<form sction='" . $_SERVER['PHP_SELF'] . '?' . SID . "' method='POST'><table>";
+		echo '<form sction="' . $_SERVER['PHP_SELF'] . '" method="POST"><table>';
 		echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
 		echo '<tr><td>' . _('From Supplier Code') . ":</font></td>

diff --git a/Areas.php b/Areas.php
@@ -1,7 +1,6 @@
 <?php
 /* $Revision: 1.22 $ */
 /* $Id$*/
-//$PageSecurity = 3;
 
 include('includes/session.inc');
 
@@ -173,13 +172,13 @@
 //end of ifs and buts!
 
 if (isset($SelectedArea)) {
-	echo '<div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '?' . SID . '">' . _('Review Areas Defined') . '</a></div>';
+	echo '<div class="centre"><a href="' . $_SERVER['PHP_SELF'] . '">' . _('Review Areas Defined') . '</a></div>';
 }
 
 
 if (!isset($_GET['delete'])) {
 
-	echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '"><br />';
+	echo '<form method="post" action="' . $_SERVER['PHP_SELF'] . '"><br />';
 	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
 	if (isset($SelectedArea)) {

diff --git a/BOMExtendedQty.php b/BOMExtendedQty.php
@@ -5,7 +5,7 @@
 /* $Revision: 1.8 $ */
 
 // BOMExtendedQty.php - Quantiy Extended Bill of Materials
-//$PageSecurity = 2;
+
 include('includes/session.inc');
 
 if (isset($_POST['PrintPDF'])) {

diff --git a/BOMIndentedReverse.php b/BOMIndentedReverse.php
@@ -153,9 +153,9 @@
 	  $title = _('Indented BOM Listing') . ' - ' . _('Problem Report');
 	  include('includes/header.inc');
 	   prnMsg( _('The Indented BOM Listing could not be retrieved by the SQL because') . ' '  . DB_error_msg($db),'error');
-	   echo "<br /><a href='" .$rootpath .'/index.php?' . SID . "'>" . _('Back to the menu') . '</a>';
+	   echo '<br /><a href="' .$rootpath .'/index.php">' . _('Back to the menu') . '</a>';
 	   if ($debug==1){
-	      echo "<br />$sql";
+	      echo '<br />'.$sql;
 	   }
 	   include('includes/footer.inc');
 	   exit;
@@ -232,7 +232,7 @@
 		$title = _('Print Reverse Indented BOM Listing Error');
 		include('includes/header.inc');
 		prnMsg(_('There were no items for the selected component'),'error');
-		echo "<br /><a href='$rootpath/index.php?" . SID . "'>" . _('Back to the menu') . '</a>';
+		echo '<br /><a href="'.$rootpath.'/index.php">' . _('Back to the menu') . '</a>';
 		include('includes/footer.inc');
 		exit;
 	} else {

diff --git a/BOMInquiry.php b/BOMInquiry.php
@@ -1,7 +1,6 @@
 <?php
 /* $Revision: 1.12 $ */
 /* $Id$*/
-//$PageSecurity = 2;
 
 include('includes/session.inc');
 $title = _('Costed Bill Of Material');
@@ -14,16 +13,16 @@
 }
 
 if (!isset($_POST['StockID'])) {
-	echo "<form action=" . $_SERVER['PHP_SELF'] . "?" . SID ." method=post><b><br /></b>".
-	'<div class="page_help_text">'. _('Select a manufactured part') . " (" . _('or Assembly or Kit part') . ") " .
-	 _('to view the costed bill of materials') . "." . "<br /><font size=1>" .
-	 _('Parts must be defined in the stock item entry') . "/" . _('modification screen as manufactured') .
-     ", " . _('kits or assemblies to be available for construction of a bill of material').'</div>'
-	."</font><br /><table class=selection cellpadding=3 colspan=4><tr><td><font size=1>" . _('Enter text extracts in the') .
-	 " <b>" . _('description') . "</b>:</font></td><td><input tabindex='1' type='Text' name='Keywords' size=20 maxlength=25></td>
-	 <td><font size=3><b>" . _('OR') . "</b></font></td><td><font size=1>" . _('Enter extract of the') .
-     " <b>" . _('Stock Code') . "</b>:</font></td><td><input tabindex='2' type='Text' name='StockCode' size=15 maxlength=20></td>
-	 </tr></table><br /><div class='centre'><input tabindex='3' type=submit name='Search' value=" . _('Search Now') . "></div><br />";
+	echo '<form action="' . $_SERVER['PHP_SELF'] . '" method=post><b><br /></b>'.
+	'<div class="page_help_text">'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' .
+	 _('to view the costed bill of materials') . '.' . '<br /><font size=1>' .
+	 _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') .
+     ', ' . _('kits or assemblies to be available for construction of a bill of material').'</div>'
+	.'</font><br /><table class=selection cellpadding=3 colspan=4><tr><td><font size=1>' . _('Enter text extracts in the') .
+	 ' <b>' . _('description') . '</b>:</font></td><td><input tabindex="1" type="text" name="Keywords" size=20 maxlength=25></td>
+	 <td><font size=3><b>' . _('OR') . '</b></font></td><td><font size=1>' . _('Enter extract of the') .
+     ' <b>' . _('Stock Code') . '</b>:</font></td><td><input tabindex="2" type="text" name="StockCode" size=15 maxlength=20></td>
+	 </tr></table><br /><div class="centre"><input tabindex="3" type=submit name="Search" value="' . _('Search Now') . '"></div><br />';
 	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 }
 
@@ -192,15 +191,15 @@
 				$k++;
 			}
 
-			$ComponentLink = "<a href='$rootpath/SelectProduct.php?" . SID . "&StockID=" . $myrow['component'] . "'>" . $myrow['component'] . "</a>";
+			$ComponentLink = '<a href="'.$rootpath.'/SelectProduct.php?StockID=' . $myrow['component'] . '">' . $myrow['component'] . '</a>';
 
 			/* Component Code  Description                 Quantity            Std Cost*                Total Cost */
-			printf("<td>%s</td>
+			printf('<td>%s</td>
 				<td>%s</td>
 				<td class=number>%s</td>
 				<td class=number>%.2f</td>
 				<td class=number>%.2f</td>
-				</tr>",
+				</tr>',
 				$ComponentLink,
 				$myrow['description'],
 				number_format($myrow['quantity'],

diff --git a/BOMListing.php b/BOMListing.php
@@ -4,10 +4,8 @@
 
 /* $Revision: 1.14 $ */
 
-//$PageSecurity = 2;
 include('includes/session.inc');
 
-
 If (isset($_POST['PrintPDF'])
 	AND isset($_POST['FromCriteria'])
 	AND strlen($_POST['FromCriteria'])>=1