Changeset 20052 for trunk/FACT++

Timestamp:

03/24/21 22:28:33 (4 years ago)

Author:

tbretz

Message:

Updated mysql calls.

Location:

trunk/FACT++/www/schedule

Files:

• load.php (modified) (2 diffs)
• save.php (modified) (2 diffs)

trunk/FACT++/www/schedule/load.php

@@ -9 +9 @@
 // ================================================================
 
-function query($query)
+function query($sql, $query)
 {
-   $sql = mysql_query($query);
+   $sql = $sql->query($query);
    if (!$sql)
-        die(mysql_error());
+        die($sql->error);
 
    $rows = array();
-   while($row = mysql_fetch_assoc($sql))
+   while($row = $sql->fetch_assoc())
       $rows[] = $row;
 
@@ -43 +43 @@
 require_once 'config.php';
 
-$db = mysql_connect($dbhost,$dbuser,$dbpass);
-if (!$db)
-   die(mysql_error());
+$sql = new mysqli($dbhost, $dbuser, $dbpass);
 
-if (!mysql_select_db($dbname, $db))
-   die(mysql_error());
+if ($sql->connect_error)
+    die($sql->connect_error);
+
+if (!$sql->select_db($dbname))
+    die($sql->error);
 
 /*mixed date_sunrise ( int $timestamp [, int $format = SUNFUNCS_RET_STRING [, float $latitude = ini_get("date.default_latitude") [, float $longitude = ini_get("date.default_longitude") [, float $zenith = ini_get("date.sunrise_zenith") [, float $gmt_offset = 0 ]]]]] )*/
 
-query("SELECT DISTINCT(DATE(ADDTIME(fStart, '-12:00'))) AS 'd' FROM Schedule");
-query("SELECT fSourceKEY AS 'key', fSourceName AS 'val' FROM Source WHERE fSourceTypeKEY=1");
-query("SELECT fMeasurementTypeKEY AS 'key', fMeasurementTypeName AS 'val' FROM MeasurementType");
-query("SELECT * FROM Schedule WHERE DATE(ADDTIME(fStart, '-12:00:00')) = '".$_POST['n']."'".$cut."ORDER BY fStart ASC, fMeasurementID ASC");
+query($sql, "SELECT DISTINCT(DATE(ADDTIME(fStart, '-12:00'))) AS 'd' FROM Schedule");
+query($sql, "SELECT fSourceKEY AS 'key', fSourceName AS 'val' FROM Source WHERE fSourceTypeKEY=1");
+query($sql, "SELECT fMeasurementTypeKEY AS 'key', fMeasurementTypeName AS 'val' FROM MeasurementType");
+query($sql, "SELECT * FROM Schedule WHERE DATE(ADDTIME(fStart, '-12:00:00')) = '".$_POST['n']."'".$cut."ORDER BY fStart ASC, fMeasurementID ASC");
 
 //sleep(3);

trunk/FACT++/www/schedule/save.php

@@ -134 +134 @@
 // ================================================================
 
-$db = mysql_connect($dbhost,$dbuser,$dbpass);
-if (!$db)
-    die(mysql_error());
-
-if (!mysql_select_db($dbname, $db))
-    die(mysql_error());
+$db = new mysqli($dbhost,$dbuser,$dbpass);
+if ($db->connect_error)
+    die($db->connect_error);
+
+if (!$db->select_db($dbname))
+    die($db->error);
 
 $query = "SELECT * FROM MeasurementType";
 
-$sql = mysql_query($query);
+$sql = $db->query($query);
 if (!$sql)
-    die(mysql_error());
+    die($db->error);
 
 $measurements = array();
-while($row = mysql_fetch_assoc($sql))
+while($row = $db->fetch_assoc($sql))
     $measurements[$row['fMeasurementTypeKey']] = $row;
 
@@ -271 +271 @@
 
 foreach ($queries as $query)
-    if (!mysql_query($query))
-        die(mysql_error());
-
-mysql_close($db);
+    if (!$db->query($query))
+        die($sql->error);
+
+$db->close();
 
 ?>