--- a/www/includes/db_recipes.php Sat May 11 23:13:40 2019 +0200
+++ b/www/includes/db_recipes.php Sun May 12 15:16:35 2019 +0200
@@ -32,7 +32,7 @@
$uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid'));
$sql .= "uuid='" . $uuid;
}
- ($_POST['locked'] == 'true') ? $sql .= "', locked='1" : $sql .= "', locked='0";
+ $sql .= "', locked='" . $_POST['locked'];
$sql .= "', st_name='" . mysqli_real_escape_string($connect, $_POST['st_name']);
$sql .= "', st_letter='" . mysqli_real_escape_string($connect, $_POST['st_letter']);
$sql .= "', st_guide='" . mysqli_real_escape_string($connect, $_POST['st_guide']);
@@ -75,7 +75,7 @@
$sql .= "', sparge_acid_amount='" . $_POST['sparge_acid_amount'];
$sql .= "', mash_ph='" . $_POST['mash_ph'];
$sql .= "', mash_name='" . $_POST['mash_name'];
- ($_POST['calc_acid'] == 'true') ? $sql .= "', calc_acid='1" : $sql .= "', calc_acid='0";
+ $sql .= "', calc_acid='" . $_POST['calc_acid'];
if (isset($_POST['w1_name'])) {
$sql .= "', w1_name='" . mysqli_real_escape_string($connect, $_POST['w1_name']);
$sql .= "', w1_amount='" . $_POST['w1_amount'];
@@ -103,7 +103,7 @@
$sql .= "', wa_acid_name='" . $_POST['wa_acid_name'];
$sql .= "', wa_acid_perc='" . $_POST['wa_acid_perc'];
$sql .= "', wa_base_name='" . $_POST['wa_base_name'];
- syslog(LOG_NOTICE, $sql);
+ //syslog(LOG_NOTICE, $sql);
$fermentables = '[';
$comma = FALSE;
@@ -202,6 +202,7 @@
$comma = FALSE;
if (isset($_POST['yeasts'])) {
$array = $_POST['yeasts'];
+syslog(LOG_NOTICE, $_POST['yeasts']);
foreach($array as $key => $item) {
if ($comma)
$yeasts .= ',';
@@ -221,7 +222,7 @@
$yeast .= ',"y_inventory":' . $item['y_inventory'];
$yeast .= ',"y_use":' . $item['y_use'];
$yeast .= ',"y_cost":' . $item['y_cost'] . '}';
- //syslog(LOG_NOTICE, $yeast);
+ syslog(LOG_NOTICE, $yeast);
$yeasts .= $yeast;
}
}
@@ -247,7 +248,7 @@
$mash .= ',"ramp_time":' . $item['ramp_time'];
$mash .= ',"end_temp":' . $item['end_temp'] . '}';
$mashs .= $mash;
- syslog(LOG_NOTICE, $mash);
+ //syslog(LOG_NOTICE, $mash);
}
}
$mashs .= ']';
@@ -303,7 +304,7 @@
}
$comma = TRUE;
$recipes .= '{"record":' . $row['record'];
- $recipes .= ',"uuid":"' . $row['uuid'];
+ $recipes .= ',"uuid":"' . str_replace($escapers, $replacements, $row['uuid']);
$recipes .= '","locked":' . $row['locked'];
$recipes .= ',"st_guide":"' . str_replace($escapers, $replacements, $row['st_guide']);
$recipes .= '","st_letter":"' . str_replace($escapers, $replacements, $row['st_letter']);
@@ -338,38 +339,38 @@
$recipes .= ',"color_method":' . $row['color_method'];
$recipes .= ',"est_ibu":' . floatval($row['est_ibu']);
$recipes .= ',"ibu_method":' . $row['ibu_method'];
- $recipes .= ',"sparge_temp":' . $row['sparge_temp'];
- $recipes .= ',"sparge_ph":' . $row['sparge_ph'];
- $recipes .= ',"sparge_volume":' . $row['sparge_volume'];
+ $recipes .= ',"sparge_temp":' . floatval($row['sparge_temp']);
+ $recipes .= ',"sparge_ph":' . floatval($row['sparge_ph']);
+ $recipes .= ',"sparge_volume":' . floatval($row['sparge_volume']);
$recipes .= ',"sparge_source":"' . $row['sparge_source'];
$recipes .= '","sparge_acid_type":' . $row['sparge_acid_type'];
- $recipes .= ',"sparge_acid_perc":' . $row['sparge_acid_perc'];
- $recipes .= ',"sparge_acid_amount":' . $row['sparge_acid_amount'];
- $recipes .= ',"mash_ph":' . $row['mash_ph'];
- $recipes .= ',"mash_name":"' . $row['mash_name'];
+ $recipes .= ',"sparge_acid_perc":' . floatval($row['sparge_acid_perc']);
+ $recipes .= ',"sparge_acid_amount":' . floatval($row['sparge_acid_amount']);
+ $recipes .= ',"mash_ph":' . floatval($row['mash_ph']);
+ $recipes .= ',"mash_name":"' . str_replace($escapers, $replacements, $row['mash_name']);
$recipes .= '","calc_acid":' . $row['calc_acid'];
$recipes .= ',"w1_name":"' . str_replace($escapers, $replacements, $row['w1_name']);
- $recipes .= '","w1_amount":' . $row['w1_amount'];
- $recipes .= ',"w1_calcium":' . $row['w1_calcium'];
- $recipes .= ',"w1_sulfate":' . $row['w1_sulfate'];
- $recipes .= ',"w1_chloride":' . $row['w1_chloride'];
- $recipes .= ',"w1_sodium":' . $row['w1_sodium'];
- $recipes .= ',"w1_magnesium":' . $row['w1_magnesium'];
- $recipes .= ',"w1_total_alkalinity":' . $row['w1_total_alkalinity'];
- $recipes .= ',"w1_ph":' . $row['w1_ph'];
- $recipes .= ',"w1_cost":' . $row['w1_cost'];
+ $recipes .= '","w1_amount":' . floatval($row['w1_amount']);
+ $recipes .= ',"w1_calcium":' . floatval($row['w1_calcium']);
+ $recipes .= ',"w1_sulfate":' . floatval($row['w1_sulfate']);
+ $recipes .= ',"w1_chloride":' . floatval($row['w1_chloride']);
+ $recipes .= ',"w1_sodium":' . floatval($row['w1_sodium']);
+ $recipes .= ',"w1_magnesium":' . floatval($row['w1_magnesium']);
+ $recipes .= ',"w1_total_alkalinity":' . floatval($row['w1_total_alkalinity']);
+ $recipes .= ',"w1_ph":' . floatval($row['w1_ph']);
+ $recipes .= ',"w1_cost":' . floatval($row['w1_cost']);
$recipes .= ',"w2_name":"' . str_replace($escapers, $replacements, $row['w2_name']);
- $recipes .= '","w2_amount":' . $row['w2_amount'];
- $recipes .= ',"w2_calcium":' . $row['w2_calcium'];
- $recipes .= ',"w2_sulfate":' . $row['w2_sulfate'];
- $recipes .= ',"w2_chloride":' . $row['w2_chloride'];
- $recipes .= ',"w2_sodium":' . $row['w2_sodium'];
- $recipes .= ',"w2_magnesium":' . $row['w2_magnesium'];
- $recipes .= ',"w2_total_alkalinity":' . $row['w2_total_alkalinity'];
- $recipes .= ',"w2_ph":' . $row['w2_ph'];
- $recipes .= ',"w2_cost":' . $row['w2_cost'];
+ $recipes .= '","w2_amount":' . floatval($row['w2_amount']);
+ $recipes .= ',"w2_calcium":' . floatval($row['w2_calcium']);
+ $recipes .= ',"w2_sulfate":' . floatval($row['w2_sulfate']);
+ $recipes .= ',"w2_chloride":' . floatval($row['w2_chloride']);
+ $recipes .= ',"w2_sodium":' . floatval($row['w2_sodium']);
+ $recipes .= ',"w2_magnesium":' . floatval($row['w2_magnesium']);
+ $recipes .= ',"w2_total_alkalinity":' . floatval($row['w2_total_alkalinity']);
+ $recipes .= ',"w2_ph":' . floatval($row['w2_ph']);
+ $recipes .= ',"w2_cost":' . floatval($row['w2_cost']);
$recipes .= ',"wa_acid_name":' . $row['wa_acid_name'];
- $recipes .= ',"wa_acid_perc":' . $row['wa_acid_perc'];
+ $recipes .= ',"wa_acid_perc":' . floatval($row['wa_acid_perc']);
$recipes .= ',"wa_base_name":' . $row['wa_base_name'];
if (isset($_GET['record'])) {
// Append stock information.
@@ -429,6 +430,8 @@
for ($i = 0; $i < count($yeasts); $i++) {
$yeasts[$i]['y_inventory'] = 0; // Not in stock
$yeasts[$i]['y_avail'] = 0; // Ingredient not in db
+ if (! isset($yeasts[$i]['y_tolerance']))
+ $yeasts[$i]['y_tolerance'] = 0;
$sql2 = "SELECT inventory,tolerance FROM inventory_yeasts ";
$sql2 .= "WHERE name='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_name'])."' AND";
$sql2 .= " form='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_form'])."' AND";