RaspberryPints · carvsdriver · Jan 20, 2021 · Jan 20, 2021 · Jan 20, 2021 · Jan 20, 2021
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+img/logo.png
 admin/includes/configp.php
 admin/includes/conn.php
-includes/config.php
+includes/config.php
diff --git a/README.md b/README.md
@@ -35,10 +35,29 @@ __Known Bugs:__
 	- Firefox has difficulty rendering our SRM image masks correctly.
 		Due to a deficiency in the way Firefox handles z-values with images and is a known
 		issue within the MDN.
+        - There are still some problems with the installer related to database
+	  access and configuration that I haven't looked at yet.
 
+	- Tap management is really wonky.  The form does not autopopulate the
+	  values for the beer slected from the drop down.  You have to manually
+	  re-enter them for it to work.  The form will submit and put your keg
+	  into 'serving' state but not show on your tap list.
+
+    	- I haven't tested anything related to the flow meters, so I'm not sure if
+	  any of that still works. Would appreciate a tester here in the meantime
+	  as I do not have flow meters installed in my setup (yet).
 
 __Version History:__
 
+	v2.0.1 (Patch 1):
+		- Fixed mysql to use mysqli
+		- Misc fixes and updatesd
+		- Changes to index.php to unclutter the display
+		- Updates to calorie calcluation and added carb calculation
+
+	v2.0.0:
+		- Revision notes unavailable
+
 	v1.0.3 (hotfix):
 		- Fixed broken links to (external) official website.
 

diff --git a/admin/Mya.php b/admin/Mya.php
@@ -49,26 +49,26 @@
 <?php
 
 $sql="SELECT `name` FROM `users` WHERE username='$_SESSION[myusername]'";
-$result=mysql_query($sql);
+$result=mysqli_query($con,$sql);
 
-echo mysql_result($result, 0, 'name');
+echo mysqli_result($con,$result, 0, 'name');
 ?><br />
 <font size="2" Color="Black" font-family="Impact">Username:</font>
 <?php
 
 $sql="SELECT `username` FROM `users` WHERE username='$_SESSION[myusername]'";
-$result=mysql_query($sql);
+$result=mysqli_query($con,$sql);
 
-echo mysql_result($result, 0, 'username');
+echo mysqli_result($result, 0, 'username');
 
 ?><br />
 <font size="2" Color="Black" font-family="Impact"> Email:</font>
 <?php
 
 $sql="SELECT `email` FROM `users` WHERE username='$_SESSION[myusername]'";
-$result=mysql_query($sql);
+$result=mysqli_query($con,$sql);
 
-echo mysql_result($result, 0, 'email');
+echo mysqli_result($result, 0, 'email');
 
 ?>
 <br />

diff --git a/admin/beer_form.php b/admin/beer_form.php
@@ -1,5 +1,8 @@
 <?php
 session_start();
+ini_set('display_errors', 1);
+ini_set('display_startup_errors', 1);
+error_reporting(E_ALL);
 if(!isset( $_SESSION['myusername'] )){
 	header("location:index.php");
 }
@@ -21,17 +24,17 @@
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
 	$beer = new Beer();
 	$beer->setFromArray($_POST);
-	$beerManager->Save($beer);
+	$beerManager->Save($con, $beer);
 	redirect('beer_list.php');
 }
 
 if( isset($_GET['id'])){
-	$beer = $beerManager->GetById($_GET['id']);
+	$beer = $beerManager->GetById($con, $_GET['id']);
 }else{
 	$beer = new Beer();
 }
 
-$beerStyleList = $beerStyleManager->GetAll();
+$beerStyleList = $beerStyleManager->GetAll($con);
 ?>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

diff --git a/admin/beer_list.php b/admin/beer_list.php
@@ -1,5 +1,8 @@
 <?php
 session_start();
+ini_set('display_errors', 1);
+ini_set('display_startup_errors', 1);
+error_reporting(E_ALL);
 if(!isset( $_SESSION['myusername'] )){
 	header("location:index.php");
 }
@@ -21,10 +24,10 @@
 $beerStyleManager = new BeerStyleManager();
 
 if (isset($_POST['inactivateBeer'])) {
-	$beerManager->Inactivate($_POST['id']);		
+	$beerManager->Inactivate($con, $_POST['id']);		
 }
 
-$beers = $beerManager->GetAllActive();
+$beers = $beerManager->GetAllActive($con);
 ?>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -87,7 +90,7 @@
 									</th>
 									<th width="35%" style="vertical-align: middle;">
 										<b><?php 
-											$beerStyle = $beerStyleManager->GetById($beer->get_beerStyleId());
+											$beerStyle = $beerStyleManager->GetById($con, $beer->get_beerStyleId());
 											if (strpos($beerStyle->get_name(),'Non-beer') !== false)
 												echo str_replace("_Non-beer: ","",$beerStyle->get_name());
 											else

diff --git a/admin/img/logo.png b/admin/img/logo.png
diff --git a/admin/includes/checklogin.php b/admin/includes/checklogin.php
@@ -7,22 +7,23 @@
 require 'conn.php';
 
 // username and password sent from form
+
 $myusername=$_POST['myusername'];
 $mypassword=md5($_POST['mypassword']);
 
 // To protect MySQL injection (more detail about MySQL injection)
 $myusername = stripslashes($myusername);
 $mypassword = stripslashes($mypassword);
 
-$myusername = mysql_real_escape_string($myusername);
-$mypassword = mysql_real_escape_string($mypassword);
+$myusername = mysqli_real_escape_string($con,$myusername);
+$mypassword = mysqli_real_escape_string($con,$mypassword);
 
 
-$sql="SELECT * FROM $tbl_name WHERE username='$myusername' and password='$mypassword'";
-$result=mysql_query($sql);
+$sql="SELECT * FROM " . $tbl_name ." WHERE username='" . $myusername . "' and password='" . $mypassword . "'";
+$result=mysqli_query($con,$sql);
 
 // Mysql_num_row is counting table row
-$count=mysql_num_rows($result);
+$count=mysqli_num_rows($result);
 // If result matched $myusername and $mypassword, table row must be 1 row
 if($count==1){
 // Register $myusername, $mypassword and redirect to file "admin.php"

diff --git a/admin/includes/functions.php b/admin/includes/functions.php
@@ -1,9 +1,9 @@
 <?php
 function redirect($url){
-	echo "<script>window.location = '$url';</script>";
+	echo "<script>window.location = '" . $url . "';</script>";
 	exit();
 }
 
 function encode($string){
 	return htmlentities ($string, ENT_QUOTES);
-}
+}
diff --git a/admin/includes/html_helper.php b/admin/includes/html_helper.php
@@ -5,7 +5,7 @@ class HtmlHelper{
 
 	function ToSelectList($selectName, $items, $nameProperty, $valueProperty, $selectedValue, $defaultName = null, $cssClasses = ""){
 
-		$str = "<select id='$selectName' name='$selectName' class='$cssClasses'>";
+		$str = "<select id='" . $selectName ."' name='" . $selectName ."' class='" . $cssClasses . "'>";
 
 			if( $defaultName ){
 				$str .= "<option value=''>" . $defaultName . "</option>";
@@ -15,7 +15,7 @@ function ToSelectList($selectName, $items, $nameProperty, $valueProperty, $selec
 				$value = $item->{"get_$valueProperty"}();
 				$name = $item->{"get_$nameProperty"}();
 
-				$str .= "<option value='$value' ";
+				$str .= "<option value='" . $value . "' ";
 
 				if( $selectedValue == $value ){
 					$str .= "selected ";
@@ -62,7 +62,7 @@ function ShowMessage(){
 	}
 
 	function CreateMessage($class, $message){
-		return "<div class='$class status'><span>$message</span></div>";
+		return "<div class='$class status'><span>" . $message . "</span></div>";
 	}
 
-}
+}
diff --git a/admin/includes/insert.php b/admin/includes/insert.php
@@ -7,9 +7,10 @@
 require_once '../includes/functions.php';
 
 
-$sql="INSERT INTO beers (name, style, notes, ogEst, fgEst, srmEst, ibuEst, modifiedDate) VALUES ('$_POST[name]','$_POST[style]','$_POST[notes]','$_POST[ogEst]','$_POST[fgEst]','$_POST[srmEst]','$_POST[ibuEst]', NOW())";
+$sql="INSERT INTO beers (name, style, notes, ogEst, fgEst, srmEst, ibuEst, modifiedDate) 
+		VALUES ('" . $_POST[name] . "','" . $_POST[style] . "','" . $_POST[notes] . "','" . $_POST[ogEst] . "','" . $_POST[fgEst] . "','" . $_POST[srmEst] . "','" . $_POST[ibuEst] . "', NOW())";
 
-if (!mysql_query($sql)) {
+if (!mysqli_query($con,$sql)) {
 die('Error: ' . mysql_error());
 }
 

diff --git a/admin/includes/managers/beerStyle_manager.php b/admin/includes/managers/beerStyle_manager.php
@@ -3,12 +3,12 @@
 
 class BeerStyleManager{
 
-	function GetAll(){
+	function GetAll(mysqli $con){
 		$sql="SELECT * FROM beerStyles ORDER BY name";
-		$qry = mysql_query($sql);
+		$qry = mysqli_query($con,$sql);
 
 		$beerStyles = array();
-		while($i = mysql_fetch_array($qry)){
+		while($i = mysqli_fetch_array($qry)){
 			$beerStyle = new beerStyle();
 			$beerStyle->setFromArray($i);
 			$beerStyles[$beerStyle->get_id()] = $beerStyle;
@@ -19,16 +19,16 @@ function GetAll(){
 
 
 
-	function GetById($id){
-		$sql="SELECT * FROM beerStyles WHERE id = $id";
-		$qry = mysql_query($sql);
+	function GetById(mysqli $con, $id){
+		$sql="SELECT * FROM beerStyles WHERE id = " . $id;
+		$qry = mysqli_query($con,$sql);
 
-		if( $i = mysql_fetch_array($qry) ){
+		if( $i = mysqli_fetch_array($qry) ){
 			$beerStyle = new beerStyle();
 			$beerStyle->setFromArray($i);
 			return $beerStyle;
 		}
 
 		return null;
 	}
-}
+}
diff --git a/admin/includes/managers/beer_manager.php b/admin/includes/managers/beer_manager.php
@@ -3,7 +3,7 @@
 
 class BeerManager{
 
-	function Save($beer){
+	function Save(mysqli $con, $beer){
 		$sql = "";
 		if($beer->get_id()){
 			$sql = 	"UPDATE beers " .
@@ -33,15 +33,15 @@ function Save($beer){
 
 		//echo $sql; exit();
 
-		mysql_query($sql);
+		mysqli_query($con, $sql);
 	}
 
-	function GetAll(){
+	function GetAll(mysqli $con){
 		$sql="SELECT * FROM beers ORDER BY name";
-		$qry = mysql_query($sql);
+		$qry = mysqli_query($con,$sql);
 
 		$beers = array();
-		while($i = mysql_fetch_array($qry)){
+		while($i = mysqli_fetch_array($qry)){
 			$beer = new Beer();
 			$beer->setFromArray($i);
 			$beers[$beer->get_id()] = $beer;		
@@ -50,12 +50,12 @@ function GetAll(){
 		return $beers;
 	}
 
-	function GetAllActive(){
+	function GetAllActive(mysqli $con){
 		$sql="SELECT * FROM beers WHERE active = 1 ORDER BY name";
-		$qry = mysql_query($sql);
+		$qry = mysqli_query($con,$sql);
 
 		$beers = array();
-		while($i = mysql_fetch_array($qry)){
+		while($i = mysqli_fetch_array($qry)){
 			$beer = new Beer();
 			$beer->setFromArray($i);
 			$beers[$beer->get_id()] = $beer;	
@@ -64,11 +64,11 @@ function GetAllActive(){
 		return $beers;
 	}
 
-	function GetById($id){
-		$sql="SELECT * FROM beers WHERE id = $id";
-		$qry = mysql_query($sql);
+	function GetById(mysqli $con, $id){
+		$sql="SELECT * FROM beers WHERE id = " . $id;
+		$qry = mysqli_query($con,$sql);
 
-		if( $i = mysql_fetch_array($qry) ){		
+		if( $i = mysqli_fetch_array($qry) ){		
 			$beer = new Beer();
 			$beer->setFromArray($i);
 			return $beer;
@@ -77,19 +77,19 @@ function GetById($id){
 		return null;
 	}
 
-	function Inactivate($id){
-		$sql = "SELECT * FROM taps WHERE beerId = $id AND active = 1";
-		$qry = mysql_query($sql);
+	function Inactivate(mysqli $con, $id){
+		$sql = "SELECT * FROM taps WHERE beerId = " . $id . "AND active = 1";
+		$qry = mysqli_query($con,$sql);
 
-		if( mysql_fetch_array($qry) ){		
+		if( mysqli_fetch_array($qry) ){		
 			$_SESSION['errorMessage'] = "Beer is associated with an active tap and could not be deleted.";
 			return;
 		}
 
-		$sql="UPDATE beers SET active = 0 WHERE id = $id";
+		$sql="UPDATE beers SET active = 0 WHERE id = " .$id;
 		//echo $sql; exit();
-		$qry = mysql_query($sql);
+		$qry = mysqli_query($con,$sql);
 
 		$_SESSION['successMessage'] = "Beer successfully deleted.";
 	}
-}
+}
diff --git a/admin/includes/managers/kegStatus_manager.php b/admin/includes/managers/kegStatus_manager.php
@@ -3,12 +3,12 @@
 
 class KegStatusManager{
 
-	function GetAll(){
+	function GetAll(mysqli $con){
 		$sql="SELECT * FROM kegStatuses ORDER BY name";
-		$qry = mysql_query($sql);
+		$qry = mysqli_query($con,$sql);
 
 		$kegStatuses = array();
-		while($i = mysql_fetch_array($qry)){
+		while($i = mysqli_fetch_array($qry)){
 			$kegStatus = new KegStatus();
 			$kegStatus->setFromArray($i);
 			$kegStatuses[$kegStatus->get_code()] = $kegStatus;		
@@ -17,11 +17,11 @@ function GetAll(){
 		return $kegStatuses;
 	}	
 
-	function GetByCode($code){
-		$sql="SELECT * FROM kegStatuses WHERE code = '$code'";
-		$qry = mysql_query($sql);
+	function GetByCode(mysqli $con, $code){
+		$sql="SELECT * FROM kegStatuses WHERE code = '" . $code . "'";
+		$qry = mysqli_query($con,$sql);
 
-		if( $i = mysql_fetch_array($qry) ){		
+		if( $i = mysqli_fetch_array($qry) ){		
 			$kegStatus = new KegStatus();
 			$kegStatus->setFromArray($i);
 			return $kegStatus;
@@ -30,4 +30,4 @@ function GetByCode($code){
 		return null;
 	}
 
-}
+}