diff --git a/htdocs/crashes.php b/htdocs/crashes.php index 56ac5b1..566205a 100644 --- a/htdocs/crashes.php +++ b/htdocs/crashes.php @@ -155,7 +155,7 @@ if ($signature_id): id, $reports[$i]->id) ?> id, $reports[$i]->client_channel . " " . $reports[$i]->client_version) ?> - id, $reports[$i]->os) ?> + id, $reports[$i]->os . ($reports[$i]->client_arch ? " (" . $reports[$i]->client_arch . ")" : ""))?> id, $reports[$i]->gpu) ?> id, $reports[$i]->grid . " (" . $reports[$i]->region . ")") ?> signature_id ?> diff --git a/htdocs/lib/CrashReport.php b/htdocs/lib/CrashReport.php index 480565c..617ec16 100644 --- a/htdocs/lib/CrashReport.php +++ b/htdocs/lib/CrashReport.php @@ -6,6 +6,7 @@ class CrashReport public $reported; public $client_version; public $client_channel; + public $client_arch; public $os; public $os_type; public $os_version; @@ -83,7 +84,7 @@ class CrashReport } } - function getReports($filter, $fields = "id, reported, client_version, client_channel, os, gpu, grid, region, signature_id") + function getReports($filter, $fields = "id, reported, client_version, client_channel, client_arch, os, gpu, grid, region, signature_id") { $ret = array(); $q = "select $fields from reports " . $filter->getWhere() . kl_str_sql(" order by id desc limit !i offset !i", $filter->limit, $filter->offset); @@ -150,6 +151,7 @@ class CrashReport client_version, client_version_s, client_channel, + client_arch, os, os_type, os_version, @@ -163,12 +165,13 @@ class CrashReport crash_address, crash_thread, raw_stacktrace - ) values (!i, !t, !s, !s, !s, !s, !s, !s, !s, !s, !s, !i, !s, !s, !s, !s, !i, !s)", + ) values (!i, !t, !s, !s, !s, !s, !s,!s, !s, !s, !s, !s, !i, !s, !s, !s, !s, !i, !s)", $this->id, $this->reported, $this->client_version, self::sortableVersion($this->client_version), $this->client_channel, + $this->client_arch, $this->os, $this->os_type, $this->os_version, @@ -383,6 +386,7 @@ class CrashReport $this->reported = $data["reported"]; $this->client_version = $data["clientVersion"]; $this->client_channel = $data["clientChannel"]; + $this->client_arch = $data["clientArch"]; $this->os = $data["DebugLog"]["OSInfo"]; $this->gpu = $data["DebugLog"]["GraphicsCard"]; $this->cpu = $data["DebugLog"]["CPUInfo"]["CPUString"]; diff --git a/htdocs/lib/ReportParser.php b/htdocs/lib/ReportParser.php index f52f879..894810b 100644 --- a/htdocs/lib/ReportParser.php +++ b/htdocs/lib/ReportParser.php @@ -53,6 +53,7 @@ class ReportParser //var_dump($client); $data->report["clientVersion"] = $client["MajorVersion"] . "." . $client["MinorVersion"] . "." . $client["PatchVersion"] . "." .$client["BuildVersion"]; $data->report["clientChannel"] = str_replace(" ", "", $client["Name"]); + $data->report["clientArch"] = $client["Architecture"]; } // $data->report["raw"] = $row; diff --git a/htdocs/lib/SearchFilter.php b/htdocs/lib/SearchFilter.php index 7acea31..8f41d35 100644 --- a/htdocs/lib/SearchFilter.php +++ b/htdocs/lib/SearchFilter.php @@ -25,6 +25,8 @@ class SearchFilter function __construct() { + global $S; + foreach($this->fields as $field) { if (strlen($_GET[$field])) @@ -32,6 +34,15 @@ class SearchFilter $this->$field = trim($_GET[$field]); } } + + if (!isset($_REQUEST["chan"])) + { + $this->chan = $S->persist->chan; + } + else + { + $S->persist->chan = $_REQUEST["chan"]; + } if (in_array($_GET["sort_by"], self::$sort_keys)) { diff --git a/htdocs/lib/Session.php b/htdocs/lib/Session.php index 61d1503..6deef4e 100644 --- a/htdocs/lib/Session.php +++ b/htdocs/lib/Session.php @@ -186,7 +186,6 @@ class Session $this->user = $user; $this->user_id = $user->user_id; $this->authenticated = true; - $this->persist->active_order = null; $this->update(); return true; } diff --git a/htdocs/lib/db_init.sql b/htdocs/lib/db_init.sql index 7fd3c3c..bf1a18b 100644 --- a/htdocs/lib/db_init.sql +++ b/htdocs/lib/db_init.sql @@ -40,6 +40,7 @@ create table reports( client_version varchar(32), client_version_s varchar(32), client_channel varchar(32), + client_arch varchar(16), os varchar(128), os_type varchar(32), os_version varchar(128),