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

2444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xisi
c192cbb0bd Token failure condition fix 2014-01-24 14:46:50 -05:00
xisi
3006cb544f Reworked csrf tokens, now enabled globally 
The way this now works is, if csrf is enabled:
 * Any new or existing template can have csrf protection by adding the hidden input ctoken that's in this batch to its form, removes any logic in templates
 * Page controllers that already exist have been updated, new ones only require checking if csrf is enabled and valid
 2014-01-24 13:00:24 -05:00
Sebastian Grewe
854867d4c5 Merge pull request #1570 from MPOS/zero-payouts 
[FIX] Skip prop payouts with 0 valid shares
 2014-01-24 07:30:12 -08:00
Sebastian Grewe
c6e2e062de [FIX] Skip prop payouts with 0 valid shares 
* [FIXED] Do not create 0 amount payout transactions for users w/o
  valid shares

Fixes #1569 once merged.
 2014-01-24 16:19:10 +01:00
Sebastian Grewe
a586cc36ab [FIX] Honor cache flag for getUserSharerate 2014-01-24 12:32:21 +01:00
Sebastian Grewe
70a09811ec [FIX] PHP Notice on Mobile Template 2014-01-24 11:29:19 +01:00
Sebastian Grewe
481c8dd980 [FIX] Round donations on donor page 2014-01-24 10:52:13 +01:00
Sebastian Grewe
30fcc42e7d Merge pull request #1567 from MPOS/donation-percentage 
[IMPROVED] Added donation minimum and rounding
 2014-01-24 01:09:34 -08:00
Sebastian Grewe
a1a3d7e873 [IMPROVED] Added donation minimum and rounding 
* [ADDED] Config option `$config['donate_threshold']['min'] = 1;`
* [VERSION] Incremented config file version to `0.0.6`
* [CHANGED] Round donations to at least two digits
* [CHANGED] Honor minimum set pool donation percentage
* [UPDATED] Account edit template

Fixes #1475 once merged
 2014-01-24 10:06:13 +01:00
Sebastian Grewe
a1efdcf58a Merge pull request #1563 from daygle/patch-8 
Update run-payout.sh
 2014-01-23 23:52:11 -08:00
Sebastian Grewe
87370987c4 Merge pull request #1562 from daygle/patch-7 
Update run-crons.sh
 2014-01-23 23:52:00 -08:00
Sebastian Grewe
659c203c06 Merge pull request #1551 from xisi/csrf-improvements 
[FIXES] CSRF tokens & login cleanup
 2014-01-23 23:27:31 -08:00
Sebastian Grewe
90d0ff1081 Merge pull request #1546 from ahmedbodi/patch-1 
Get Cronjob Status API
 2014-01-23 23:13:42 -08:00
Sebastian Grewe
f75200ce1e Merge pull request #1560 from raistlinthewiz/next 
Added reward_type and reward info to api/getpoolinfo
 2014-01-23 23:09:06 -08:00
Sebastian Grewe
abb0665bd2 Merge pull request #1559 from Neozonz/issue-1558 
[FIX/ENHANCE] Session management
 2014-01-23 23:07:54 -08:00
Glen
be234ad1b1 Update run-payout.sh 
Liquid payout was being processed before block(s) found/payout causing liquid balances to go in to the minus as the liquid payout job would see funds in wallet that were unassigned.

This change moves the liquid_payout.php cron as the last step to be performed.
 2014-01-24 13:09:17 +11:00
Glen
d9b37b4adb Update run-crons.sh 
Liquid payout was being processed before block(s) found/payout causing liquid balances to go in to the minus as the liquid payout job would see funds in wallet that were unassigned.

This change moves the liquid_payout.php cron as the last step to be performed.
 2014-01-24 13:08:03 +11:00
Neozonz
2d607cca97 [FIX/ENHANCE] Session management 
@herrkauwer appreciate the code review and help
@xisi initial code pr
@add1ct3dd reporting the issue
 2014-01-23 16:52:29 -08:00
Hüseyin Uslu
b518ce0799 Tiny update. 2014-01-24 00:38:28 +02:00
Hüseyin Uslu
0639af54b3 Added reward_type and reward info to api/getpoolinfo 2014-01-24 00:37:50 +02:00
ahmedbodi
6d7d3f2026 Update getcronjobstatus.inc.php 2014-01-23 20:23:41 +00:00
Sebastian Grewe
207a8719fd Merge pull request #1558 from xisi/security-invalidsession-fix 
[FIX] Invalid session regeneration
 2014-01-23 11:52:00 -08:00
xisi
bb24b9cb2c Wrong spot 2014-01-23 14:45:11 -05:00
Joey
8b59e3d519 Merge pull request #1557 from xisi/security-invalidsession-fix 
[FIX] Invalid session regeneration
 2014-01-23 11:43:29 -08:00
Sebastian Grewe
d66296cdee Merge pull request #1555 from cutnpaster/next 
Lint on cronjobs/pplns_payout.php #1554
 2014-01-23 11:41:53 -08:00
xisi
4df4957ec5 Fixes invalid session bug 2014-01-23 14:32:28 -05:00
cut
5705774dfb Lint on cronjobs/pplns_payout.php #1554 2014-01-23 12:11:18 -06:00
Sebastian Grewe
693edccb18 Merge pull request #1536 from rog1121/patch-1 
Add Block ID to logging
 2014-01-23 08:32:45 -08:00
xisi
1fd0adf038 Removed unused config setting 2014-01-23 11:01:30 -05:00
xisi
a3314fa81e Cleaned up login page logic a bit more 
Fixed up CSRF tokens so rollover minutes/hours are now checked and valid
 2014-01-23 11:01:30 -05:00
Sebastian Grewe
33cfa5667d Merge branch 'next' of github.com:MPOS/php-mpos into next 2014-01-23 16:59:46 +01:00
Sebastian Grewe
92e7f3e1e4 [FIX] Return floats for some statistics 
Fixes #1540
 2014-01-23 16:59:12 +01:00
Sebastian Grewe
fc67e0eb3d Merge pull request #1548 from vekexasia/patch-2 
Lets always use $this->table instead of hardcoding
 2014-01-23 07:54:41 -08:00
Andrea Baccega
d6670508f7 Lets always use $this->table instead of hardcoding 2014-01-23 12:56:19 +01:00
ahmedbodi
ece8b3adf6 Create getcronjobstatus.inc.php 2014-01-23 10:29:01 +00:00
Sebastian Grewe
6b52d47ab2 Merge pull request #1545 from Neozonz/issue-1489 
[FIX] getUserID -> getUserIdbyEmail
 2014-01-23 01:16:16 -08:00
Sebastian Grewe
7acd3bc821 Merge pull request #1543 from Neozonz/issue-1542 
[BUG] FIX txfee in getpoolinfo API
 2014-01-23 01:13:00 -08:00
Sebastian Grewe
4b04df5d8a [FIX] Allow TAB to focus on email login 2014-01-23 10:11:37 +01:00
Sebastian Grewe
8a53e0319d [FIX] Missed file for admin maintenance 2014-01-23 10:01:35 +01:00
Neozonz
d75ee58d94 [FIX] getUserID -> getUserIdbyEmail 
If I understand correctly... Email is stored in $username.
 2014-01-23 03:25:01 -05:00
Sebastian Grewe
9828458963 Merge pull request #1544 from MPOS/maintenance-mode-admin 
[FIX] Allow admin logins in maintenance mode
 2014-01-22 23:58:56 -08:00
Sebastian Grewe
ac1bc4b2ce [FIX] Allow admin logins in maintenance mode 
Fixes #1489
 2014-01-23 08:58:25 +01:00
Neozonz
7a21b05a3d [BUG] Fix txfee API call with added support for old API calls 
[ADD] txfee_auto to API Calls
[ADD] txfee_manual to API Calls
[ADD] confirmations to API Calls
 2014-01-23 02:38:34 -05:00
Sebastian Grewe
cde6227692 Merge pull request #1539 from fspijkerman/next 
Use a full path instead of CWD set by PHP
 2014-01-22 22:17:24 -08:00
Frank Spijkerman
0d300581ff Use a full path instead of CWD set by PHP 2014-01-22 18:40:06 +01:00
rog1121
9a23148adb Update pplns_payout.php 2014-01-22 09:24:22 -07:00
rog1121
21888a8153 Update pplns_payout.php 2014-01-22 09:05:21 -07:00
Sebastian Grewe
be19318e26 Merge pull request #1534 from freynder/next 
Bugfix: shares and shares_archive values should be added up.
 2014-01-22 05:38:06 -08:00
freynder
952d5d979c Bugfix: shares and shares_archive values should be added up. 2014-01-22 14:18:38 +01:00
Sebastian Grewe
2a661b5e78 [FIX] Return proper data if memcache disabled 
If memcache option is disabled, the functions should return the data we
tried to set instead of false. At least we can ensure data is returned
as expected from any methods trying to use the memcache.
 2014-01-22 14:02:44 +01:00