diff -r 217ba4596c4d -r 3c680d1dea35 www/includes/db_inventory_fermentables.php --- a/www/includes/db_inventory_fermentables.php Mon Oct 14 23:13:40 2019 +0200 +++ b/www/includes/db_inventory_fermentables.php Wed Oct 16 21:05:03 2019 +0200 @@ -2,6 +2,7 @@ require($_SERVER['DOCUMENT_ROOT']."/config.php"); require($_SERVER['DOCUMENT_ROOT']."/version.php"); +require($_SERVER['DOCUMENT_ROOT']."/includes/constants.php"); #Connect to the database @@ -21,7 +22,7 @@ } $sql .= "name='" . mysqli_real_escape_string($connect, $_POST['name']); - $sql .= "', type='" . $_POST['type']; + $sql .= "', type='" . array_search($_POST['type'], $fermentabletype); $sql .= "', yield='" . $_POST['yield']; $sql .= "', color='" . $_POST['color']; ($_POST['add_after_boil'] == 'true') ? $sql .= "', add_after_boil='1" : $sql .= "', add_after_boil='0"; @@ -35,11 +36,11 @@ $sql .= "', dissolved_protein='" . $_POST['dissolved_protein']; $sql .= "', max_in_batch='" . $_POST['max_in_batch']; ($_POST['recommend_mash'] == 'true') ? $sql .= "', recommend_mash='1" : $sql .= "', recommend_mash='0"; - $sql .= "', added='" . $_POST['added']; + $sql .= "', added='" . array_search($_POST['added'], $added); ($_POST['always_on_stock'] == 'true') ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0"; $sql .= "', di_ph='" . $_POST['di_ph']; $sql .= "', acid_to_ph_57='" . $_POST['acid_to_ph_57']; - $sql .= "', graintype='" . $_POST['graintype']; + $sql .= "', graintype='" . array_search($_POST['graintype'], $graintype); $sql .= "', inventory='" . $_POST['inventory']; $sql .= "', cost='" . $_POST['cost'] . "'"; if ($_POST['production_date'] == '') @@ -90,7 +91,7 @@ $fermentables[] = array( 'record' => $row['record'], 'name' => $row['name'], - 'type' => $row['type'], + 'type' => $fermentabletype[$row['type']], 'yield' => $row['yield'], 'color' => $row['color'], 'add_after_boil' => $row['add_after_boil'], @@ -104,11 +105,11 @@ 'dissolved_protein' => $row['dissolved_protein'], 'max_in_batch' => $row['max_in_batch'], 'recommend_mash' => $row['recommend_mash'], - 'added' => $row['added'], + 'added' => $added[$row['added']], 'always_on_stock' => $row['always_on_stock'], 'di_ph' => $row['di_ph'], 'acid_to_ph_57' => $row['acid_to_ph_57'], - 'graintype' => $row['graintype'], + 'graintype' => $graintype[$row['graintype']], 'inventory' => $row['inventory'], 'cost' => $row['cost'], 'production_date' => $row['production_date'],