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

Merge branch 'next' into issue-444-theserapher

Browse Source
This commit is contained in:
Sebastian Grewe 2013-09-20 16:11:41 +02:00
commit baeae10027
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
README.md
View File

@ -21,7 +21,11 @@ Donations
I was hoping to keep this out of the README but apparently people remove or change the LTC address I was hoping to keep this out of the README but apparently people remove or change the LTC address
at the bottom of the page. For those of you finding my project and are willing to appreciate the work at the bottom of the page. For those of you finding my project and are willing to appreciate the work
with some hard earned LTC feel free to donate to my LTC address: `Lge95QR2frp9y1wJufjUPCycVsg5gLJPW8` with some hard earned coins feel free to donate:
* LTC address: `Lge95QR2frp9y1wJufjUPCycVsg5gLJPW8`
* FTC address: `6jDgGaUzMVyac5uqBhJCMiFMKCtH1LagTA`
* NVC address: `4Guct6z7NVPVALHRAVn517TTmvqQve4WYr`
# Website Footer # Website Footer
@ -78,31 +82,39 @@ The following feature have been implemented so far:
* Reward Systems * Reward Systems
* Propotional * Propotional
* PPS * PPS
* PPLNS **NEW** * PPLNS
* Statistics are cached in Memcache by Cronjob for quick data access * Statistics are cached in Memcache by Cronjob for quick data access
* **NEW** Now supporting incremental round share updates!
* **SOON** New Theme
* **SOON** Live Dashboard
* **SOON** AJAX Support
* **SOON** Overhauled API
* Web User accounts * Web User accounts
* Re-Captcha protected registration form * Re-Captcha protected registration form
* Worker accounts * Worker accounts
* Worker activity (live, past 10 minutes) * Worker activity
* Worker hashrates (live, past 10 minutes) * Worker hashrates
* Pool statistics * Pool statistics
* Minimal Block statistics * Minimal Block statistics
* Pool donations * Pool donations
* Pool fees * Pool fees
* Block Bonus Payouts **NEW**
* Manual payout * Manual payout
* Auto payout * Auto payout
* Transaction list (confirmed and unconfirmed) * Transaction list
* Admin Panel * Admin Panel
* Cron Monitoring Overview **NEW** * Cron Monitoring Overview
* User Listing including statistics * User Listing including statistics
* Wallet information * Wallet information
* User Transactions **NEW** * User Transactions
* News Posts * News Posts
* Pool Settings **NEW**
* Notification system * Notification system
* IDLE Workers * IDLE Workers
* New blocks found in pool * New blocks found in pool
* Auto Payout * Auto Payout
* Manual Payout * Manual Payout
* User-to-user Invitation System **NEW**
* Support for various Scrypt based coins via config * Support for various Scrypt based coins via config
* MNC * MNC
* LTC * LTC

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

@ -78,7 +78,7 @@ class Worker {
FROM " . $this->table . " AS w FROM " . $this->table . " AS w
WHERE monitor = 1 WHERE monitor = 1
AND ( AND (
SELECT IFNULL(SIGN(IF(our_result = 'Y', COUNT(id), 0)), 0) FROM " . $this->share->getTableName() . " WHERE username = w.username AND time > DATE_SUB(now(), INTERVAL 10 MINUTE) SELECT IFNULL(SUM(IF(our_result = 'Y', 1, 0)), 0) FROM " . $this->share->getTableName() . " WHERE username = w.username AND time > DATE_SUB(now(), INTERVAL 10 MINUTE)
) = 0"); ) = 0");
if ($this->checkStmt($stmt) && $stmt->execute() && $result = $stmt->get_result()) if ($this->checkStmt($stmt) && $stmt->execute() && $result = $stmt->get_result())
return $result->fetch_all(MYSQLI_ASSOC); return $result->fetch_all(MYSQLI_ASSOC);