Skip to content

Commit

Permalink
Used MySQLi extension instead of old MySQL. For future compatibility …
Browse files Browse the repository at this point in the history
…with new PHP versions.
  • Loading branch information
MultiTricker committed Dec 29, 2013
1 parent 0c8710e commit 1759082
Show file tree
Hide file tree
Showing 43 changed files with 240 additions and 240 deletions.
6 changes: 3 additions & 3 deletions app/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@
// kontrolujeme IP a sedi
if(isset($ip) AND $ip != "" AND $ip == $_SERVER['REMOTE_ADDR'])
{
MySQL_query("INSERT INTO tme(kdy, teplota, vlhkost) VALUES(now(), '{$teplota}', {$vlhkost})");
MySQLi_query($GLOBALS["DBC"], "INSERT INTO tme(kdy, teplota, vlhkost) VALUES(now(), '{$teplota}', {$vlhkost})");
}
// nekontrolujeme IP
elseif($ip == "")
{
MySQL_query("INSERT INTO tme(kdy, teplota, vlhkost) VALUES(now(), '{$teplota}', {$vlhkost})");
print mysql_error();
MySQLi_query($GLOBALS["DBC"], "INSERT INTO tme(kdy, teplota, vlhkost) VALUES(now(), '{$teplota}', {$vlhkost})");
print mysqli_error($GLOBALS["DBC"]);
}
// problem? zrejme pozadavek z jine nez z povolene IP
else
Expand Down
28 changes: 14 additions & 14 deletions app/mobile.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@
<body>
<?php
// Posledni mereni
$dotaz = MySQL_query("SELECT kdy, teplota, vlhkost FROM tme ORDER BY kdy DESC LIMIT 1");
$posledni = MySQL_fetch_assoc($dotaz);
$dotaz = MySQLi_query($GLOBALS["DBC"], "SELECT kdy, teplota, vlhkost FROM tme ORDER BY kdy DESC LIMIT 1");
$posledni = MySQLi_fetch_assoc($dotaz);

// Nejvyssi namerena teplota
$dotaz = MySQL_query("SELECT kdy, teplota FROM tme ORDER BY teplota DESC LIMIT 1");
$nejvyssi = MySQL_fetch_assoc($dotaz);
$dotaz = MySQLi_query($GLOBALS["DBC"], "SELECT kdy, teplota FROM tme ORDER BY teplota DESC LIMIT 1");
$nejvyssi = MySQLi_fetch_assoc($dotaz);

// Nejnizsi namerena teplota
$dotaz = MySQL_query("SELECT kdy, teplota FROM tme ORDER BY teplota ASC LIMIT 1");
$nejnizsi = MySQL_fetch_assoc($dotaz);
$dotaz = MySQLi_query($GLOBALS["DBC"], "SELECT kdy, teplota FROM tme ORDER BY teplota ASC LIMIT 1");
$nejnizsi = MySQLi_fetch_assoc($dotaz);
?>
<div data-role='page' data-theme='a' id='home'>
<div data-role='header'data-position='fixed' >
Expand Down Expand Up @@ -94,12 +94,12 @@
for($a = 0; $a < count($dny2); $a++)
{

$dotaz = MySQL_query("SELECT kdy, teplota
$dotaz = MySQLi_query($GLOBALS["DBC"], "SELECT kdy, teplota
FROM tme
WHERE kdy >= CAST('".substr($dny2[$a], 0, 14)."0' AS datetime)
AND kdy <= CAST('".substr($dny2[$a], 0, 14)."9' AS datetime)
LIMIT 1");
$hod = MySQL_fetch_assoc($dotaz);
$hod = MySQLi_fetch_assoc($dotaz);

echo "<li data-icon='false'>
<p>".formatDnu($dny2[$a])."</p>
Expand All @@ -111,23 +111,23 @@
// MIN/AVG/MAX za dnesni den
// Data pro mereni z dneska
// Dnes nejnizsi namerena teplota/vlhkost
$dotaz = MySQL_query("SELECT MIN(teplota) as teplota, MIN(vlhkost) as vlhkost
$dotaz = MySQLi_query($GLOBALS["DBC"], "SELECT MIN(teplota) as teplota, MIN(vlhkost) as vlhkost
FROM tme
WHERE kdy >= CAST('".date("Y-m-d")." 00:00:00' AS datetime)
AND kdy <= CAST('".date("Y-m-d")." 23:59:59' AS datetime)");
$nejnizsiDnes = MySQL_fetch_assoc($dotaz);
$nejnizsiDnes = MySQLi_fetch_assoc($dotaz);
// Dnes prumerna teplota/vlhkost
$dotaz = MySQL_query("SELECT AVG(teplota) as teplota, AVG(vlhkost) as vlhkost
$dotaz = MySQLi_query($GLOBALS["DBC"], "SELECT AVG(teplota) as teplota, AVG(vlhkost) as vlhkost
FROM tme
WHERE kdy >= CAST('".date("Y-m-d")." 00:00:00' AS datetime)
AND kdy <= CAST('".date("Y-m-d")." 23:59:59' AS datetime)");
$prumernaDnes = MySQL_fetch_assoc($dotaz);
$prumernaDnes = MySQLi_fetch_assoc($dotaz);
// Dnes nejvyssi namerena teplota/vlhkost
$dotaz = MySQL_query("SELECT MAX(teplota) as teplota, MAX(vlhkost) as vlhkost
$dotaz = MySQLi_query($GLOBALS["DBC"], "SELECT MAX(teplota) as teplota, MAX(vlhkost) as vlhkost
FROM tme
WHERE kdy >= CAST('".date("Y-m-d")." 00:00:00' AS datetime)
AND kdy <= CAST('".date("Y-m-d")." 23:59:59' AS datetime)");
$nejvyssiDnes = MySQL_fetch_assoc($dotaz);
$nejvyssiDnes = MySQLi_fetch_assoc($dotaz);

echo "<li data-icon=\"false\" data-role=\"list-divider\">{$lang['dnes']}</li>";

Expand Down
4 changes: 2 additions & 2 deletions app/scripts/ajax/drive-touto-dobou.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@
for($a = 0; $a < count($dny2); $a++)
{

$dotaz = MySQL_query("SELECT kdy, teplota, vlhkost
$dotaz = MySQLi_query($GLOBALS["DBC"], "SELECT kdy, teplota, vlhkost
FROM tme
WHERE kdy >= CAST('".substr($dny2[$a], 0, 14)."0' AS datetime)
AND kdy <= CAST('".substr($dny2[$a], 0, 14)."9' AS datetime)
LIMIT 1");
$hod = MySQL_fetch_assoc($dotaz);
$hod = MySQLi_fetch_assoc($dotaz);

echo "<tr>
<td align='center'>".formatDnu($dny2[$a])."</td>
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/ajax/pocet-mereni.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
require "../fce.php"; // skript s nekolika funkcemi

// Pocet mereni
$dotaz = MySQL_query("SELECT count(id) AS pocet FROM tme");
$pocetMereni = MySQL_fetch_assoc($dotaz);
$dotaz = MySQLi_query($GLOBALS["DBC"], "SELECT count(id) AS pocet FROM tme");
$pocetMereni = MySQLi_fetch_assoc($dotaz);

header('Content-type: text/html; charset=UTF-8');

Expand Down
8 changes: 4 additions & 4 deletions app/scripts/ajax/teplota.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@
// Vycteni hodnot

// Posledni mereni
$dotaz = MySQL_query("SELECT kdy, teplota, vlhkost FROM tme ORDER BY kdy DESC LIMIT 1");
$posledni = MySQL_fetch_assoc($dotaz);
$dotaz = MySQLi_query($GLOBALS["DBC"], "SELECT kdy, teplota, vlhkost FROM tme ORDER BY kdy DESC LIMIT 1");
$posledni = MySQLi_fetch_assoc($dotaz);
// Starsi mereni
$dotaz = MySQL_query("SELECT kdy, teplota, vlhkost FROM tme ORDER BY kdy DESC LIMIT 5, 1");
$starsi = MySQL_fetch_assoc($dotaz);
$dotaz = MySQLi_query($GLOBALS["DBC"], "SELECT kdy, teplota, vlhkost FROM tme ORDER BY kdy DESC LIMIT 5, 1");
$starsi = MySQLi_fetch_assoc($dotaz);

// vyvoj teploty
if($posledni['teplota'] > $starsi['teplota'])
Expand Down
12 changes: 6 additions & 6 deletions app/scripts/db.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
*** Pripojeni k DB / DB connection ***
*************************************************************************/

if (!MySQL_connect($dbServer,$dbUzivatel,$dbHeslo))
echo "Nepodarilo se spojit s databazi. Prosim, zkontrolujte nastaveni.<br>
Unable to connect into database. Please, check out your settings.";
if(!($GLOBALS["DBC"] = MySQLi_connect($dbServer, $dbUzivatel, $dbHeslo)))
echo "Nepodarilo se spojit s databazovym serverem a prihlasit se. Prosim, zkontrolujte nastaveni.<br>
Unable to connect to database server and log in. Please, check out your settings.";

if (!MySQL_select_db($dbDb))
echo "Chyba ve vybrani databaze. Prosim, zkontrolujte nastaveni.<br>
Unable to select database. Please, check out your settings.";
if(!((bool)mysqli_query($GLOBALS["DBC"], "USE {$dbDb}")))
echo "Chyba ve vybrani databaze \"{$dbDb}\". Prosim, zkontrolujte nastaveni.<br>
Unable to select database \"{$dbDb}\". Please, check out your settings.";
60 changes: 30 additions & 30 deletions app/scripts/dopocitat.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,27 @@
$vcera = date("Y-m-d", mktime(0, 0, 0, date("m"), date("d")-1, date("Y")));

// Nejdriv najdeme posledni dopocitany den krome dnesniho
$q = MySQL_query("SELECT MAX(den) AS den FROM tme_denni");
$h = MySQL_fetch_assoc($q);
$q = MySQLi_query($GLOBALS["DBC"], "SELECT MAX(den) AS den FROM tme_denni");
$h = MySQLi_fetch_assoc($q);

// je potreba neco dopocitavat?
if(MySQL_num_rows($q) == 0 OR $h['den'] != $vcera)
if(MySQLi_num_rows($q) == 0 OR $h['den'] != $vcera)
{

// takova hloupost...cheme dalsi den :)
if($h['den'] != ""){ $h['den2'] = $h['den']." 23:59:59"; }

$q = MySQL_query("SELECT kdy
$q = MySQLi_query($GLOBALS["DBC"], "SELECT kdy
FROM tme
WHERE kdy > '{$h['den2']}' AND kdy < '".date("Y-m-d")."'
GROUP BY year(kdy),month(kdy),day(kdy)
ORDER BY kdy ASC");

// Mame co dopocitavat?
if(MySQL_num_rows($q) > 0)
if(MySQLi_num_rows($q) > 0)
{

while($t = MySQL_fetch_assoc($q))
while($t = MySQLi_fetch_assoc($q))
{

// vytahneme den z datetime
Expand All @@ -56,21 +56,21 @@
// nejdrive naplnime tabulku cache, kde budou radky jen pro dopocitavany den
// a tu potrapime radou dotazu misto toho, abysme ty dotazy vykonavali nad
// tabulkou se vsemi merenimi, ktera mohou jit do milionu zaznamu
MySQL_query("INSERT INTO tme_cache(id, kdy, teplota, vlhkost)
SELECT id, kdy, teplota, vlhkost
FROM tme
WHERE kdy >= CAST('{$den} 00:00:00' AS datetime)
AND kdy <= CAST('{$den} 23:59:59' AS datetime)");
MySQLi_query($GLOBALS["DBC"], "INSERT INTO tme_cache(id, kdy, teplota, vlhkost)
SELECT id, kdy, teplota, vlhkost
FROM tme
WHERE kdy >= CAST('{$den} 00:00:00' AS datetime)
AND kdy <= CAST('{$den} 23:59:59' AS datetime)");

// mereni za den
$qV = MySQL_query("SELECT COUNT(id) AS pocet,
MIN(teplota) AS minteplota, MAX(teplota) AS maxteplota, AVG(teplota) AS avgteplota,
MIN(vlhkost) AS minvlh, MAX(vlhkost) AS maxvlh, AVG(vlhkost) AS avgvlh
FROM tme_cache
WHERE kdy >= CAST('{$den} 00:00:00' AS datetime)
AND kdy <= CAST('{$den} 23:59:59' AS datetime)");
$qV = MySQLi_query($GLOBALS["DBC"], "SELECT COUNT(id) AS pocet,
MIN(teplota) AS minteplota, MAX(teplota) AS maxteplota, AVG(teplota) AS avgteplota,
MIN(vlhkost) AS minvlh, MAX(vlhkost) AS maxvlh, AVG(vlhkost) AS avgvlh
FROM tme_cache
WHERE kdy >= CAST('{$den} 00:00:00' AS datetime)
AND kdy <= CAST('{$den} 23:59:59' AS datetime)");

$qVhod = MySQL_fetch_assoc($qV);
$qVhod = MySQLi_fetch_assoc($qV);

$hod['mereni'] = $qVhod['pocet'];
$hod['nejnizsi'] = $qVhod['minteplota'];
Expand All @@ -96,14 +96,14 @@
(strlen($a) == 1 ? $c = "0".$a : $c = $a);

// mereni za danou hodinu
$qV = MySQL_query("SELECT COUNT(id) AS pocet,
MIN(teplota) AS minteplota, MAX(teplota) AS maxteplota, AVG(teplota) AS avgteplota,
MIN(vlhkost) AS minvlh, MAX(vlhkost) AS maxvlh, AVG(vlhkost) AS avgvlh
FROM tme_cache
WHERE kdy >= CAST('{$den} {$c}:00:00' AS datetime)
AND kdy <= CAST('{$den} {$c}:59:59' AS datetime)");

$qVhod = MySQL_fetch_assoc($qV);
$qV = MySQLi_query($GLOBALS["DBC"], "SELECT COUNT(id) AS pocet,
MIN(teplota) AS minteplota, MAX(teplota) AS maxteplota, AVG(teplota) AS avgteplota,
MIN(vlhkost) AS minvlh, MAX(vlhkost) AS maxvlh, AVG(vlhkost) AS avgvlh
FROM tme_cache
WHERE kdy >= CAST('{$den} {$c}:00:00' AS datetime)
AND kdy <= CAST('{$den} {$c}:59:59' AS datetime)");

$qVhod = MySQLi_fetch_assoc($qV);

// Mame vubec nejaka mereni?
if($qVhod['pocet'] == 0)
Expand Down Expand Up @@ -134,7 +134,7 @@

}

MySQL_query("INSERT INTO tme_denni (den, mereni, nejnizsi, nejvyssi, prumer, nejnizsi_vlhkost, nejvyssi_vlhkost, prumer_vlhkost,
MySQLi_query($GLOBALS["DBC"], "INSERT INTO tme_denni (den, mereni, nejnizsi, nejvyssi, prumer, nejnizsi_vlhkost, nejvyssi_vlhkost, prumer_vlhkost,
0mereni, 0nejnizsi, 0nejvyssi, 0prumer, 0nejnizsi_vlhkost, 0nejvyssi_vlhkost, 0prumer_vlhkost,
1mereni, 1nejnizsi, 1nejvyssi, 1prumer, 1nejnizsi_vlhkost, 1nejvyssi_vlhkost, 1prumer_vlhkost,
2mereni, 2nejnizsi, 2nejvyssi, 2prumer, 2nejnizsi_vlhkost, 2nejvyssi_vlhkost, 2prumer_vlhkost,
Expand Down Expand Up @@ -185,13 +185,13 @@
{$hod['22mereni']}, {$hod['22nejnizsi']}, {$hod['22nejvyssi']}, {$hod['22prumer']}, {$hod['22nejnizsivlh']}, {$hod['22nejvyssivlh']}, {$hod['22prumervlh']},
{$hod['23mereni']}, {$hod['23nejnizsi']}, {$hod['23nejvyssi']}, {$hod['23prumer']}, {$hod['23nejnizsivlh']}, {$hod['23nejvyssivlh']}, {$hod['23prumervlh']})");

echo mysql_error();
echo mysqli_error($GLOBALS["DBC"]);

// smazeme docasne zaznamy
mysql_query("TRUNCATE tme_cache;");
MySQLi_query($GLOBALS["DBC"], "TRUNCATE tme_cache;");

// mame stale pripojeni na MySQL server?
if (!mysql_ping()) {
if (!mysqli_ping($GLOBALS["DBC"])) {
echo "<p style='font-weight; color: darkred;'>Skript skončil předčasně. Spusťte jej znovu pro dopočítání dalších dní.";
echo "Script ended early. Run it again to calculate more data for past days.</p>";
exit;
Expand Down
8 changes: 4 additions & 4 deletions app/scripts/fce.php
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ function romer($teplota)
function kolik($co, $kde, $podminky="")
{

$k = MySQL_query("SELECT COUNT($co) AS pocet
$k = MySQLi_query($GLOBALS["DBC"], "SELECT COUNT($co) AS pocet
FROM $kde $podminky");
$k = MySQL_fetch_assoc($k);
$k = MySQLi_fetch_assoc($k);

return $k['pocet'];

Expand All @@ -154,10 +154,10 @@ function kolik($co, $kde, $podminky="")
function kolikRadek($co, $kde, $podminky="")
{

$k = MySQL_query("SELECT $co AS pocet
$k = MySQLi_query($GLOBALS["DBC"], "SELECT $co AS pocet
FROM $kde $podminky");

return MySQL_num_rows($k);
return MySQLi_num_rows($k);

} // konec funkce

Expand Down
4 changes: 2 additions & 2 deletions app/scripts/grafy/kombinovane/24-hodin.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
require "./scripts/init.php";

// Posledni zaznamy
$q = MySQL_query("SELECT kdy, teplota, vlhkost FROM tme ORDER BY kdy DESC LIMIT 1440");
$q = MySQLi_query($GLOBALS["DBC"], "SELECT kdy, teplota, vlhkost FROM tme ORDER BY kdy DESC LIMIT 1440");

// budeme brat kazdy 10ty zaznam, abychom se do grafu rozumne vesli
$a = 10;

while($t = MySQL_fetch_assoc($q))
while($t = MySQLi_fetch_assoc($q))
{

// budeme za tu dobu, aktualne 40 minut, pocitat prumernou teplotu,
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/grafy/kombinovane/3-dny.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
$do = date("Y-m-d H:m:s");

// Posledni zaznamy vcera
$q = MySQL_query("SELECT kdy, teplota, vlhkost FROM tme WHERE kdy > '{$od}' AND kdy < '{$do}' ORDER BY kdy DESC");
$q = MySQLi_query($GLOBALS["DBC"], "SELECT kdy, teplota, vlhkost FROM tme WHERE kdy > '{$od}' AND kdy < '{$do}' ORDER BY kdy DESC");

// budeme brat kazdy 5ty zaznam
$a = 8;

while($t = MySQL_fetch_assoc($q))
while($t = MySQLi_fetch_assoc($q))
{

// budeme za tu dobu, aktualne 10 minut, pocitat prumernou teplotu,
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/grafy/kombinovane/4-hodiny.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
require "./scripts/init.php";

// Posledni zaznamy
$q = MySQL_query("SELECT kdy, teplota, vlhkost FROM tme ORDER BY kdy DESC LIMIT 240");
$q = MySQLi_query($GLOBALS["DBC"], "SELECT kdy, teplota, vlhkost FROM tme ORDER BY kdy DESC LIMIT 240");

// budeme pocitat kazdy osmy zaznam, tedy kazdou osmou minutu
$a = 6;

while($t = MySQL_fetch_assoc($q))
while($t = MySQLi_fetch_assoc($q))
{

// budeme pocitat prumernou teplotu za poslednich osm minut... vypada to lepe
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/grafy/teplota/24-hodin-mobile.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
require "./scripts/init.php";

// Posledni zaznamy
$q = MySQL_query("SELECT kdy, teplota FROM tme ORDER BY kdy DESC LIMIT 1440");
$q = MySQLi_query($GLOBALS["DBC"], "SELECT kdy, teplota FROM tme ORDER BY kdy DESC LIMIT 1440");

// budeme brat kazdy 40ty zaznam, abychom se do grafu rozumne vesli
$a = 10;
$count = 0;

while($t = MySQL_fetch_assoc($q))
while($t = MySQLi_fetch_assoc($q))
{

// budeme za tu dobu, aktualne 40 minut, pocitat prumernou teplotu,
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/grafy/teplota/24-hodin.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
require "./scripts/init.php";

// Posledni zaznamy
$q = MySQL_query("SELECT kdy, teplota FROM tme ORDER BY kdy DESC LIMIT 1440");
$q = MySQLi_query($GLOBALS["DBC"], "SELECT kdy, teplota FROM tme ORDER BY kdy DESC LIMIT 1440");

// budeme brat kazdy 40ty zaznam, abychom se do grafu rozumne vesli
$a = 10;
$count = 0;

while($t = MySQL_fetch_assoc($q))
while($t = MySQLi_fetch_assoc($q))
{

// budeme za tu dobu, aktualne 40 minut, pocitat prumernou teplotu,
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/grafy/teplota/3-dny.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
$tep = 0;

// Posledni zaznamy
$q = MySQL_query("SELECT kdy, teplota FROM tme WHERE kdy > '{$od}' AND kdy < '{$do}' ORDER BY kdy DESC");
$q = MySQLi_query($GLOBALS["DBC"], "SELECT kdy, teplota FROM tme WHERE kdy > '{$od}' AND kdy < '{$do}' ORDER BY kdy DESC");
$a = 5;
$fr = 1;
while($t = MySQL_fetch_assoc($q))
while($t = MySQLi_fetch_assoc($q))
{
$tep = $tep+$t['teplota'];
if($a == 5)
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/grafy/teplota/31-dni.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
require "./scripts/init.php";

// maximalni teplota dany den
$qj = MySQL_query("SELECT den, nejvyssi, nejnizsi, prumer FROM tme_denni ORDER BY den DESC LIMIT 0, 31");
while($hod = MySQL_fetch_assoc($qj))
$qj = MySQLi_query($GLOBALS["DBC"], "SELECT den, nejvyssi, nejnizsi, prumer FROM tme_denni ORDER BY den DESC LIMIT 0, 31");
while($hod = MySQLi_fetch_assoc($qj))
{
// popisek
$labels[] = formatDnu($hod['den']);
Expand Down
Loading

0 comments on commit 1759082

Please sign in to comment.