diff -r e6e5d007eb54 -r c0f0bbfefd63 www/includes/db_recipes.php
--- a/www/includes/db_recipes.php	Mon Dec 17 22:24:32 2018 +0100
+++ b/www/includes/db_recipes.php	Wed Dec 19 21:58:21 2018 +0100
@@ -68,6 +68,30 @@
 	$sql .= "', mash_ph='" . $_POST['mash_ph'];
 	$sql .= "', mash_name='" . $_POST['mash_name'];
 	$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'];
+		$sql .= "', w1_calcium='" . $_POST['w1_calcium'];
+		$sql .= "', w1_sulfate='" . $_POST['w1_sulfate'];
+		$sql .= "', w1_chloride='" . $_POST['w1_chloride'];
+		$sql .= "', w1_sodium='" . $_POST['w1_sodium'];
+		$sql .= "', w1_magnesium='" . $_POST['w1_magnesium'];
+		$sql .= "', w1_total_alkalinity='" . $_POST['w1_total_alkalinity'];
+		$sql .= "', w1_ph='" . $_POST['w1_ph'];
+		$sql .= "', w1_cost='" . $_POST['w1_cost'];
+	}
+	if (isset($_POST['w2_name'])) {
+		$sql .= "', w2_name='" . mysqli_real_escape_string($connect, $_POST['w2_name']);
+		$sql .= "', w2_amount='" . $_POST['w2_amount'];
+		$sql .= "', w2_calcium='" . $_POST['w2_calcium'];
+		$sql .= "', w2_sulfate='" . $_POST['w2_sulfate'];
+		$sql .= "', w2_chloride='" . $_POST['w2_chloride'];
+		$sql .= "', w2_sodium='" . $_POST['w2_sodium'];
+		$sql .= "', w2_magnesium='" . $_POST['w2_magnesium'];
+		$sql .= "', w2_total_alkalinity='" . $_POST['w2_total_alkalinity'];
+		$sql .= "', w2_ph='" . $_POST['w2_ph'];
+		$sql .= "', w2_cost='" . $_POST['w2_cost'];
+	}
 	syslog(LOG_NOTICE, $sql);
 
 	if (isset($_POST['fermentables'])) {
@@ -114,17 +138,6 @@
 		$sql .= "', json_yeasts='" . str_replace($rescapers,$rreplacements,json_encode($array));
 	}
 
-	if (isset($_POST['waters'])) {
-		$array = $_POST['waters'];
-		foreach($array as $key => $item){
-			foreach ($disallowed as $disallowed_key) {
-				unset($array[$key]["$disallowed_key"]);
-			}
-		}
-		syslog(LOG_NOTICE, "json_waters: ".str_replace($rescapers,$rreplacements,json_encode($array)));
-		$sql .= "', json_waters='" . str_replace($rescapers,$rreplacements,json_encode($array));
-	}
-
 	if (isset($_POST['mashs'])) {
 		$array = $_POST['mashs'];
 		foreach($array as $key => $item){
@@ -228,11 +241,30 @@
 		$recipes .= ',"mash_ph":' . $row['mash_ph'];
 		$recipes .= ',"mash_name":"' . $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 .= ',"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 .= ',"fermentables":' . $row['json_fermentables'];
 		$recipes .= ',"hops":' . $row['json_hops'];
 		$recipes .= ',"miscs":' . $row['json_miscs'];
 		$recipes .= ',"yeasts":' . $row['json_yeasts'];
-		$recipes .= ',"waters":' . $row['json_waters'];
 		$recipes .= ',"mashs":' . $row['json_mashs'];
 		$recipes .= '}';
 	}