Mercurial > bms / file diff

--- a/www/includes/db_inventory_water.php	Wed Aug 29 19:58:36 2018 +0200
+++ b/www/includes/db_inventory_water.php	Wed Aug 29 23:13:13 2018 +0200
@@ -15,20 +15,20 @@
 function clear_default() {
 	global	$connect;
 
-	$usql = "UPDATE inventory_water SET default_water='0' WHERE (default_water = '1');";
+	$usql = "UPDATE inventory_waters SET default_water='0' WHERE (default_water = '1');";
 	$result = mysqli_query($connect, $usql);
 	if (! $result) {
-		syslog(LOG_NOTICE, "db_inventory_water: " . $usql . "  result: ".mysqli_error($connect));
+		syslog(LOG_NOTICE, "db_inventory_waters: " . $usql . "  result: ".mysqli_error($connect));
 	}
 }
 
 
 // get data and store in a json array
-$query = "SELECT * FROM inventory_water ORDER BY name";
+$query = "SELECT * FROM inventory_waters ORDER BY name";
 if (isset($_GET['insert'])) {
 	// INSERT COMMAND
-	$sql  = "INSERT INTO `inventory_water` SET name='" . mysqli_real_escape_string($connect, $_GET['name']);
-	($_GET['always_on_stock'] == 'true') ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0";
+	$sql  = "INSERT INTO `inventory_waters` SET name='" . mysqli_real_escape_string($connect, $_GET['name']);
+	($_GET['unlimited_stock'] == 'true') ? $sql .= "', unlimited_stock='1" : $sql .= "', unlimited_stock='0";
 	$sql .= "', calcium='" . $_GET['calcium'];
 	$sql .= "', bicarbonate='" . $_GET['bicarbonate'];
 	$sql .= "', sulfate='" . $_GET['sulfate'];
@@ -49,16 +49,16 @@
 	$sql .= "';";
 	$result = mysqli_query($connect, $sql);
 	if (! $result) {
-		syslog(LOG_NOTICE, "db_inventory_water: ".$sql." result: ".mysqli_error($connect));
+		syslog(LOG_NOTICE, "db_inventory_waters: ".$sql." result: ".mysqli_error($connect));
 	} else {
-		syslog(LOG_NOTICE, "db_inventory_water: inserted ".$_GET['name']);
+		syslog(LOG_NOTICE, "db_inventory_waters: inserted ".$_GET['name']);
 	}
 	echo $result;
 
 } else if (isset($_GET['update'])) {
 	// UPDATE COMMAND
-	$sql  = "UPDATE `inventory_water` SET name='" . mysqli_real_escape_string($connect, $_GET['name']);
-	($_GET['always_on_stock'] == 'true') ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0";
+	$sql  = "UPDATE `inventory_waters` SET name='" . mysqli_real_escape_string($connect, $_GET['name']);
+	($_GET['unlimited_stock'] == 'true') ? $sql .= "', unlimited_stock='1" : $sql .= "', unlimited_stock='0";
 	$sql .= "', calcium='" . $_GET['calcium'];
 	$sql .= "', bicarbonate='" . $_GET['bicarbonate'];
 	$sql .= "', sulfate='" . $_GET['sulfate'];
@@ -79,20 +79,20 @@
 	$sql .= "' WHERE record='" . $_GET['record'] . "';";
 	$result = mysqli_query($connect, $sql);
 	if (! $result) {
-		syslog(LOG_NOTICE, "db_inventory_water: ".$sql." result: ".mysqli_error($connect));
+		syslog(LOG_NOTICE, "db_inventory_waters: ".$sql." result: ".mysqli_error($connect));
 	} else {
-		syslog(LOG_NOTICE, "db_inventory_water: updated record ".$_GET['record']);
+		syslog(LOG_NOTICE, "db_inventory_waters: updated record ".$_GET['record']);
 	}
 	echo $result;
 
 } else if (isset($_GET['delete'])) {
 	// DELETE COMMAND
-	$sql = "DELETE FROM `inventory_water` WHERE record='".$_GET['record']."';";
+	$sql = "DELETE FROM `inventory_waters` WHERE record='".$_GET['record']."';";
 	$result = mysqli_query($connect, $sql);
 	if (! $result) {
-		syslog(LOG_NOTICE, "db_inventory_water: ".$sql." result: ".mysqli_error($connect));
+		syslog(LOG_NOTICE, "db_inventory_waters: ".$sql." result: ".mysqli_error($connect));
 	} else {
-		syslog(LOG_NOTICE, "db_inventory_water: deleted record ".$_GET['record']);
+		syslog(LOG_NOTICE, "db_inventory_waters: deleted record ".$_GET['record']);
 	}
 	echo $result;
 
@@ -103,7 +103,7 @@
 		$waters[] = array(
 			'record' => $row['record'],
 			'name' => $row['name'],
-			'always_on_stock' => $row['always_on_stock'],
+			'unlimited_stock' => $row['unlimited_stock'],
 			'calcium' => $row['calcium'],
 			'bicarbonate' => $row['bicarbonate'],
 			'sulfate' => $row['sulfate'],