RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,928 Commits 4 Branches 11 Tags 14 MiB
46cfd2cf8c
Commit Graph

1969 Commits

Author SHA1 Message Date
rog1121
639d4ccb10 Fix Notifications Class 2014-03-01 17:00:51 -07:00
Sebastian Grewe
0b2aecbad9 Merge branch 'master' into development 2014-03-01 19:00:11 +01:00
Sebastian Grewe
735bdadd88 [FIX] Payout notification type in list 2014-03-01 13:50:03 +01:00
Contex
4d2606bedc Fixed table cells for general_stats.tpl 
<th></td> is obviously wrong
 2014-02-28 21:09:28 +01:00
Sebastian Grewe
aac80502e1 [FIX] Bail findblocks on block insertion errors 
Fixes #1857 once merged.
 2014-02-28 09:09:29 +01:00
Sebastian Grewe
12b80856c4 [UPDATE] Enable PPLNS Backpay by default 2014-02-27 22:34:47 +01:00
Sebastian Grewe
8d369d5ba4 [IMPROVED] Deduct TXFEE in Transaction CreateDebit 
No need to deduct the fees on our cronjob, do it automatically in our
transaction class when creating a Debit record.
 2014-02-27 15:19:01 +01:00
Sebastian Grewe
5966f77e76 [ADDED] Hashrate modifier name and value 
* [ADDED] Hashrate modifier value to getnavbardata
* [ADDED] Hashrate modifier name to getnavbardata

Fixes #1845 once merged.
 2014-02-27 15:19:00 +01:00
Sebastian Grewe
52b8ecca89 Merge pull request #1849 from MPOS/ctoken-missing 
[FIX] Do not use CTOKEN if CSRF disabled
 2014-02-27 12:38:09 +01:00
Sebastian Grewe
9ad568a1d1 [FIX] Do not use CTOKEN if CSRF disabled 
* [FIX] Workers page not checking for CTOKEN properly

Fixes #1848 once merged.
 2014-02-27 11:56:46 +01:00
Sebastian Grewe
d857a3d85e [FIX] No captcha on contactform if disabled 
Fixes #1846 once merged
 2014-02-27 11:07:37 +01:00
iAmShorty
6fb8f835ed [FIX] added >= to values 2014-02-26 11:18:59 +01:00
Sebastian Grewe
bcc45e22cf [FIX] Same fix for hashrate list 
Formatting updated
 2014-02-26 10:47:10 +01:00
Sebastian Grewe
6df2010b53 [FIX] Donor icons out of order 2014-02-26 10:42:45 +01:00
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
858c2cb24c Merge pull request #1826 from iAmShorty/PoS-Balance-Fix 
[FIX] Newmint Payout Fix
 2014-02-26 09:53:17 +01:00
Sebastian Grewe
9955b1ec5c Merge pull request #1829 from iAmShorty/donor-icons 
[UPDATE] nicer donor icons
 2014-02-26 09:53:03 +01:00
Sebastian Grewe
d750e81b02 [FIX] Wait for global cache data, don't run queries 2014-02-26 09:42:49 +01:00
iAmShorty
20374a1eac [UPDATE] changed template 2014-02-26 09:35:50 +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
iAmShorty
9ae66915c8 [UPDATE] added Asteroids MacOS Miner 2014-02-25 12:49:57 +01:00
iAmShorty
54652cb93f [FIX] added default values 2014-02-25 09:29:09 +01:00
iAmShorty
c39db3bec3 [UPDATE] changed icons 2014-02-25 09:10:06 +01:00
iAmShorty
a52909d909 [UPDATE] changed icons 2014-02-25 08:53:12 +01:00
iAmShorty
67ca76279d [UPDAT] added footer, cleanup 2014-02-24 22:48:57 +01:00
iAmShorty
3381b0e60a [FIX] Typo 2014-02-24 21:24:03 +01:00
iAmShorty
8b3d5ec138 [UPDATE] nicer donor icons 2014-02-24 21:16:15 +01:00
iAmShorty
c6b060dbd5 [FIX] Newmint Payout Fix 2014-02-24 20:31:53 +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
42aa77c454 [UPDATE] links in dashboard, cleanup dashboard 2014-02-24 14:49:42 +01:00
iAmShorty
759b8a2e7a [UPDATE] separate pages, new icons, navigation update 2014-02-24 14:40:46 +01:00
iAmShorty
ddb80a791b [UPDATE] added anchors for pagination 2014-02-24 14:07:47 +01:00
iAmShorty
f09d7c4b7c [UPDATE] fixed typo 2014-02-24 13:15:28 +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
bf8673b1f0 [UPDATE] changed text 2014-02-24 11:25:05 +01:00
iAmShorty
55266e274a [UPDATE] added pagination to reg and invite 2014-02-24 11:24:13 +01:00
Nathan Patten
02568df759 Update default.tpl 2014-02-24 21:16:14 +11: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
0c064d4d58 Update default.tpl 2014-02-24 20:28:49 +11:00
Nathan Patten
624c613c89 Update admin_settings.inc.php 2014-02-24 20:28:09 +11:00
Nathan Patten
3ea023e6e0 Blah 2014-02-24 20:21:27 +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
9372da9aa8 Update default.tpl 2014-02-24 19:28:26 +11:00
Nathan Patten
467a9531a6 Update navigation.tpl 2014-02-24 19:27:53 +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
00c184d45e [UPDATE] cleaning up admin dashboard 2014-02-23 22:58:57 +01: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
0e81af405a [FIX]tablesorter margin on resize 
Stops the tablesorter from pushing right on window resize
 2014-02-23 07:14:06 +11:00
Nathan Patten
ac8657e909 [ADD] Donor 2014-02-22 21:43:57 +11:00
Nathan Patten
e7ec045785 [ADD] Donor 2014-02-22 21:42:45 +11:00
Nathan Patten
a68a5675b1 [ADD] Chat Link To Nav 2014-02-22 21:39:22 +11:00
Nathan Patten
fdd8cb64f9 Create disabled.tpl 2014-02-22 21:36:14 +11:00
Nathan Patten
2aab514624 [ADD] Chat tpl 2014-02-22 21:35:27 +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
28d114b099 [ADDED] Use getCurrentIP on IP check 2014-02-20 08:26:58 +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
8f4237945b [UPDATE] make it uppercase 2014-02-17 15:40:26 +01:00
iAmShorty
4532bd6601 [UPDATE] add coinname to qrode 2014-02-17 15:39:10 +01:00
iAmShorty
63ba74fc60 [UPDATE] balance fix for cron and wallet 2014-02-16 17:32:05 +01:00
iAmShorty
d2be015554 [FIX] return balance from main account 2014-02-16 16:44:36 +01:00
Sebastian Grewe
85f985060b Merge pull request #1766 from rog1121/notification-fix 
Notifications Fix
 2014-02-16 14:50:38 +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
rog1121
eb382b677c Notifications Fix 2014-02-15 18:00:36 -07:00
iAmShorty
45d79d0eab [UPDATE] style change for addresses 2014-02-15 23:17:37 +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
iAmShorty
2acf83894d only show new table if accounts > 1 2014-02-15 13:55:28 +01:00
Sebastian Grewe
7c4ec2f042 Merge pull request #1754 from MPOS/csrf-validation 
[FIX] Use session ID for user uniqueness
 2014-02-15 09:30:31 +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
iAmShorty
0ef5fdedef [UPDATE] small changes 2014-02-14 17:08:22 +01:00