Replaced mysql_query() with query_appdb()

This commit is contained in:
Jonathan Ernst
2005-01-11 00:26:05 +00:00
committed by WineHQ
parent d2a1505ad5
commit ee28390769
7 changed files with 74 additions and 75 deletions

View File

@@ -4,14 +4,14 @@ function log_category_visit($catId)
{ {
global $REMOTE_ADDR; global $REMOTE_ADDR;
$result = mysql_query("SELECT * FROM catHitStats WHERE ip = '$REMOTE_ADDR' AND catId = $catId"); $result = query_appdb("SELECT * FROM catHitStats WHERE ip = '$REMOTE_ADDR' AND catId = $catId");
if($result && mysql_num_rows($result) == 1) if($result && mysql_num_rows($result) == 1)
{ {
$stats = mysql_fetch_object($result); $stats = mysql_fetch_object($result);
mysql_query("UPDATE catHitStats SET count = count + 1 WHERE catHitId = $stats->catHitId"); query_appdb("UPDATE catHitStats SET count = count + 1 WHERE catHitId = $stats->catHitId");
} else } else
{ {
mysql_query("INSERT INTO catHitStats VALUES(null, null, '$REMOTE_ADDR', $catId, 1)"); query_appdb("INSERT INTO catHitStats VALUES(null, null, '$REMOTE_ADDR', $catId, 1)");
} }
} }
@@ -19,14 +19,14 @@ function log_application_visit($appId)
{ {
global $REMOTE_ADDR; global $REMOTE_ADDR;
$result = mysql_query("SELECT * FROM appHitStats WHERE ip = '$REMOTE_ADDR' AND appId = $appId"); $result = query_appdb("SELECT * FROM appHitStats WHERE ip = '$REMOTE_ADDR' AND appId = $appId");
if($result && mysql_num_rows($result) == 1) if($result && mysql_num_rows($result) == 1)
{ {
$stats = mysql_fetch_object($result); $stats = mysql_fetch_object($result);
mysql_query("UPDATE appHitStats SET count = count + 1 WHERE appHitId = $stats->appHitId"); query_appdb("UPDATE appHitStats SET count = count + 1 WHERE appHitId = $stats->appHitId");
} else } else
{ {
mysql_query("INSERT INTO appHitStats VALUES(null, null, '$REMOTE_ADDR', $appId, 1)"); query_appdb("INSERT INTO appHitStats VALUES(null, null, '$REMOTE_ADDR', $appId, 1)");
} }
} }

View File

@@ -9,7 +9,7 @@ class Application {
function Application($id) function Application($id)
{ {
$result = mysql_query("SELECT * FROM appFamily WHERE appId = $id"); $result = query_appdb("SELECT * FROM appFamily WHERE appId = $id");
if(!$result) if(!$result)
return; // Oops return; // Oops
if(mysql_num_rows($result) != 1) if(mysql_num_rows($result) != 1)
@@ -23,7 +23,7 @@ class Application {
{ {
$list = array(); $list = array();
$result = mysql_query("SELECT * FROM appVersion ". $result = query_appdb("SELECT * FROM appVersion ".
"WHERE appId = ". $this->data->appId . " " . "WHERE appId = ". $this->data->appId . " " .
"ORDER BY versionName"); "ORDER BY versionName");
if(!$result) if(!$result)
@@ -41,7 +41,7 @@ class Application {
function getAppVersion($versionId) function getAppVersion($versionId)
{ {
$result = mysql_query("SELECT * FROM appVersion ". $result = query_appdb("SELECT * FROM appVersion ".
"WHERE appId = ". $this->data->appId ." AND ". "WHERE appId = ". $this->data->appId ." AND ".
"versionId = $versionId"); "versionId = $versionId");
if(!$result || mysql_num_rows($result) != 1) if(!$result || mysql_num_rows($result) != 1)
@@ -52,7 +52,7 @@ class Application {
function getVendor() function getVendor()
{ {
$result = mysql_query("SELECT * FROM vendor ". $result = query_appdb("SELECT * FROM vendor ".
"WHERE vendorId = ". $this->data->vendorId); "WHERE vendorId = ". $this->data->vendorId);
if(!$result || mysql_num_rows($result) != 1) if(!$result || mysql_num_rows($result) != 1)
return array("vendorName" => "Unknown"); return array("vendorName" => "Unknown");
@@ -65,7 +65,7 @@ class Application {
{ {
$list = array(); $list = array();
$result = mysql_query("SELECT * FROM appComments ". $result = query_appdb("SELECT * FROM appComments ".
"WHERE appId = ". $this->data->appId . " AND " . "WHERE appId = ". $this->data->appId . " AND " .
"versionId = $versionId " . "versionId = $versionId " .
"ORDER BY time"); "ORDER BY time");
@@ -81,10 +81,10 @@ class Application {
function deleteAppFamily($appId) function deleteAppFamily($appId)
{ {
$r = mysql_query("DELETE FROM appFamily WHERE appId = $appId"); $r = query_appdb("DELETE FROM appFamily WHERE appId = $appId");
if($r) if($r)
{ {
$r = mysql_query("DELETE FROM appVersion WHERE appId = $appId"); $r = query_appdb("DELETE FROM appVersion WHERE appId = $appId");
if($r) if($r)
addmsg("Application and versions deleted", "green"); addmsg("Application and versions deleted", "green");
else else
@@ -97,7 +97,7 @@ function deleteAppFamily($appId)
function deleteAppVersion($versionId) function deleteAppVersion($versionId)
{ {
$r = mysql_query("DELETE FROM appVersion WHERE versionId = $versionId"); $r = query_appdb("DELETE FROM appVersion WHERE versionId = $versionId");
if($r) if($r)
addmsg("Application Version $versionId deleted", "green"); addmsg("Application Version $versionId deleted", "green");
else else
@@ -106,7 +106,7 @@ function deleteAppVersion($versionId)
function lookupVersionName($appId, $versionId) function lookupVersionName($appId, $versionId)
{ {
$result = mysql_query("SELECT versionName FROM appVersion WHERE versionId = $versionId and appId = $appId"); $result = query_appdb("SELECT versionName FROM appVersion WHERE versionId = $versionId and appId = $appId");
if(!$result || mysql_num_rows($result) != 1) if(!$result || mysql_num_rows($result) != 1)
return null; return null;
$ob = mysql_fetch_object($result); $ob = mysql_fetch_object($result);
@@ -116,7 +116,7 @@ function lookupVersionName($appId, $versionId)
function lookupAppName($appId) function lookupAppName($appId)
{ {
$result = mysql_query("SELECT appName FROM appFamily WHERE appId = $appId"); $result = query_appdb("SELECT appName FROM appFamily WHERE appId = $appId");
if(!$result || mysql_num_rows($result) != 1) if(!$result || mysql_num_rows($result) != 1)
return null; return null;
$ob = mysql_fetch_object($result); $ob = mysql_fetch_object($result);

View File

@@ -31,7 +31,7 @@ class Category {
$this->name = "ROOT"; $this->name = "ROOT";
} else } else
{ {
$result = mysql_query("SELECT * FROM appCategory WHERE catId = $id"); $result = query_appdb("SELECT * FROM appCategory WHERE catId = $id");
if(!$result) if(!$result)
{ {
// category not found! // category not found!
@@ -43,7 +43,7 @@ class Category {
$this->name = $ob->catName; $this->name = $ob->catName;
} }
$result = mysql_query("SELECT catId, catName, catDescription FROM ". $result = query_appdb("SELECT catId, catName, catDescription FROM ".
"appCategory WHERE catParent = $this->id " . "appCategory WHERE catParent = $this->id " .
"ORDER BY catName"); "ORDER BY catName");
if(mysql_num_rows($result) == 0) if(mysql_num_rows($result) == 0)
@@ -68,7 +68,7 @@ class Category {
if($name == "ROOT") if($name == "ROOT")
return 0; return 0;
$result = mysql_query("SELECT catId FROM appCategory WHERE ". $result = query_appdb("SELECT catId FROM appCategory WHERE ".
"catName = '$name'"); "catName = '$name'");
if(!$result) if(!$result)
return -1; return -1;
@@ -102,7 +102,7 @@ class Category {
$id = $this->id; $id = $this->id;
while(1) while(1)
{ {
$result = mysql_query("SELECT catName, catId, catParent FROM appCategory WHERE catId = $id"); $result = query_appdb("SELECT catName, catId, catParent FROM appCategory WHERE catId = $id");
if(!$result || mysql_num_rows($result) != 1) if(!$result || mysql_num_rows($result) != 1)
break; break;
$cat = mysql_fetch_object($result); $cat = mysql_fetch_object($result);
@@ -119,7 +119,7 @@ class Category {
*/ */
function getAppList($id) function getAppList($id)
{ {
$result = mysql_query("SELECT appId, appName, description FROM ". $result = query_appdb("SELECT appId, appName, description FROM ".
"appFamily WHERE catId = $id ". "appFamily WHERE catId = $id ".
"ORDER BY appName"); "ORDER BY appName");
if(!$result || mysql_num_rows($result) == 0) if(!$result || mysql_num_rows($result) == 0)
@@ -143,13 +143,13 @@ class Category {
{ {
$total = 0; $total = 0;
$result = mysql_query("SELECT appId FROM appFamily WHERE catId = $id"); $result = query_appdb("SELECT appId FROM appFamily WHERE catId = $id");
if($result) if($result)
$total += mysql_num_rows($result); $total += mysql_num_rows($result);
if($recurse) if($recurse)
{ {
$result = mysql_query("SELECT catId FROM appCategory WHERE catParent = $id"); $result = query_appdb("SELECT catId FROM appCategory WHERE catParent = $id");
if($result) if($result)
{ {
while($ob = mysql_fetch_object($result)) while($ob = mysql_fetch_object($result))
@@ -163,7 +163,7 @@ class Category {
function appIdToName($appId) function appIdToName($appId)
{ {
$result = mysql_query("SELECT appName FROM appFamily WHERE appId = $appId"); $result = query_appdb("SELECT appName FROM appFamily WHERE appId = $appId");
if(!$result || !mysql_num_rows($result)) if(!$result || !mysql_num_rows($result))
return "<unknown>"; // shouldn't normally happen return "<unknown>"; // shouldn't normally happen
$ob = mysql_fetch_object($result); $ob = mysql_fetch_object($result);
@@ -172,7 +172,7 @@ function appIdToName($appId)
function versionIdToName($versionId) function versionIdToName($versionId)
{ {
$result = mysql_query("SELECT versionName FROM appVersion WHERE versionId = $versionId"); $result = query_appdb("SELECT versionName FROM appVersion WHERE versionId = $versionId");
if(!$result || !mysql_num_rows($result)) if(!$result || !mysql_num_rows($result))
return "<unknown>"; // shouldn't normally happen return "<unknown>"; // shouldn't normally happen
$ob = mysql_fetch_object($result); $ob = mysql_fetch_object($result);
@@ -211,12 +211,12 @@ function make_cat_path($path, $appId = '', $versionId = '')
function deleteCategory($catId) function deleteCategory($catId)
{ {
$r = mysql_query("SELECT appId FROM appFamily WHERE catId = $catId"); $r = query_appdb("SELECT appId FROM appFamily WHERE catId = $catId");
if($r) if($r)
{ {
while($ob = mysql_fetch_object($r)) while($ob = mysql_fetch_object($r))
deleteAppFamily($ob->appId); deleteAppFamily($ob->appId);
$r = mysql_query("DELETE FROM appCategory WHERE catId = $catId"); $r = query_appdb("DELETE FROM appCategory WHERE catId = $catId");
if($r) if($r)
addmsg("Category $catId deleted", "green"); addmsg("Category $catId deleted", "green");

View File

@@ -184,7 +184,7 @@ function addmsg($text, $color = "black")
$text = "<font color='$color'> $text </font>\n"; $text = "<font color='$color'> $text </font>\n";
$text = str_replace("'", "\\'", $text); $text = str_replace("'", "\\'", $text);
mysql_query("INSERT INTO sessionMessages VALUES (null, null, '".session_id()."', '$text')"); query_appdb("INSERT INTO sessionMessages VALUES (null, null, '".session_id()."', '$text')");
echo mysql_error(); echo mysql_error();
} }
@@ -195,7 +195,7 @@ function addmsg($text, $color = "black")
*/ */
function dumpmsgbuffer() function dumpmsgbuffer()
{ {
$result = mysql_query("SELECT * FROM sessionMessages WHERE sessionId = '".session_id()."'"); $result = query_appdb("SELECT * FROM sessionMessages WHERE sessionId = '".session_id()."'");
if(!$result) if(!$result)
return; return;
@@ -207,7 +207,7 @@ function dumpmsgbuffer()
echo "<br>\n"; echo "<br>\n";
} }
mysql_query("DELETE FROM sessionMessages WHERE sessionId = '".session_id()."'"); query_appdb("DELETE FROM sessionMessages WHERE sessionId = '".session_id()."'");
} }

View File

@@ -24,7 +24,7 @@ class TableVE {
function test($query) function test($query)
{ {
$result = mysql_query($query); $result = query_appdb($query);
$nfields = mysql_num_fields($result); $nfields = mysql_num_fields($result);
$nrows = mysql_num_rows($result); $nrows = mysql_num_rows($result);
$table = mysql_field_table($result, 0); $table = mysql_field_table($result, 0);
@@ -51,7 +51,7 @@ class TableVE {
*/ */
function create($query, $table, $idcolumn) function create($query, $table, $idcolumn)
{ {
$result = mysql_query($query); $result = query_appdb($query);
$id = mysql_insert_id(); $id = mysql_insert_id();
$new_query = "SELECT * FROM $table WHERE $idcolumn = $id"; $new_query = "SELECT * FROM $table WHERE $idcolumn = $id";
@@ -65,7 +65,7 @@ class TableVE {
$nrows = 0; $nrows = 0;
$result = mysql_query($query); $result = query_appdb($query);
$nrows = mysql_num_rows($result); $nrows = mysql_num_rows($result);
if(debugging()) if(debugging())
@@ -127,7 +127,7 @@ class TableVE {
function edit($query) function edit($query)
{ {
$result = mysql_query($query); $result = query_appdb($query);
if(!$result) if(!$result)
echo "Oops: ".mysql_error()."<br>$query<br>\n"; echo "Oops: ".mysql_error()."<br>$query<br>\n";
$nrows = mysql_num_rows($result); $nrows = mysql_num_rows($result);
@@ -182,7 +182,7 @@ class TableVE {
function timestamp_to_unix($stamp) function timestamp_to_unix($stamp)
{ {
$result = mysql_query("select unix_timestamp($stamp)"); $result = query_appdb("select unix_timestamp($stamp)");
if(!$result) if(!$result)
return 0; return 0;
$r = mysql_fetch_row($result); $r = mysql_fetch_row($result);
@@ -192,7 +192,7 @@ class TableVE {
function make_option_list($varname, $cvalue, $table, $idField, $nameField, $where = "") function make_option_list($varname, $cvalue, $table, $idField, $nameField, $where = "")
{ {
$result = mysql_query("SELECT $idField, $nameField FROM $table $where ORDER BY $nameField"); $result = query_appdb("SELECT $idField, $nameField FROM $table $where ORDER BY $nameField");
if(!$result) if(!$result)
return; // Oops return; // Oops
@@ -459,7 +459,7 @@ class TableVE {
$update .= " WHERE ".$this->get_id($table)." = $value"; $update .= " WHERE ".$this->get_id($table)." = $value";
if(!mysql_query($update)) if(!query_appdb($update))
{ {
$thisError = "<p><font color=black><b>Query:</b>: $update</font></p>\n"; $thisError = "<p><font color=black><b>Query:</b>: $update</font></p>\n";
$thisError .= "<p><font color=red>".mysql_error()."</font></p>"; $thisError .= "<p><font color=red>".mysql_error()."</font></p>";
@@ -473,7 +473,7 @@ class TableVE {
if(ereg("^impl_.+$", $table)) if(ereg("^impl_.+$", $table))
{ {
$value = $fieldnames["apiid"][$i]; $value = $fieldnames["apiid"][$i];
mysql_query("UPDATE $table SET lastmodby = ".$_SESSION['current']->userid." WHERE apiid = $value"); query_appdb("UPDATE $table SET lastmodby = ".$_SESSION['current']->userid." WHERE apiid = $value");
} }
} }
} }

View File

@@ -28,7 +28,7 @@ class User {
*/ */
function exists($sEmail) function exists($sEmail)
{ {
$result = mysql_query("SELECT * FROM user_list WHERE email = '$sEmail'"); $result = query_appdb("SELECT * FROM user_list WHERE email = '$sEmail'");
if(!$result || mysql_num_rows($result) != 1) if(!$result || mysql_num_rows($result) != 1)
return 0; return 0;
return 1; return 1;
@@ -36,7 +36,7 @@ class User {
function lookup_userid($sEmail) function lookup_userid($sEmail)
{ {
$result = mysql_query("SELECT userid FROM user_list WHERE email = '$sEmail'"); $result = query_appdb("SELECT userid FROM user_list WHERE email = '$sEmail'");
if(!$result || mysql_num_rows($result) != 1) if(!$result || mysql_num_rows($result) != 1)
return null; return null;
$ob = mysql_fetch_object($result); $ob = mysql_fetch_object($result);
@@ -46,7 +46,7 @@ class User {
function lookup_realname($userid) function lookup_realname($userid)
{ {
$result = mysql_query("SELECT realname FROM user_list WHERE userid = $userid"); $result = query_appdb("SELECT realname FROM user_list WHERE userid = $userid");
if(!$result || mysql_num_rows($result) != 1) if(!$result || mysql_num_rows($result) != 1)
return null; return null;
$ob = mysql_fetch_object($result); $ob = mysql_fetch_object($result);
@@ -61,7 +61,7 @@ class User {
function lookup_CVSrelease($userId) function lookup_CVSrelease($userId)
{ {
$result = mysql_query("SELECT CVSrelease FROM user_list WHERE userId = '$userId'"); $result = query_appdb("SELECT CVSrelease FROM user_list WHERE userId = '$userId'");
if(!$result || mysql_num_rows($result) != 1) if(!$result || mysql_num_rows($result) != 1)
return null; return null;
$ob = mysql_fetch_object($result); $ob = mysql_fetch_object($result);
@@ -74,7 +74,7 @@ class User {
*/ */
function restore($sEmail, $sPassword) function restore($sEmail, $sPassword)
{ {
$result = mysql_query("SELECT stamp, userid, realname, ". $result = query_appdb("SELECT stamp, userid, realname, ".
"created, status, perm FROM user_list WHERE ". "created, status, perm FROM user_list WHERE ".
"email = '$sEmail' AND ". "email = '$sEmail' AND ".
"password = password('$sPassword')"); "password = password('$sPassword')");
@@ -102,7 +102,7 @@ class User {
/* update the 'stamp' field in the users account to reflect the last time */ /* update the 'stamp' field in the users account to reflect the last time */
/* they logged in */ /* they logged in */
$myUserId = $this->lookup_userid($sEmail); $myUserId = $this->lookup_userid($sEmail);
$result = mysql_query("UPDATE user_list SET stamp=null WHERE userid=$myUserId;"); $result = query_appdb("UPDATE user_list SET stamp=null WHERE userid=$myUserId;");
return 0; return 0;
} }
@@ -140,25 +140,25 @@ class User {
return 0; return 0;
if ($password) if ($password)
{ {
if (!mysql_query("UPDATE user_list SET password = password('$password') WHERE userid = $userid")) if (!query_appdb("UPDATE user_list SET password = password('$password') WHERE userid = $userid"))
return 0; return 0;
} }
if ($realname) if ($realname)
{ {
if (!mysql_query("UPDATE user_list SET realname = '".addslashes($realname)."' WHERE userid = $userid")) if (!query_appdb("UPDATE user_list SET realname = '".addslashes($realname)."' WHERE userid = $userid"))
return 0; return 0;
} }
if ($email) if ($email)
{ {
if (!mysql_query("UPDATE user_list SET email = '".addslashes($email)."' WHERE userid = $userid")) if (!query_appdb("UPDATE user_list SET email = '".addslashes($email)."' WHERE userid = $userid"))
return 0; return 0;
} }
if ($CVSrelease) if ($CVSrelease)
{ {
if (!mysql_query("UPDATE user_list SET CVSrelease = '".addslashes($CVSrelease)."' WHERE userid = $userid")) if (!query_appdb("UPDATE user_list SET CVSrelease = '".addslashes($CVSrelease)."' WHERE userid = $userid"))
return 0; return 0;
} }
@@ -174,7 +174,7 @@ class User {
if($sEmail == 0) if($sEmail == 0)
$sEmail = $this->email; $sEmail = $this->email;
$result = mysql_query("DELETE FROM user_list WHERE email = '$sEmail'"); $result = query_appdb("DELETE FROM user_list WHERE email = '$sEmail'");
if(!$result) if(!$result)
return mysql_error(); return mysql_error();
@@ -195,7 +195,7 @@ class User {
if(!$this->userid || !$key) if(!$this->userid || !$key)
return $def; return $def;
$result = mysql_query("SELECT * FROM user_prefs WHERE userid = $this->userid AND name = '$key'"); $result = query_appdb("SELECT * FROM user_prefs WHERE userid = $this->userid AND name = '$key'");
if(!$result || mysql_num_rows($result) == 0) if(!$result || mysql_num_rows($result) == 0)
return $def; return $def;
$ob = mysql_fetch_object($result); $ob = mysql_fetch_object($result);
@@ -208,9 +208,8 @@ class User {
if(!$this->userid || !$key || !$value) if(!$this->userid || !$key || !$value)
return null; return null;
$result = mysql_query("DELETE FROM user_prefs WHERE userid = $this->userid AND name = '$key'"); $result = query_appdb("DELETE FROM user_prefs WHERE userid = $this->userid AND name = '$key'");
$result = mysql_query("INSERT INTO user_prefs VALUES($this->userid, '$key', '$value')"); $result = query_appdb("INSERT INTO user_prefs VALUES($this->userid, '$key', '$value')");
echo mysql_error();
return $result ? true : false; return $result ? true : false;
} }
@@ -223,7 +222,7 @@ class User {
if(!$this->userid || !$priv) if(!$this->userid || !$priv)
return 0; return 0;
$result = mysql_query("SELECT * FROM user_privs WHERE userid = $this->userid AND priv = '$priv'"); $result = query_appdb("SELECT * FROM user_privs WHERE userid = $this->userid AND priv = '$priv'");
if(!$result) if(!$result)
return 0; return 0;
return mysql_num_rows($result); return mysql_num_rows($result);
@@ -246,7 +245,7 @@ class User {
} }
$query = "SELECT * FROM appMaintainers WHERE userid = '$this->userid' AND appId = '$appId' AND versionId = '$versionId'"; $query = "SELECT * FROM appMaintainers WHERE userid = '$this->userid' AND appId = '$appId' AND versionId = '$versionId'";
$result = mysql_query($query); $result = query_appdb($query);
if(!$result) if(!$result)
return 0; return 0;
return mysql_num_rows($result); return mysql_num_rows($result);
@@ -262,7 +261,7 @@ class User {
return false; return false;
$query = "SELECT * FROM appMaintainers WHERE userid = '$this->userid' AND appId = '$appId' AND superMaintainer = '1'"; $query = "SELECT * FROM appMaintainers WHERE userid = '$this->userid' AND appId = '$appId' AND superMaintainer = '1'";
$result = mysql_query($query); $result = query_appdb($query);
if(!$result) if(!$result)
return 0; return 0;
return mysql_num_rows($result); return mysql_num_rows($result);
@@ -277,7 +276,7 @@ class User {
if($this->checkpriv($priv)) if($this->checkpriv($priv))
return 1; return 1;
$result = mysql_query("INSERT INTO user_privs VALUES ($this->userid, '$priv')"); $result = query_appdb("INSERT INTO user_privs VALUES ($this->userid, '$priv')");
return $result; return $result;
} }
@@ -287,7 +286,7 @@ class User {
if(!$this->userid || !$priv) if(!$this->userid || !$priv)
return 0; return 0;
$result = mysql_query("DELETE FROM user_privs WHERE userid = $this->userid AND priv = '$priv'"); $result = query_appdb("DELETE FROM user_privs WHERE userid = $this->userid AND priv = '$priv'");
return $result; return $result;
} }
} }
@@ -343,7 +342,7 @@ function generate_passwd($pass_len = 10)
function lookupEmail($userid) function lookupEmail($userid)
{ {
$result = mysql_query("SELECT email FROM user_list WHERE userid = $userid"); $result = query_appdb("SELECT email FROM user_list WHERE userid = $userid");
if(!$result || mysql_num_rows($result) != 1) if(!$result || mysql_num_rows($result) != 1)
return null; return null;
$ob = mysql_fetch_object($result); $ob = mysql_fetch_object($result);
@@ -352,7 +351,7 @@ function lookupEmail($userid)
function lookupRealname($userid) function lookupRealname($userid)
{ {
$result = mysql_query("SELECT realname FROM user_list WHERE userid = $userid"); $result = query_appdb("SELECT realname FROM user_list WHERE userid = $userid");
if(!$result || mysql_num_rows($result) != 1) if(!$result || mysql_num_rows($result) != 1)
return null; return null;
$ob = mysql_fetch_object($result); $ob = mysql_fetch_object($result);
@@ -361,7 +360,7 @@ function lookupRealname($userid)
function UserWantsEmail($userid) function UserWantsEmail($userid)
{ {
$result = mysql_query("SELECT * FROM user_prefs WHERE userid = $userid AND name = 'send_email'"); $result = query_appdb("SELECT * FROM user_prefs WHERE userid = $userid AND name = 'send_email'");
if(!$result || mysql_num_rows($result) == 0) if(!$result || mysql_num_rows($result) == 0)
{ {
return true; return true;
@@ -385,7 +384,7 @@ function getNotifyEmailAddressList($appId, $versionId = 0)
$sWhere = "appId = ".$appId." AND versionId = ".$versionId; $sWhere = "appId = ".$appId." AND versionId = ".$versionId;
$query = "SELECT userId FROM appMaintainers WHERE ".$sWhere.";"; $query = "SELECT userId FROM appMaintainers WHERE ".$sWhere.";";
$result = mysql_query($query); $result = query_appdb($query);
if(mysql_num_rows($result) > 0) if(mysql_num_rows($result) > 0)
{ {
while($row = mysql_fetch_object($result)) while($row = mysql_fetch_object($result))
@@ -394,7 +393,7 @@ function getNotifyEmailAddressList($appId, $versionId = 0)
$c++; $c++;
} }
} }
$result = mysql_query("SELECT * FROM user_privs WHERE priv = 'admin'"); $result = query_appdb("SELECT * FROM user_privs WHERE priv = 'admin'");
if(mysql_num_rows($result) > 0) if(mysql_num_rows($result) > 0)
{ {
while($row = mysql_fetch_object($result)) while($row = mysql_fetch_object($result))
@@ -425,7 +424,7 @@ function getNotifyEmailAddressList($appId, $versionId = 0)
*/ */
function getNumberOfUsers() function getNumberOfUsers()
{ {
$result = mysql_query("SELECT count(*) as num_users FROM user_list;"); $result = query_appdb("SELECT count(*) as num_users FROM user_list;");
$row = mysql_fetch_object($result); $row = mysql_fetch_object($result);
return $row->num_users; return $row->num_users;
} }
@@ -436,7 +435,7 @@ function getNumberOfUsers()
*/ */
function getActiveUsersWithinDays($days) function getActiveUsersWithinDays($days)
{ {
$result = mysql_query("SELECT count(*) as num_users FROM user_list WHERE stamp >= DATE_SUB(CURDATE(), interval $days day);"); $result = query_appdb("SELECT count(*) as num_users FROM user_list WHERE stamp >= DATE_SUB(CURDATE(), interval $days day);");
$row = mysql_fetch_object($result); $row = mysql_fetch_object($result);
return $row->num_users; return $row->num_users;
} }

View File

@@ -202,7 +202,7 @@ function make_maintainer_rating_list($varname, $cvalue)
function getQueuedAppCount() function getQueuedAppCount()
{ {
$qstring = "SELECT count(*) as queued_apps FROM appQueue"; $qstring = "SELECT count(*) as queued_apps FROM appQueue";
$result = mysql_query($qstring); $result = query_appdb($qstring);
$ob = mysql_fetch_object($result); $ob = mysql_fetch_object($result);
return $ob->queued_apps; return $ob->queued_apps;
} }
@@ -211,7 +211,7 @@ function getQueuedAppCount()
function getQueuedAppDataCount() function getQueuedAppDataCount()
{ {
$qstring = "SELECT count(*) as queued_appdata FROM appDataQueue"; $qstring = "SELECT count(*) as queued_appdata FROM appDataQueue";
$result = mysql_query($qstring); $result = query_appdb($qstring);
$ob = mysql_fetch_object($result); $ob = mysql_fetch_object($result);
return $ob->queued_appdata; return $ob->queued_appdata;
} }
@@ -220,7 +220,7 @@ function getQueuedAppDataCount()
function getQueuedMaintainerCount() function getQueuedMaintainerCount()
{ {
$qstring = "SELECT count(*) as queued_maintainers FROM appMaintainerQueue"; $qstring = "SELECT count(*) as queued_maintainers FROM appMaintainerQueue";
$result = mysql_query($qstring); $result = query_appdb($qstring);
$ob = mysql_fetch_object($result); $ob = mysql_fetch_object($result);
return $ob->queued_maintainers; return $ob->queued_maintainers;
} }
@@ -229,7 +229,7 @@ function getQueuedMaintainerCount()
function getMaintainerCount() function getMaintainerCount()
{ {
$qstring = "SELECT count(*) as maintainers FROM appMaintainers"; $qstring = "SELECT count(*) as maintainers FROM appMaintainers";
$result = mysql_query($qstring); $result = query_appdb($qstring);
$ob = mysql_fetch_object($result); $ob = mysql_fetch_object($result);
return $ob->maintainers; return $ob->maintainers;
} }
@@ -238,7 +238,7 @@ function getMaintainerCount()
function getVendorCount() function getVendorCount()
{ {
$qstring = "SELECT count(*) as vendors FROM vendor"; $qstring = "SELECT count(*) as vendors FROM vendor";
$result = mysql_query($qstring); $result = query_appdb($qstring);
$ob = mysql_fetch_object($result); $ob = mysql_fetch_object($result);
return $ob->vendors; return $ob->vendors;
} }
@@ -246,7 +246,7 @@ function getVendorCount()
/* Get the number of users in the database */ /* Get the number of users in the database */
function getNumberOfComments() function getNumberOfComments()
{ {
$result = mysql_query("SELECT count(*) as num_comments FROM appComments;"); $result = query_appdb("SELECT count(*) as num_comments FROM appComments;");
$row = mysql_fetch_object($result); $row = mysql_fetch_object($result);
return $row->num_comments; return $row->num_comments;
} }
@@ -254,7 +254,7 @@ function getNumberOfComments()
/* Get the number of versions in the database */ /* Get the number of versions in the database */
function getNumberOfVersions() function getNumberOfVersions()
{ {
$result = mysql_query("SELECT count(versionId) as num_versions FROM appVersion WHERE versionName != 'NONAME';"); $result = query_appdb("SELECT count(versionId) as num_versions FROM appVersion WHERE versionName != 'NONAME';");
$row = mysql_fetch_object($result); $row = mysql_fetch_object($result);
return $row->num_versions; return $row->num_versions;
} }
@@ -262,7 +262,7 @@ function getNumberOfVersions()
/* Get the number of maintainers in the database */ /* Get the number of maintainers in the database */
function getNumberOfMaintainers() function getNumberOfMaintainers()
{ {
$result = mysql_query("SELECT count(maintainerId ) as num_maintainers FROM appMaintainers;"); $result = query_appdb("SELECT count(maintainerId ) as num_maintainers FROM appMaintainers;");
$row = mysql_fetch_object($result); $row = mysql_fetch_object($result);
return $row->num_maintainers; return $row->num_maintainers;
} }
@@ -270,7 +270,7 @@ function getNumberOfMaintainers()
/* Get the number of app familes in the database */ /* Get the number of app familes in the database */
function getNumberOfAppFamilies() function getNumberOfAppFamilies()
{ {
$result = mysql_query("SELECT count(*) as num_appfamilies FROM appFamily;"); $result = query_appdb("SELECT count(*) as num_appfamilies FROM appFamily;");
$row = mysql_fetch_object($result); $row = mysql_fetch_object($result);
return $row->num_appfamilies; return $row->num_appfamilies;
} }
@@ -278,7 +278,7 @@ function getNumberOfAppFamilies()
/* Get the number of images in the database */ /* Get the number of images in the database */
function getNumberOfImages() function getNumberOfImages()
{ {
$result = mysql_query("SELECT count(*) as num_images FROM appData WHERE type='image';"); $result = query_appdb("SELECT count(*) as num_images FROM appData WHERE type='image';");
$row = mysql_fetch_object($result); $row = mysql_fetch_object($result);
return $row->num_images; return $row->num_images;
} }