From 5d6bdd07aaf6a3284dbf55d8348c2b561ca88697 Mon Sep 17 00:00:00 2001 From: George Hotelling Date: Sat, 11 Aug 2012 15:08:49 +0000 Subject: [PATCH] Stabilizing trunk so that development can continue. * Removed check_mobile include which was crashing pages like the admin section (it was previously added to functions.inc.php) * Fixed ABV display in lists * Fixed bitterness calculations. * Removed call-time pass-by-reference in BeerXML parser, since it is no longer supported by PHP --- admin/includes/admin_icons.inc.php | 3 +- admin/index.php | 7 +- admin/lib/bitterness.lib.php | 140 +++++++++--------- admin/tools/bitterness.php | 74 +++++---- admin/tools/calculate.php | 3 +- admin/tools/hydrometer.php | 8 +- admin/tools/water_amounts.php | 16 +- entry.php | 3 +- includes/authentication_nav.inc.php | 6 - includes/beerXMLparser/parse_beer_xml.inc.php | 2 +- includes/beerXMLparser/parser.php | 2 +- includes/db_connect_log.inc.php | 6 +- includes/db_connect_universal.inc.php | 13 +- includes/functions.inc.php | 7 +- includes/messages.inc.php | 10 +- includes/output_beer_xml.inc.php | 3 +- includes/titles.inc.php | 2 + includes/url_variables.inc.php | 2 +- index.php | 8 - paths.php | 1 + print.php | 4 - reference/carbonation.php | 4 +- sections/add_review.inc.php | 3 +- sections/brewblogList.inc.php | 2 +- sections/featured.inc.php | 2 +- sections/label.inc.php | 2 +- sections/list.inc.php | 4 +- sections/print.inc.php | 11 +- sections/quick_edit.inc.php | 2 +- sections/recipe.inc.php | 4 +- sections/recipeList.inc.php | 2 +- sections/recipe_specifics.inc.php | 2 +- sections/reference.inc.php | 3 +- sections/userPic.inc.php | 2 +- sections/water_amounts_calc.inc.php | 10 +- 35 files changed, 189 insertions(+), 184 deletions(-) diff --git a/admin/includes/admin_icons.inc.php b/admin/includes/admin_icons.inc.php index 6126688..4845cba 100644 --- a/admin/includes/admin_icons.inc.php +++ b/admin/includes/admin_icons.inc.php @@ -1,12 +1,11 @@ diff --git a/admin/lib/bitterness.lib.php b/admin/lib/bitterness.lib.php index 70f3dc5..1ad6a88 100755 --- a/admin/lib/bitterness.lib.php +++ b/admin/lib/bitterness.lib.php @@ -1,57 +1,57 @@ 1.050) - $ga = (($gravity - 1.050) / .2); + if ($sg > 1.050) + $ga = (($sg - 1.050) / .2); else $ga = 0; @@ -205,23 +205,23 @@ function calc_bitter_garetz($boilTime, $sg, $aa, $weight, $postBoilVol, $form, $ return $ibu; } -/* ----------------------------- Daniels Method ----------------------------- - Reference: Daniels, Ray. Designing Great Beers, Brewers - Publications, 2000. - - Equation - U.S.: - IBU = Weight * Utilization % * Alpha % * 7,489 - ------------------------------------------------- - (Final Volume * (1 +[(Boil Time - 1.050) / 0.2)]) - - Equation - Metric: - IBU = Weight * Utilization % * Alpha % * 1,000 - ------------------------------------------------- - (Final Volume * (1 +[(Boil Time - 1.050) / 0.2)]) - - $form = ('pellet' || any other value is treated as whole/leaf/plug) - $units = ('metric' || 'us') -*/ +/* ----------------------------- Daniels Method ----------------------------- + Reference: Daniels, Ray. Designing Great Beers, Brewers + Publications, 2000. + + Equation - U.S.: + IBU = Weight * Utilization % * Alpha % * 7,489 + ------------------------------------------------- + (Final Volume * (1 +[(Boil Time - 1.050) / 0.2)]) + + Equation - Metric: + IBU = Weight * Utilization % * Alpha % * 1,000 + ------------------------------------------------- + (Final Volume * (1 +[(Boil Time - 1.050) / 0.2)]) + + $form = ('pellet' || any other value is treated as whole/leaf/plug) + $units = ('metric' || 'us') +*/ function calc_bitter_daniels($boilTime, $sg, $aa, $weight, $vol, $form, $units) { $f = ($units == "us") ? 7489 : 1000; @@ -263,10 +263,10 @@ function calc_bitter_daniels($boilTime, $sg, $aa, $weight, $vol, $form, $units) } // Correct gravity - if ($gravity < 1.050) + if ($sg < 1.050) $cGravity = 1; else - $cGravity = 1 + (($gravity - 1.050) / 0.2); + $cGravity = 1 + (($sg - 1.050) / 0.2); // Calculate $ibu = ($weight * $u * ($aa * .01) * $f) / ($vol * $cGravity); diff --git a/admin/tools/bitterness.php b/admin/tools/bitterness.php index 46c9e85..281f569 100644 --- a/admin/tools/bitterness.php +++ b/admin/tools/bitterness.php @@ -3,16 +3,8 @@ // Bitterness Calculator // //-----------------------// -// Load the library of bitterness formula functions -// The file_exists.. statement helps determine what our CWD is since the getcwd() -// function isn't entirely portable or may be disabled. -if (file_exists("bitterness.php")) { - require_once (ADMIN_LIBRARY.'bitterness.lib.php'); - require_once (ADMIN_INCLUDES.'constants.inc.php'); -} else { - require_once (ADMIN_LIBRARY.'bitterness.lib.php'); - require_once (ADMIN_INCLUDES.'includes/constants.inc.php'); -} +require_once (ADMIN_LIBRARY.'bitterness.lib.php'); +require_once (ADMIN_INCLUDES.'constants.inc.php'); // This is the maximum number of hop entries we can // process in this calculator. @@ -34,53 +26,75 @@ if ($row_user['defaultBatchSize'] > 0) { $DEFAULT_BATCH_SZ = 19; } +$gravity = (isset($_POST['gravity']))?$_POST['gravity']:''; + if (($action == "calculate") || ($action == "entry")) { // The $form variable and 'form' $_POST key are in reference to // the format of the hops, i.e. whole/plug or pellet. // It's easy to confuse this with fact that it's being // submitted via an HTML form. + // @TODO: Format this form as $_POST['hops'][$i]['weight|aa|utilization|form'] so we can foreach over it + $submittedHops = 0; for ($i = 0; $i < MAX_HOPS; $i++) { - $hopWeight[$i] = $_POST['hopWeight'][$i]; - $hopAA[$i] = $_POST['hopAA'][$i]; - $utilization[$i] = $_POST['utilization'][$i]; - $form[$i] = $_POST['form'][$i]; + if (isset($_POST['hopWeight'][$i])) { + $submittedHops = $i + 1; + } + $hopWeight[$i] = isset($_POST['hopWeight'][$i])?$_POST['hopWeight'][$i]:NULL; + $hopAA[$i] = isset($_POST['hopAA'][$i])?$_POST['hopAA'][$i]:NULL; + $utilization[$i] = isset($_POST['utilization'][$i])?$_POST['utilization'][$i]:NULL; + $form[$i] = isset($_POST['form'][$i])?$_POST['form'][$i]:NULL; } $preBoilVol = $_POST['preBoilVol']; $finalVol = $_POST['finalVol']; - $gravity = $_POST['gravity']; $desiredIBUs = $_POST['desiredIBUs']; $elevation = $_POST['elevation']; $units = $_POST['units']; // Tinseth method $ibuT = 0; + $ibu_T = array_fill(0, MAX_HOPS, NULL); for ($i = 0; $i < MAX_HOPS; $i++) { + if (!isset($hopWeight[$i])) { + continue; + } $ibu_T[$i] = calc_bitter_tinseth($utilization[$i], $gravity, $hopAA[$i], $hopWeight[$i], $finalVol, $form[$i], $units); $ibuT += $ibu_T[$i]; } // Rager Method $ibuR = 0; + $ibu_R = array_fill(0, MAX_HOPS, NULL); for ($i = 0; $i < MAX_HOPS; $i++) { + if (!isset($hopWeight[$i])) { + continue; + } $ibu_R[$i] = calc_bitter_rager($utilization[$i], $gravity, $hopAA[$i], $hopWeight[$i], $finalVol, $form[$i], $units); $ibuR += $ibu_R[$i]; } // Daniels Method $ibuD = 0; + $ibu_D = array_fill(0, MAX_HOPS, NULL); for ($i = 0; $i < MAX_HOPS; $i++) { + if (!isset($hopWeight[$i])) { + continue; + } $ibu_D[$i] = calc_bitter_daniels($utilization[$i], $gravity, $hopAA[$i], $hopWeight[$i], $finalVol, $form[$i], $units); $ibuD += $ibu_D[$i]; } // Garetz Method $ibuG = 0; + $ibu_G = array_fill(0, MAX_HOPS, NULL); if (($preBoilVol > 0) && ($desiredIBUs > 0) && ($elevation >= 0)) { for ($i = 0; $i < MAX_HOPS; $i++) { + if (!isset($hopWeight[$i])) { + continue; + } $ibu_G[$i] = calc_bitter_garetz($utilization[$i], $gravity, $hopAA[$i], $hopWeight[$i], $finalVol, $form[$i], $units, - $preBoilVol, $desiredIBUs, $elevation); + $preBoilVol, $desiredIBUs, $elevation); $ibuG += $ibu_G[$i]; } } @@ -94,7 +108,7 @@ if (($action == "default") || ($action == "entry")) {
">
International Bitterness Unit (IBU) Calculator
- + 0) $endHopEntries = $i; + if (isset($ibu_T[$i]) && $ibu_T[$i] > 0) $endHopEntries = $i; } for ($i = 0; $i <= $endHopEntries; $i++) { @@ -250,27 +264,27 @@ for ($i = 0; $i < MAX_HOPS; $i++) { 0) { - echo ''; + echo ''; } else { - echo ''; + echo ''; } ?> 0) { - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; + echo ''; } ?>
Average IBUs: '; - $ibuAverage = ($ibuG + $ibuR + $ibuT + $ibuD) / 4; - echo round ($ibuAverage, 1) . ''; + $ibuAverage = ($ibuG + $ibuR + $ibuT + $ibuD) / 4; + echo round ($ibuAverage, 1) . ''; - $ibuAverage = ($ibuR + $ibuT + $ibuD) / 3; - echo round ($ibuAverage, 1); - echo '(Garetz formula excluded from avg.)'; + $ibuAverage = ($ibuR + $ibuT + $ibuD) / 3; + echo round ($ibuAverage, 1); + echo '(Garetz formula excluded from avg.)
Target IBUs:' . $desiredIBUs . '
Target IBUs:' . $desiredIBUs . '
- + /button_back_Brilliant.png" alt="Re-Enter Values" class="calcButton" value="Re-Enter Values" /> \ No newline at end of file diff --git a/admin/tools/calculate.php b/admin/tools/calculate.php index b3bfbbe..76c9b5d 100644 --- a/admin/tools/calculate.php +++ b/admin/tools/calculate.php @@ -1,13 +1,12 @@ diff --git a/admin/tools/hydrometer.php b/admin/tools/hydrometer.php index 7061365..3304af0 100644 --- a/admin/tools/hydrometer.php +++ b/admin/tools/hydrometer.php @@ -15,10 +15,10 @@ // This needs to be a user profile variable. $CAL_TEMP_DEFAULT = 60; -$calTemp = $_POST["calTemp"]; -$temp = $_POST["temp"]; -$sg = $_POST["sg"]; -$units = $_POST["units"]; +$calTemp = isset($_POST["calTemp"])?$_POST["calTemp"]:$CAL_TEMP_DEFAULT; +$temp = isset($_POST["temp"])?$_POST["temp"]:NULL; +$sg = isset($_POST["sg"])?$_POST["sg"]:NULL; +$units = isset($_POST["units"])?$_POST["units"]:NULL; if (($action == "default") || ($action == "entry")) { ?>