diff -r 08c92cb740b9 -r 5b6bb99bc52a www/includes/formulas.php --- a/www/includes/formulas.php Sat Nov 17 19:44:39 2018 +0100 +++ b/www/includes/formulas.php Sat Nov 17 20:40:23 2018 +0100 @@ -197,23 +197,28 @@ -function calc_IBU($useat, $form, $sg, $volume, $mass, $boiltime, $alpha, $method) { +function calc_IBU($useat, $form, $sg, $volume, $mass, $boiltime, $alpha, $method) +{ + global $my_factor_mashhop; + global $my_factor_fwh; + global $my_factor_pellet; + global $my_factor_plug; $fmoment = 1.0; if (($useat == "Dry Hop") || ($useat == "Dry hop") || ($useat == "Whirlpool") || ($useat == "Aroma")) { $fmoment = 0.0; } else if ($useat == "Mash") { - $fmoment += /* Settings.MashHopFactor.Value = -30% */ -30 / 100; // Brouwhulp + $fmoment += $my_factor_mashhop / 100; // Brouwhulp } else if (($useat == "First Wort") || ($useat == "First wort")) { - $fmoment += /* Settings.FWHFactor.Value = 10% */ 10 / 100; // Brouwhulp, Louis, Ozzie + $fmoment += $my_factor_fwh / 100; // Brouwhulp, Louis, Ozzie } $pfactor = 1.0; if ($form == "Pellet") { - $pfactor += /* Settings.PelletFactor.Value = 10% */ 10 / 100; + $pfactor += $my_factor_pellet / 100; } if ($form == "Plug") { - $pfactor += /* Settings.PlugFactor.Value = 2% */ 2 / 100; + $pfactor += $my_factor_plug / 100; } $ibu = 0;