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

1100 Commits

Author SHA1 Message Date
Sebastian Grewe
a6f9c25b5b [UPDATE] Proper implementation of target bits 
* [ADDED] New Config Option: Algorithm
 * scrypt and sha256d supported right now
 * might add SHA coin support across MPOS
 * Compatible with previous implementation
* [REMOVED] config option: pps_target
 * Replaced by config option: algorithm
 * Please update your config, defaults to srypt now!
* [ADDED] Unpaid Shares in Dashboard
* [MODIFIED] User estshares from DB query instead template math
 2013-10-26 14:10:34 +02:00
Sebastian Grewe
3326ce0927 [FIX] 14 and 30 days estimates 2013-10-26 09:48:07 +02:00
Sebastian Grewe
0838bc7783 [FIX] Fixing PPS calculations 
* [FIX] PPS estimations
* [FIX] PPS Value, PPS Payouts being off (too low)

Tested on testnet, estimates worked perfectly and payouts worked well.
 2013-10-26 02:38:24 +02:00
Sebastian Grewe
ee46e65fca [FIX] Fixed potential PPLNS issue 
* getMinimumShareId did not use Share Counts but Weights
 2013-10-26 02:35:51 +02:00
Sebastian Grewe
ed6382c81d [CHANGE] Removed Round estimate reference 2013-10-25 22:17:31 +02:00
Sebastian Grewe
a545362ba5 [FIX] getUserShareDifficulty must return 0 on NULL 2013-10-25 14:48:36 +02:00
Sebastian Grewe
6fd04fc838 [UPDATE] Removing colors in round shares 2013-10-25 14:39:28 +02:00
Sebastian Grewe
f55d0ba982 [IMRPOVED] MPOS Theme Dashboard 
* [CHANGE] Removed `default_<payout_sytem>` files
* [ADDED] Added generic, simple templates to remove code duplication
* [CHANGE] New default payment system template expanding on payout type
 2013-10-25 14:17:36 +02:00
Sebastian Grewe
fa4d666f1f [FIX] Escape some query parameters 2013-10-25 13:05:57 +02:00
Sebastian Grewe
8d005cbe5d [FIX] Properly align popup boxes with content 2013-10-25 12:54:21 +02:00
Sebastian Grewe
06997429f2 [FIX] Round invalid % values 2013-10-25 11:57:17 +02:00
Sebastian Grewe
ad3f7ecde9 [UPDATED] Added more data to getdashboarddata API 
* [UPDATED] Added % values to Dashboard
* [UPDATED] Allow dashboard to update % values
 2013-10-25 11:52:06 +02:00
Sebastian Grewe
ccb8faf5e3 Merge pull request #763 from TheSerapher/issue-743 
[IMPROVED] User payout estimations
 2013-10-25 02:43:18 -07:00
Sebastian Grewe
1c2b84bb50 Merge pull request #744 from obigal/pplns-stats 
Pplns stats
 2013-10-25 00:50:16 -07:00
Sebastian Grewe
0addd6ec80 [IMPROVED] User payout estimations 
* [ADDED] Proper PPS caclulations to statistics getUserEstimates
* [IMPROVED] Updated themes to use new estimates format in global smarty
* [IMPROVED] Updated PPS Dashboard to update estimates via Ajax
* [IMPROVED] Added PPS estimates to getdashboarddata API

This will require theme updates for those sites relying on the
est_<value> format for user payout estimates!

Fixes #743 once merged.
 2013-10-25 09:31:25 +02:00
Sebastian Grewe
f321364ff2 [FIX] Proper max for Sharerates < 1.00 2013-10-24 14:21:07 +02:00
Sebastian Grewe
c09f8700a0 [FIX] My Workers hashrate/difficulty 2013-10-24 14:03:16 +02:00
Sebastian Grewe
412fbe3f5b [FIX] Proper getTableName in Base Class 2013-10-24 12:32:58 +02:00
Sebastian Grewe
ac5c0fce95 [IMPROVED] Out of Order Share detection 
* [ADDED] Allow findblocks to detect and fix out of order shares
* [IMPROVED] Share class extends Base class for common functions
* [IMPROVED] Added more debugging and logging output to cronjob
* [ADDED] Added various new methods to blocks, share, base classes

For an overview of errors thrown in crons, please check:

https://github.com/TheSerapher/php-mpos/wiki/Error-Codes

Fixes #759 once merged.
 2013-10-24 12:04:00 +02:00
Sebastian Grewe
f0e39d9158 Merge pull request #754 from nrpatten/dashboard-test 
Dashboard test
 2013-10-23 05:20:36 -07:00
nrpatten
dab792736d Update default_pplns.tpl 
add GLOBAL.hashunits.pool for hashrate.
 2013-10-23 22:22:59 +11:00
nrpatten
2a1e0ab390 New Dashboard Layout 2013-10-23 06:11:03 -04:00
Sebastian Grewe
a63ed9700a [FIX] Account filter in admin transactions 2013-10-23 09:26:42 +02:00
Sebastian Grewe
1c5b53452a [FIX] Do not parse non-existing cache data, use SQL 2013-10-23 07:55:17 +02:00
Sebastian Grewe
acfa8f246e [IMPROVED] Only display user contributions > 0 2013-10-23 07:37:10 +02:00
Sebastian Grewe
a97fd7341f [IMPROVED] User real account name for contributor lists 2013-10-23 07:36:29 +02:00
obigal
c2169576ee round stats fixes 2013-10-23 00:28:24 -04:00
Sebastian Grewe
bbb2290dcc [IMPROVED] Look & Feel of basic Dashboard info 
* [ADDED] Pool Workers live Update!
* [IMPROVED] PPLNS and PPS dashboard data
* [IMPROVED] Adjusted all dashboard to look alike
 2013-10-22 21:01:34 +02:00
Sebastian Grewe
3451f481f6 Merge branch 'next' of github.com:TheSerapher/php-mpos into next 2013-10-22 20:29:40 +02:00
Sebastian Grewe
813ad615d4 [FIX] Messed up getIdleWorkers name 2013-10-22 20:29:27 +02:00
Sebastian Grewe
bdfd54e9b9 Merge pull request #749 from TheSerapher/issue-745 
Issue 745
 2013-10-22 08:54:01 -07:00
Sebastian Grewe
da5c066312 Merge pull request #748 from TheSerapher/issue-734 
Issue 734
 2013-10-22 08:53:20 -07:00
Sebastian Grewe
f4c68d721b Revert "[FIX] Next attempt to fix #745" 
This reverts commit d3d183cfe0.
 2013-10-22 16:45:53 +02:00
Sebastian Grewe
d3d183cfe0 [FIX] Next attempt to fix #745 2013-10-22 16:27:37 +02:00
Sebastian Grewe
f42d420561 [FIX] Contirbutor detection 
Fixes #745 once merged.
 2013-10-22 16:17:12 +02:00
Sebastian Grewe
bbbd5eda52 [IMPROVE] 404 handling 
* [ADDED] Error/404 templates to mmcFE & mobile themes
* [IMPROVED] Make 404 default error with unknown page parameter
 2013-10-22 16:05:55 +02:00
Sebastian Grewe
35e7c04386 Merge pull request #747 from TheSerapher/issue-739 
[FIX] Honor top share contributors limits
 2013-10-22 06:55:31 -07:00
Sebastian Grewe
c04bf347fb Merge pull request #746 from TheSerapher/issue-740 
[FIX] Active worker count method
 2013-10-22 06:54:14 -07:00
obigal
7e49e7c254 pplns-stats, block-stats paging, dynamic and reverse payout 2013-10-22 09:07:31 -04:00
Sebastian Grewe
38d3140829 [FIX] Added admin check to all templates 
Fixes #737
 2013-10-21 17:32:26 +02:00
Sebastian Grewe
a5c4b0e8c9 [IMPROVED] Show usernames in contrib lists if admin 
Addresses #737
 2013-10-21 17:13:08 +02:00
Sebastian Grewe
3f99e48360 [FIX] Active worker count method 
* Mmodified Query to properly return total active workers

Fixes #740 once merged.
 2013-10-21 16:44:13 +02:00
Sebastian Grewe
59a46dd48c [FIX] Honor top share contributors limits 2013-10-21 16:33:06 +02:00
Sebastian Grewe
1bb5ca3c2d [FIX] Fix donors, missing closing th tag 2013-10-21 15:55:59 +02:00
Sebastian Grewe
13c06715fc [IMPROVED] Adding customizable error page to MPOS 
* `.htaccess` is used to re-define the error documents
* redirects to `index.php?page=error&action=<code>`
* does not work for MPOS inside subfolders yet

Addresses #734. If this works we can add this to all the other themes.
 2013-10-19 09:16:57 +02:00
Sebastian Grewe
c89831943b [FIX] Fixed issues with uncached user shares data 2013-10-19 09:02:15 +02:00
Sebastian Grewe
0c65c4de1e [FIX] Removed uneeded shares data 2013-10-18 19:38:34 +02:00
Sebastian Grewe
8786a99382 [FIX] Fix sending mails even though diabled 
Fixes #732
 2013-10-18 07:21:51 +02:00
Sebastian Grewe
668f6abf78 [FIX] Method argument order fixed 2013-10-16 12:00:29 +02:00
Sebastian Grewe
50fb5218b1 [FIX] Use existing getDonatePercent 2013-10-16 11:54:59 +02:00
Sebastian Grewe
aedb37aa3d [IMPROVED] Added getUserEstimates method 2013-10-16 11:34:59 +02:00
Sebastian Grewe
899c92ee7e Merge pull request #728 from nrpatten/issue-703 
[FIX] Graphs not rendering properly
 2013-10-16 00:45:41 -07:00
Sebastian Grewe
f636e4fc99 [FIX] Return 0 data not NULL if cache-key missing 2013-10-16 09:35:12 +02:00
nrpatten
bee2d3a1cc [FIX] Graphs not rendering properly 
Update jquery.visualize.js to fix graphs not working for Pool, Both.
 2013-10-16 16:31:53 +11:00
andy
35303fd1a1 [FIX] Fixes Issue #722 Firefox wrapping Pool name on long names 2013-10-15 13:25:18 -07:00
Sebastian Grewe
1c15884faa Merge pull request #723 from nicoschtein/patch-7 
Added space after Pool Title on MPOS Theme
 2013-10-14 11:50:58 -07:00
nicoschtein
568bb1811f Added space after Pool Title on MPOS Theme 2013-10-13 20:17:01 -03:00
Sebastian Grewe
7b2adf27d1 Merge pull request #711 from TheSerapher/issue-709 
[IMPROVED] Added case-insensitive login
 2013-10-13 08:18:20 -07:00
Sebastian Grewe
15d7b6d1fa [IMPROVED] Detect potential dual payout situations 2013-10-12 19:28:56 +02:00
nicoschtein
c31cb95d20 Aligned API Key on Edit Account 
Could be done better, but setting style on <a> should be enough.
 2013-10-12 04:32:19 -03:00
nicoschtein
fdba2340eb Better set the Pool Name to auto adjust width pushing Section Title 
Better set the "display: inline-block;" much like breadcrumbs does.
So we get just the right width to fit the Pool Name, followed by the nice shadow and then the Section Name
 2013-10-12 04:12:38 -03:00
nicoschtein
95f217f32d Increased width % for Pool Name header on MPOS Theme 
This way longer pool name can fit, and it wont affect section_title as it is one or two words long.
 2013-10-12 04:03:12 -03:00
nicoschtein
d5620fd61c Increased width % for News title to fit longer text on MPOS Theme 2013-10-12 03:56:11 -03:00
nicoschtein
cea3b29d08 [FIX] Disable Block Explorer Link on Mobile Theme 2013-10-11 21:13:29 -03:00
Sebastian Grewe
a06d64e1fb [IMPROVED] Added case-insensitive login 
* [IMPROVED] Added Username/Email password reset

Fixes #709
 2013-10-10 17:06:01 +02:00
Sebastian Grewe
628dabacb5 [CHANGE] Updated mobile theme 2013-10-09 11:15:11 +02:00
Sebastian Grewe
21245eac92 [CHANGE] Modified some page templates 2013-10-09 10:16:47 +02:00
Sebastian Grewe
4add80328d Merge pull request #696 from nicoschtein/patch-4 
[FIX] Disable Block Explorer and Chain Info Link, Hashrate modifier on mmcFE Theme
 2013-10-08 23:52:30 -07:00
Sebastian Grewe
b7ae212d55 Merge pull request #697 from nicoschtein/patch-5 
[FIX] Website Title instead of Website Name on <title>, MPOS Theme
 2013-10-08 23:52:09 -07:00
nrpatten
f1859d7a8e Update contactform.inc.php 
[FIX] php error and no message. not sure how this was broken.
 2013-10-09 16:11:32 +11:00
nrpatten
8109c17051 Update contactform.inc.php 
[FIX] Recaptcha php error
 2013-10-09 16:02:58 +11:00
nicoschtein
7112e9d643 [FIX] Website Title instead of Website Name on <title>, MPOS Theme 2013-10-08 23:38:33 -03:00
nicoschtein
98bcabc362 [FIX] Disable Block Explorer Link on mmcFE Theme 
Last Block Found
Next Network Block
 2013-10-08 12:28:02 -03:00
nicoschtein
c8150a7021 [FIX] Disable Block Explorer Link and Chain Info on mmcFE Theme 2013-10-08 12:17:41 -03:00
nicoschtein
8feadc59a2 [FIX] Honor Pool Hashrate modifier with unit. 2013-10-08 12:08:11 -03:00
Sebastian Grewe
1b99096a5b Merge pull request #694 from TheSerapher/issue-691 
[FIX] PPLNS Target Display, PHP Notice
 2013-10-07 22:19:21 -07:00
Sebastian Grewe
bf627a320e [FIX] PPLNS Target Display, PHP Notice 
Fixes #691 and #687
 2013-10-08 07:18:39 +02:00
Sebastian Grewe
1ec0b25bb4 Merge pull request #693 from TheSerapher/issue-692 
[FIX] Worker Difficulty on mobile worker page

Fixes #692.
 2013-10-07 22:13:57 -07:00
Sebastian Grewe
91158bc755 [FIX] Worker Difficulty on mobile worker page 2013-10-08 07:13:37 +02:00
nicoschtein
93f713b665 [FIX] Disable Block Explorer Link on MPOS Theme 2013-10-07 18:58:04 -03:00
Sebastian Grewe
0dca798f5c [FIX] Do not notify on missing cache entry 2013-10-07 13:48:48 +02:00
Sebastian Grewe
02c9be54ed [MAJOR] Changing project name to MPOS 
* Adjusted mmcfe-ng occurences in code
* Adjusted Database strucutre to only supply the full structure
* Adjusted default template to MPOS

Addresses #643
 2013-10-07 10:10:49 +02:00
nrpatten
7a074f852b Update layout.css 
Resize fix: Test 1 and h2.section_title back to left it is hidden when not logged in and text-transform: uppercase; looks better in the title for some page links.
 2013-10-07 12:45:49 +11:00
nrpatten
dfba48051b Update layout.css 
Resize fix: test 1
 2013-10-07 11:34:24 +11:00
Sebastian Grewe
1dfb7e9702 Merge pull request #673 from TheSerapher/issue-444-theserapher 
Issue 444 theserapher
 2013-10-04 02:27:28 -07:00
Sebastian Grewe
de9220ebc4 [FIX] User password field for PW reset 2013-10-03 12:20:44 +02:00
obigal
66296a8f36 pplns_payout block average fix when multiple blocks found during a payout run 2013-10-02 16:42:03 -04:00
Sebastian Grewe
617ff46689 Merge branch 'next' into issue-444-theserapher 2013-09-30 13:50:43 +02:00
Sebastian Grewe
d74770aaeb [FIX] Proper formatting for network hashrates 2013-09-30 13:50:13 +02:00
Sebastian Grewe
fe982c112c Merge branch 'next' into issue-444-theserapher 2013-09-30 13:43:44 +02:00
Sebastian Grewe
594b2c0e10 [FIX] Network Hashrate on Novacoin 2013-09-30 13:43:27 +02:00
Sebastian Grewe
b4b2ff2218 [FIX] Display worker difficulty 2013-09-30 13:39:55 +02:00
Sebastian Grewe
1d4f60b4d9 [FIX] Logout on HTTPS 2013-09-30 13:25:27 +02:00
Sebastian Grewe
64205dd099 [MERGE] Fix merge conflict with NEXT 2013-09-30 09:56:49 +02:00
Sebastian Grewe
db89768cd5 Merge pull request #648 from TheSerapher/issue-145 
Issue 145
 2013-09-30 00:53:45 -07:00
Sebastian Grewe
52db8bc682 [FIX] My name in footer :/ 2013-09-29 21:01:18 +02:00
Sebastian Grewe
8c5f8df07e Merge branch 'next' into issue-444-theserapher 2013-09-25 11:40:06 +02:00
Sebastian Grewe
928385c00c Fix PHP notice with 0 difficulty 2013-09-25 11:39:56 +02:00
Sebastian Grewe
84071cbd5d Merge branch 'next' into issue-444-theserapher 2013-09-25 11:35:24 +02:00
Sebastian Grewe
abcd62d8e8 Fix #657, added getmininginfo to wrapper 2013-09-25 11:31:42 +02:00
Sebastian Grewe
1f6ec91dfa Honor donations and anon state in caches 2013-09-25 11:08:12 +02:00
Sebastian Grewe
d23916f6bd Fixed PHP Notice on Contributor Hashrates 2013-09-25 10:38:43 +02:00
Sebastian Grewe
6c3d2d1e96 Allow Public ACL for all round transactions 2013-09-25 10:34:36 +02:00
Sebastian Grewe
bb924f82fe adding new round stats icon 2013-09-25 10:19:30 +02:00
Sebastian Grewe
7a596c65e2 Added donation indicator to pool stats for accounts 2013-09-25 10:14:39 +02:00
Sebastian Grewe
e68ea2b1a4 Added donation info to account dashboard 2013-09-25 09:53:45 +02:00
Sebastian Grewe
29edf83083 Display pool fee in dashboard 2013-09-25 09:49:51 +02:00
Sebastian Grewe
716e118041 Update statistics.class.php 
Fixes #664
 2013-09-23 07:11:43 +02:00
Sebastian Grewe
e58e9bcfb9 fix display of pool hashrate 2013-09-20 19:40:46 +02:00
Sebastian Grewe
fdfc82476a Re-added username in getuserstatus 
Upon popular demand *cough* @WKNiGHT- *cough* this is now available in
the data JSON array.
 2013-09-20 18:14:06 +02:00
Sebastian Grewe
c85b5f0207 skip Smarty Globals for API pages 2013-09-20 18:13:47 +02:00
Sebastian Grewe
baeae10027 Merge branch 'next' into issue-444-theserapher 2013-09-20 16:11:41 +02:00
Sebastian Grewe
432f2b1fba Merge branch 'next' into issue-145 2013-09-20 16:11:25 +02:00
Sebastian Grewe
ab90b045c0 [FIX #662] IDLE Worker False Positives 2013-09-20 16:07:57 +02:00
Sebastian Grewe
d7deac370a [FIX] Fieldset Textarea box size 2013-09-19 15:09:31 +02:00
Sebastian Grewe
0aac4289a9 [IMPROVEMENT] Better site layout 2013-09-19 14:33:02 +02:00
Sebastian Grewe
515af18ea5 [FIX] Display Pool Hashrate on Pool Stats 2013-09-19 11:54:39 +02:00
Sebastian Grewe
a345175ec5 [FIX] Link to round on general pool stats 2013-09-19 10:46:20 +02:00
Sebastian Grewe
442fcb015a adding FTC address for donations 2013-09-19 10:41:23 +02:00
Sebastian Grewe
5ce61d9f18 Merge branch 'next' into issue-145 2013-09-19 09:25:15 +02:00
Sebastian Grewe
c4d11885e3 [FIX] Properly show user sharerate 2013-09-19 09:24:48 +02:00
Sebastian Grewe
326397b48f [IMPROVEMENT] Website Layout 
* [FEATURE] Added footer, thanks @nrpatten for the idea and sample
* [IMPROVEMENT] Sidebar smaller and min width added
* [IMPROVEMENT] Properly format debug console
* [IMRPOVEMENT] Moved all custom CSS into own file
 2013-09-19 08:19:01 +02:00
Sebastian Grewe
1387bbdf44 [MERGE] Merge conflict NEXT 2013-09-18 16:34:52 +02:00
Sebastian Grewe
c578c504ed [MERGE] Conflict with NEXT 2013-09-18 16:32:29 +02:00
Sebastian Grewe
d863e66ef4 [BUG] Fixing contrib shares issue without cache 2013-09-18 16:31:36 +02:00
Sebastian Grewe
50cc2da3a3 [BUG] Fixed contrib shares with empty cache 2013-09-18 16:23:34 +02:00
Sebastian Grewe
88b2a35a7a [BUG] Fixed PHP notice 2013-09-18 16:19:42 +02:00
Sebastian Grewe
0f8df566f3 Merge branch 'issue-444-theserapher' of github.com:TheSerapher/php-mmcfe-ng into issue-444-theserapher 2013-09-18 15:52:11 +02:00
Sebastian Grewe
822c643d88 Merge branch 'issue-444-theserapher' of https://github.com/TheSerapher/php-mmcfe-ng into issue-444-theserapher 2013-09-18 15:51:53 +02:00
Sebastian Grewe
8224f6148e [IMPROVEMENT] @nrpatten supplied better quicklogin 
* Needs to be fixed to properly use fieldset tags
 2013-09-18 15:50:49 +02:00
Sebastian Grewe
c8f19d2841 Revert "[FEATURE] Added Ajax JSON Memcache" 
This reverts commit bd8796b824.

It turns out it's pretty much useless as long as the data passed to
get_json is not also being cached.
 2013-09-18 13:16:25 +02:00
Sebastian Grewe
bd8796b824 [FEATURE] Added Ajax JSON Memcache 2013-09-18 13:11:24 +02:00
Sebastian Grewe
f41ea296df [IMPROVEMENT] Fixed notification table layout and icons 2013-09-18 12:50:09 +02:00
Sebastian Grewe
ec4931bbc8 [IMPROVEMENT] Using fontello icons instead of theme icons 2013-09-18 12:38:45 +02:00
Sebastian Grewe
20fe936feb [IMPROVEMENT] Added round statistics link to transaction blocks 2013-09-18 12:38:26 +02:00
Sebastian Grewe
6ae6b3febd adding Fontello config to expand icons as needed 2013-09-18 12:37:57 +02:00
Sebastian Grewe
1a9ada84d4 fixing merge conflict from next to branch 2013-09-18 11:46:22 +02:00
Sebastian Grewe
a349e1e060 use archive table for sharerate calcs 2013-09-18 11:38:51 +02:00
Sebastian Grewe
4954f14923 Merge branch 'next' into issue-444-theserapher 2013-09-18 11:03:07 +02:00
Sebastian Grewe
07f0361050 [IMPROVEMENT] Support incremental contrib shares 2013-09-18 10:48:02 +02:00
Sebastian Grewe
a0fa71b264 [IMPROVEMENT] Adding incremental round/user shares 
This will address #510. It needs thorough testing and is a WiP but
is a start to improve cron runtime and DB loads.
 2013-09-18 09:45:52 +02:00
Sebastian Grewe
5d19964321 adding DEBUG console 2013-09-18 08:06:22 +02:00
Sebastian Grewe
7aace8be26 [IMPROVEMENT] Added secondary login box in header 2013-09-18 07:42:54 +02:00
Sebastian Grewe
f05a9c2b25 [FIX] Properly prompt for user or email at login 2013-09-18 07:34:55 +02:00
Sebastian Grewe
05f6f03424 removing unused template 2013-09-18 07:34:29 +02:00
Sebastian Grewe
5e64d43732 [IMPROVEMENT] Allow user login via E-Mail 2013-09-18 07:33:57 +02:00
Sebastian Grewe
fbf2a86162 [FIX] Properly redirect after login 2013-09-18 07:24:34 +02:00
Sebastian Grewe
3930285521 fixing website name in breadcrumbs 2013-09-17 17:14:06 +02:00
Sebastian Grewe
49b6ebe62f Also show negative cold coins 
Fixes #660
 2013-09-17 16:49:11 +02:00
Sebastian Grewe
e7f62134f1 adding cold wallet coin display and setting 2013-09-17 16:15:18 +02:00