Remove unnecessary PageSecurity assignments

timschofield · May 4, 2012 · f4f4584 · f4f4584
1 parent 9f078cc
commit f4f4584
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 16 deletions.
diff --git a/KCMCEditPatientDetails.php b/KCMCEditPatientDetails.php
@@ -1,5 +1,4 @@
 <?php
-$PageSecurity=1;
 
 include('includes/session.inc');
 include('includes/SQL_CommonFunctions.inc');

diff --git a/KCMCFunctionalUnitPL.php b/KCMCFunctionalUnitPL.php
@@ -1,7 +1,6 @@
 <?php
 
 /* $Id$*/
-$PageSecurity=1;
 include ('includes/session.inc');
 $title = _('Income and Expenditure by Functional Unit');
 include('includes/SQL_CommonFunctions.inc');

diff --git a/KCMCInPatientBilling.php b/KCMCInPatientBilling.php
@@ -1,5 +1,4 @@
 <?php
-$PageSecurity=1;
 include('includes/session.inc');
 $title = _('Billing For All Drugs and Services');
 include('includes/header.inc');

diff --git a/KCMCInsuranceCompanyDetails.php b/KCMCInsuranceCompanyDetails.php
@@ -2,8 +2,6 @@
 
 /* $Id$ */
 
-$PageSecurity=1;
-
 include('includes/session.inc');
 
 $title = _('Create or Modify Insurance Company Details');

diff --git a/KCMCInsuranceInvoice.php b/KCMCInsuranceInvoice.php
@@ -1,5 +1,4 @@
 <?php
-$PageSecurity=1;
 include('includes/session.inc');
 $title = _('Monthly Insurance Company Billing');
 include('includes/header.inc');

diff --git a/KCMCLabTests.php b/KCMCLabTests.php
@@ -1,5 +1,4 @@
 <?php
-$PageSecurity=1;
 include('includes/session.inc');
 $title = _('Billing For Laboratory Tests');
 include('includes/header.inc');

diff --git a/KCMCLaboratoryReport.php b/KCMCLaboratoryReport.php
@@ -1,7 +1,6 @@
 <?php
 
 /* $Id$*/
-$PageSecurity=1;
 include ('includes/session.inc');
 $title = _('Financial Report for Laboratory Department');
 

diff --git a/KCMCOtherMedicalServices.php b/KCMCOtherMedicalServices.php
@@ -1,5 +1,4 @@
 <?php
-$PageSecurity=1;
 include('includes/session.inc');
 $title = _('Billing For Other Medical Services');
 include('includes/header.inc');

diff --git a/KCMCPharmacy.php b/KCMCPharmacy.php
@@ -1,5 +1,4 @@
 <?php
-$PageSecurity=1;
 include('includes/session.inc');
 $title = _('Billing For Pharmaceuticals');
 include('includes/header.inc');

diff --git a/KCMCPrintInsuranceInvoice.php b/KCMCPrintInsuranceInvoice.php
@@ -1,6 +1,5 @@
 <?php
 /* $Id$ */
-$PageSecurity = 1;
 include ('includes/session.inc');
 if (isset($_GET['FromTransNo'])) {
 	$FromTransNo = trim($_GET['FromTransNo']);

diff --git a/KCMCRadiology.php b/KCMCRadiology.php
@@ -1,5 +1,4 @@
 <?php
-$PageSecurity=1;
 include('includes/session.inc');
 $title = _('Billing For Radiology Tests');
 include('includes/header.inc');

diff --git a/KCMCRadiologyReport.php b/KCMCRadiologyReport.php
@@ -1,7 +1,6 @@
 <?php
 
 /* $Id$*/
-$PageSecurity=1;
 include ('includes/session.inc');
 $title = _('Financial Report for Radiology Department');
 

diff --git a/KCMCRegister.php b/KCMCRegister.php
@@ -1,5 +1,4 @@
 <?php
-$PageSecurity=1;
 
 include('includes/session.inc');
 include('includes/SQL_CommonFunctions.inc');

diff --git a/includes/CustomerSearch.php b/includes/CustomerSearch.php
@@ -136,6 +136,13 @@ function CustomerSearchSQL($db) {
 							ON debtorsmaster.debtorno = custbranch.debtorno
 						INNER JOIN debtortype
 							ON debtorsmaster.typeid = debtortype.typeid";
+			$CountSQL = "SELECT COUNT(debtorsmaster.debtorno) as totaldebtors
+							FROM debtorsmaster
+							LEFT JOIN custbranch
+								ON debtorsmaster.debtorno = custbranch.debtorno
+							INNER JOIN debtortype
+								ON debtorsmaster.typeid = debtortype.typeid";
+
 		} else {
 			$SearchKeywords = mb_strtoupper(trim(str_replace(' ', '%', $_POST['Keywords'])));
 			$_POST['CustCode'] = mb_strtoupper(trim($_POST['CustCode']));
@@ -166,6 +173,20 @@ function CustomerSearchSQL($db) {
 							OR debtorsmaster.address3 "  . LIKE . " '%" . $_POST['CustAdd'] . "%'
 							OR debtorsmaster.address4 "  . LIKE . " '%" . $_POST['CustAdd'] . "%')";
 
+			$CountSQL = "SELECT COUNT(debtorsmaster.debtorno) as totaldebtors
+						FROM debtorsmaster
+						INNER JOIN debtortype
+							ON debtorsmaster.typeid = debtortype.typeid
+						LEFT JOIN custbranch
+							ON debtorsmaster.debtorno = custbranch.debtorno
+						WHERE debtorsmaster.name " . LIKE . " '%" . $SearchKeywords . "%'
+							AND debtorsmaster.debtorno " . LIKE . " '%" . $_POST['CustCode'] . "%'
+							AND custbranch.phoneno " . LIKE . " '%" . $_POST['CustPhone'] . "%'
+							AND (debtorsmaster.address1 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
+							OR debtorsmaster.address2 " . LIKE . " '%" . $_POST['CustAdd'] . "%'
+							OR debtorsmaster.address3 "  . LIKE . " '%" . $_POST['CustAdd'] . "%'
+							OR debtorsmaster.address4 "  . LIKE . " '%" . $_POST['CustAdd'] . "%')";
+
 			if (mb_strlen($_POST['CustType']) > 0 AND $_POST['CustType']!='ALL') {
 				$SQL .= " AND debtortype.typename = '" . $_POST['CustType'] . "'";
 			}
@@ -176,8 +197,9 @@ function CustomerSearchSQL($db) {
 		if ($_SESSION['SalesmanLogin'] != '') {
 			$SQL.= " AND custbranch.salesman='" . $_SESSION['SalesmanLogin'] . "'";
 		}
-		$CountResult=DB_query($SQL, $db);
-		$_SESSION['ListCount']=DB_num_rows($CountResult);
+		$CountResult=DB_query($CountSQL, $db);
+		$CountRow=DB_fetch_array($CountResult);
+		$_SESSION['ListCount']=$CountRow['totaldebtors'];
 		$_SESSION['ListPageMax'] = ceil($_SESSION['ListCount'] / $_SESSION['DisplayRecordsMax']);
 		if (isset($_POST['Next'])) {
 			if ($_POST['PageOffset'] < $_SESSION['ListPageMax']) {