X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=maps%2Fphp%2FMAPS.php;h=9b94c17d2bee80634233584fe3c2e34d3862ca98;hb=1f5737d7c0b97ac29c72a9f0cd883bd6211edec9;hp=59936e20393b643001683ada7c567e17c138e444;hpb=3f50a70e676ff421d6e55d058d2cb2c6d0891358;p=clearscm.git
diff --git a/maps/php/MAPS.php b/maps/php/MAPS.php
index 59936e2..9b94c17 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("localhost", "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) {
+ global $db;
+
$statement = "select encode(\"$password\",\"$userid\")";
- $result = mysql_query($statement)
+ $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"];
@@ -109,15 +127,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 +147,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 +160,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
@@ -350,16 +370,16 @@ END;
} # NavigationBar
function GetUserLines() {
- global $userid;
+ global $userid, $db;
$lines = 10;
$statement = "select value from useropts where userid=\"$userid\" and name=\"Page\"";
- $result = mysql_query($statement)
+ $result = mysqli_query($db, $statement)
or DBError("GetUserLines: Unable to execute query: ", $statement);
- $row = mysql_fetch_array ($result);
+ $row = mysqli_fetch_array ($result);
if (isset ($row["value"])) {
$lines = $row["value"];
@@ -372,14 +392,15 @@ function DisplayList($type, $next, $lines) {
global $userid;
global $total;
global $last;
+ global $db;
$statement = "select * from list where userid=\"$userid\" and type=\"$type\" order by sequence limit $next, $lines";
- $result = mysql_query($statement)
+ $result = mysqli_query($db, $statement)
or DBError("DisplayList: Unable to execute query: ", $statement);
for ($i = 0; $i < $lines; $i++) {
- $row = mysql_fetch_array ($result);
+ $row = mysqli_fetch_array ($result);
if (!isset ($row ["sequence"])) {
break;
@@ -435,7 +456,7 @@ END;
} // MAPSHeader
function ListDomains($top = 10) {
- global $userid;
+ global $userid, $db;
// Generate a list of the top 10 spammers by domain
$statement = "select count(sender) as nbr, ";
@@ -447,7 +468,7 @@ function ListDomains($top = 10) {
$statement = $statement . "group by domain order by nbr desc";
// Do the query
- $result = mysql_query($statement)
+ $result = mysqli_query($db, $statement)
or DBError("ListDomains: Unable to execute query: ", $statement);
print <<