|
diff --git a/admin/includes/formCheck.inc.php b/admin/includes/formCheck.inc.php
index cbe65a3..1401732 100644
--- a/admin/includes/formCheck.inc.php
+++ b/admin/includes/formCheck.inc.php
@@ -1,4 +1,3 @@
-
-
diff --git a/admin/lib/bitterness.lib.php b/admin/lib/bitterness.lib.php
index 1247399..058997c 100755
--- a/admin/lib/bitterness.lib.php
+++ b/admin/lib/bitterness.lib.php
@@ -19,9 +19,8 @@
// Most modern data I've seen supports this range. The 15%
// delta value is a left-over from the old days and appears to
// have been based on speculation at that time.
-// Anyways, this really should be a user var they can set in their prefs.
// - Kevin
-$pelletFactor = 1.06;
+$pelletFactor = $row_pref['hopPelletFactor'];
// --------------------------- Tinseth Method --------------------------- //
// Reference: Tinseth, Glenn. www.realbeer.com/hops, 1995-1999.
diff --git a/admin/process.php b/admin/process.php
index 6792d78..1250fbb 100644
--- a/admin/process.php
+++ b/admin/process.php
@@ -12,7 +12,10 @@ function GetSQLValueString($theValue, $theType, $theDefinedValue = "", $theNotDe
switch ($theType) {
case "text":
$theValue = ($theValue != "") ? "'" . $theValue . "'" : "NULL";
- break;
+ break;
+ case "float":
+ $theValue = ($theValue != "") ? floatval($theValue) : "NULL";
+ break;
case "long":
case "int":
$theValue = ($theValue != "") ? intval($theValue) : "NULL";
@@ -2590,13 +2593,14 @@ if (($action == "edit") && ($dbTable == "preferences")) {
menuLogout=%s,
menuMembers=%s,
mashDisplayMethod=%s,
- waterDisplayMethod=%s
+ waterDisplayMethod=%s,
+ hopPelletFactor=%f
WHERE $dbTable.id='%s'",
GetSQLValueString($_POST['measFluid1'], "text"),
GetSQLValueString($_POST['measFluid2'], "text"),
GetSQLValueString($_POST['measWeight1'], "text"),
GetSQLValueString($_POST['measWeight2'], "text"),
- GetSQLValueString($_POST['measWaterGrainRatio'], "text"),
+ GetSQLValueString($_POST['measWaterGrainRatio'], "text"),
GetSQLValueString($_POST['measTemp'], "text"),
GetSQLValueString($_POST['measColor'], "text"),
GetSQLValueString($_POST['measBitter'], "text"),
@@ -2616,28 +2620,29 @@ if (($action == "edit") && ($dbTable == "preferences")) {
GetSQLValueString($_POST['allowFermentation'], "text"),
GetSQLValueString($_POST['allowLabel'], "text"),
GetSQLValueString($_POST['allowRelated'], "text"),
- GetSQLValueString($_POST['allowStatus'], "text"),
- GetSQLValueString($_POST['allowUpcoming'], "text"),
- GetSQLValueString($_POST['allowAwards'], "text"),
- GetSQLValueString($_POST['allowCalendar'], "text"),
- GetSQLValueString($_POST['allowNews'], "text"),
- GetSQLValueString($_POST['allowProfile'], "text"),
- GetSQLValueString($_POST['theme'], "text"),
- GetSQLValueString($_POST['mode'], "text"),
- GetSQLValueString($_POST['home'], "text"),
- GetSQLValueString($_POST['menuHome'], "scrubbed"),
- GetSQLValueString($_POST['menuBrewBlogs'], "scrubbed"),
- GetSQLValueString($_POST['menuRecipes'], "scrubbed"),
- GetSQLValueString($_POST['menuAwards'], "scrubbed"),
- GetSQLValueString($_POST['menuAbout'], "scrubbed"),
- GetSQLValueString($_POST['menuReference'], "scrubbed"),
- GetSQLValueString($_POST['menuCalculators'], "scrubbed"),
- GetSQLValueString($_POST['menuCalendar'], "scrubbed"),
- GetSQLValueString($_POST['menuLogin'], "scrubbed"),
- GetSQLValueString($_POST['menuLogout'], "scrubbed"),
- GetSQLValueString($_POST['menuMembers'], "scrubbed"),
- GetSQLValueString($_POST['mashDisplayMethod'], "text"),
- GetSQLValueString($_POST['waterDisplayMethod'], "text"),
+ GetSQLValueString($_POST['allowStatus'], "text"),
+ GetSQLValueString($_POST['allowUpcoming'], "text"),
+ GetSQLValueString($_POST['allowAwards'], "text"),
+ GetSQLValueString($_POST['allowCalendar'], "text"),
+ GetSQLValueString($_POST['allowNews'], "text"),
+ GetSQLValueString($_POST['allowProfile'], "text"),
+ GetSQLValueString($_POST['theme'], "text"),
+ GetSQLValueString($_POST['mode'], "text"),
+ GetSQLValueString($_POST['home'], "text"),
+ GetSQLValueString($_POST['menuHome'], "scrubbed"),
+ GetSQLValueString($_POST['menuBrewBlogs'], "scrubbed"),
+ GetSQLValueString($_POST['menuRecipes'], "scrubbed"),
+ GetSQLValueString($_POST['menuAwards'], "scrubbed"),
+ GetSQLValueString($_POST['menuAbout'], "scrubbed"),
+ GetSQLValueString($_POST['menuReference'], "scrubbed"),
+ GetSQLValueString($_POST['menuCalculators'], "scrubbed"),
+ GetSQLValueString($_POST['menuCalendar'], "scrubbed"),
+ GetSQLValueString($_POST['menuLogin'], "scrubbed"),
+ GetSQLValueString($_POST['menuLogout'], "scrubbed"),
+ GetSQLValueString($_POST['menuMembers'], "scrubbed"),
+ GetSQLValueString($_POST['mashDisplayMethod'], "text"),
+ GetSQLValueString($_POST['waterDisplayMethod'], "text"),
+ GetSQLValueString($_POST['pelletFactor'], "float"),
GetSQLValueString($id, "int"));
mysql_select_db($database_brewing, $brewing);
diff --git a/sections/add_review.inc.php b/sections/add_review.inc.php
index 550ec97..f114e29 100644
--- a/sections/add_review.inc.php
+++ b/sections/add_review.inc.php
@@ -111,21 +111,20 @@ include ('../includes/plug-ins.inc.php');
|