Commit Graph

1286 Commits

Author SHA1 Message Date
Sebastian Grewe
a083b1c272 [REMOVED] Liquid Payout cron due to issues
Payouts did not work very well and caused more issues for pools than
being worth having this cron. We revert this and let them use
sendtoaddress again whenever they wish to deduct payouts from their pool
at their own discretion.

We may add this thing back in sometime later with a proper and working
implementation but no promises.
2014-02-14 11:39:11 +01:00
Sebastian Grewe
d7f2e6e5ac [UPDATE] ACL Management
* [ADDED] Smarty acl_check function
* [ADDED] Optional default return  value for getValue calls
* [UPDATE] ACL Checks in page controllers
* [UPDATE] Navigation template to use check_acl from Smarty
* [ADDED] New ACL options where needed
* [REMOVED] Disable pages from System Settings Tab
* [ADDED] Above removed pages into ACL Settings Tab

This will make usage of ACLs a bit easier and transparent.
Also fixes #1731 once merged.
2014-02-14 10:56:25 +01:00
Sebastian Grewe
f43a5214c4 [FIX] PPS Payout processing
* [ADDED] Abort if we don't have enough shares to calculate PPS from
* [FIXED] Proper calculations for account shares, we dropped a share
  each run
* [ADDED] Error code if no new shares available
2014-02-14 10:55:17 +01:00
Sebastian Grewe
682beb60d1 Merge pull request #1739 from MPOS/notification-cleanup
[ADDED] Notification cleanup script
2014-02-14 08:56:51 +01:00
iAmShorty
224af2c9d3 [UPDATE] showing accounts with balance and address 2014-02-13 16:29:33 +01:00
Sebastian Grewe
c8f639796a [UPDATE] Added INDEX to transactions table
Should speed up queries using both account_id and archived for a
specific account.
2014-02-13 14:45:32 +01:00
iAmShorty
146799d163 [FEATURE] show addresses from account 2014-02-13 12:28:26 +01:00
Sebastian Grewe
8c1174bcb2 Merge pull request #1749 from iAmShorty/wallet-info
[UPDATE] Wallet Accounts Message
2014-02-13 09:31:04 +01:00
iAmShorty
58085eb7f5 [UPDATE] cleanup 2014-02-13 09:30:07 +01:00
iAmShorty
0e792e34f3 [UPDATE] message only if more than 1 account in wallet and Default has no funds 2014-02-13 09:21:19 +01:00
Sebastian Grewe
3d10f25d22 [ADDED] Documentation URL 2014-02-13 09:01:45 +01:00
Sebastian Grewe
d725f9bf5d [ADDED] Sendmany config option
* Disable sendmany by default
* Allow people to enable the new feature via config
2014-02-12 16:21:24 +01:00
Sebastian Grewe
71aca7e0af [UPDATE] Getbalance wrapper
We need to wrap our getbalance call due to issues in the coind and
payout systems in the RPC. Apparently it's having issues with multiple
accounts setup in a single wallet. Sendmany can not properly use other
accounts added to the wallet as the payout account.

Hence we wrap our getbalance call in the RPC and only return the default
account balance at all times. Since this is used for all payouts and for
payments from blocks, there should be no issue. Those pools running
multiple accounts in their wallet will have to move their coins into the
default wallet!
2014-02-12 16:21:24 +01:00
Sebastian Grewe
2f52a8b1d2 Merge branch 'next' of github.com:MPOS/php-mpos into next 2014-02-12 15:44:12 +01:00
Sebastian Grewe
def685082b [ADDED] RPC Error Code to Logging 2014-02-12 15:44:00 +01:00
Sebastian Grewe
86ca90fa09 Merge pull request #1743 from iAmShorty/check-wallet-accounts
[UPDATE] Removed Wallet Info Message
2014-02-12 14:51:39 +01:00
iAmShorty
37581d720c [UPDATE] Removed Wallet Info Message 2014-02-12 14:47:28 +01:00
Sebastian Grewe
8fd0af6fe1 Merge pull request #1741 from iAmShorty/check-wallet-accounts
Check wallet accounts
2014-02-12 13:20:56 +01:00
iAmShorty
3b53a3bbb7 [UPDATE] updated text 2014-02-12 13:20:35 +01:00
iAmShorty
eb06bd1b7e [UPDATE] changed error message 2014-02-12 12:16:25 +01:00
iAmShorty
4096109788 [UPDATE] added currency 2014-02-12 12:14:02 +01:00
iAmShorty
ed943f5c54 [UPDATE] typo 2014-02-12 11:53:10 +01:00
iAmShorty
2d0755915a [UPDATE] no php notice when array is empty 2014-02-12 11:47:47 +01:00
iAmShorty
7d6e9e1fd3 [UPDATE] check for number of accounts in admin_checks.php 2014-02-12 11:44:18 +01:00
iAmShorty
2df6472656 [UPDATE] check for number of accounts in admin_checks.php 2014-02-12 11:43:41 +01:00
iAmShorty
e7a6ee7e95 [UPDATE] logging rpc error message 2014-02-12 11:03:51 +01:00
Sebastian Grewe
5f48d2dabc [ADDED] Notification cleanup script
* [ADDED] Admin Panel Setting for max age for notifications
* [ADDED] Cronjob to clean out old notifications
* [ADDED] New cron to scripts and monitoring

Fixes #1672 once merged.
2014-02-12 10:47:42 +01:00
Sebastian Grewe
975b41276d [ADDED] New memcache option for contrib caches 2014-02-12 08:07:58 +01:00
Sebastian Grewe
cb4211a618 Merge pull request #1732 from MPOS/no-txfee-check
[FIX] Do not add TXFee with txfee 0
2014-02-12 07:33:15 +01:00
Sebastian Grewe
c622d7c69b Merge pull request #1726 from j4s0n/fix/next/issue-1725
(#1725) Fix cold wallet check FP and added testnet detection
2014-02-11 19:38:08 +01:00
Sebastian Grewe
9039eb29dc [FIX] Do not add TXFee with txfee 0 2014-02-11 16:35:01 +01:00
j4s0n
4f7dcb4f9c Typo correction. 2014-02-10 23:46:56 -05:00
Sebastian Grewe
0cf6e38dc3 Merge pull request #1705 from MPOS/cron-check-active
[IMPROVED] Check if cron is running in PHP scripts
2014-02-10 21:57:28 +01:00
Sebastian Grewe
fe554f5864 Merge pull request #1704 from MPOS/worker-delete-csrf
[ADDE] CSRF validation for Worker Deletion
2014-02-10 21:57:16 +01:00
j4s0n
8c3205a8b2 (#1725) Fix cold wallet check FP and added testnet detection
Without this patch, admin.php checks if it can connect to the wallet service. Regardless of if that check passes or fails, it then checks if the cold wallet address is valid. If the can_connect() test failed, the validateaddress() check will also fail, even if the address is not invalid. To fix this, the validateaddress() check is move to an elseif block in the can_connect() chain.

Additionally, this patch checks to see if the wallet service is running as a testnet. While running as a testnet is perfectly acceptable when testing, the suer should be warned. A lot of folks using the quickstart guide miss this.

A function was added to the Bitcoin class to detect when we are running in a test net. A check was added to admin.php, and the existing can_connect and validateaddress() calls were restructured to solve these issues.
2014-02-10 12:07:08 -05:00
Sebastian Grewe
a9d9fe4b64 [FIX] Proper fix for Payout ID # 2014-02-10 09:47:40 +01:00
Sebastian Grewe
19fc975d95 [FIX] Insert ID of Payout Request 2014-02-09 17:46:25 +01:00
Sebastian Grewe
6ea257ac20 Merge pull request #1711 from raistlinthewiz/next
Fixed back ['memcache']['keyprefix'].
2014-02-08 18:10:31 +01:00
Hüseyin Uslu
24e910a01c Fixed back ['memcache']['keyprefix']. 2014-02-08 18:24:43 +02:00
Sebastian Grewe
08a3200b75 [FIX] Fallback to fixed reward without blocks 2014-02-08 13:46:21 +01:00
Sebastian Grewe
5d65f04515 Merge pull request #1695 from MPOS/reward-average
[ADDED] Use block averages for payout estimates
2014-02-07 13:48:07 +01:00
Sebastian Grewe
754f69df2c Merge pull request #1682 from MPOS/payout-balance-check
Payout balance check
2014-02-07 13:47:54 +01:00
Sebastian Grewe
ed0be8ec47 [UPGRADE] Upgraded KLogger Library
* [REMOVED] Logfile name not possible right now
* [ADDED] All loglevels supplied by KLogger
2014-02-07 13:40:50 +01:00
Sebastian Grewe
ba1dd5e8ab Merge pull request #1696 from MPOS/cron-user-notification
[ADDED] User notifications for disabled crons
2014-02-07 13:03:26 +01:00
Sebastian Grewe
2a8927af8f [IMPROVED] Check if cron is running in PHP scripts
* Ensures we don't spawn more than one PHP process
* Will require admin-intervention to reset the cron_active flag in DB

Shouldn't trigger often but may help people.
2014-02-07 13:00:05 +01:00
Sebastian Grewe
6509cc6039 [ADDE] CSRF validation for Worker Deletion
* [ADDED] CSRF token checks to worker page
* [CHANGED] Check for both _GET and _POST ctokens
* [ADDED] CSRF token to each delete call URL

Fixes #1702 once merged
2014-02-07 12:24:48 +01:00
Sebastian Grewe
feeca87eb0 [FIX] Reset failed login, redirect to trusted location
Fixes #1701
2014-02-07 12:20:24 +01:00
Sebastian Grewe
6a55506b0c [IMPROVED] Logging format
* Added IP address to all log output
* Added Page and Action to all log output
* Modified log messages
* Added Error and Fatal handlers
* Raised failed logins to Error
* Added KLogger default log levels
* Made it most verbose
2014-02-07 10:14:56 +01:00
Sebastian Grewe
a03b9d4ace [ADDED] JSONP support for MPOS API
Fixes #1700 once merged.

Thanks @spliznork for the feature request and solution.
2014-02-07 09:00:09 +01:00
Sebastian Grewe
93470fd63e [FIX] Suppress potential empty HTTP_USER_AGENT 2014-02-06 16:34:06 +01:00
Sebastian Grewe
baaf8bf6eb [IMPROVED] Skip contrib shares until cache available
* Will help larger pools
* Will fallback to SQL if memcache is disabled
2014-02-06 14:38:38 +01:00
Sebastian Grewe
8a050ba9af [ADDED] User notifications for disabled crons
Fixes #1201 once merged
2014-02-06 14:20:40 +01:00
Sebastian Grewe
6130db50a5 [FIX] Default reward to 50 again 2014-02-06 12:19:16 +01:00
Sebastian Grewe
3deaf82f1e [ADDED] Use block averages for payout estimates
Fixes #1514 once merged.
2014-02-06 11:38:57 +01:00
Sebastian Grewe
c8fbc369cf [FIX] API Key sample format
Fixes #1694
2014-02-06 11:20:57 +01:00
Sebastian Grewe
7cf3fb27fb [UPDATE] Allow global notification settings
Fixes #1232 and allows further expansion in the future.
Addresses #1672 too.
2014-02-06 11:13:22 +01:00
Sebastian Grewe
7673c34d80 Merge branch 'fix-contactform' into next 2014-02-06 10:57:49 +01:00
Sebastian Grewe
324bf05116 [FIX] Better error message
Fixes #1664
2014-02-06 10:51:00 +01:00
Sebastian Grewe
b05f87ab5d [FIX] Invalid CSRF error on password reset form
Fixes #1675
2014-02-06 10:49:04 +01:00
Sebastian Grewe
2f1d68448f [FIX] CSRF/Re-captcha on Contactform
Fixes #1666
2014-02-06 10:19:58 +01:00
Sebastian Grewe
837a8c58ea [FIX] Smarty caching cross-sessions
Fixes #1691 and fixes #1684
2014-02-06 09:17:09 +01:00
Sebastian Grewe
0e968c90a6 [FIX] Manual PPS Payouts
Fixes #1692
2014-02-06 08:53:18 +01:00
Sebastian Grewe
bea6477cb0 [UPDATE] Cache getmininginfo too 2014-02-05 17:21:13 +01:00
Sebastian Grewe
af2e34a1c6 [FIX] No manual-payout on empty coin address 2014-02-05 17:02:21 +01:00
Sebastian Grewe
bdaa4933fa [FIX] Cron error code for monitoring 2014-02-05 16:16:23 +01:00
Sebastian Grewe
bfbb8c83b7 [FIX] Account Update with same coin address 2014-02-05 15:29:52 +01:00
Sebastian Grewe
06eee145bf [FIX] Validate cold wallet address 2014-02-05 09:31:51 +01:00
Sebastian Grewe
c0618dd598 [VERSION] 0.0.4 MPOS for Payout overhaul 2014-02-05 09:02:36 +01:00
Sebastian Grewe
bc0d340bf3 Merge pull request #1642 from MPOS/payout-overhaul
[IMPROVED] Payout logics
2014-02-04 21:59:22 -08:00
Sebastian Grewe
43e1c44def Merge pull request #1646 from xisi/security-logging
[ADDITION] Basic security logging
2014-02-04 08:05:13 -08:00
Sebastian Grewe
c677295447 [FIX] Network hashrate in khash before checks 2014-02-03 08:20:42 +01:00
Sebastian Grewe
e59d3a8e25 [FIX] Address Validation in user class 2014-02-03 08:16:59 +01:00
Sebastian Grewe
c00b6d6757 [IMPROVED] Payout logics
* [ADDED] More methods to our transaction class
 * `createDebitAPRecord` and `createDebitMPRecord`, will handle the
 * entire debit process
  * Adds Debit transaction
  * Adds TXFee transaction
  * mark transactions as archived
  * validate user is fully paid out
  * send notification to user
 * `getMPQueue` was added to unify the process of getting payout queues
* [MOVED] Only one mail template for both payout methods
* [ADDED] Some minor calls to user class
* [ADDED] Full address validation to bitcoin class
* [SQL] New SQL upgrade and Version Increment
 * Adding UNIQUE index to coin_address in accounts table
 * preperation for `sendmany` implementation
2014-02-03 08:16:58 +01:00
Sebastian Grewe
d61e6a7243 [FIX] Cron compile folder permission issue 2014-02-03 07:58:06 +01:00
xisi
18c7565e5c cleanup 2014-02-02 13:34:41 -05:00
xisi
ca1ae6ba2c wrapped KLogger 2014-02-02 11:57:06 -05:00
Sebastian Grewe
9da7af8a5e [FIX] 24 Hour Account Graphs 2014-02-02 11:35:08 +01:00
Sebastian Grewe
656a92d286 Merge pull request #1651 from rog1121/patch-4
Locked Account Message
2014-02-01 13:14:22 -08:00
rog1121
07d49b0956 Locked Account Message 2014-02-01 12:35:48 -07:00
xisi
cf8a8cc4d8 fixes #1639 2014-01-31 17:34:48 -05:00
xisi
e7bace5550 basic logging, adds logs folder to root dir
htaccess to block access to the logs
by default, only log warnings
simple config check to see if that folder is writable

warning if changeNoFee is used
warning if setLocked is used
warning if changeAdmin is used
warning if when logging in that IP is different than saved IP
info if a login fails with bad user or password
warning if a user is locked via failed logins
info if an update/etc fails with bad pin
warning if a user is locked via failed pins
info when a pin request is sent
warning when a pin request email doesn't send
warning when trying to request pin reset and incorrect password
info when a twofactor token sent
warning if twofactor email doesn't send
warning when a user tries to request multiple of the same type of token
info when a twofactor token is deleted
warning if a twofactor token fails to delete
warning when an invalid change password token is used
info on successful account update
warning when reset password is called and IP doesn't match saved IP, info otherwise
warning if isAuthenticated falls through and kills a session
2014-01-31 13:11:38 -05:00
Sebastian Grewe
255b9e1f56 [FIX] API Timeout added
Fixes #1643
2014-01-31 16:27:03 +01:00
Sebastian Grewe
319d9439a4 Merge pull request #1621 from xisi/sessions-mclimiter-fixes
[UPDATE] Security updates and fixes
2014-01-31 05:55:09 -08:00
xisi
afdf3abb29 ripped out all the memcache session stuff, not worth it with the side effects of caching things
cleaned up config/checks
2014-01-30 18:41:56 -05:00
xisi
8487a8d462 respect client validation settings for failures 2014-01-30 09:38:41 -05:00
xisi
3d414e9ffa I think this is a good midway between hardcoding it in and allowing configurability 2014-01-29 23:35:07 -05:00
xisi
0643cf4b87 fixed crons, tested on 2 boxes 2014-01-29 18:33:34 -05:00
xisi
53a8b4adf1 .htaccess check for @ahmedbodi 2014-01-29 15:43:09 -05:00
xisi
51818421d8 weird problem, strict for isAuthenticated 2014-01-29 14:46:21 -05:00
xisi
5d017f60c3 how this worked before is beyond me 2014-01-29 13:28:38 -05:00
xisi
ae47437ab7 fixed worker delete csrf thing I stubbed earlier
took to field out of the rest of the login forms
2014-01-29 09:41:50 -05:00
xisi
f298c60260 little more cleanup
put version check/config check after sessions/rate limiter so it works correctly & only uses 1 db hit
2014-01-29 09:16:03 -05:00
xisi
568445845a changes DEBUG SALT and SALTY from defines to variables
switched that in all places used (class loads mostly)
moved all includes at the beginning of index into bootstrap
moves *_PATH defines from config to bootstrap
config now uses defaults first, then user config
2014-01-29 07:34:50 -05:00
xisi
c2b1c68699 added check if we can write config files to admin_checks, we shouldnt be able to 2014-01-29 05:20:06 -05:00
Sebastian Grewe
923795c23b [FIX] Ignore AP for empty/NULL addresses 2014-01-29 09:58:18 +01:00
xisi
56ad9266d3 last login time not this login time 2014-01-29 03:55:51 -05:00
Sebastian Grewe
d84018763d [FIX] Admin Panel Users: Show user shares
Fixes #1624
2014-01-29 09:27:34 +01:00
Sebastian Grewe
d007358710 [FIX] Ignore missing HTTP_REFERRER
Fixes #1626
2014-01-29 08:52:12 +01:00
xisi
74dec2796d Added last login time/ip address popup on login w/ close button
Info/blue if your ip matches, warning/yellow if not
2014-01-28 15:45:24 -05:00
xisi
3efe979ae3 Switch config over to wiki, yay 2014-01-28 14:24:48 -05:00