comparison: www/includes/db_inventory_fermentables.php
www/includes/db_inventory_fermentables.php
- changeset 785
- aa79acfdf8a9
- parent 767
- 08c0343b622b
equal
deleted
inserted
replaced
| 784:d51b05838ac4 | 785:aa79acfdf8a9 |
|---|---|
| 24 } | 24 } |
| 25 if (isset($_POST['update'])) { | 25 if (isset($_POST['update'])) { |
| 26 $sql = "UPDATE `inventory_fermentables` SET "; | 26 $sql = "UPDATE `inventory_fermentables` SET "; |
| 27 } | 27 } |
| 28 | 28 |
| 29 $sql .= "name='" . mysqli_real_escape_string($connect, $_POST['name']); | 29 if (isset($_POST['uuid']) && (strlen($_POST['uuid']) == 36)) { |
| 30 $sql .= "uuid='" . $_POST['uuid']; | |
| 31 } else { | |
| 32 $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); | |
| 33 $sql .= "uuid='" . $uuid; | |
| 34 } | |
| 35 $sql .= "', name='" . mysqli_real_escape_string($connect, $_POST['name']); | |
| 30 $sql .= "', type='" . array_search($_POST['type'], $fermentabletype); | 36 $sql .= "', type='" . array_search($_POST['type'], $fermentabletype); |
| 31 $sql .= "', yield='" . $_POST['yield']; | 37 $sql .= "', yield='" . $_POST['yield']; |
| 32 $sql .= "', color='" . $_POST['color']; | 38 $sql .= "', color='" . $_POST['color']; |
| 33 ($_POST['add_after_boil'] == 'true') ? $sql .= "', add_after_boil='1" : $sql .= "', add_after_boil='0"; | 39 ($_POST['add_after_boil'] == 'true') ? $sql .= "', add_after_boil='1" : $sql .= "', add_after_boil='0"; |
| 34 $sql .= "', origin='" . mysqli_real_escape_string($connect, $_POST['origin']); | 40 $sql .= "', origin='" . mysqli_real_escape_string($connect, $_POST['origin']); |
| 87 $result = mysqli_query($connect, $query) or die("SQL Error 1: " . mysqli_error($connect)); | 93 $result = mysqli_query($connect, $query) or die("SQL Error 1: " . mysqli_error($connect)); |
| 88 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { | 94 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
| 89 $fermentables[] = array( | 95 $fermentables[] = array( |
| 90 'record' => $row['record'], | 96 'record' => $row['record'], |
| 91 'name' => $row['name'], | 97 'name' => $row['name'], |
| 98 'uuid' => $row['uuid'], | |
| 92 'type' => $fermentabletype[$row['type']], | 99 'type' => $fermentabletype[$row['type']], |
| 93 'yield' => $row['yield'], | 100 'yield' => $row['yield'], |
| 94 'color' => $row['color'], | 101 'color' => $row['color'], |
| 95 'add_after_boil' => $row['add_after_boil'], | 102 'add_after_boil' => $row['add_after_boil'], |
| 96 'origin' => $row['origin'], | 103 'origin' => $row['origin'], |
