RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure we set workers to 0

Browse Source 
If no workers are found false is returned. Smarty is not able to set a
default on `false` values so we have to set it to 0 if the query failed.

Fixes #418
This commit is contained in:
Sebastian Grewe 2013-07-11 11:43:48 +02:00
parent 39d1193e6a
commit 1344f39f96
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/include/classes/worker.class.php
View File

@ -135,15 +135,9 @@ class Worker {
**/ **/
public function getCountAllActiveWorkers() { public function getCountAllActiveWorkers() {
$this->debug->append("STA " . __METHOD__, 4); $this->debug->append("STA " . __METHOD__, 4);
$stmt = $this->mysqli->prepare("SELECT COUNT(DISTINCT username) AS total FROM " . $this->share->getTableName() . " WHERE time > DATE_SUB(now(), INTERVAL 10 MINUTE)"); $stmt = $this->mysqli->prepare("SELECT IFNULL(COUNT(DISTINCT username), 0) AS total FROM " . $this->share->getTableName() . " WHERE time > DATE_SUB(now(), INTERVAL 10 MINUTE)");
if ($this->checkStmt($stmt)) { if ($this->checkStmt($stmt) && $stmt->execute() && $result = $stmt->get_result())
if (!$stmt->execute()) {
return false;
}
$result = $stmt->get_result();
$stmt->close();
return $result->fetch_object()->total; return $result->fetch_object()->total;
}
return false; return false;
} }

2
public/include/smarty_globals.inc.php
View File

@ -24,7 +24,7 @@ if (@$_SESSION['AUTHENTICATED']) {
$bitcoin->can_connect() === true ? $dNetworkHashrate = $bitcoin->query('getnetworkhashps') : $dNetworkHashrate = 0; $bitcoin->can_connect() === true ? $dNetworkHashrate = $bitcoin->query('getnetworkhashps') : $dNetworkHashrate = 0;
// Fetch some data // Fetch some data
$iCurrentActiveWorkers = $worker->getCountAllActiveWorkers(); if (!$iCurrentActiveWorkers = $worker->getCountAllActiveWorkers()) $iCurrentActiveWorkers = 0;
$iCurrentPoolHashrate = $statistics->getCurrentHashrate(); $iCurrentPoolHashrate = $statistics->getCurrentHashrate();
$iCurrentPoolShareRate = $statistics->getCurrentShareRate(); $iCurrentPoolShareRate = $statistics->getCurrentShareRate();