diff --git a/htdocs/lib/CrashReport.php b/htdocs/lib/CrashReport.php
index e25cffb..ab13b2b 100644
--- a/htdocs/lib/CrashReport.php
+++ b/htdocs/lib/CrashReport.php
@@ -63,13 +63,11 @@ class CrashReport
}
function getTotal($filter)
{
- global $DB;
-
$where = $filter->getWhere();
$q = "select count(id) as total from reports $where";
if (false !== $cached = Memc::getq($q)) return $cached;
- if (!$res = $DB->query($q) OR !$row = $DB->fetchRow($res))
+ if (!$res = DBH::$db->query($q) OR !$row = DBH::$db->fetchRow($res))
{
return 0;
}
@@ -82,21 +80,19 @@ class CrashReport
function getReports($filter, $fields = "id, reported, client_version, client_channel, os, gpu, grid, region")
{
- global $DB;
-
$ret = array();
$q = "select $fields from reports " . $filter->getWhere() . kl_str_sql(" order by id desc limit !i offset !i", $filter->limit, $filter->offset);
if (false !== $cached = Memc::getq($q)) return $cached;
- if (!$res = $DB->query($q))
+ if (!$res = DBH::$db->query($q))
{
return $ret;
}
- while ($row = $DB->fetchRow($res))
+ while ($row = DBH::$db->fetchRow($res))
{
$r = new CrashReport;
- $DB->loadFromDbRow($r, $res, $row);
+ DBH::$db->loadFromDbRow($r, $res, $row);
$ret[] = $r;
}
@@ -106,18 +102,16 @@ class CrashReport
function getReport($id)
{
- global $DB;
-
$ret = array();
- if (!$res = $DB->query(kl_str_sql("select * from reports where id=!i", $id)))
+ if (!$res = DBH::$db->query(kl_str_sql("select * from reports where id=!i", $id)))
{
return null;
}
- if ($row = $DB->fetchRow($res))
+ if ($row = DBH::$db->fetchRow($res))
{
$r = new CrashReport;
- $DB->loadFromDbRow($r, $res, $row);
+ DBH::$db->loadFromDbRow($r, $res, $row);
$r->parseStackTrace($r->raw_stacktrace);
return $r;
}
@@ -127,13 +121,11 @@ class CrashReport
function delete()
{
- global $DB;
- $DB->query(kl_str_sql("delete from reports where id=!i", $this->id));
+ DBH::$db->query(kl_str_sql("delete from reports where id=!i", $this->id));
}
function save()
{
- global $DB;
$this->delete();
$q = kl_str_sql("insert into reports (
id,
@@ -171,7 +163,7 @@ class CrashReport
$this->crash_address,
$this->crash_thread,
$this->raw_stacktrace);
- if ($res = $DB->query($q))
+ if ($res = DBH::$db->query($q))
{
return true;
}
diff --git a/htdocs/lib/DBH.php b/htdocs/lib/DBH.php
index 32b3ecf..a97316d 100644
--- a/htdocs/lib/DBH.php
+++ b/htdocs/lib/DBH.php
@@ -1,7 +1,6 @@
query("SELECT * FROM options")) {
+ if(!$result = DBH::$db->query("SELECT * FROM options")) {
return false;
} else {
- while ($row = $DB->fetchRow($result)) {
+ while ($row = DBH::$db->fetchRow($result)) {
self::$optionArray[$row['name']] = $row['value'];
}
return true;
@@ -59,9 +57,8 @@ class Option
*/
public static function update($name, $value)
{
- global $DB;
- $result = $DB->query(kl_str_sql("DELETE FROM options WHERE name=!s", $name));
- $result = $DB->query(kl_str_sql("INSERT INTO options (name, value) VALUES(!s,!s)", $name,$value ));
+ $result = DBH::$db->query(kl_str_sql("DELETE FROM options WHERE name=!s", $name));
+ $result = DBH::$db->query(kl_str_sql("INSERT INTO options (name, value) VALUES(!s,!s)", $name,$value ));
self::$optionArray[$name] = $value;
return $result;
}
diff --git a/htdocs/lib/ReportParser.php b/htdocs/lib/ReportParser.php
index fa02044..5804157 100644
--- a/htdocs/lib/ReportParser.php
+++ b/htdocs/lib/ReportParser.php
@@ -37,14 +37,13 @@ class ReportParser
function parse($id)
{
- global $DB;
$q = kl_str_sql("select * from raw_reports where report_id=!i", $id);
- if (!$res = $DB->query($q) OR !$row = $DB->fetchRow($res))
+ if (!$res = DBH::$db->query($q) OR !$row = DBH::$db->fetchRow($res))
{
return array();
}
$data = new stdClass;
- $DB->loadFromDbRow($data, $res, $row);
+ DBH::$db->loadFromDbRow($data, $res, $row);
$data->report = llsd_decode($data->raw_data);
$data->report["reported"] = $data->reported;
unset($data->raw_data);
@@ -62,11 +61,10 @@ class ReportParser
function setProcessed($id, $status)
{
- global $DB;
$ret = array();
$q = kl_str_sql("update raw_reports set processed=!i where report_id=!i", $status, $id);
- if ($res = $DB->query($q))
+ if ($res = DBH::$db->query($q))
{
return true;
}
@@ -78,16 +76,15 @@ class ReportParser
function getUnprocessedIDs()
{
- global $DB;
$ret = array();
$q = kl_str_sql("select report_id from raw_reports where processed=!i", 0);
- if (!$res = $DB->query($q))
+ if (!$res = DBH::$db->query($q))
{
return $ret;
}
- while ($row = $DB->fetchRow($res))
+ while ($row = DBH::$db->fetchRow($res))
{
$ret[] = (int)$row["report_id"];
}
diff --git a/htdocs/lib/SearchFilter.php b/htdocs/lib/SearchFilter.php
index 0a5bd5b..eabcca6 100644
--- a/htdocs/lib/SearchFilter.php
+++ b/htdocs/lib/SearchFilter.php
@@ -81,19 +81,17 @@ class SearchFilter
function getVersions()
{
- global $DB;
-
$ret = array();
$where = $this->chan ? kl_str_sql("where client_channel=!s", $this->chan) : '';
$q = "select distinct client_version from reports $where order by client_version desc";
if (false !== $cached = Memc::getq($q)) return $cached;
- if (!$res = $DB->query($q))
+ if (!$res = DBH::$db->query($q))
{
return $ret;
}
- while ($row = $DB->fetchRow($res))
+ while ($row = DBH::$db->fetchRow($res))
{
$ret[] = $row["client_version"];
}
@@ -104,18 +102,16 @@ class SearchFilter
function getGrids()
{
- global $DB;
-
$ret = array();
$q = "select distinct grid from reports order by grid asc";
if (false !== $cached = Memc::getq($q)) return $cached;
- if (!$res = $DB->query($q))
+ if (!$res = DBH::$db->query($q))
{
return $ret;
}
- while ($row = $DB->fetchRow($res))
+ while ($row = DBH::$db->fetchRow($res))
{
$ret[] = $row["grid"];
}
@@ -155,7 +151,7 @@ class SearchFilter
Version
-