www/includes/global.inc.php

changeset 289
4082c41f45e9
parent 231
9881453a49b3
child 290
12aa92828e24
--- a/www/includes/global.inc.php	Sun Feb 24 21:22:25 2019 +0100
+++ b/www/includes/global.inc.php	Sun Feb 24 22:29:00 2019 +0100
@@ -62,7 +62,7 @@
 }
 mysqli_set_charset($connect, "utf8" );
 $my_default_water = $my_brewery_name = $my_ibu_method = $my_color_method = '';
-$my_factor_mashhop = $my_factor_fwh = $my_factor_pellet = $my_factor_plug = 0;
+$my_factor_mashhop = $my_factor_fwh = $my_factor_pellet = $my_factor_plug = $my_factor_wethop = 0;
 $my_brix_correction = $my_grain_absorbtion = 1.0;
 
 $result = mysqli_query($connect, "SELECT * FROM profile_setup WHERE record='1'") or die("SQL Error 1: " . mysqli_error($connect));
@@ -76,8 +76,9 @@
 	$my_factor_fwh= floatval($row['factor_fwh']);
 	$my_factor_pellet= floatval($row['factor_pellet']);
 	$my_factor_plug= floatval($row['factor_plug']);
-	$my_ibu_method = str_replace($escapers, $replacements, $row['ibu_method']);
-	$my_color_method = str_replace($escapers, $replacements, $row['color_method']);
+	$my_factor_wethop = floatval($row['factor_wethop']);
+	$my_ibu_method = $row['ibu_method'];
+	$my_color_method = $row['color_method'];
 	$my_brix_correction = floatval($row['brix_correction']);
 	$my_grain_absorbtion = floatval($row['grain_absorbtion']);
 }
@@ -97,6 +98,7 @@
 	global $my_factor_fwh;
 	global $my_factor_pellet;
 	global $my_factor_plug;
+	global $my_factor_wethop;
 	global $my_ibu_method;
 	global $my_color_method;
 	global $my_brix_correction;
@@ -124,6 +126,7 @@
 	var my_factor_fwh = "<?php echo $my_factor_fwh; ?>";
 	var my_factor_pellet = "<?php echo $my_factor_pellet; ?>";
 	var my_factor_plug = "<?php echo $my_factor_plug; ?>";
+	var my_factor_wethop = "<?php echo $my_factor_wethop; ?>";
 	var my_ibu_method = "<?php echo $my_ibu_method; ?>";
 	var my_color_method = "<?php echo $my_color_method; ?>";
 	var my_brix_correction = "<?php echo $my_brix_correction; ?>";

mercurial