salfter/brewblogger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Last commits before beta testing period starting September 20, 2010.

Browse Source
This commit is contained in:
Geoff Humphrey
2010-09-14 19:53:49 +00:00
parent 32e3ac240d
commit d23b4d1d14
16 changed files with 469 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
admin/lib/calculations.lib.php
View File

@@ -200,56 +200,77 @@ $brewAdjunct7Weight = $_POST['brewAdjunct7Weight'];
$brewAdjunct8Weight = $_POST['brewAdjunct8Weight']; $brewAdjunct8Weight = $_POST['brewAdjunct8Weight'];
$brewAdjunct9Weight = $_POST['brewAdjunct9Weight']; $brewAdjunct9Weight = $_POST['brewAdjunct9Weight'];
for($i = 1; $i <= 9; ++$i) { $query_adjunct1 = "SELECT adjunctYield, adjunctLovibond FROM adjuncts WHERE adjunctName='$brewAdjunct1'";
$adjunct1 = mysql_query($query_adjunct1, $brewing) or die(mysql_error());
$row_adjunct1 = mysql_fetch_assoc($adjunct1);
$query_adjunct = 'query_adjunct'.$i; $query_adjunct1PPG = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_adjunct1['adjunctYield']);
$adjunct = 'adjunct'.$i; $adjunct1PPG = mysql_query($query_adjunct1PPG, $brewing) or die(mysql_error());
$row_adjunct = 'row_adjunct'.$i; $row_adjunct1PPG = mysql_fetch_assoc($adjunct1PPG);
$totalRows_adjunct = 'totalRows_adjunct'.$i;
mysql_select_db($database_brewing, $brewing); $query_adjunct2 = "SELECT adjunctYield, adjunctLovibond FROM adjuncts WHERE adjunctName='$brewAdjunct2'";
$$query_adjunct = sprintf("SELECT adjunctYield, adjunctLovibond FROM adjuncts WHERE adjunctName='%s'", $_POST['brewadjunct'.$i]); $adjunct2 = mysql_query($query_adjunct2, $brewing) or die(mysql_error());
$$adjunct = mysql_query($$query_adjunct, $brewing); $row_adjunct2 = mysql_fetch_assoc($adjunct2);
$$row_adjunct = mysql_fetch_assoc($$adjunct);
$$totalRows_adjunct = mysql_num_rows($$adjunct);
}
$query_adjunct2PPG = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_adjunct2['adjunctYield']);
$adjunct2PPG = mysql_query($query_adjunct2PPG, $brewing) or die(mysql_error());
$row_adjunct2PPG = mysql_fetch_assoc($adjunct2PPG);
$query_adjunctPPG1 = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_adjunct1['adjunctYield']); $query_adjunct3 = "SELECT adjunctYield, adjunctLovibond FROM adjuncts WHERE adjunctName='$brewAdjunct3'";
$adjunctPPG1 = mysql_query($query_adjunctPPG1, $brewing); $adjunct3 = mysql_query($query_adjunct3, $brewing) or die(mysql_error());
$row_adjunctPPG1 = mysql_fetch_assoc($adjunctPPG1); $row_adjunct3 = mysql_fetch_assoc($adjunct3);
$query_adjunctPPG2 = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_adjunct2['adjunctYield']); $query_adjunct3PPG = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_adjunct3['adjunctYield']);
$adjunctPPG2 = mysql_query($query_adjunctPPG2, $brewing); $adjunct3PPG = mysql_query($query_adjunct3PPG, $brewing) or die(mysql_error());
$row_adjunctPPG2 = mysql_fetch_assoc($adjunctPPG2); $row_adjunct3PPG = mysql_fetch_assoc($adjunct3PPG);
$query_adjunctPPG3 = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_adjunct3['adjunctYield']); $query_adjunct4 = "SELECT adjunctYield, adjunctLovibond FROM adjuncts WHERE adjunctName='$brewAdjunct4'";
$adjunctPPG3 = mysql_query($query_adjunctPPG3, $brewing); $adjunct4 = mysql_query($query_adjunct4, $brewing) or die(mysql_error());
$row_adjunctPPG3 = mysql_fetch_assoc($adjunctPPG3); $row_adjunct4 = mysql_fetch_assoc($adjunct4);
$query_adjunctPPG4 = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_adjunct4['adjunctYield']); $query_adjunct4PPG = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_adjunct4['adjunctYield']);
$adjunctPPG4 = mysql_query($query_adjunctPPG4, $brewing); $adjunct4PPG = mysql_query($query_adjunct4PPG, $brewing) or die(mysql_error());
$row_adjunctPPG4 = mysql_fetch_assoc($adjunctPPG4); $row_adjunct4PPG = mysql_fetch_assoc($adjunct4PPG);
$query_adjunctPPG5 = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_adjunct5['adjunctYield']); $query_adjunct5 = "SELECT adjunctYield, adjunctLovibond FROM adjuncts WHERE id='$brewAdjunct5'";
$adjunctPPG5 = mysql_query($query_adjunctPPG5, $brewing); $adjunct5 = mysql_query($query_adjunct5, $brewing) or die(mysql_error());
$row_adjunctPPG5 = mysql_fetch_assoc($adjunctPPG5); $row_adjunct5 = mysql_fetch_assoc($adjunct5);
$query_adjunctPPG6 = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_adjunct6['adjunctYield']); $query_adjunct5PPG = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_adjunct5['adjunctYield']);
$adjunctPPG6 = mysql_query($query_adjunctPPG6, $brewing); $adjunct5PPG = mysql_query($query_adjunct5PPG, $brewing) or die(mysql_error());
$row_adjunctPPG6 = mysql_fetch_assoc($adjunctPPG6); $row_adjunct5PPG = mysql_fetch_assoc($adjunct5PPG);
$query_adjunctPPG7 = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_adjunct7['adjunctYield']); $query_adjunct6 = "SELECT adjunctYield, adjunctLovibond FROM adjuncts WHERE adjunctName='$brewAdjunct6'";
$adjunctPPG7 = mysql_query($query_adjunctPPG7, $brewing); $adjunct6 = mysql_query($query_adjunct6, $brewing) or die(mysql_error());
$row_adjunctPPG7 = mysql_fetch_assoc($adjunctPPG7); $row_adjunct6 = mysql_fetch_assoc($adjunct6);
$query_adjunctPPG8 = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_adjunct8['adjunctYield']); $query_adjunct6PPG = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_adjunct6['adjunctYield']);
$adjunctPPG8 = mysql_query($query_adjunctPPG8, $brewing); $adjunct6PPG = mysql_query($query_adjunct6PPG, $brewing) or die(mysql_error());
$row_adjunctPPG8 = mysql_fetch_assoc($adjunctPPG8); $row_adjunct6PPG = mysql_fetch_assoc($adjunct6PPG);
$query_adjunctPPG9 = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_adjunct9['adjunctYield']); $query_adjunct7 = "SELECT adjunctYield, adjunctLovibond FROM adjuncts WHERE adjunctName='$brewAdjunct7'";
$adjunctPPG9 = mysql_query($query_adjunctPPG9, $brewing); $adjunct7 = mysql_query($query_adjunct7, $brewing) or die(mysql_error());
$row_adjunctPPG9 = mysql_fetch_assoc($adjunctPPG9); $row_adjunct7 = mysql_fetch_assoc($adjunct7);
$query_adjunct7PPG = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_adjunct7['adjunctYield']);
$adjunct7PPG = mysql_query($query_adjunct7PPG, $brewing) or die(mysql_error());
$row_adjunct7PPG = mysql_fetch_assoc($adjunct7PPG);
$query_adjunct8 = "SELECT adjunctYield, adjunctLovibond FROM adjuncts WHERE adjunctName='$brewAdjunct8'";
$adjunct8 = mysql_query($query_adjunct8, $brewing) or die(mysql_error());
$row_adjunct8 = mysql_fetch_assoc($adjunct8);
$query_adjunct8PPG = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_adjunct8['adjunctYield']);
$adjunct8PPG = mysql_query($query_adjunct8PPG, $brewing) or die(mysql_error());
$row_adjunct8PPG = mysql_fetch_assoc($adjunct8PPG);
$query_adjunct9 = "SELECT adjunctYield, adjunctLovibond FROM adjuncts WHERE adjunctName='$brewAdjunct9'";
$adjunct9 = mysql_query($query_adjunct9, $brewing) or die(mysql_error());
$row_adjunct9 = mysql_fetch_assoc($adjunct9);
$query_adjunct9PPG = sprintf("SELECT sugarPPG FROM sugar_type WHERE id='%s'", $row_adjunct9['adjunctYield']);
$adjunct9PPG = mysql_query($query_adjunct9PPG, $brewing) or die(mysql_error());
$row_adjunct9PPG = mysql_fetch_assoc($adjunct9PPG);
// Extract Gravity Units (GU) // Extract Gravity Units (GU)
if ($row_pref['measWeight2'] == "pounds") { if ($row_pref['measWeight2'] == "pounds") {
@@ -307,27 +328,27 @@ $grain15GU = ($brewGrain15Weight * 2.2046) * $row_grainPPG15['sugarPPG'];
// Adjunct Gravity Units // Adjunct Gravity Units
if ($row_pref['measWeight2'] == "pounds") { if ($row_pref['measWeight2'] == "pounds") {
$adjunct1GU = $brewAdjunct1Weight * $row_adjunctPPG1['sugarPPG']; $adjunct1GU = $brewAdjunct1Weight * $row_adjunct1PPG['sugarPPG'];
$adjunct2GU = $brewAdjunct2Weight * $row_adjunctPPG2['sugarPPG']; $adjunct2GU = $brewAdjunct2Weight * $row_adjunct2PPG['sugarPPG'];
$adjunct3GU = $brewAdjunct3Weight * $row_adjunctPPG3['sugarPPG']; $adjunct3GU = $brewAdjunct3Weight * $row_adjunct3PPG['sugarPPG'];
$adjunct4GU = $brewAdjunct4Weight * $row_adjunctPPG4['sugarPPG']; $adjunct4GU = $brewAdjunct4Weight * $row_adjunct4PPG['sugarPPG'];
$adjunct5GU = $brewAdjunct5Weight * $row_adjunctPPG5['sugarPPG']; $adjunct5GU = $brewAdjunct5Weight * $row_adjunct5PPG['sugarPPG'];
$adjunct6GU = $brewAdjunct6Weight * $row_adjunctPPG6['sugarPPG']; $adjunct6GU = $brewAdjunct6Weight * $row_adjunct6PPG['sugarPPG'];
$adjunct7GU = $brewAdjunct7Weight * $row_adjunctPPG7['sugarPPG']; $adjunct7GU = $brewAdjunct7Weight * $row_adjunct7PPG['sugarPPG'];
$adjunct8GU = $brewAdjunct8Weight * $row_adjunctPPG8['sugarPPG']; $adjunct8GU = $brewAdjunct8Weight * $row_adjunct8PPG['sugarPPG'];
$adjunct9GU = $brewAdjunct9Weight * $row_adjunctPPG9['sugarPPG']; $adjunct9GU = $brewAdjunct9Weight * $row_adjunct9PPG['sugarPPG'];
} }
if ($row_pref['measWeight2'] == "kilograms") { if ($row_pref['measWeight2'] == "kilograms") {
$adjunct1GU = ($brewAdjunct1Weight * 2.2046) * $row_adjunctPPG1['sugarPPG']; $adjunct1GU = ($brewAdjunct1Weight * 2.2046) * $row_adjunct1PPG['sugarPPG'];
$adjunct2GU = ($brewAdjunct2Weight * 2.2046) * $row_adjunctPPG2['sugarPPG']; $adjunct2GU = ($brewAdjunct2Weight * 2.2046) * $row_adjunct2PPG['sugarPPG'];
$adjunct3GU = ($brewAdjunct3Weight * 2.2046) * $row_adjunctPPG3['sugarPPG']; $adjunct3GU = ($brewAdjunct3Weight * 2.2046) * $row_adjunct3PPG['sugarPPG'];
$adjunct4GU = ($brewAdjunct4Weight * 2.2046) * $row_adjunctPPG4['sugarPPG']; $adjunct4GU = ($brewAdjunct4Weight * 2.2046) * $row_adjunct4PPG['sugarPPG'];
$adjunct5GU = ($brewAdjunct5Weight * 2.2046) * $row_adjunctPPG5['sugarPPG']; $adjunct5GU = ($brewAdjunct5Weight * 2.2046) * $row_adjunct5PPG['sugarPPG'];
$adjunct6GU = ($brewAdjunct6Weight * 2.2046) * $row_adjunctPPG6['sugarPPG']; $adjunct6GU = ($brewAdjunct6Weight * 2.2046) * $row_adjunct6PPG['sugarPPG'];
$adjunct7GU = ($brewAdjunct7Weight * 2.2046) * $row_adjunctPPG7['sugarPPG']; $adjunct7GU = ($brewAdjunct7Weight * 2.2046) * $row_adjunct7PPG['sugarPPG'];
$adjunct8GU = ($brewAdjunct8Weight * 2.2046) * $row_adjunctPPG8['sugarPPG']; $adjunct8GU = ($brewAdjunct8Weight * 2.2046) * $row_adjunct8PPG['sugarPPG'];
$adjunct9GU = ($brewAdjunct9Weight * 2.2046) * $row_adjunctPPG9['sugarPPG']; $adjunct9GU = ($brewAdjunct9Weight * 2.2046) * $row_adjunct9PPG['sugarPPG'];
} }
// Total Gravity Units (GU) // Total Gravity Units (GU)

42
admin/tools/main.php
View File

@@ -2,30 +2,34 @@
<table> <table>
<tr> <tr>
<td class="data_icon" width="1%"><img src="<?php echo $imageSrc; ?>calculator.png"></td> <td class="data_icon" width="1%"><img src="<?php echo $imageSrc; ?>calculator.png"></td>
<td class="data" width="33%"><a href="calculate.php?section=bitterness" title="<?php echo $row_pref['menuCalculators']; ?>">Bitterness Calculator</a></td> <td width="28%" class="data"><a href="calculate.php?section=bitterness" title="<?php echo $row_pref['menuCalculators']; ?>">Bitterness Calculator</a></td>
<td class="data_icon" width="1%"><img src="<?php echo $imageSrc; ?>calculator.png"></td>
<td class="data" width="33%"><a href="calculate.php?section=calories" title="<?php echo $row_pref['menuCalculators']; ?>">Calories, Alcohol, and Plato Calculator</a></td>
<td class="data_icon" width="1%"><img src="<?php echo $imageSrc; ?>calculator.png" /></td> <td class="data_icon" width="1%"><img src="<?php echo $imageSrc; ?>calculator.png" /></td>
<td class="data"><a href="calculate.php?section=force_carb" title="<?php echo $row_pref['menuCalculators']; ?>">Force Carbonation Calculator</a></td> <td class="data"><a href="calculate.php?section=efficiency" title="<?php echo $row_pref['menuCalculators']; ?>">Brewhouse Efficiency Calculator</a></td>
<td class="data_icon" width="1%"><img src="<?php echo $imageSrc; ?>calculator.png"></td>
<td width="33%" class="data"><a href="calculate.php?section=calories" title="<?php echo $row_pref['menuCalculators']; ?>">Calories, Alcohol, and Plato Calculator</a></td>
</tr> </tr>
<tr> <tr>
<td class="data_icon"><img src="<?php echo $imageSrc; ?>calculator.png" /></td> <td class="data_icon"><img src="<?php echo $imageSrc; ?>calculator.png" /></td>
<td class="data"><a href="calculate.php?section=plato" title="<?php echo $row_pref['menuCalculators']; ?>">Plato/Brix/SG Calculator</a></td> <td width="28%" class="data"><a href="calculate.php?section=force_carb" title="<?php echo $row_pref['menuCalculators']; ?>">Force Carbonation Calculator</a></td>
<td class="data_icon"><img src="<?php echo $imageSrc; ?>calculator.png" /></td>
<td class="data"><a href="calculate.php?section=efficiency" title="<?php echo $row_pref['menuCalculators']; ?>">PPG and Efficiency Calculator</a></td>
<td class="data_icon"><img src="<?php echo $imageSrc; ?>calculator.png" /></td>
<td class="data"><a href="calculate.php?section=sugar" title="<?php echo $row_pref['menuCalculators']; ?>">Priming Sugar Calculator</a></td>
</tr>
<tr>
<td class="data_icon"><img src="<?php echo $imageSrc; ?>calculator.png"></td>
<td class="data"><a href="../index.php?action=chooseRecalc" target="_parent">Recalculate a Recipe or Log</a></td>
<td class="data_icon"><img src="<?php echo $imageSrc; ?>calculator.png"></td>
<td class="data"><a href="../index.php?action=calculate" target="_parent">Recipe Calculator</a></td>
<td class="data_icon"><img src="<?php echo $imageSrc; ?>calculator.png" /></td>
<td class="data"><a href="calculate.php?section=water" title="<?php echo $row_pref['menuCalculators']; ?>">Water Amounts Calculator</a></td>
</tr>
<tr>
<td class="data_icon"><img src="<?php echo $imageSrc; ?>calculator.png"></td> <td class="data_icon"><img src="<?php echo $imageSrc; ?>calculator.png"></td>
<td class="data"><a href="calculate.php?section=hyd" title="<?php echo $row_pref['menuCalculators']; ?>">Hydrometer Correction Calculator</a></td> <td class="data"><a href="calculate.php?section=hyd" title="<?php echo $row_pref['menuCalculators']; ?>">Hydrometer Correction Calculator</a></td>
<td class="data_icon"><img src="<?php echo $imageSrc; ?>calculator.png" /></td>
<td width="33%" class="data"><a href="calculate.php?section=plato" title="<?php echo $row_pref['menuCalculators']; ?>">Plato/Brix/SG Calculator</a></td>
</tr>
<tr>
<td class="data_icon"><img src="<?php echo $imageSrc; ?>calculator.png" /></td>
<td width="28%" class="data"><a href="calculate.php?section=sugar" title="<?php echo $row_pref['menuCalculators']; ?>">Priming Sugar Calculator</a></td>
<td class="data_icon"><img src="<?php echo $imageSrc; ?>calculator.png" /></td>
<td class="data"><a href="calculate.php?section=strike" title="<?php echo $row_pref['menuCalculators']; ?>">Strike Water Temperature Calculator</a></td>
<td class="data_icon"><img src="<?php echo $imageSrc; ?>calculator.png" /></td>
<td width="33%" class="data"><a href="calculate.php?section=water" title="<?php echo $row_pref['menuCalculators']; ?>">Water Amounts Calculator</a></td>
</tr>
<tr>
<td class="data_icon"><img src="<?php echo $imageSrc; ?>calculator.png"></td>
<td width="28%" class="data"><a href="../index.php?action=chooseRecalc" target="_parent">Recalculate a Recipe or Log</a></td>
<td class="data_icon"><img src="<?php echo $imageSrc; ?>calculator.png"></td>
<td class="data"><a href="../index.php?action=calculate" target="_parent">Recipe Calculator</a></td>
</tr>
<tr>
</tr> </tr>
</table> </table>

8
admin/tools/recipe_calculator.php
View File

@@ -410,7 +410,8 @@ if ($results != "verify") {
<?php do { ?> <?php do { ?>
<option value="<?php echo $row_adjuncts['adjunctName']; ?>" <?php if ($results == "true") { if ($brewAdjunct1 == $row_adjuncts['adjunctName']) echo "SELECTED"; } if ((($source == "recipes") || ($source == "brewing")) && ($results == "false")) { if ($row_recipeRecalc['brewAddition1'] == $row_adjuncts['adjunctName']) echo "SELECTED"; } ?>><?php echo $row_adjuncts['adjunctName']; ?></option> <option value="<?php echo $row_adjuncts['adjunctName']; ?>" <?php if ($results == "true") { if ($brewAdjunct1 == $row_adjuncts['adjunctName']) echo "SELECTED"; } if ((($source == "recipes") || ($source == "brewing")) && ($results == "false")) { if ($row_recipeRecalc['brewAddition1'] == $row_adjuncts['adjunctName']) echo "SELECTED"; } ?>><?php echo $row_adjuncts['adjunctName']; ?></option>
<?php } while ($row_adjuncts = mysql_fetch_assoc($adjuncts)); $rows = mysql_num_rows($adjuncts); if($rows > 0) { mysql_data_seek($adjuncts, 0); $row_adjuncts = mysql_fetch_assoc($adjuncts); } ?> <?php } while ($row_adjuncts = mysql_fetch_assoc($adjuncts)); $rows = mysql_num_rows($adjuncts); if($rows > 0) { mysql_data_seek($adjuncts, 0); $row_adjuncts = mysql_fetch_assoc($adjuncts); } ?>
</select> </td> </select>
</td>
<td class="dataLabel">Weight:</td> <td class="dataLabel">Weight:</td>
<td class="data" width="5%"><input name="brewAdjunct1Weight" type="text" id="brewAdjunct1Weight" size="5" value="<?php if ($results == "true") echo $brewAdjunct1Weight; if ((($source == "recipes") || ($source == "brewing")) && ($results == "false")) echo $row_recipeRecalc['brewAddition1Amt']; ?>"> <td class="data" width="5%"><input name="brewAdjunct1Weight" type="text" id="brewAdjunct1Weight" size="5" value="<?php if ($results == "true") echo $brewAdjunct1Weight; if ((($source == "recipes") || ($source == "brewing")) && ($results == "false")) echo $row_recipeRecalc['brewAddition1Amt']; ?>">
<td class="data"><?php echo $row_pref['measWeight2']; ?></td> <td class="data"><?php echo $row_pref['measWeight2']; ?></td>
@@ -421,9 +422,10 @@ if ($results != "verify") {
<select name="brewAdjunct2" id="brewAdjunct2"> <select name="brewAdjunct2" id="brewAdjunct2">
<option value=""></option> <option value=""></option>
<?php do { ?> <?php do { ?>
<option value="<?php echo $row_adjuncts['adjunctName']; ?>" <?php if ($results == "true") { if ($brewAdjunct2 == $row_adjuncts['adjunctName']) echo "SELECTED"; } if (($source == "recipes") || ($source == "brewing")) { if ($row_recipeRecalc['brewAddition2'] == $row_adjuncts['adjunctName']) echo "SELECTED"; } ?>><?php echo $row_adjuncts['adjunctName']; ?></option> <option value="<?php echo $row_adjuncts['adjunctName']; ?>" <?php if ($results == "true") { if ($brewAdjunct2 == $row_adjuncts['adjunctName']) echo "SELECTED"; } if ((($source == "recipes") || ($source == "brewing")) && ($results == "false")) { if ($row_recipeRecalc['brewAddition2'] == $row_adjuncts['adjunctName']) echo "SELECTED"; } ?>><?php echo $row_adjuncts['adjunctName']; ?></option>
<?php } while ($row_adjuncts = mysql_fetch_assoc($adjuncts)); $rows = mysql_num_rows($adjuncts); if($rows > 0) { mysql_data_seek($adjuncts, 0); $row_adjuncts = mysql_fetch_assoc($adjuncts); } ?> <?php } while ($row_adjuncts = mysql_fetch_assoc($adjuncts)); $rows = mysql_num_rows($adjuncts); if($rows > 0) { mysql_data_seek($adjuncts, 0); $row_adjuncts = mysql_fetch_assoc($adjuncts); } ?>
</select> </td> </select>
</td>
<td class="dataLabel">Weight:</td> <td class="dataLabel">Weight:</td>
<td class="data"><input name="brewAdjunct2Weight" type="text" id="brewAdjunct2Weight" size="5" value="<?php if ($results == "true") echo $brewAdjunct2Weight; if ((($source == "recipes") || ($source == "brewing")) && ($results == "false")) echo $row_recipeRecalc['brewAddition2Amt']; ?>"> <td class="data"><input name="brewAdjunct2Weight" type="text" id="brewAdjunct2Weight" size="5" value="<?php if ($results == "true") echo $brewAdjunct2Weight; if ((($source == "recipes") || ($source == "brewing")) && ($results == "false")) echo $row_recipeRecalc['brewAddition2Amt']; ?>">
<td class="data"><?php echo $row_pref['measWeight2']; ?></td> <td class="data"><?php echo $row_pref['measWeight2']; ?></td>

1
css/1.css
View File

@@ -2,6 +2,7 @@
body { body {
margin:0; margin:0;
padding:0; padding:0;
line-height: 1.4; line-height: 1.4;

3
css/html_elements.css
View File

@@ -6,12 +6,11 @@ body {
font-size: 100%; /* Fixes exaggerated text resizing in IE6 and IE7 */ font-size: 100%; /* Fixes exaggerated text resizing in IE6 and IE7 */
} }
body, caption, input, textarea, select, option, legend, fieldset { caption, input, textarea, select, option, legend, fieldset {
font-family: Verdana, Arial, Helvetica, "Bitstream Vera Sans", sans-serif; font-family: Verdana, Arial, Helvetica, "Bitstream Vera Sans", sans-serif;
} }
th, td { th, td {
font-family: Verdana, Arial, Helvetica, "Bitstream Vera Sans", sans-serif;
vertical-align: top; vertical-align: top;
} }

13
css/print.css
View File

@@ -3,9 +3,10 @@ margin: 10px;
padding:0; padding:0;
line-height: 1.25; line-height: 1.25;
color: #000000; color: #000000;
font-size: 11px; font-size: 12px;
background-color: #FFFFFF; background-color: #FFFFFF;
text-align: center; text-align: center;
font-family: Arial, Helvetica, sans-serif;
} }
/* ------------------ global link styles ------------------ */ /* ------------------ global link styles ------------------ */
@@ -28,8 +29,8 @@ color: #000000; text-decoration: none;
#subtitle { #subtitle {
padding: 0px 0px 10px 0px; padding: 0px 0px 10px 0px;
margin-top: 0px; margin-top: 0px;
font-family: Georgia, "Times New Roman", Times, serif; font-family: Arial Black, Gadget, sans-serif;
font-size: 20px; font-size: 1.75em;
font-weight: bold; font-weight: bold;
} }
@@ -108,13 +109,13 @@ font-size: 9px;
.headerContent { .headerContent {
clear: left; clear: left;
width: inherit; width: inherit;
height: 20px; height: 1.5em;
padding: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;
text-align: left; text-align: left;
border-bottom: 1px dashed #000000; border-bottom: 1px dashed #000000;
font-size: 16px; font-size: 1.5em;
color: #000000; color: #000000;
font-family: Georgia, "Times New Roman", Times, serif; font-family: Arial Black, Gadget, sans-serif;
font-weight: bold; font-weight: bold;
margin-bottom: 10px; margin-bottom: 10px;
margin-top: 15px; margin-top: 15px;

4
includes/abv.inc.php
View File

@@ -17,8 +17,8 @@ $fg_featured = $row_featured['brewFG'];
if (($page == "brewBlogCurrent") || ($page == "brewBlogList") || ($page == "brewBlogDetail") || ($page == "logPrint") || ($page == "recipePrint") || ($page == "recipeList") || ($page == "recipeDetail")) { if (($page == "brewBlogCurrent") || ($page == "brewBlogList") || ($page == "brewBlogDetail") || ($page == "logPrint") || ($page == "recipePrint") || ($page == "recipeList") || ($page == "recipeDetail")) {
// Square OG and FG // Square OG and FG
$og2 = $og * $og; $og2 = pow($og,2);
$fg2 = $fg * $fg; $fg2 = pow($fg,2);
// Degrees Plato Calculation // Degrees Plato Calculation
$plato_i = (-463.37) + (668.72 * $og) - (205.35 * $og2); $plato_i = (-463.37) + (668.72 * $og) - (205.35 * $og2);

8
includes/db_connect_log.inc.php
View File

@@ -197,7 +197,7 @@ if (($row_pref['mode'] == "2") && ($filter != "all")) {
mysql_select_db($database_brewing, $brewing); mysql_select_db($database_brewing, $brewing);
$result = mysql_query("SELECT count(*) FROM brewing WHERE brewBrewerID = '$filter'"); $result = mysql_query("SELECT count(*) FROM brewing WHERE brewBrewerID = '$filter'");
$total = mysql_result($result, 0); $total = mysql_result($result, 0);
$list = mysql_query("SELECT * FROM brewing WHERE brewBrewerID = '$filter' ORDER BY brewDate DESC LIMIT $start, $display") or die(mysql_error()); $list = mysql_query("SELECT * FROM brewing WHERE brewArchive='' OR brewArchive='N' AND brewBrewerID = '$filter'ORDER BY brewDate DESC LIMIT $start, $display") or die(mysql_error());
$row_list = mysql_fetch_assoc($list); $row_list = mysql_fetch_assoc($list);
} }
@@ -630,13 +630,13 @@ $totalRows_status = mysql_num_rows($status);
// Status - multi-user // Status - multi-user
if ($row_pref['mode'] == "2") { if ($row_pref['mode'] == "2") {
mysql_select_db($database_brewing, $brewing); mysql_select_db($database_brewing, $brewing);
$countStatus = sprintf("SELECT * FROM brewing WHERE brewBrewerID = '%s' AND brewStatus NOT LIKE '%s' AND brewArchive NOT LIKE '%s' ORDER BY brewStatus,brewName ASC", $filter, "", "Y"); $countStatus = sprintf("SELECT * FROM brewing WHERE brewBrewerID = '%s' AND brewStatus NOT LIKE '' AND brewArchive NOT LIKE '%s' ORDER BY brewStatus,brewName ASC", $filter, "Y");
$query_count = mysql_query($countStatus, $brewing) or die(mysql_error()); $query_count = mysql_query($countStatus, $brewing) or die(mysql_error());
$total_status = mysql_num_rows($query_count); $total_status = mysql_num_rows($query_count);
mysql_select_db($database_brewing, $brewing); mysql_select_db($database_brewing, $brewing);
if ($page == "profile") $query_status = sprintf("SELECT * FROM brewing WHERE brewBrewerID = '%s' AND brewStatus NOT LIKE '%s' AND brewArchive NOT LIKE '%s' ORDER BY brewStatus,brewName ASC", $filter, "", "Y"); if ($page == "profile") $query_status = sprintf("SELECT * FROM brewing WHERE brewBrewerID = '%s' AND brewStatus NOT LIKE '' AND brewArchive NOT LIKE 'Y' ORDER BY brewStatus,brewName ASC", $filter);
else $query_status = sprintf("SELECT * FROM brewing WHERE brewBrewerID = '%s' AND brewStatus NOT LIKE '%s' ORDER BY brewStatus,brewName,brewDate DESC", $row_log['brewBrewerID'], ""); else $query_status = sprintf("SELECT * FROM brewing WHERE brewBrewerID = '%s' AND brewStatus NOT LIKE '' AND brewArchive NOT LIKE 'Y' ORDER BY brewStatus,brewName,brewDate DESC", $row_log['brewBrewerID']);
if ($total_status > 25) $query_status .= " LIMIT 25"; if ($total_status > 25) $query_status .= " LIMIT 25";
$status = mysql_query($query_status, $brewing) or die(mysql_error()); $status = mysql_query($query_status, $brewing) or die(mysql_error());
$row_status = mysql_fetch_assoc($status); $row_status = mysql_fetch_assoc($status);

224
print.php Normal file
View File

@@ -0,0 +1,224 @@
<?php
// Set up a root path constant
define('ROOT', getcwd().'/');
// Define the config, includes, connections, and application folders
define('CONFIG', ROOT.'config/');
define('IMAGES', ROOT.'images/');
define('INCLUDES', ROOT.'includes/');
define('SECTIONS', ROOT.'sections/');
define('CONNECTIONS', ROOT.'Connections/');
define('LABELS', ROOT.'label_images/');
//image dir / SQL information and connect to MySQL server
require_once (CONNECTIONS.'config.php');
include (INCLUDES.'url_variables.inc.php');
$page = "logPrint";
if (isset($_GET['page'])) {
$page = (get_magic_quotes_gpc()) ? $_GET['page'] : addslashes($_GET['page']);
}
//if ($source == "brewLog") { $page == "logPrint"; }
//if ($source == "brewLogRecipe") { $page == "recipePrint"; }
//if ($source == "recipeDB") { $page == "recipePrint"; }
$scale = $amt;
$colname_style = "-1";
if (isset($_GET['brewStyle'])) {
$colname_style = (get_magic_quotes_gpc()) ? $_GET['brewStyle'] : addslashes($_GET['brewStyle']);
}
mysql_select_db($database_brewing, $brewing);
$query_style = sprintf("SELECT * FROM styles WHERE brewStyle = '%s'", $colname_style);
$style = mysql_query($query_style, $brewing) or die(mysql_error());
$row_style = mysql_fetch_assoc($style);
$totalRows_style = mysql_num_rows($style);
include (INCLUDES.'db_connect_universal.inc.php');
include (INCLUDES.'db_connect_log.inc.php');
include (INCLUDES.'abv.inc.php');
include (INCLUDES.'color.inc.php');
include (INCLUDES.'check_mobile.inc.php');
include (INCLUDES.'plug-ins.inc.php');
include (INCLUDES.'version.inc.php');
include (SECTIONS.'water_amounts_calc.inc.php');
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<?php if ($view == "limited") { // Yeah, I know it's a hack to get the JS print onload event in Thickbox. But it works.?>
<meta http-equiv="refresh" content="0;URL=print.php?page=<?php echo $page; ?>&source=<?php echo $source; ?>&dbTable=<?php echo $dbTable; ?>&brewStyle=<?php echo $colname_style; if ($amt != "default") echo "&amt=".$amt."&action=scale"; ?>&view=print&id=<?php echo $colname_log; ?>">
<?php } ?>
<title><?php echo $row_log['brewName']; if ($row_name['brewerFirstName'] != "") { ?>: From <?php echo $row_name['brewerFirstName']; ?> <?php echo $row_name['brewerLastName']; ?>'s BrewBlog<?php } ?></title>
<link href="css/html_elements.css" rel="stylesheet" type="text/css">
<link href="css/universal_elements.css" rel="stylesheet" type="text/css">
<link href="css/print.css" rel="stylesheet" type="text/css">
</head>
<body <?php if ($view == "print") echo "onload=\"javascript:window.print()\""; ?>>
<div id="maincontainer">
<?php if ($view == "limited") { // if auto print turned off ?>
<p><img src="../images/printer.png"><span class="data"><a href="javascript:window.print()">Print</a></span></p>
<?php } ?>
<div id="subtitle"><?php echo $row_log['brewName']; ?></div>
<p>From the BrewBlog of <?php echo $row_name['brewerFirstName']; if ($row_name['brewerLastName'] != "" ) echo "&nbsp;".$row_name['brewerLastName']; if ($row_name['brewerCity'] != "" ) echo " &ndash; ".$row_name['brewerCity']; if ($row_name['brewerState'] != "" ) echo ", ".$row_name['brewerState']; if ($row_name['brewerCountry'] != "" ) echo " ".$row_name['brewerCountry']; ?>
<br>Printed <?php print date ( 'F j, Y' );?></p>
<?php if ($row_pref['allowSpecifics'] == "Y") { include (SECTIONS.'recipe_specifics.inc.php'); } ?>
<?php if ($totalRows_style > 0) { ?>
<div class="headerContent">BJCP Style Info: <?php echo $row_style['brewStyle']; ?></div>
<table>
<?php if ($row_style['brewStyleOG'] != "" ) { ?>
<tr>
<td width="15%" class="dataLabelLeft">O.G.:</td>
<td class="data"><?php if ($row_style['brewStyleOG'] == "" ) echo "Varies"; elseif ($row_style['brewStyleOG'] == "Varies" ) echo "Varies"; elseif ($row_style['brewStyleOG'] == "N/A" ) echo "N/A"; else echo $row_style['brewStyleOG']." - ".$row_style['brewStyleOGMax']; ?></td>
</tr>
<?php } ?>
<?php if ($row_style['brewStyleFG'] != "" ) { ?>
<tr>
<td class="dataLabelLeft">F.G.:</td>
<td class="data"><?php if ($row_style['brewStyleFG'] == "" ) echo "Varies"; elseif ($row_style['brewStyleFG'] == "Varies" ) echo "Varies"; elseif ($row_style['brewStyleFG'] == "N/A" ) echo "N/A"; else echo $row_style['brewStyleFG']." - ".$row_style['brewStyleFGMax']; ?></td>
</tr>
<?php } ?>
<?php if ($row_style['brewStyleABV'] != "" ) { ?>
<tr>
<td class="dataLabelLeft">ABV:</td>
<td class="data"> <?php if ($row_style['brewStyleABV'] == "" ) echo "Varies"; elseif ($row_style['brewStyleABV'] == "Varies" ) echo "Varies"; elseif ($row_style['brewStyleABV'] == "N/A" ) echo "N/A"; else echo $row_style['brewStyleABV']." - ".$row_style['brewStyleABVMax']."%"; ?></td>
</tr>
<?php } ?>
<?php if ($row_style['brewStyleIBU'] != "" ) { ?>
<tr>
<td class="dataLabelLeft">Bitterness:</td>
<td class="data"><?php if ($row_style['brewStyleIBU'] == "" ) echo "Varies"; elseif ($row_style['brewStyleIBU'] == "Varies" ) echo "Varies"; elseif ($row_style['brewStyleIBU'] == "N/A" ) echo "N/A"; else echo $row_style['brewStyleIBU']." - ".$row_style['brewStyleIBUMax']." IBUs"; ?></td>
</tr>
<?php } ?>
<?php if ($row_style['brewStyleSRM'] != "" ) { ?>
<tr>
<td class="dataLabelLeft">Color:</td>
<td class="data"><?php if ($row_style['brewStyleSRM'] == "" ) echo "Varies"; elseif ($row_style['brewStyleSRM'] == "Varies" ) echo "Varies"; elseif ($row_style['brewStyleSRM'] == "N/A" ) echo "N/A"; else echo ltrim($row_style['brewStyleSRM'], "0")." - ".ltrim($row_style['brewStyleSRMMax'], "0")." SRM"; ?></td>
</tr>
<?php } ?>
<?php if ($row_style['brewStyleInfo'] != "" ) { ?>
<tr>
<td class="dataLabelLeft">Info:</td>
<td class="data"><?php echo $row_style['brewStyleInfo']; ?></td>
</tr>
<?php } ?>
</table>
<?php } ?>
<?php
if ($row_pref['allowGeneral'] == "Y") { include (SECTIONS.'recipe_general.inc.php'); }
if ($row_pref['allowComments'] == "Y") { if ($page == "logPrint") include (SECTIONS.'recipe_comments.inc.php'); if ($page == "recipePrint") include (SECTIONS.'recipe_notes.inc.php'); }
if ($row_pref['allowRecipe'] == "Y") { include (SECTIONS.'recipe.inc.php'); }
if ($row_pref['allowMash'] == "Y") { include (SECTIONS.'recipe_mash.inc.php'); }
if (($page == "logPrint") && ($row_pref['allowWater'] == "Y")) { include (SECTIONS.'recipe_water.inc.php'); }
if ($row_pref['allowProcedure'] == "Y") { include (SECTIONS.'recipe_procedure.inc.php'); }
if (($page == "logPrint") && ($row_pref['allowSpecialProcedure'] == "Y")) { include (SECTIONS.'recipe_special_procedure.inc.php'); }
if ($row_pref['allowFermentation'] == "Y") { include (SECTIONS.'recipe_fermentation.inc.php'); }
?>
<div id="subtitle" style="page-break-before:always;"><?php echo $row_log['brewName']; ?></div>
<table width="50%">
<tr>
<td class="dataLabelLeft">Date Brewed:</td>
<td class="data bdr1B_black">&nbsp;</td>
</tr>
<tr>
<td class="dataLabelLeft">Brewer/Assistant:</td>
<td class="data bdr1B_black">&nbsp;</td>
</tr>
</table>
<div class="headerContent">Brew Day Data</div>
<table class="dataTable" style="border: 1px solid #000000;">
<tr>
<td class="dataLabel bdr1B_black">&nbsp;</td>
<td width="30%" class="dataLabel bdr1B_black bdr1L_black">Target</td>
<td width="30%" class="dataLabel bdr1B_black bdr1L_black">Actual</td>
</tr>
<?php if ($row_log['brewMethod'] == "All Grain") {
include (SECTIONS.'water_amounts_calc.inc.php');
?>
<tr>
<td class="dataLabel bdr1B_black">Strike Water Amount:</td>
<td class="data bdr1B_black bdr1L_black"><?php if ($row_pref['measFluid2'] == "liters") echo round ($mashWaterMet, 1); else echo round ($mashWater, 1); ?></td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
</tr>
<tr>
<td class="dataLabel bdr1B_black">Strike Water Temperature:</td>
<td class="data bdr1B_black bdr1L_black" bdr1L_black>&nbsp;</td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
</tr>
<tr>
<td class="dataLabel bdr1B_black">Mash Temperature:</td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
</tr>
<tr>
<td class="dataLabel bdr1B_black">Mash Time:</td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
</tr>
<tr>
<td class="dataLabel bdr1B_black">Sparge Water Amount:</td>
<td class="data bdr1B_black bdr1L_black"><?php if ($row_pref['measFluid2'] == "liters") echo round ($spargeWaterMet, 1); else echo round ($spargeWater, 1); ?></td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
</tr>
<tr>
<td class="dataLabel bdr1B_black">Sparge Water Temperature:</td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
</tr>
<tr>
<td class="dataLabel bdr1B_black">Pre-Boil Gravity:</td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
</tr>
<tr>
<td class="dataLabel bdr1B_black">Pre-Boil Amount:</td>
<td class="data bdr1B_black bdr1L_black"><?php echo round ($runoffVol, 1); ?></td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
</tr>
<tr>
<td class="dataLabel bdr1B_black">Post-Boil Amount:</td>
<td class="data bdr1B_black bdr1L_black"><?php echo $finalBoilVol; ?></td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
</tr>
<?php } ?>
<tr>
<td class="dataLabel bdr1B_black">Boil Time:</td>
<td class="data bdr1B_black bdr1L_black"><?php if ($dbTable == "recipes") echo $boilTime; echo $row_log['brewBoilTime']; ?></td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
</tr>
<tr>
<td class="dataLabel bdr1B_black">Original Gravity:</td>
<td class="data bdr1B_black bdr1L_black"><?php if ($row_log['brewOG'] != "") echo $row_log['brewOG']." / ".round((-463.37) + (668.72 * $row_log['brewOG']) - (205.35 * (pow($row_log['brewOG'],2))), 1)."&deg; P"; elseif ($row_log['brewTargetOG'] != "") echo $row_log['brewTargetOG']." / ".round((-463.37) + (668.72 * $row_log['brewTargetOG']) - (205.35 * (pow($row_log['brewTargetOG'],2))), 1)."&deg; P"; else echo ""; ?></td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
</tr>
<tr>
<td class="dataLeft bdr1B_black">&nbsp;</td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
</tr>
<tr>
<td class="dataLeft bdr1B_black">&nbsp;</td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
</tr>
<tr>
<td class="dataLeft bdr1B_black">&nbsp;</td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
</tr>
<tr>
<td class="dataLeft bdr1B_black">&nbsp;</td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
<td class="data bdr1B_black bdr1L_black">&nbsp;</td>
</tr>
</table>
<div class="headerContent">Brew Day Notes</div>
<table class="dataTable" style="border: 1px solid #000000;">
<tr>
<td style="height: 200px;">&nbsp;</td>
</tr>
</table>
<p><div id="footerInclude">Printed using BrewBlogger <?php echo $version; ?>, brewing log software for PHP and MySQL, available at http://www.brewblogger.net.</div></p>
</div>
</body>
</html>

2
sections/brewblogList.inc.php
View File

@@ -19,7 +19,7 @@
</div> </div>
<?php } else { ?> <?php } else { ?>
<?php if ($totalRows_featured > 0) { if (($row_pref['mode'] == "1") || (($row_pref['mode'] == "2") && ($filter == "all"))) include ('featured.inc.php'); } ?> <?php if ($totalRows_featured > 0) { if (($row_pref['mode'] == "1") || (($row_pref['mode'] == "2") && ($filter == "all"))) include ('featured.inc.php'); } ?>
<?php if ($totalRows_featured > 0) { if (($row_pref['mode'] == "1") || (($row_pref['mode'] == "2") && ($filter == "all"))) { ?><div id="headerContentAdmin">All <?php echo $dbName; ?></div><?php } } ?> <?php if ($totalRows_featured > 0) { if (($row_pref['mode'] == "1") || (($row_pref['mode'] == "2") && ($filter == "all"))) { ?><div class="headerContentAdmin">All <?php echo $dbName; ?></div><?php } } ?>
<table class="dataTable"> <table class="dataTable">
<tr> <tr>
<?php if ($style != "all") { ?> <?php if ($style != "all") { ?>

2
sections/featured.inc.php
View File

@@ -1,4 +1,4 @@
<div id="headerContentAdmin">Featured <?php echo $dbName; ?></div> <div class="headerContentAdmin">Featured <?php echo $dbName; ?></div>
<table class="dataTable"> <table class="dataTable">
<tr> <tr>
<?php if (isset($_SESSION["loginUsername"])) echo "<td class=\"dataHeadingList\" width=\"1%\"><img src=\"".$imageSrc."pencil.png\" border=\"0\" align=\"absmiddle\"></td>"; ?> <?php if (isset($_SESSION["loginUsername"])) echo "<td class=\"dataHeadingList\" width=\"1%\"><img src=\"".$imageSrc."pencil.png\" border=\"0\" align=\"absmiddle\"></td>"; ?>

2
sections/recipeList.inc.php
View File

@@ -19,7 +19,7 @@
</div> </div>
<?php } else { ?> <?php } else { ?>
<?php if ($totalRows_featured > 0) { if (($row_pref['mode'] == "1") || (($row_pref['mode'] == "2") && ($filter == "all"))) include ('featured.inc.php'); } ?> <?php if ($totalRows_featured > 0) { if (($row_pref['mode'] == "1") || (($row_pref['mode'] == "2") && ($filter == "all"))) include ('featured.inc.php'); } ?>
<?php if ($totalRows_featured > 0) { if (($row_pref['mode'] == "1") || (($row_pref['mode'] == "2") && ($filter == "all"))) { ?><div id="headerContentAdmin">All <?php echo $dbName; ?></div><?php } } ?> <?php if ($totalRows_featured > 0) { if (($row_pref['mode'] == "1") || (($row_pref['mode'] == "2") && ($filter == "all"))) { ?><div class="headerContentAdmin">All <?php echo $dbName; ?></div><?php } } ?>
<table class="dataTable"> <table class="dataTable">
<tr> <tr>
<?php if ($style != "all") { ?> <?php if ($style != "all") { ?>

1
sections/recipe_non-fermentables.inc.php
View File

@@ -1,6 +1,7 @@
<?php if (($row_log['brewMisc1Name'] != "") && ($row_log['brewMisc1Amount'] != "")) { // hide entire set of misc rows if first is not present (4) ?> <?php if (($row_log['brewMisc1Name'] != "") && ($row_log['brewMisc1Amount'] != "")) { // hide entire set of misc rows if first is not present (4) ?>
<div class="headerContent"><a name="recipe" id="recipe"></a>Non-Fermentables</div> <div class="headerContent"><a name="recipe" id="recipe"></a>Non-Fermentables</div>
<div class="dataContainer"> <div class="dataContainer">
<table>
<tr> <tr>
<td class="dataLeft"><?php echo $row_log['brewMisc1Amount']; ?></td> <td class="dataLeft"><?php echo $row_log['brewMisc1Amount']; ?></td>
<td class="data"><?php echo $row_log['brewMisc1Name']; if ($row_log['brewMisc1Time'] !="") echo " @ ".$row_log['brewMisc1Time']." minutes"; else echo ""; if ($row_log['brewMisc1Use'] !="") echo " (".$row_log['brewMisc1Use'].")"; else echo ""; ?></td> <td class="data"><?php echo $row_log['brewMisc1Name']; if ($row_log['brewMisc1Time'] !="") echo " @ ".$row_log['brewMisc1Time']." minutes"; else echo ""; if ($row_log['brewMisc1Use'] !="") echo " (".$row_log['brewMisc1Use'].")"; else echo ""; ?></td>

4
sections/recipe_specifics.inc.php
View File

@@ -59,17 +59,19 @@ $totalRows_styles = mysql_num_rows($styles);
</td> </td>
</tr> </tr>
<?php } // Lovibond ?> <?php } // Lovibond ?>
<?php if ($row_log['brewBitterness'] != "" ) { ?> <?php if ($row_log['brewBitterness'] != "") { ?>
<tr> <tr>
<td class="dataLabelLeft">Bitterness (Calc):</td> <td class="dataLabelLeft">Bitterness (Calc):</td>
<td class="data"><?php $IBU = ltrim ($row_log['brewBitterness'], "0"); echo round ($IBU,1)." ".$row_pref['measBitter']; if ($row_log['brewIBUFormula'] != "") echo " (".$row_log['brewIBUFormula'].")"; ?></td> <td class="data"><?php $IBU = ltrim ($row_log['brewBitterness'], "0"); echo round ($IBU,1)." ".$row_pref['measBitter']; if ($row_log['brewIBUFormula'] != "") echo " (".$row_log['brewIBUFormula'].")"; ?></td>
</tr> </tr>
<?php } // Bitterness ?> <?php } // Bitterness ?>
<?php if (($row_log['brewOG'] == "" ) || ($row_log['brewFG'] == "" )) echo ""; else { ?> <?php if (($row_log['brewOG'] == "" ) || ($row_log['brewFG'] == "" )) echo ""; else { ?>
<?php if ($row_log['brewBitterness'] != "") { ?>
<tr> <tr>
<td class="dataLabelLeft">BU/GU:</td> <td class="dataLabelLeft">BU/GU:</td>
<td class="data"><?php $bugu = $row_log['brewBitterness']/(($row_log['brewOG'] - 1) * 1000); echo round ($bugu, 2); ?></td> <td class="data"><?php $bugu = $row_log['brewBitterness']/(($row_log['brewOG'] - 1) * 1000); echo round ($bugu, 2); ?></td>
</tr> </tr>
<?php } ?>
<tr> <tr>
<td class="dataLabelLeft">Calories:</td> <td class="dataLabelLeft">Calories:</td>
<td class="data"><?php echo round ($calories, 0); ?> (12 ounces)</td> <td class="data"><?php echo round ($calories, 0); ?> (12 ounces)</td>

33
sql/2.3.2_new_install.sql
View File

@@ -1892,5 +1892,34 @@ ADD `brewHops15Use` varchar(25) NULL AFTER `brewHops15Time`,
ADD `brewHops15Type` varchar(25) NULL AFTER `brewHops15Use`, ADD `brewHops15Type` varchar(25) NULL AFTER `brewHops15Use`,
ADD `brewHops15Form` varchar(25) NULL AFTER `brewHops15Type`; ADD `brewHops15Form` varchar(25) NULL AFTER `brewHops15Type`;
ALTER TABLE `preferences` INSERT INTO `adjuncts` (`id`, `adjunctName`, `adjunctType`, `adjunctOrigin`, `adjunctSupplier`, `adjunctLovibond`, `adjunctInfo`, `adjunctCategory`, `adjunctYield`)
ADD `hopPelletFactor` FLOAT NOT NULL DEFAULT '1.06' COMMENT 'Pellet factor compared to whole/plug'; VALUES
(NULL, 'Fruit - Blackberries, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Raspberries, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Marionberries, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Blueberries, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Cherries, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Cranberries, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Strawberries, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Watermellon, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Apples, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Grapes, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Peaches, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Blackberries, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Raspberries, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Marionberries, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Blueberries, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Cherries, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Cranberries, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Strawberries, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Watermellon, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Apples, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Raisins', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Peaches, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Prunes', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200');
-- Derived from averages at http://winemaking.jackkeller.net/sugar.asp --
INSERT INTO `sugar_type` (`id`, `sugarName`, `sugarPPG`) VALUES
(200, 'Fruit - Dried', '38'),
(201, 'Fruit - Raw, Fresh/Frozen, No Sugar Added', '13');

34
sql/2.3.2_sql_upgrade.txt → sql/2.3.2_sql_upgrade.sql
View File

@@ -1,6 +1,6 @@
-- SQL Changes: BrewBlogger 2.3.2 -- SQL Changes: BrewBlogger 2.3.2
-- Created February 8, 2010 by gpzhumphrey -- Created February 8, 2010 by gpzhumphrey
-- Modified August 17, 2010 by gpzhumphrey -- Modified September 10, 2010 by gpzhumphrey
INSERT INTO `brewingcss` (`id`, `theme`, `themeName`, `themeColor1`, `themeColor2`) VALUES INSERT INTO `brewingcss` (`id`, `theme`, `themeName`, `themeColor1`, `themeColor2`) VALUES
(NULL, 'SB12.css', 'SB12', '#dae2ec', '#c7d3e3'); (NULL, 'SB12.css', 'SB12', '#dae2ec', '#c7d3e3');
@@ -131,3 +131,35 @@ ADD `brewHops15Form` varchar(25) NULL AFTER `brewHops15Type`;
ALTER TABLE `preferences` ALTER TABLE `preferences`
ADD `hopPelletFactor` FLOAT NOT NULL DEFAULT '1.06' COMMENT 'Pellet factor compared to whole/plug'; ADD `hopPelletFactor` FLOAT NOT NULL DEFAULT '1.06' COMMENT 'Pellet factor compared to whole/plug';
INSERT INTO `adjuncts` (`id`, `adjunctName`, `adjunctType`, `adjunctOrigin`, `adjunctSupplier`, `adjunctLovibond`, `adjunctInfo`, `adjunctCategory`, `adjunctYield`)
VALUES
(NULL, 'Fruit - Blackberries, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Raspberries, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Marionberries, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Blueberries, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Cherries, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Cranberries, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Strawberries, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Watermellon, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Apples, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Grapes, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Peaches, Raw or Frozen', 'Sugar', NULL, NULL, NULL, NULL, NULL, '201'),
(NULL, 'Fruit - Blackberries, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Raspberries, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Marionberries, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Blueberries, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Cherries, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Cranberries, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Strawberries, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Watermellon, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Apples, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Raisins', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Peaches, Dried', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200'),
(NULL, 'Fruit - Prunes', 'Sugar', NULL, NULL, NULL, NULL, NULL, '200');
-- Derived from averages at http://winemaking.jackkeller.net/sugar.asp --
INSERT INTO `sugar_type` (`id`, `sugarName`, `sugarPPG`) VALUES
(200, 'Fruit - Dried', '38'),
(201, 'Fruit - Raw, Fresh/Frozen, No Sugar Added', '13');