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

2698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
6f706b883d Merge branch 'next' of github.com:MPOS/php-mpos into next 2014-02-14 09:42:16 +01:00
Sebastian Grewe
6d52f5d47c [FIX] Added missing file, gitignore :/ 2014-02-14 09:42:03 +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
Sebastian Grewe
bb2037d813 Merge pull request #1753 from andymornes/next 
[FIX] Correcting user ID for new block emails
 2014-02-14 06:34:51 +01:00
Andy Mornes
ac3bea9f1a [FIX] Correcting user ID for new block emails 
Also adding the currency to the notifications as well.
 2014-02-13 13:26:48 -06:00
Sebastian Grewe
8589d84ba9 Merge pull request #1751 from MPOS/transaction-index 
[UPDATE] Added INDEX to transactions table
 2014-02-13 14:58:39 +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
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
46574cb4ab Merge pull request #1722 from MPOS/sendmany-support 
[ADDED] First draft: sendmany RPC support
 2014-02-13 09:12:28 +01:00
Sebastian Grewe
3d10f25d22 [ADDED] Documentation URL 2014-02-13 09:01:45 +01:00
Sebastian Grewe
eb40e4080a [ADDED] Log RPC TXID into logfile for payouts 2014-02-12 16:21:24 +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
332aa5aaa4 [FIX] Apply TXFees before running sendmany 2014-02-12 16:21:24 +01:00
Sebastian Grewe
4359b6a649 [CHANGE] Made startup messages debug level 2014-02-12 16:21:24 +01:00
Sebastian Grewe
0e49e8440d [ADDED] First draft: sendmany RPC support 
We can now run payouts via sendmany:

* No big logical changes, sendmany is called once for MP and once for AP
* Instead of paying out via sendtoaddress, store in array and use
  sendmany later
* Update all transactions with the RPC TXID returned by sendmany

Will fix #1238 once merged.
 2014-02-12 16:21:23 +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
Sebastian Grewe
ce89286a1e Merge pull request #1740 from iAmShorty/log-rpc-error 
[UPDATE] logging rpc error message
 2014-02-12 11:50:13 +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
7e4b5ae038 Merge pull request #1737 from andymornes/next 
New Block Notification additions
 2014-02-12 07:33:04 +01:00
Andy Mornes
caee4a7c8f Consolidating the nocache tags 2014-02-12 00:27:21 -06:00
Andy Mornes
91a57903ce New Block Notification additions 
Adding the block number, finder, amount, and difficulty to the new block
notification email
 2014-02-12 00:18:00 -06: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
Sebastian Grewe
86d68eff1c [FIX] Removed debugging 2014-02-11 14:58:08 +01:00
Sebastian Grewe
cbf98b4655 [ADDED] More checks for amounts 2014-02-11 14:56:56 +01:00
Sebastian Grewe
792be3e3e0 Merge branch 'validate-payouts-script' into next 2014-02-11 13:55:34 +01:00
Sebastian Grewe
f3b079f854 [FIX] Force string comparision 2014-02-11 11:11:13 +01:00
Sebastian Grewe
de8137aa64 [ADDED] Validate Payouts script added 
* Validate all DB transactions against your payouts in the RPC
* Does not use TXID to search for records but rather a combination of
  address and amount
* May help debugging issues
 2014-02-11 10:31:23 +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