--- a/www/includes/db_inventory_mash_profiles.php Sat Aug 25 13:07:13 2018 +0200
+++ b/www/includes/db_inventory_mash_profiles.php Mon Aug 27 22:58:20 2018 +0200
@@ -10,12 +10,12 @@
}
// get data and store in a json array
-$query = "SELECT * FROM inventory_mash_profiles";
+$query = "SELECT * FROM inventory_mash_profiles ORDER BY name";
if (isset($_GET['insert'])) {
// INSERT COMMAND
$sql = "INSERT INTO `inventory_mash_profiles` SET name='" . mysqli_real_escape_string($connect, $_GET['name']);
$sql .= "', notes='" . mysqli_real_escape_string($connect, $_GET['notes']);
- $sql .= "', steps='" . mysqli_real_escape_string($connect, $_GET['steos']);
+ $sql .= "', steps='" . json_encode($_GET['steps']);
$sql .= "';";
$result = mysqli_query($connect, $sql);
if (! $result) {
@@ -29,7 +29,7 @@
// UPDATE COMMAND
$sql = "UPDATE `inventory_mash_profiles` SET name='" . mysqli_real_escape_string($connect, $_GET['name']);
$sql .= "', notes='" . mysqli_real_escape_string($connect, $_GET['notes']);
- $sql .= "', steps='" . mysqli_real_escape_string($connect, $_GET['steos']);
+ $sql .= "', steps='" . json_encode($_GET['steps']);
$sql .= "' WHERE record='" . $_GET['record'] . "';";
$result = mysqli_query($connect, $sql);
if (! $result) {
@@ -53,14 +53,22 @@
} else {
// SELECT COMMAND
$result = mysqli_query($connect, $query) or die("SQL Error 1: " . mysqli_error($connect));
+ $mashprofiles = '[';
+ $comma = FALSE;
while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
- $suppliers[] = array(
- 'record' => $row['record'],
- 'name' => $row['name'],
- 'notes' => $row['notes'],
- 'steps' => $row['steps']
- );
+ // Manual encode to JSON.
+ if ($comma) {
+ $mashprofiles .= ',';
+ }
+ $comma = TRUE;
+ $mashprofiles .= '{"record":' . $row['record'];
+ $mashprofiles .= ',"name":"' . $row['name'];
+ $mashprofiles .= '","notes":"' . $row['notes'];
+ $mashprofiles .= '","steps":' . $row['steps'];
+ $mashprofiles .= '}';
}
- echo json_encode($suppliers);
+ $mashprofiles .= ']';
+ header("Content-type: application/json");
+ echo $mashprofiles;
}
?>