Skip to content

php script migration to mysqli and php 7 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
taoufiqaitali wants to merge 2 commits into
base: master
Choose a base branch
from
Open

php script migration to mysqli and php 7 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6139666
migrate from mysql to mysqli, fix compatibility with php 7
taoufiqaitali Jan 16, 2019
d5158d3
rename db.php.inc to db.inc.php for security
taoufiqaitali Jan 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions Code PHP/arduino.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//Test URL
//http://www.tinkurlab.com/projects/dasbot/arduino.php?rfid=12345678&consumed1=750&consumed2=0&consumed3=0

require('db.php.inc');
require('db.inc.php');

include 'badgecheckfunction.php';

Expand All @@ -20,27 +20,27 @@
//GET REFERENCE VALUES

//get total ticks per liter
$refTicksPerLiterResult = mysql_query("SELECT value FROM ref_data WHERE name = 'ticks_per_liter' LIMIT 1")
or die(mysql_error());
$refTicksPerLiterRows = mysql_fetch_array( $refTicksPerLiterResult );
$refTicksPerLiterResult = mysqli_query($GLOBALS["cnx"], "SELECT value FROM ref_data WHERE name = 'ticks_per_liter' LIMIT 1")
or die(mysqli_error($GLOBALS["cnx"]));
$refTicksPerLiterRows = mysqli_fetch_array( $refTicksPerLiterResult );
$refTicksPerLiter = $refTicksPerLiterRows['value'];

//get keg status
$kegStateResult = mysql_query("SELECT AVG(percentconsumed) AS avgpercentconsumed FROM keg_stats")
or die(mysql_error());
$kegStateRows = mysql_fetch_array( $kegStateResult );
$kegStateResult = mysqli_query($GLOBALS["cnx"], "SELECT AVG(percentconsumed) AS avgpercentconsumed FROM keg_stats")
or die(mysqli_error($GLOBALS["cnx"]));
$kegStateRows = mysqli_fetch_array( $kegStateResult );
$kegState = (100 - round($kegStateRows['avgpercentconsumed'],0));


//Now that we know the RFID value has been passed, check to see if the RFID is a current user

$userResult = mysql_query("SELECT * FROM users WHERE rfid = '$rfid' LIMIT 1")
or die(mysql_error());
$userResult = mysqli_query($GLOBALS["cnx"], "SELECT * FROM users WHERE rfid = '$rfid' LIMIT 1")
or die(mysqli_error($GLOBALS["cnx"]));

if(mysql_num_rows($userResult) == 1) {
if(mysqli_num_rows($userResult) == 1) {
//echo "Thank you for using Das Bot";

$userRows = mysql_fetch_array( $userResult );
$userRows = mysqli_fetch_array( $userResult );
$user = $userRows['username'];
$userID = $userRows['id'];

Expand All @@ -61,9 +61,9 @@
//echo "<p>total ticks per Liter = $refTicksPerLiter</p>";

//GET CURRENT TOTAL CONSUMPTION
$totalDrinkResult = mysql_query("SELECT sum(volume) as total FROM drinks WHERE userid = '$userID' LIMIT 1")
or die(mysql_error());
$totalDrinksRows = mysql_fetch_array( $totalDrinkResult );
$totalDrinkResult = mysqli_query($GLOBALS["cnx"], "SELECT sum(volume) as total FROM drinks WHERE userid = '$userID' LIMIT 1")
or die(mysqli_error($GLOBALS["cnx"]));
$totalDrinksRows = mysqli_fetch_array( $totalDrinkResult );
$totalDrinks = $totalDrinksRows['total'];
$litersConsumed = round($totalDrinks / $refTicksPerLiter, 1);

Expand All @@ -77,24 +77,24 @@
$curTime = time();

if($_GET['consumed1'] > 5) {
$drink1 = mysql_real_escape_string($_GET['consumed1']);
$drink1 = mysqli_real_escape_string($GLOBALS["cnx"], $_GET['consumed1']);
$insertDrinkQuery = "INSERT INTO `dasbot`.`drinks` (id,timestamp, userid, volume, kegid)
VALUES (NULL ,'$curTime', '$userID', '$drink1', 1)";
mysql_query($insertDrinkQuery);
mysqli_query($GLOBALS["cnx"], $insertDrinkQuery);
}

if($_GET['consumed2'] > 5) {
$drink2 = mysql_real_escape_string($_GET['consumed2']);
$drink2 = mysqli_real_escape_string($GLOBALS["cnx"], $_GET['consumed2']);
$insertDrinkQuery = "INSERT INTO `dasbot`.`drinks` (id,timestamp, userid, volume, kegid)
VALUES (NULL ,'$curTime', '$userID', '$drink2', 2)";
mysql_query($insertDrinkQuery);
mysqli_query($GLOBALS["cnx"], $insertDrinkQuery);
}

if($_GET['consumed3'] > 5) {
$drink3 = mysql_real_escape_string($_GET['consumed3']);
$drink3 = mysqli_real_escape_string($GLOBALS["cnx"], $_GET['consumed3']);
$insertDrinkQuery = "INSERT INTO `dasbot`.`drinks` (id,timestamp, userid, volume, kegid)
VALUES (NULL ,'$curTime', '$userID', '$drink3', 3)";
mysql_query($insertDrinkQuery);
mysqli_query($GLOBALS["cnx"], $insertDrinkQuery);
}

//award badges via function
Expand All @@ -103,8 +103,8 @@
//get current leaders
$leaderQuery = "SELECT users.username, sum(drinks.volume) as total FROM drinks, users WHERE users.id= drinks.userid GROUP BY userid ORDER BY total DESC LIMIT 3";

$leadersResult = mysql_query($leaderQuery)
or die(mysql_error());
$leadersResult = mysqli_query($GLOBALS["cnx"], $leaderQuery)
or die(mysqli_error($GLOBALS["cnx"]));

//output message
$curDrinkLiters = round(($drink1 + $drink2 + $drink3)/$refTicksPerLiter, 1);
Expand Down Expand Up @@ -139,9 +139,9 @@
else {
//echo "User not found";

mysql_query("INSERT INTO users (rfid)
mysqli_query($GLOBALS["cnx"], "INSERT INTO users (rfid)
VALUES ('$rfid')");
$userID = mysql_insert_id();
$userID = ((is_null($___mysqli_res = mysqli_insert_id($GLOBALS["cnx"]))) ? false : $___mysqli_res);

echo "Hello! Das Bot v2.0 welcomes youID $userID!\n\n You must register at http://is.gd/kickthekeg before I can give you more beer.";
}
Expand Down
30 changes: 15 additions & 15 deletions Code PHP/badgecheckfunction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?php

//ensure "require('db.php.inc');" is included in the main file from which this is included
//ensure "require('db.inc.php');" is included in the main file from which this is included

//usage "awardbadges(1);"

function awardbadges($userid)
{

$usernamelookupResult = mysql_query("SELECT username FROM dasbot.users WHERE id = $userid")
or die(mysql_error());
$usernamelookupResult = mysqli_query($GLOBALS["cnx"], "SELECT username FROM dasbot.users WHERE id = $userid")
or die(mysqli_error($GLOBALS["cnx"]));

while($usernamelookupRows = mysql_fetch_array($usernamelookupResult)){
while($usernamelookupRows = mysqli_fetch_array($usernamelookupResult)){
$username = $usernamelookupRows['username'];
}

Expand All @@ -22,17 +22,17 @@ function awardbadges($userid)
} else {

//get available badges
$availablebadgesResult = mysql_query("SELECT bb.badgeid, bb.badgetitle, bb.badgeactive, bb.badgerules, bb.badgeqty, ba.badgeawardedcount
$availablebadgesResult = mysqli_query($GLOBALS["cnx"], "SELECT bb.badgeid, bb.badgetitle, bb.badgeactive, bb.badgerules, bb.badgeqty, ba.badgeawardedcount
FROM (dasbot.badges bb LEFT JOIN (SELECT badgeid, count(*) AS badgeawardedcount FROM dasbot.badgesawarded GROUP BY badgeid) ba
ON bb.badgeid = ba.badgeid) LEFT JOIN (SELECT badgeid FROM dasbot.badgesawarded WHERE userid = $userid) bc ON bb.badgeid = bc.badgeid
WHERE (bb.badgeqty = 0 OR bb.badgeqty > ba.badgeawardedcount OR ba.badgeawardedcount IS NULL) AND bc.badgeid IS NULL AND bb.badgeactive = 1")
or die(mysql_error());
or die(mysqli_error($GLOBALS["cnx"]));

//establish counter for array of awarded badges
$b = 0;

//loop through available badges
while($availablebadgesRows = mysql_fetch_array($availablebadgesResult)){
while($availablebadgesRows = mysqli_fetch_array($availablebadgesResult)){

$availablebadgesID = $availablebadgesRows['badgeid'];
$availablebadgesTitle = $availablebadgesRows['badgetitle'];
Expand All @@ -48,11 +48,11 @@ function awardbadges($userid)
//echo "<br>";

//check if badge should be awarded
$awardbadgeResult = mysql_query("$availablebadgesRules")
or die(mysql_error());
echo mysql_error();
$awardbadgeResult = mysqli_query($GLOBALS["cnx"], "$availablebadgesRules")
or die(mysqli_error($GLOBALS["cnx"]));
echo mysqli_error($GLOBALS["cnx"]);

while($awardbadgeRows = mysql_fetch_array($awardbadgeResult)){
while($awardbadgeRows = mysqli_fetch_array($awardbadgeResult)){

$awardbadgeBool = $awardbadgeRows['awardbadge'];

Expand All @@ -64,7 +64,7 @@ function awardbadges($userid)
//award badge if qualifies
if($awardbadgeBool == 1){
$awardBadge = "INSERT INTO dasbot.badgesawarded (userid, badgeid) VALUES ($userid, $availablebadgesID)";
mysql_query($awardBadge);
mysqli_query($GLOBALS["cnx"], $awardBadge);

//store awarded badges in array
$awardedBadges[$b] = $availablebadgesID;
Expand All @@ -83,10 +83,10 @@ function awardbadges($userid)
{
//echo "Badge awarded: " . $awardedBadges[$i] . " ";

$badgelookupResult = mysql_query("SELECT badgetitle, badgedescription FROM dasbot.badges WHERE badgeid = $awardedBadges[$i]")
or die(mysql_error());
$badgelookupResult = mysqli_query($GLOBALS["cnx"], "SELECT badgetitle, badgedescription FROM dasbot.badges WHERE badgeid = $awardedBadges[$i]")
or die(mysqli_error($GLOBALS["cnx"]));

while($badgelookupRows = mysql_fetch_array($badgelookupResult)){
while($badgelookupRows = mysqli_fetch_array($badgelookupResult)){
$badgetitle = $badgelookupRows['badgetitle'];
$badgedescription = $badgelookupRows['badgedescription'];

Expand Down
Loading