diff --git a/admin/admin_sections/add-edit/preferences.add-edit.php b/admin/admin_sections/add-edit/preferences.add-edit.php index 96ff3f1..03231ec 100644 --- a/admin/admin_sections/add-edit/preferences.add-edit.php +++ b/admin/admin_sections/add-edit/preferences.add-edit.php @@ -11,6 +11,7 @@ Add Themes?Add Themes? +
Edition
@@ -22,6 +23,7 @@
+
Home Page
@@ -41,6 +43,7 @@
* Be sure to choose your edition and click "Edit" BEFORE choosing your home page.
+
General
@@ -121,7 +124,13 @@ + + + + +
IBU is the more recognized standard.
Pellet Factor:Represents increased utilization vs. whole or plug hops. A value of 1.06 is recommended as this reflects a 6% increase over whole hops.
+
Water and Mash Profiles
@@ -141,6 +150,7 @@
"Yes" indicates that you would like to use BrewBlogger's mash profiles database. You can add your own mash profiles to the database and reuse any one for a BrewBlog.
+
Menu Link Text
diff --git a/admin/admin_sections/add.admin.php b/admin/admin_sections/add.admin.php index 75d3f6a..aa96076 100644 --- a/admin/admin_sections/add.admin.php +++ b/admin/admin_sections/add.admin.php @@ -71,7 +71,7 @@ elseif (($dbTable == "recipes") && ($action == "importRecipe")) echo " -
> +
- @@ -137,20 +136,19 @@ include ('../includes/plug-ins.inc.php'); + + + + + + + + + + + + +  / 12 @@ -162,11 +160,10 @@ include ('../includes/plug-ins.inc.php'); + + + +  / 3 @@ -178,28 +175,27 @@ include ('../includes/plug-ins.inc.php'); + + + + + + + + + + + + + + + + + + + + +  / 20 @@ -210,13 +206,12 @@ include ('../includes/plug-ins.inc.php'); + + + + + +  / 5 @@ -228,18 +223,17 @@ include ('../includes/plug-ins.inc.php'); + + + + + + + + + + +  / 10 diff --git a/sql/2.3.2_new_install.sql b/sql/2.3.2_new_install.sql index b146ff9..35b6e2f 100644 --- a/sql/2.3.2_new_install.sql +++ b/sql/2.3.2_new_install.sql @@ -1892,3 +1892,5 @@ ADD `brewHops15Use` varchar(25) NULL AFTER `brewHops15Time`, ADD `brewHops15Type` varchar(25) NULL AFTER `brewHops15Use`, ADD `brewHops15Form` varchar(25) NULL AFTER `brewHops15Type`; +ALTER TABLE `preferences` +ADD `hopPelletFactor` FLOAT NOT NULL DEFAULT '1.06' COMMENT 'Pellet factor compared to whole/plug'; diff --git a/sql/2.3.2_sql_upgrade.txt b/sql/2.3.2_sql_upgrade.txt index c1125ba..1d3722b 100644 --- a/sql/2.3.2_sql_upgrade.txt +++ b/sql/2.3.2_sql_upgrade.txt @@ -127,3 +127,6 @@ ADD `brewHops15Time` varchar(25) NULL AFTER `brewHops15IBU`, ADD `brewHops15Use` varchar(25) NULL AFTER `brewHops15Time`, ADD `brewHops15Type` varchar(25) NULL AFTER `brewHops15Use`, ADD `brewHops15Form` varchar(25) NULL AFTER `brewHops15Type`; + +ALTER TABLE `preferences` +ADD `hopPelletFactor` FLOAT NOT NULL DEFAULT '1.06' COMMENT 'Pellet factor compared to whole/plug';
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');
Scorer Is: - +
Aroma Score:  / 12
Appearance Score:  / 3
Flavor Score:  / 20
Flavor Comments:
Mouthfeel Score:  / 5
Overall Impression:  / 10