X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fdb%2Fitems_locations_db.inc;h=809e928c028f1021aed34bd9e2bcbee28c6c0f15;hb=3ff9ed87cb909f19c8fe3e7dfda5df79d0c01a6c;hp=0cdb1e0c3206a4ea431e4b88a6071078f5f6c979;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/inventory/includes/db/items_locations_db.inc b/inventory/includes/db/items_locations_db.inc
index 0cdb1e0c..809e928c 100644
--- a/inventory/includes/db/items_locations_db.inc
+++ b/inventory/includes/db/items_locations_db.inc
@@ -1,72 +1,82 @@
 <?php
-
-function add_item_location($loc_code, $location_name, $delivery_address, $phone, $fax, $email, $contact)
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+function add_item_location($loc_code, $location_name, $delivery_address, $phone, $phone2, $fax, $email, $contact)
 {
-	$sql = "INSERT INTO ".TB_PREF."locations (loc_code, location_name, delivery_address, phone, fax, email, contact) 
-		VALUES ('$loc_code', '$location_name', '$delivery_address', '$phone', '$fax', '$email', '$contact')";	
-	
+	$sql = "INSERT INTO ".TB_PREF."locations (loc_code, location_name, delivery_address, phone, phone2, fax, email, contact)
+		VALUES (".db_escape($loc_code).", ".db_escape($location_name).", ".db_escape($delivery_address).", "
+			.db_escape($phone).", ".db_escape($phone2).", ".db_escape($fax).", ".db_escape($email).", ".db_escape($contact).")";
+
 	db_query($sql,"a location could not be added");
-	
+
 	/* Also need to add loc_stock records for all existing items */
-	$sql = "INSERT INTO ".TB_PREF."loc_stock (loc_code, stock_id, reorder_level) 
+	$sql = "INSERT INTO ".TB_PREF."loc_stock (loc_code, stock_id, reorder_level)
 		SELECT '$loc_code', ".TB_PREF."stock_master.stock_id, 0 FROM ".TB_PREF."stock_master";
-	
-	db_query($sql,"a location could not be added");				
+
+	db_query($sql,"a location could not be added");
 }
 
 //------------------------------------------------------------------------------------
 
-function update_item_location($loc_code, $location_name, $delivery_address, $phone, $fax, $email, $contact)
+function update_item_location($loc_code, $location_name, $delivery_address, $phone, $phone2, $fax, $email, $contact)
 
 {
-    $sql = "UPDATE ".TB_PREF."locations SET location_name='$location_name', 
-    	delivery_address='$delivery_address', 
-    	phone='$phone', fax='$fax', 
-    	email='$email', contact='$contact' 
+    $sql = "UPDATE ".TB_PREF."locations SET location_name=".db_escape($location_name).",
+    	delivery_address=".db_escape($delivery_address).",
+    	phone=".db_escape($phone).", phone2=".db_escape($phone2).", fax=".db_escape($fax).",
+    	email=".db_escape($email).", contact=".db_escape($contact)."
     	WHERE loc_code = '$loc_code'";
-	
-	db_query($sql,"a location could not be updated");	
+
+	db_query($sql,"a location could not be updated");
 }
 
 //------------------------------------------------------------------------------------
 
 function delete_item_location($item_location)
 {
-	$sql="DELETE FROM ".TB_PREF."locations WHERE loc_code='$item_location'";	
+	$sql="DELETE FROM ".TB_PREF."locations WHERE loc_code='$item_location'";
 	db_query($sql,"a location could not be deleted");
-	
+
 	$sql = "DELETE FROM ".TB_PREF."loc_stock WHERE loc_code ='$item_location'";
-	db_query($sql,"a location could not be deleted");		
+	db_query($sql,"a location could not be deleted");
 }
 
 //------------------------------------------------------------------------------------
 
 function get_item_location($item_location)
 {
-	$sql="SELECT * FROM ".TB_PREF."locations WHERE loc_code='$item_location'";	
-	
+	$sql="SELECT * FROM ".TB_PREF."locations WHERE loc_code='$item_location'";
+
 	$result = db_query($sql,"a location could not be retrieved");
-	
-	return db_fetch($result);	
+
+	return db_fetch($result);
 }
 
 //------------------------------------------------------------------------------------
 
 function set_reorder_level($stock_id, $loc_code, $reorder_level)
 {
-	$sql = "UPDATE ".TB_PREF."loc_stock SET reorder_level = $reorder_level 
-		WHERE stock_id = '$stock_id' AND loc_code = '$loc_code'";	
-				
-	db_query($sql,"an item reorder could not be set");						
+	$sql = "UPDATE ".TB_PREF."loc_stock SET reorder_level = $reorder_level
+		WHERE stock_id = '$stock_id' AND loc_code = '$loc_code'";
+
+	db_query($sql,"an item reorder could not be set");
 }
 
 //------------------------------------------------------------------------------------
 
 function get_loc_details($stock_id)
 {
-	$sql = "SELECT ".TB_PREF."loc_stock.*, ".TB_PREF."locations.location_name   
-		FROM ".TB_PREF."loc_stock, ".TB_PREF."locations 
-		WHERE ".TB_PREF."loc_stock.loc_code=".TB_PREF."locations.loc_code 
+	$sql = "SELECT ".TB_PREF."loc_stock.*, ".TB_PREF."locations.location_name
+		FROM ".TB_PREF."loc_stock, ".TB_PREF."locations
+		WHERE ".TB_PREF."loc_stock.loc_code=".TB_PREF."locations.loc_code
 		AND ".TB_PREF."loc_stock.stock_id = '" . $stock_id . "' ORDER BY ".TB_PREF."loc_stock.loc_code";
 	return db_query($sql,"an item reorder could not be retreived");
 }