Sebastian Grewe
bbba9d1daf
Merge pull request #1837 from MPOS/unified-user-miningstats
...
Unified user miningstats
2014-02-26 09:53:41 +01:00
Sebastian Grewe
3e64dd3487
Merge pull request #1798 from MPOS/x-forwarded-for-check
...
[CHANGED] Parse X-FORWARDED-FOR when supplied
2014-02-26 09:53:29 +01:00
Sebastian Grewe
d750e81b02
[FIX] Wait for global cache data, don't run queries
2014-02-26 09:42:49 +01:00
Sebastian Grewe
78619c1427
[IMPROVED] Unified user speed statistics
...
* [ADDED] getUserMiningStats to fetch all speed related data
* Uses global cache if available, falls back to local query and then
local caches
* [REMOVED] getUserHashrate, getUserSharerate, getUserAvgShareDifficulty
* [UPDATED] All code occurences for the above to use the new system
Probably won't change much since global cache was already used but does
help on the Dashboard since we combine at least 2 calls into one.
2014-02-26 09:27:32 +01:00
Sebastian Grewe
b2f555a83a
Merge pull request #1820 from iAmShorty/users-registered
...
[UPDATE] Adding registrations and Regdate to Admin Dashboard and Userinfo
2014-02-24 15:02:55 +01:00
iAmShorty
759b8a2e7a
[UPDATE] separate pages, new icons, navigation update
2014-02-24 14:40:46 +01:00
Sebastian Grewe
dc1fe9aa35
Merge pull request #1799 from MPOS/debug-to-logfile
...
[IMPROVED] Allow debug console log to logfile
2014-02-24 11:26:43 +01:00
iAmShorty
55266e274a
[UPDATE] added pagination to reg and invite
2014-02-24 11:24:13 +01:00
Nathan Patten
966d32036b
Update chat.inc.php
2014-02-24 21:12:15 +11:00
iAmShorty
0f9cdb915c
[UPDATE] fixed typo in sql queries
2014-02-24 10:58:23 +01:00
iAmShorty
d419b1f0ff
[UPDATE] sorting by count
2014-02-24 10:56:47 +01:00
iAmShorty
37b8d5a56b
[UPDATE] changed hardcoded table names
2014-02-24 10:52:12 +01:00
iAmShorty
fbdd811d7f
[UPDATE] added top inviter, some code cleanup
2014-02-24 10:39:09 +01:00
Nathan Patten
d5c63ff824
Update smarty_globals.inc.php
2014-02-24 20:32:00 +11:00
Nathan Patten
624c613c89
Update admin_settings.inc.php
2014-02-24 20:28:09 +11:00
Nathan Patten
7f8c5e8270
Blah
2014-02-24 20:18:14 +11:00
Nathan Patten
17509aa3b9
Update admin_settings.inc.php
2014-02-24 20:02:45 +11:00
Nathan Patten
ae9c220521
Update chat.inc.php
2014-02-24 20:01:02 +11:00
Nathan Patten
a9cc0a9ec9
Update smarty_globals.inc.php
2014-02-24 19:56:51 +11:00
Nathan Patten
aac9b70aac
Update smarty_globals.inc.php
2014-02-24 19:30:08 +11:00
Nathan Patten
3418c3db77
Update chat.inc.php
2014-02-24 19:29:01 +11:00
Nathan Patten
b1af60709e
[EDIT] move from acl to system
...
Was going to do this the first time.. dunno why i put it in acl :p
2014-02-24 19:17:31 +11:00
iAmShorty
d0a82be11b
[UPDATE] adding if user was invited and inviter to registered users
2014-02-23 22:30:52 +01:00
iAmShorty
23afae0aaf
[UPDATE] added last 10 registered users to dashboard
2014-02-23 21:35:20 +01:00
iAmShorty
7ffa620975
[UPDATE] Adding Reg Date to Userinfo in Admin Panel
2014-02-23 20:48:58 +01:00
iAmShorty
47f6048378
[UPDATE] Adding registrations to Admin Dashboard
2014-02-23 20:23:21 +01:00
Nathan Patten
45127409ed
[FIX] Web Chat Disabled bt default
2014-02-23 07:26:36 +11:00
Nathan Patten
b79bd6ae8e
[ADD] Chat
2014-02-22 21:33:49 +11:00
Nathan Patten
305d0e4cc9
[ADD] Chat settings
2014-02-22 21:32:30 +11:00
Nathan Patten
b657d41bd6
[ADD] Chat global
2014-02-22 21:30:11 +11:00
iAmShorty
c5ff564deb
[FIX] Wallet Balance
2014-02-20 20:59:54 +01:00
Sebastian Grewe
865cd96f5e
[IMPROVED] Allow debug console log to logfile
...
* Needs logging level set to 7 in security config
* Needs debugging enabled in global config
2014-02-20 09:01:18 +01:00
Sebastian Grewe
8bd469ba5d
[CHANGED] Parse X-FORWARDED-FOR when supplied
...
Instead of trusting REMOTE_ADDR we should parse X-FORWARDED-FOR if
supplied. This will properly use the user IP in a multi-LB setup.
Needs testing
2014-02-19 14:32:20 +01:00
iAmShorty
e16db6071e
[FIX] Wallet Balance Fix
2014-02-19 09:45:35 +01:00
Sebastian Grewe
8cb42aab2b
Merge pull request #1770 from iAmShorty/realbalance-wrapper
...
[FIX] return balance from main account
2014-02-19 09:34:01 +01:00
Sebastian Grewe
a4e3468b9b
[CHANGE] 500 default limit
2014-02-18 09:22:16 +01:00
Sebastian Grewe
7229b5b130
[ADDED] Payout Queue Limiter
...
* [ADDED] LIMIT to getMPQueue and getAPQueue
* [ADDED] Default config payout queue size of 1000 for MP and 1000 for AP
* [UPDATED] Payouts cronjob to use this new default limits
This may help some coins that have tx count issues when doing sendmany.
Other coins can play with the values to find their sweet spot. Run the
payout multiple times in a row to force more transactions of the same
amount.
Fixes #1773 and thanks to @jrwr for the idea!
2014-02-18 09:16:26 +01:00
iAmShorty
d2be015554
[FIX] return balance from main account
2014-02-16 16:44:36 +01:00
Sebastian Grewe
cdaf757b8b
Merge branch 'next' of github.com:MPOS/php-mpos into next
2014-02-16 08:32:10 +01:00
Sebastian Grewe
6f5d866bb9
[ADDED] Force run even if cron is active with -f
2014-02-16 08:31:47 +01:00
Sebastian Grewe
5c22cc3c08
Merge pull request #1764 from MPOS/combine-cleanups
...
[IMPROVED] Combined cleanup tasks into single PHP
2014-02-16 08:12:11 +01:00
Sebastian Grewe
e6a396c85b
Merge pull request #1750 from iAmShorty/wallet-info-adminpanel
...
[ENHANCEMENT] Wallet info adminpanel
2014-02-16 08:12:03 +01:00
Sebastian Grewe
5dd13d4475
Merge pull request #1757 from MPOS/getrealbalance-wrapper
...
[ADDED] getrealbalance wrapper for payouts
2014-02-16 08:11:08 +01:00
Sebastian Grewe
d1f3f5d01d
[UPDATE] Return negative balance if main is negative
2014-02-15 19:17:12 +01:00
Sebastian Grewe
146b56259b
[IMPROVED] Combined cleanup tasks into single PHP
...
* [IMPROVED] Logging format for all cleanup tasks
* [UPDATED] Cron shellescripts
* [UPDATE] Cron Monitoring Page
* [DELETED] Old `*_cleanup.php` scripts
2014-02-15 19:01:25 +01:00
Sebastian Grewe
bd561ff465
[FIX] Statistics Graphs ACL
...
Fixes #1760
2014-02-15 09:27:38 +01:00
iAmShorty
b0baa29a1f
[FIX] fix for negative balance
...
using php abs() should do the trick with negative balance
2014-02-14 21:03:30 +01:00
iAmShorty
691e1e60cb
Update bitcoinwrapper.class.php
2014-02-14 20:49:42 +01:00
Sebastian Grewe
6f1f56abb6
[ADDED] getrealbalance wrapper for payouts
...
During payouts, we must ensure our wallets main accounts has the funds
to payout users. Hence we implement a wrapper method:
* If account count == 1 we only have main account, return getbalance
* Else return our main accounts balance - calculated unconfirmed
This should keep getbalance untouched when used on other places but
gives our payout processing a proper main account balance.
It's mostly a wrapper for those wallets running multiple accounts in one
wallet. They are warned on the front-end already but this ensure payouts
process properly.
Fixes #1755 once merged.
2014-02-14 17:21:52 +01:00
Sebastian Grewe
8f4af5b038
[REMOVED] Liquid payout cron from monitoring pages
2014-02-14 11:40:50 +01:00
