Mercurial > bms / file diff

--- a/www/includes/db_recipes.php	Thu Sep 27 23:13:41 2018 +0200
+++ b/www/includes/db_recipes.php	Fri Sep 28 17:29:23 2018 +0200
@@ -30,7 +30,9 @@
 	$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']);
-	// st_category st_category_number st_type
+	$sql .= "', st_type='" . mysqli_real_escape_string($connect, $_POST['st_type']);
+	$sql .= "', st_category='" . mysqli_real_escape_string($connect, $_POST['st_categpry']);
+	$sql .= "', st_category_number='" . $_POST['st_category_number'];
 	$sql .= "', st_og_min='" . $_POST['st_og_min'];
 	$sql .= "', st_og_max='" . $_POST['st_og_max'];
 	$sql .= "', st_fg_min='" . $_POST['st_fg_min'];
@@ -51,6 +53,8 @@
 	$sql .= "', efficiency='" . $_POST['efficiency'];
 	$sql .= "', est_og='" . $_POST['est_og'];
 	$sql .= "', est_fg='" . $_POST['est_fg'];
+	$sql .= "', est_abv='" . $_POST['est_abv'];
+	$sql .= "', est_carb='" . $_POST['est_carb'];
 	$sql .= "', est_color='" . $_POST['est_color'];
 	$sql .= "', color_method='" . $_POST['color_method'];
 	$sql .= "', est_ibu='" . $_POST['est_ibu'];
@@ -140,7 +144,8 @@
 		if (isset($_POST['update'])) {
 			syslog(LOG_NOTICE, "db_recipes: updated record ".$_POST['record']);
 		} else {
-			syslog(LOG_NOTICE, "db_recipes: inserted ".$_POST['name']);
+			$lastid = mysqli_insert_id($connect);
+			syslog(LOG_NOTICE, "db_recipes: inserted record ".$lastid);
 		}
 	}
 	echo $result;
@@ -150,7 +155,6 @@
 	$sql = "DELETE FROM `recipes` WHERE record='".$_POST['record']."';";
 	$result = mysqli_query($connect, $sql);
 	if (! $result) {
-//		syslog(LOG_NOTICE, "db_recipes: ".$sql." result: ".mysqli_error($connect));
 		syslog(LOG_NOTICE, "db_recipes: result: ".mysqli_error($connect));
 	} else {
 		syslog(LOG_NOTICE, "db_recipes: deleted record ".$_POST['record']);
@@ -172,7 +176,10 @@
 		$recipes .=  ',"st_guide":"' . str_replace($escapers, $replacements, $row['st_guide']);
 		$recipes .= '","st_letter":"' . str_replace($escapers, $replacements, $row['st_letter']);
 		$recipes .= '","st_name":"'  . str_replace($escapers, $replacements, $row['st_name']);
-		$recipes .= '","st_og_min":' . floatval($row['st_og_min']);
+		$recipes .= '","st_type":"' . str_replace($escapers, $replacements, $row['st_type']);
+		$recipes .= '","st_category":"' . str_replace($escapers, $replacements, $row['st_category']);
+		$recipes .= '","st_category_number":' . floatval($row['st_category_number']);
+		$recipes .= ',"st_og_min":' . floatval($row['st_og_min']);
 		$recipes .= ',"st_og_max":' . floatval($row['st_og_max']);
 		$recipes .= ',"st_fg_min":' . floatval($row['st_fg_min']);
 		$recipes .= ',"st_fg_max":' . floatval($row['st_fg_max']);
@@ -192,6 +199,8 @@
 		$recipes .= ',"efficiency":' . floatval($row['efficiency']);
 		$recipes .= ',"est_og":' . floatval($row['est_og']);
 		$recipes .= ',"est_fg":' . floatval($row['est_fg']);
+		$recipes .= ',"est_abv":' . floatval($row['est_abv']);
+		$recipes .= ',"est_carb":' . floatval($row['est_carb']);
 		$recipes .= ',"est_color":' . floatval($row['est_color']);
 		$recipes .= ',"color_method":"' . $row['color_method'];
 		$recipes .= '","est_ibu":' . floatval($row['est_ibu']);