diff --git a/admin/process.php b/admin/process.php index fff118d..77ec355 100644 --- a/admin/process.php +++ b/admin/process.php @@ -1222,18 +1222,24 @@ if (($action == "edit") && ($dbTable == "brewing")) { if (($action == "update") && (($dbTable == "brewing") || ($dbTable == "recipes"))) { function get_hop_type($time) { - if ($time > 30) $type = "Bittering"; - if (($time <= 30) && ($time >= 15)) $type = "Flavor"; - if (($time < 15) && ($time >= 0)) $type = "Aroma"; + if ($time != "") { + if ($time > 30) $type = "Bittering"; + if (($time <= 30) && ($time >= 15)) $type = "Flavor"; + if (($time < 15) && ($time >= 0)) $type = "Aroma"; + } + else $type = ""; return $type; } function get_hop_use($time,$boil_time) { - if ($boil_time == "") $boil_time = 60; - if ($time > $boil_time) $use = "First Wort"; - if (($time <= $boil_time) && ($time > 15)) $use = "Boil"; - if (($time <= 15) && ($time > 0)) $use = "Aroma"; - if ($time <= 0) $use = "Dry Hop"; + if ($time != "") { + if ($boil_time == "") $boil_time = 60; + if ($time > $boil_time) $use = "First Wort"; + if (($time <= $boil_time) && ($time > 15)) $use = "Boil"; + if (($time <= 15) && ($time > 0)) $use = "Aroma"; + if ($time <= 0) $use = "Dry Hop"; + } + else $use = ""; return $use; } $brewBitterness = explode("-", $_POST['brewBitterness']); diff --git a/includes/beerXMLparser/input_beer_xml.inc.php b/includes/beerXMLparser/input_beer_xml.inc.php index 7af5344..453e081 100644 --- a/includes/beerXMLparser/input_beer_xml.inc.php +++ b/includes/beerXMLparser/input_beer_xml.inc.php @@ -200,11 +200,12 @@ class InputBeerXML { $fields .= "," . $field; $values .= ",'" . $value . "'"; } - + $fields .= ", brewArchive"; $fields .= ")"; + $values .= ", 'N'"; $values .= ")"; $sqlQuery .= $fields . $values; - // echo $sqlQuery . "
"; + echo $sqlQuery . "
"; mysql_select_db($GLOBALS['database_brewing'], $brewing) or die(mysql_error()); $Result1 = mysql_query($sqlQuery, $brewing) or die(mysql_error()); @@ -391,7 +392,9 @@ class InputBeerXML { $values .= ",'" . $value . "'"; } + $fields .= ", brewArchive"; $fields .= ")"; + $values .= ", 'N'"; $values .= ")"; $sqlQuery .= $fields . $values; //echo $sqlQuery . "
"; diff --git a/includes/output_beer_xml.inc.php b/includes/output_beer_xml.inc.php index 469b3c8..82885a4 100644 --- a/includes/output_beer_xml.inc.php +++ b/includes/output_beer_xml.inc.php @@ -1182,12 +1182,15 @@ $xml_output .= "\n"; $xml_output .= "\t\n"; $xml_output .= "\n"; # This line will stream the file to the user rather than spray it across the screen + $nospace = str_replace(" ", "", $row_log['brewName'] ); $nospace = strtr($nospace, $html_remove); header("Content-Type: application/force-download"); header("Content-Disposition: attachment; filename=".$nospace.".xml"); header("Pragma: no-cache"); header("Expires: 0"); + echo $xml_output; exit(); + ?> diff --git a/sections/brewblogList.inc.php b/sections/brewblogList.inc.php index 2f9bde4..a27cbeb 100644 --- a/sections/brewblogList.inc.php +++ b/sections/brewblogList.inc.php @@ -19,7 +19,7 @@ 0) { if (($row_pref['mode'] == "1") || (($row_pref['mode'] == "2") && ($filter == "all"))) include ('featured.inc.php'); } ?> - 0) { if (($row_pref['mode'] == "1") || (($row_pref['mode'] == "2") && ($filter == "all"))) { ?>
All
+ 0) { if (($row_pref['mode'] == "1") || (($row_pref['mode'] == "2") && ($filter == "all"))) { ?>
All
diff --git a/sections/featured.inc.php b/sections/featured.inc.php index ce63669..1e7157a 100644 --- a/sections/featured.inc.php +++ b/sections/featured.inc.php @@ -23,7 +23,7 @@ $query_styles = sprintf("SELECT * FROM styles WHERE brewStyle='%s'", $row_featured['brewStyle']); $styles = mysql_query($query_styles, $brewing) or die(mysql_error()); $row_styles = mysql_fetch_assoc($styles); - $totalRows_styles = mysql_num_rows($styles); + $totalRows_styles = mysql_num_rows($styles); // Get real user names mysql_select_db($database_brewing, $brewing); diff --git a/sections/news.inc.php b/sections/news.inc.php index 54d11e1..488c9aa 100644 --- a/sections/news.inc.php +++ b/sections/news.inc.php @@ -1,55 +1,55 @@ - -
">
" align="baseline">
Club News/Announcements
- - - -
- 5) { ?> - - - - - - $view)) { ?> - - - - - -
 Limit View To  - = 5) && ($totalRows_newsGen < 15)) { ?>5  - = 15) && ($totalRows_newsGen < 25)) { ?>15  - = 25) { ?>25  - News Items
 All News >>
- - - - - -
Members, 0)) { ?>click herelogin to view club-only news.
- - -
">
- - - - - - - - - - - - - -
  Posted by  
Read the Entire Post >>
- 2) && ($page != "news")) { ?> - - - - - -
 More News >>
+ +
">
" align="baseline">
Club News/Announcements
+ + + + + 5) { ?> + + + + + + $view)) { ?> + + + + + +
 Limit View To  + = 5) && ($totalRows_newsGen < 15)) { ?>5  + = 15) && ($totalRows_newsGen < 25)) { ?>15  + = 25) { ?>25  + News Items
 All News >>
+ + + + + +
Members, 0)) { ?>click herelogin to view club-only news.
+ + +
">
+ + + + + + + + + + + + + +
  Posted by  
Read the Entire Post >>
+ 2) && ($page != "news")) { ?> + + + + + +
 More News >>
\ No newline at end of file diff --git a/sections/printLog.inc.php b/sections/printLog.inc.php index dd51f65..6810514 100644 --- a/sections/printLog.inc.php +++ b/sections/printLog.inc.php @@ -1,5 +1,5 @@ -&id=','','height=600,width=800,toolbar=no,resizable=yes,scrollbars=yes'); return false;" title="Print ">Print Log +&id=&view=print','','height=600,width=800,toolbar=no,resizable=yes,scrollbars=yes'); return false;" title="Print ">Print Log &id=&KeepThis=true&TB_iframe=true&height=450&width=700" title="Print " class="thickbox">Print Log \ No newline at end of file diff --git a/sections/printRecipe.inc.php b/sections/printRecipe.inc.php index 8b1166c..8a24778 100644 --- a/sections/printRecipe.inc.php +++ b/sections/printRecipe.inc.php @@ -1,6 +1,6 @@ -&id=','','height=600,width=800,toolbar=no,resizable=yes,scrollbars=yes'); return false;" title="Print ">Print Recipe -&id=','','height=600,width=800,toolbar=no,resizable=yes,scrollbars=yes'); return false;" title="Print ">Print Recipe +&id=&view=print','','height=600,width=800,toolbar=no,resizable=yes,scrollbars=yes'); return false;" title="Print ">Print Recipe +&id=&view=print','','height=600,width=800,toolbar=no,resizable=yes,scrollbars=yes'); return false;" title="Print ">Print Recipe &id=&KeepThis=true&TB_iframe=true&height=450&width=700" title="Print " class="thickbox">Print Recipe &id=&KeepThis=true&TB_iframe=true&height=450&width=700" title="Print " class="thickbox">Print Recipe diff --git a/sections/printXML.inc.php b/sections/printXML.inc.php index 9b500ae..1b476f3 100644 --- a/sections/printXML.inc.php +++ b/sections/printXML.inc.php @@ -1,2 +1,16 @@ -Output to Beer XML -Output to Beer XML + +Output to Beer XML + +Output to Beer XML + + +Output to Beer XML + +Output to Beer XML + + diff --git a/sections/recipeList.inc.php b/sections/recipeList.inc.php index 6dcd48a..7dd37d7 100644 --- a/sections/recipeList.inc.php +++ b/sections/recipeList.inc.php @@ -19,7 +19,7 @@ 0) { if (($row_pref['mode'] == "1") || (($row_pref['mode'] == "2") && ($filter == "all"))) include ('featured.inc.php'); } ?> - 0) { if (($row_pref['mode'] == "1") || (($row_pref['mode'] == "2") && ($filter == "all"))) { ?>
All
+ 0) { if (($row_pref['mode'] == "1") || (($row_pref['mode'] == "2") && ($filter == "all"))) { ?>
All