X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=maps%2Fphp%2FMAPS.php;h=589e74d53f34b53510a19f162445841a1ea88ba3;hb=983213261f42cfb514586f4a72f5f06bcf025409;hp=406c9287a323e2ca832eaa8662964dac6f3b3802;hpb=37489534599748bb39434caf2eb59a1211c651fe;p=clearscm.git
diff --git a/maps/php/MAPS.php b/maps/php/MAPS.php
index 406c928..589e74d 100755
--- a/maps/php/MAPS.php
+++ b/maps/php/MAPS.php
@@ -34,9 +34,13 @@ $Types = array (
"nulllist"
);
+$db;
+
function DBError($msg, $statement) {
- $errno = mysql_errno();
- $errmsg = mysql_error();
+ global $db;
+
+ $errno = mysqli_errno($db);
+ $errmsg = mysqli_error($db);
print "$msg
Error # $errno $errmsg";
print "
SQL Statement: $statement";
@@ -44,13 +48,23 @@ function DBError($msg, $statement) {
} // DBError
function OpenDB() {
- $db = mysql_connect("localhost", "maps", "spam")
+ global $db;
+
+ $db = mysqli_connect("127.0.0.1", "maps", "spam")
or DBError("OpenDB: Unable to connect to database server", "Connect");
- mysql_select_db("MAPS")
+ mysqli_select_db($db, "MAPS")
or DBError("OpenDB: Unable to select MAPS database", "adefaria_maps");
} // OpenDB
+function CloseDB() {
+ global $db;
+
+ if (isset ($db)) {
+ mysqli_close($db);
+ } // if
+} // CloseDB
+
function SetContext($new_userid) {
global $userid;
@@ -58,24 +72,28 @@ function SetContext($new_userid) {
} // SetContext
function Encrypt($password, $userid) {
- $statement = "select encode(\"$password\",\"$userid\")";
+ global $db;
- $result = mysql_query($statement)
+ $statement = "select hex(aes_encrypt(\"$password\",\"$userid\"))";
+
+ $result = mysqli_query($db, $statement)
or DBError("Encrypt: Unable to execute statement", $statement);
// Get return value, which should be the encoded password
- $row = mysql_fetch_array($result);
+ $row = mysqli_fetch_array($result);
return $row[0];
} // Encrypt
function UserExists($userid) {
+ global $db;
+
$statement = "select userid, password from user where userid = \"$userid\"";
- $result = mysql_query($statement)
+ $result = mysqli_query($db, $statement)
or DBError ("UserExists: Unable to execute statement", $statement);
- $row = mysql_fetch_array($result);
+ $row = mysqli_fetch_array($result);
$dbuserid = $row["userid"];
$dbpassword = $row["password"];
@@ -92,6 +110,7 @@ function Login($userid, $password) {
// Check if user exists
$dbpassword = UserExists($userid);
+ print "dbpassword = $dbpassword
";
// Return -1 if user doesn't exist
if ($dbpassword == -1) {
@@ -109,15 +128,15 @@ function Login($userid, $password) {
} // Login
function CountList ($type) {
- global $userid;
+ global $userid, $db;
$statement = "select count(*) as count from list where type=\"$type\" and userid=\"$userid\"";
- $result = mysql_query($statement)
+ $result = mysqli_query($db, $statement)
or DBError("CountList: Unable to count list: ", $statement);
// How many rows are there?
- $row = mysql_fetch_array($result);
+ $row = mysqli_fetch_array($result);
return $row["count"];
} // CountList
@@ -129,10 +148,10 @@ function FindList($type, $next, $lines) {
$statement = "select * from list where type=\"$type\" and userid=\"$userid\" order by sequence limit $next, $lines";
- $result = mysql_query($statement)
+ $result = mysqli_query($db, $statement)
or DBError ("FindList: Unable to execute query: ", $statement);
- $count = mysql_num_rows($result);
+ $count = mysqli_num_rows($result);
return array($count, $result);
} // FindList
@@ -142,13 +161,15 @@ function Today2SQLDatetime() {
} // Today2SQLDatetime
function countem($table, $condition) {
+ global $db;
+
$statement = "select count(distinct sender) as count from $table where $condition";
- $result = mysql_query($statement)
+ $result = mysqli_query($db, $statement)
or DBError("countem: Unable to perform query: ", $statement);
// How many rows are there?
- $row = mysql_fetch_array($result);
+ $row = mysqli_fetch_array($result);
return $row["count"];
} // countem
@@ -200,7 +221,7 @@ function displayquickstats() {
// Start quickstats
print "
as of $current_time
"; $processed = $dates[$today]["processed"]; @@ -295,7 +316,8 @@ function NavigationBar($userid) { if (!isset ($userid) || $userid == "") { print <<