Remove unused $db and $conn parameters from DB_Last_Insert_ID() and (…

…where present) from DB_show_tables(), and DB_show_fields(). Also, remove any unused 'global $db' references across the code base.
webERP-team · Feb 26, 2018 · 7f3464c · 7f3464c
1 parent ffa090f
commit 7f3464c
Show file tree

Hide file tree

Showing 59 changed files with 108 additions and 205 deletions.
diff --git a/AuditTrail.php b/AuditTrail.php
@@ -29,7 +29,7 @@
 }
 
 // Get list of tables
-$TableResult = DB_show_tables($db);
+$TableResult = DB_show_tables();
 
 // Get list of users
 $UserResult = DB_query("SELECT userid FROM www_users ORDER BY userid");

diff --git a/BOMs.php b/BOMs.php
@@ -11,7 +11,6 @@
 
 function display_children($Parent, $Level, &$BOMTree) {
 
-	global $db;
 	global $i;
 
 	// retrive all children of parent

diff --git a/BOMs_SingleLevel.php b/BOMs_SingleLevel.php
@@ -11,7 +11,6 @@
 
 function display_children($Parent, $Level, &$BOMTree) {
 
-	global $db;
 	global $i;
 
 	// retrive all children of parent

diff --git a/ConfirmDispatch_Invoice.php b/ConfirmDispatch_Invoice.php
@@ -890,7 +890,7 @@
 	$DbgMsg = _('The following SQL to insert the debtor transaction record was used');
  	$Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
 
-	$DebtorTransID = DB_Last_Insert_ID($db,'debtortrans','id');
+	$DebtorTransID = DB_Last_Insert_ID('debtortrans','id');
 
 /* Insert the tax totals for each tax authority where tax was charged on the invoice */
 	foreach ($TaxTotals AS $TaxAuthID => $TaxAmount) {
@@ -1251,7 +1251,7 @@
 			$Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
 
 /*Get the ID of the StockMove... */
-			$StkMoveNo = DB_Last_Insert_ID($db,'stockmoves','stkmoveno');
+			$StkMoveNo = DB_Last_Insert_ID('stockmoves','stkmoveno');
 
 /*Insert the taxes that applied to this line */
 			foreach ($OrderLine->Taxes as $Tax) {

diff --git a/ContractCosting.php b/ContractCosting.php
@@ -370,7 +370,7 @@
 				$Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
 
 				/*Get the ID of the StockMove... */
-				$StkMoveNo = DB_Last_Insert_ID($db,'stockmoves','stkmoveno');
+				$StkMoveNo = DB_Last_Insert_ID('stockmoves','stkmoveno');
 
 				/* If GLLink_Stock then insert GLTrans to debit the GL Code  and credit GRN Suspense account at standard cost*/
 				if ($_SESSION['CompanyRecord']['gllink_stock']==1 AND ($OtherReqtsBudget+$ContractBOMBudget)!=0){

diff --git a/CounterReturns.php b/CounterReturns.php
@@ -948,7 +948,7 @@
 		$DbgMsg = _('The following SQL to insert the debtor transaction record was used');
 	 	$Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
 
-		$DebtorTransID = DB_Last_Insert_ID($db,'debtortrans','id');
+		$DebtorTransID = DB_Last_Insert_ID('debtortrans','id');
 
 	/* Insert the tax totals for each tax authority where tax was charged on the invoice */
 		foreach ($_SESSION['Items' . $identifier]->TaxTotals AS $TaxAuthID => $TaxAmount) {
@@ -1172,7 +1172,7 @@
 			$Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
 
 		/*Get the ID of the StockMove... */
-			$StkMoveNo = DB_Last_Insert_ID($db,'stockmoves','stkmoveno');
+			$StkMoveNo = DB_Last_Insert_ID('stockmoves','stkmoveno');
 
 		/*Insert the taxes that applied to this line */
 			foreach ($ReturnItemLine->Taxes as $Tax) {
@@ -1569,7 +1569,7 @@ functionalexrate,
 			$ErrMsg = _('Cannot insert a receipt transaction against the customer because') ;
 			$result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
 
-			$ReceiptDebtorTransID = DB_Last_Insert_ID($db,'debtortrans','id');
+			$ReceiptDebtorTransID = DB_Last_Insert_ID('debtortrans','id');
 
 
 			//and finally add the allocation record between receipt and invoice

diff --git a/CounterSales.php b/CounterSales.php
@@ -1359,7 +1359,7 @@
 		$DbgMsg = _('The following SQL to insert the debtor transaction record was used');
 	 	$Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
 
-		$DebtorTransID = DB_Last_Insert_ID($db,'debtortrans','id');
+		$DebtorTransID = DB_Last_Insert_ID('debtortrans','id');
 
 	/* Insert the tax totals for each tax authority where tax was charged on the invoice */
 		foreach ($_SESSION['Items'.$identifier]->TaxTotals AS $TaxAuthID => $TaxAmount) {
@@ -1584,7 +1584,7 @@
 			$Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
 
 		/*Get the ID of the StockMove... */
-			$StkMoveNo = DB_Last_Insert_ID($db,'stockmoves','stkmoveno');
+			$StkMoveNo = DB_Last_Insert_ID('stockmoves','stkmoveno');
 
 		/*Insert the taxes that applied to this line */
 			foreach ($OrderLine->Taxes as $Tax) {
@@ -2021,7 +2021,7 @@ functionalexrate,
 			$ErrMsg = _('Cannot insert a receipt transaction against the customer because') ;
 			$result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
 
-			$ReceiptDebtorTransID = DB_Last_Insert_ID($db,'debtortrans','id');
+			$ReceiptDebtorTransID = DB_Last_Insert_ID('debtortrans','id');
 
 			$SQL = "UPDATE debtorsmaster SET lastpaiddate = '" . $DefaultDispatchDate . "',
 											lastpaid='" . filter_number_format($_POST['AmountPaid']) . "'

diff --git a/Credit_Invoice.php b/Credit_Invoice.php
@@ -658,7 +658,7 @@
 	$DbgMsg = _('The following SQL to insert the customer credit note was used');
 	$Result = DB_query($SQL,$ErrMsg, $DbgMsg, true);
 
-	$CreditTransID = DB_Last_Insert_ID($db,'debtortrans','id');
+	$CreditTransID = DB_Last_Insert_ID('debtortrans','id');
 
 	/* Insert the tax totals for each tax authority where tax was charged on the invoice */
 	foreach($TaxTotals AS $TaxAuthID => $TaxAmount) {
@@ -958,7 +958,7 @@
 				$DbgMsg = _('The following SQL to insert the stock movement records was used');
 				$Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
 
-				$StkMoveNo = DB_Last_Insert_ID($db,'stockmoves','stkmoveno');
+				$StkMoveNo = DB_Last_Insert_ID('stockmoves','stkmoveno');
 				/*Insert the StockSerialMovements and update the StockSerialItems  for controlled items*/
 				//echo "<div align="left"><pre>"; var_dump($CreditLine); echo "</pre> </div>";
 				if($CreditLine->Controlled ==1) {
@@ -1060,7 +1060,7 @@
 				$DbgMsg = _('The following SQL to insert the stock movement records was used');
 				$Result = DB_query($SQL,$ErrMsg, $DbgMsg, true);
 				/*Get the ID of the StockMove... */
-				$StkMoveNo = DB_Last_Insert_ID($db,'stockmoves','stkmoveno');
+				$StkMoveNo = DB_Last_Insert_ID('stockmoves','stkmoveno');
 
 				$SQL = "INSERT INTO stockmoves(stockid,
 												type,
@@ -1145,7 +1145,7 @@
 
 				$Result = DB_query($SQL,$ErrMsg, $DbgMsg, true);
 				/*Get the ID of the StockMove... */
-				$StkMoveNo = DB_Last_Insert_ID($db,'stockmoves','stkmoveno');
+				$StkMoveNo = DB_Last_Insert_ID('stockmoves','stkmoveno');
 			}
 
 			/*Insert the taxes that applied to this line */

diff --git a/FixedAssetItems.php b/FixedAssetItems.php
@@ -277,7 +277,7 @@
 			$result = DB_query($sql, $ErrMsg, $DbgMsg);
 
 			if (DB_error_no() ==0) {
-				$NewAssetID = DB_Last_Insert_ID($db,'fixedassets', 'assetid');
+				$NewAssetID = DB_Last_Insert_ID('fixedassets', 'assetid');
 				prnMsg( _('The new asset has been added to the database with an asset code of:') . ' ' . $NewAssetID,'success');
 				unset($_POST['LongDescription']);
 				unset($_POST['Description']);

diff --git a/GLProfit_Loss.php b/GLProfit_Loss.php
@@ -93,7 +93,7 @@
 
 	$RetResult = DB_data_seek($Periods,0);
 
-	while ($myrow=DB_fetch_array($Periods,$db)){
+	while ($myrow=DB_fetch_array($Periods)){
 
 		if($myrow['periodno']==$DefaultToPeriod){
 			echo '<option selected="selected" value="' . $myrow['periodno'] . '">' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</option>';

diff --git a/GoodsReceived.php b/GoodsReceived.php
@@ -591,7 +591,7 @@
 				$Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
 
 				/*Get the ID of the StockMove... */
-				$StkMoveNo = DB_Last_Insert_ID($db,'stockmoves','stkmoveno');
+				$StkMoveNo = DB_Last_Insert_ID('stockmoves','stkmoveno');
 				/* Do the Controlled Item INSERTS HERE */
 
 				if ($OrderLine->Controlled ==1){

diff --git a/InternalStockRequestFulfill.php b/InternalStockRequestFulfill.php
@@ -91,7 +91,7 @@
 
 
 				/*Get the ID of the StockMove... */
-				$StkMoveNo = DB_Last_Insert_ID($db,'stockmoves','stkmoveno');
+				$StkMoveNo = DB_Last_Insert_ID('stockmoves','stkmoveno');
 
 				$SQL="UPDATE stockrequestitems
 						SET qtydelivered=qtydelivered+" . $Quantity . "

diff --git a/InternalStockRequestInquiry.php b/InternalStockRequestInquiry.php
@@ -164,9 +164,7 @@
 		<td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="FromDate" maxlength="10" size="11" vaue="' . $_POST['FromDate'] .'" /></td> 
 		<td>' . _('Date To') . '</td>
 		<td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" maxlength="10" size="11" value="' . $_POST['ToDate'] . '" /></td>
-		<td><input type="submit" name="Search"  value="' ._('Search') . '" /></td></tr></table>	
-		
-		';
+		<td><input type="submit" name="Search"  value="' ._('Search') . '" /></td></tr></table>';
 	if (!isset($_POST['ShowDetails'])) {
 		$_POST['ShowDetails'] = 1;
 	}
@@ -324,8 +322,7 @@
 			FROM stockrequest INNER JOIN stockrequestitems ON stockrequest.dispatchid=stockrequestitems.dispatchid 
 			INNER JOIN departments ON stockrequest.departmentid=departments.departmentid 
 			INNER JOIN locations ON locations.loccode=stockrequest.loccode 
-			INNER JOIN stockmaster ON stockrequestitems.stockid=stockmaster.stockid
-			"; 
+			INNER JOIN stockmaster ON stockrequestitems.stockid=stockmaster.stockid";
 	} else {
 		$SQL = "SELECT stockrequest.dispatchid,
 					stockrequest.loccode,
@@ -338,7 +335,7 @@
 					narrative,
 					initiator
 					FROM stockrequest INNER JOIN departments ON stockrequest.departmentid=departments.departmentid
-				        INNER JOIN locations ON locations.loccode=stockrequest.loccode	";
+					INNER JOIN locations ON locations.loccode=stockrequest.loccode";
 	}
 	//lets add the condition selected by users
 	if (isset($_POST['RequestNo']) AND $_POST['RequestNo'] !== '') {
@@ -489,23 +486,12 @@
 	} else {
 		prnMsg(_('There are no stock request available'),'warn');
 	}	
-
-
-
-
-
-
-
-
-
-
 }
 
 include('includes/footer.php');
 exit;
 
 function GetSearchItems ($SQLConstraint='') {
-	global $db;
 	if ($_POST['Keywords'] AND $_POST['StockCode']) {
 		 echo _('Stock description keywords have been used in preference to the Stock code extract entered');
 	}

diff --git a/MailingGroupMaintenance.php b/MailingGroupMaintenance.php
@@ -153,15 +153,8 @@
 ?>
 
 
-
-
-
-
-
-
 <?php
 function GetMailGroup () {
-global $db;
 //GET the mailing group data if there are any
 $sql = "SELECT groupname, id FROM mailgroups ORDER BY groupname";
 $ErrMsg = _('Failed to retrieve mail groups information');
@@ -188,7 +181,6 @@ function GetMailGroup () {
 }
 
 function GetUsers ($GroupId,$GroupName) {
-	global $db;
 	$sql = "SELECT userid FROM mailgroups INNER JOIN mailgroupdetails ON mailgroups.groupname=mailgroupdetails.groupname WHERE mailgroups.id = '".$GroupId."'";
 	$ErrMsg = _('Failed to retrieve userid');
 	$result = DB_query($sql,$ErrMsg);

diff --git a/PcClaimExpensesFromTab.php b/PcClaimExpensesFromTab.php
@@ -165,7 +165,7 @@
 										)";
 		$Msg = _('The expense claim on tab') . ' ' . $_POST['SelectedTabs'] . ' ' . _('has been created');
 		$Result = DB_query($SQL);
-		$SelectedIndex = DB_Last_Insert_ID($db, 'pcashdetails', 'counterindex');
+		$SelectedIndex = DB_Last_Insert_ID('pcashdetails', 'counterindex');
 		foreach ($_POST as $Index => $Value) {
 			if (substr($Index, 0, 5) == 'index') {
 				$Index = $Value;

diff --git a/RecurringSalesOrders.php b/RecurringSalesOrders.php
@@ -267,7 +267,7 @@
 			$DbgMsg = _('The SQL that failed was');
 			$InsertQryResult = DB_query($HeaderSQL,$ErrMsg,$DbgMsg,true);
 
-			$RecurrOrderNo = DB_Last_Insert_ID($db,'recurringsalesorders','recurrorderno');
+			$RecurrOrderNo = DB_Last_Insert_ID('recurringsalesorders','recurrorderno');
 			echo 'xxx'.$RecurrOrderNo;
 			$StartOf_LineItemsSQL = "INSERT INTO recurrsalesorderdetails (recurrorderno,
 																			stkcode,

diff --git a/RecurringSalesOrdersProcess.php b/RecurringSalesOrdersProcess.php
@@ -367,7 +367,7 @@
 			$Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
 
 			/*Get the ID of the StockMove... */
-			$StkMoveNo = DB_Last_Insert_ID($db,'stockmoves','stkmoveno');
+			$StkMoveNo = DB_Last_Insert_ID('stockmoves','stkmoveno');
 
 			/*Insert the taxes that applied to this line */
 			foreach ($LineTaxes[$LineCounter] as $Tax) {
@@ -683,7 +683,7 @@
 		$DbgMsg = _('The following SQL to insert the debtor transaction record was used');
 		$Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
 
-		$DebtorTransID = DB_Last_Insert_ID($db,'debtortrans','id');
+		$DebtorTransID = DB_Last_Insert_ID('debtortrans','id');
 
 
 		$SQL = "INSERT INTO debtortranstaxes (debtortransid,

diff --git a/ReverseGRN.php b/ReverseGRN.php
@@ -257,7 +257,7 @@
 		$DbgMsg = _('The following SQL to insert the stock movement records was used');
 		$Result=DB_query($SQL,$ErrMsg,$DbgMsg,true);
 
-		$StkMoveNo = DB_Last_Insert_ID($db,'stockmoves','stkmoveno');
+		$StkMoveNo = DB_Last_Insert_ID('stockmoves','stkmoveno');
 
 		if ($Controlled==true){
 			while ($SerialStockMoves = DB_fetch_array($GetStockMoveResult)){

diff --git a/SelectCreditItems.php b/SelectCreditItems.php
@@ -1171,7 +1171,7 @@
 	$Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
 
 
-	$CreditTransID = DB_Last_Insert_ID($db,'debtortrans','id');
+	$CreditTransID = DB_Last_Insert_ID('debtortrans','id');
 
 	/* Insert the tax totals for each tax authority where tax was charged on the invoice */
 	foreach ($TaxTotals AS $TaxAuthID => $TaxAmount) {
@@ -1332,7 +1332,7 @@
 				$Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
 
 				/*Get the stockmoveno from above - need to ref StockMoveTaxes and possibly SerialStockMoves */
-				$StkMoveNo = DB_Last_Insert_ID($db,'stockmoves','stkmoveno');
+				$StkMoveNo = DB_Last_Insert_ID('stockmoves','stkmoveno');
 
 				/*Insert the taxes that applied to this line */
 				foreach ($CreditLine->Taxes as $Tax) {
@@ -1613,7 +1613,7 @@
 					/*Its a write off too still so need to process the serial items
 					written off */
 
-					$StkMoveNo = DB_Last_Insert_ID($db,'stockmoves','stkmoveno');
+					$StkMoveNo = DB_Last_Insert_ID('stockmoves','stkmoveno');
 
 					foreach($CreditLine->SerialItems as $Item){
 					/*no need to check StockSerialItems record exists

diff --git a/SelectOrderItems.php b/SelectOrderItems.php
@@ -1888,7 +1888,6 @@
 include('includes/footer.php');
 
 function GetCustBranchDetails($identifier) {
-		global $db;
 		$sql = "SELECT custbranch.brname,
 						custbranch.branchcode,
 						custbranch.braddress1,

diff --git a/SelectQASamples.php b/SelectQASamples.php
@@ -106,7 +106,7 @@
 
 	} else {
 		CreateQASample($_POST['ProdSpecKey'],$_POST['LotKey'], $_POST['Identifier'], $_POST['Comments'], $_POST['Cert'], $_POST['DuplicateOK'],$db);
-		$SelectedSampleID=DB_Last_Insert_ID($db,'qasamples','sampleid');
+		$SelectedSampleID=DB_Last_Insert_ID('qasamples','sampleid');
 		if ($SelectedSampleID > '') {
 			$msg = _('Created New Sample');
 			prnMsg($msg , 'success');

diff --git a/StockAdjustments.php b/StockAdjustments.php
@@ -240,7 +240,7 @@
 		$Result = DB_query($SQL, $ErrMsg, $DbgMsg, true);
 
 /*Get the ID of the StockMove... */
-		$StkMoveNo = DB_Last_Insert_ID($db,'stockmoves','stkmoveno');
+		$StkMoveNo = DB_Last_Insert_ID('stockmoves','stkmoveno');
 
 /*Insert the StockSerialMovements and update the StockSerialItems  for controlled items*/
 

diff --git a/StockLocTransferReceive.php b/StockLocTransferReceive.php
@@ -113,7 +113,7 @@
 				$Result = DB_query($SQL,$ErrMsg, $DbgMsg, true);
 
 				/*Get the ID of the StockMove... */
-				$StkMoveNo = DB_Last_Insert_ID($db,'stockmoves','stkmoveno');
+				$StkMoveNo = DB_Last_Insert_ID('stockmoves','stkmoveno');
 
 		/*Insert the StockSerialMovements and update the StockSerialItems  for controlled items*/
 
@@ -267,7 +267,7 @@
 
 
 				/*Get the ID of the StockMove... */
-				$StkMoveNo = DB_Last_Insert_ID($db,'stockmoves','stkmoveno');
+				$StkMoveNo = DB_Last_Insert_ID('stockmoves','stkmoveno');
 
 				/*Insert the StockSerialMovements and update the StockSerialItems  for controlled items*/
 				if($TrfLine->Controlled ==1) {

diff --git a/StockTransfers.php b/StockTransfers.php
@@ -283,7 +283,7 @@
 		$Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
 
 		/*Get the ID of the StockMove... */
-		$StkMoveNo = DB_Last_Insert_ID($db,'stockmoves','stkmoveno');
+		$StkMoveNo = DB_Last_Insert_ID('stockmoves','stkmoveno');
 
 /*Insert the StockSerialMovements and update the StockSerialItems  for controlled items*/
 
@@ -437,7 +437,7 @@
 		$Result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
 
 		/*Get the ID of the StockMove... */
-		$StkMoveNo = DB_Last_Insert_ID($db,'stockmoves','stkmoveno');
+		$StkMoveNo = DB_Last_Insert_ID('stockmoves','stkmoveno');
 
 /*Insert the StockSerialMovements and update the StockSerialItems  for controlled items*/
 

diff --git a/SupplierCredit.php b/SupplierCredit.php
@@ -1145,7 +1145,7 @@
 		$DbgMsg = _('The following SQL to insert the supplier credit note was used');
 		$Result = DB_query($SQL, $ErrMsg, $DbgMsg, True);
 
-		$SuppTransID = DB_Last_Insert_ID($db,'supptrans','id');
+		$SuppTransID = DB_Last_Insert_ID('supptrans','id');
 
 		/* Insert the tax totals for each tax authority where tax was charged on the invoice */
 		foreach ($_SESSION['SuppTrans']->Taxes AS $TaxTotals) {