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

623 Commits

Author SHA1 Message Date
Sebastian Grewe
9d9401d673 Merge pull request #999 from headzoo/memcache_fix 
Windows Memcache Compatibility
 2013-12-17 00:35:23 -08:00
Sebastian Grewe
405fd3d9e0 Merge pull request #981 from Fredyy90/next 
3 small improvments
 2013-12-17 00:10:09 -08:00
headz
cb4d69f092 [FIX] Calling $this from static context 
The static function pubKeyToAddress() was calling $this->hash160(). Changed to self::hash160().
 2013-12-16 23:51:50 -05:00
Frederick Behrends
ed769f9659 Moved Calculation of "Expected Time Per Block (Network)" and "Next Difficulty" to Statistics Class and fixed Dashboard-API for Ajax Refresh 2013-12-16 21:51:31 +01:00
headz
132c497d89 [FIX] Use Memcached wrapper on Windows 2013-12-16 13:57:49 -05:00
headz
f00b30d0e2 Initial import 2013-12-16 13:56:10 -05:00
Sebastian Grewe
35ab40cbb7 [FIX] Inifite loop on archive_cleanup 
Fixes an infinite loop in cleaning up the archive table:

* Shares come in faster than defined in cleanup sleep timeout

Will use an upper limit ID which would match the delete query at the
initial state. Skips archiving if no ID is found (e.g. no rows match the
archive purge conditions).

This will fix #997 once merged.
 2013-12-16 16:50:39 +01:00
Sebastian Grewe
8f89b7fceb Merge pull request #867 from Kukunin/next 
Admin Template Editor page
 2013-12-15 01:45:05 -08:00
Sebastian Grewe
f465bda350 [ADDED] Accept TaC during registration 2013-12-12 10:11:44 +01:00
Sebastian Grewe
847c1283b6 [CHANGE] Adjusted purge defaults 2013-12-10 16:59:53 +01:00
Sebastian Grewe
ab2326a557 [IMPROVED] Use limits for DELETE statements 
This will address #886. Long rounds can cause a system to become
very unresponsive due to high SQL/IO load when doing cleanups of
shares and archived tables.

* Run DELETE from shares with LIMIT
* Run DELETE from shares_archive with LIMIT
* Configure DELETE behaviour via config file
* Only archive shares that are really required (PROP, PPS)

Should greatly improve round ends on PROP and PPS after large rounds,
also improves PPLNS though archving will still take some time unless
we limit the share amount artificially. Shares could be needed though,
so we don't.
 2013-12-10 16:59:52 +01:00
Sebastian Grewe
6315d8fe03 [FIX] Validate coin_address on account updates 
Fixes #945 once merged.
 2013-12-10 16:53:56 +01:00
Sergey Kukunin
f97116b1b2 Show templates tree on Admin Templates page 
Show active and activated templates in Tree
Make templates tree persistent
 2013-12-09 20:55:59 +02:00
Sergey Kukunin
1aee65859f Make Smarty search template in database first 
If not, fallback to file template
Implement normalizer to convert gettingstarted/../support/default.tpl to support/default.tpl
 2013-12-09 20:55:58 +02:00
Sergey Kukunin
75c7e0fc6d Implement Templates admin page 
Create `templates` table in database
Add navigation links to Template page
Let admin to manage his templates from adminpanel
 2013-12-09 20:55:58 +02:00
Sebastian Grewe
256b5f59c6 [IMPROVED] Lockout user on invalid pin/password 
This will lock a user account if a password or PIN has been entered
wrong for multiple times in a row. When unlocking the account via admin
panel, both counters are reset so the user can log in again.

This should fix issues with brute force attacks to access user accounts.

Please see configuration dist file for new config options.
Please import SQL upgrade 007 to add new column to user accounts table.

Addresses #670 and should be merged once tested.
 2013-12-07 22:14:14 +01:00
Sebastian Grewe
eec52b7e4a [UPDATE] Cache RPC getinfo calls 2013-12-07 13:32:57 +01:00
Sebastian Grewe
e18c7b0508 [SECURITY] Clear cache before sending a mail 
Will fix an issue with users receiving wrong mails, e.g. during password
resets ONLY IF smarty cache is enabled.

Please update ASAP if you have smarty caches enabled! This is a very big
issue. By default smarty caches are disabled and not recommended to be
used. See configuration file.

Fixes #899 once merged.
 2013-12-04 19:15:51 +01:00
Sebastian Grewe
084bf67dc7 [FIX] Undefined index in Mail Class 2013-12-04 15:58:36 +01:00
Sebastian Grewe
288c2dd866 Merge pull request #893 from TheSerapher/issue-872 
Issue 872
 2013-12-03 01:10:35 -08:00
Sebastian Grewe
7b41a75f92 [FIX] Added where clause for archived 2013-12-02 16:50:16 +01:00
Sebastian Grewe
7a2e6061ab [REVERT] Do not use TX ID boundaries for archiving 2013-12-02 16:46:42 +01:00
Sebastian Grewe
f07064a0a3 [FIX] Hourly Hashrate Graphs 2013-11-29 16:25:37 +01:00
Sebastian Grewe
1ffcba8b51 [ADDED] RPC txid to Transaction lists 2013-11-28 11:52:15 +01:00
Sebastian Grewe
232dd76af5 [ADDED] TXID on debit transactions 2013-11-28 10:53:24 +01:00
Sebastian Grewe
3094681018 Merge pull request #863 from TheSerapher/issue-642 
[FIX] Hashrate increase on round ends
 2013-11-27 04:51:44 -08:00
Sebastian Grewe
dbdd80575c Merge pull request #857 from nicoschtein/patch-9 
Added "Reply-To" header to email
 2013-11-25 00:18:22 -08:00
Sebastian Grewe
1e7e92b5fe [FIX] Hashrate increase on round ends 
This should address issues with pools finishing very long rounds where
hashrate statistics suddenly dramatically increased. This was caused due
to both shares and archived shares being added before they they were
deleted from shares.

* adds the proper way to calculate user based hash- and sharerates.
* replaces `UNION ALL` with `UNION`

Fixes #642 once merged.
 2013-11-23 22:17:10 +01:00
Sebastian Grewe
c418e98aca [FIX] Idle Worker Notifiaction reset 2013-11-23 20:37:19 +01:00
Sebastian Grewe
ae89c7f198 [FIX] Backport from #855 2013-11-21 09:36:44 +01:00
nicoschtein
3433bd658f Added "Reply-To" header to email 
Added simple verification for cases where no sender name or email are set.
 2013-11-20 13:12:29 -02:00
Sebastian Grewe
55190b7d08 [FIX] Also exclude TXFee records for last ID 2013-11-20 11:13:11 +01:00
Sebastian Grewe
038d398344 [FIX] Wrong TX ID boundaries 
* We must ignore the last debit transaction to find the proper TX ID
  that has been archived

This should now complete the fix for #853 - needs live testing but I am
confident it will work as intended. Deploying to my live FST pool for
testing.
 2013-11-20 09:53:40 +01:00
Sebastian Grewe
4819b6819f [FIX] Remove debug output 2013-11-20 09:31:54 +01:00
Sebastian Grewe
09cf821730 [FIX] Honor confirmation status 2013-11-20 09:30:21 +01:00
Sebastian Grewe
f80826ff71 [UPDATE] Cache transaction summaries 2013-11-20 08:21:11 +01:00
Sebastian Grewe
78ae3174d8 [UPDATE] Use proper transaction ID boundaries 2013-11-20 08:11:16 +01:00
Sebastian Grewe
b0cdbd54bc [FIX] Removed blocks JOIN on archive query 2013-11-20 07:43:09 +01:00
Sebastian Grewe
ffc39f855d Addressing #853 with a fix and proposed change 2013-11-20 07:33:24 +01:00
Sebastian Grewe
eb9f63b821 Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next 2013-11-19 12:06:03 +01:00
Sebastian Grewe
86e22fcfc7 [FIX] Admin Panel worker hashrates on SHA coins 2013-11-19 12:05:50 +01:00
root
40d223d584 [UPDATE] template changes 2013-11-18 12:43:17 +01:00
root
3c580ad8d0 [UPDATE] latest 2013-11-18 12:43:17 +01:00
root
510c076452 [FEATURE] blockfinder statistics 2013-11-18 12:43:17 +01:00
Sebastian Grewe
21acec83d0 [FIX] Proper error on missing shares 2013-11-17 16:36:30 +01:00
Sebastian Grewe
d95961b470 [FIX] Coins without nethashrate in getmininginfo 
Fixes issues with coins that did not implement a proper array index into
their `getmininginfo` output. Currently supported keys are

* networkhashps
* hashespersec
* netmhashps

If none of there are found or `getmininginfo` fails itself, we now
default to `0` to ensure the webfrontend still works.

Fixes #847 and also fixes #834 which has not reported back the
required information.
 2013-11-16 20:39:41 +01:00
Sebastian Grewe
fcd00be62c [FIX] Do not cache admin panel query for setting updates 2013-11-14 15:37:28 +01:00
Sebastian Grewe
089d63931d [IMPROVE] Use round shares cache for user admin 
Fixes #843 once merged.
 2013-11-14 15:29:16 +01:00
Sebastian Grewe
9ccc3403f8 [UPDATED] Query improved for first blocks time 2013-11-11 12:42:35 +01:00
Sebastian Grewe
dc4d1b3b8e [FIX] Class Warning on new pools 2013-11-11 12:24:54 +01:00
Sebastian Grewe
708de1c1b8 Merge pull request #838 from TheSerapher/issue-837 
[FIX] Defaults via Smarty for empty settings
 2013-11-11 01:03:12 -08:00
Sebastian Grewe
ef120d9504 [FIX] Skip uptime robot with defaults set 
This will skip any updates if we detect the default string in our
settings table. Otherwise the script will return an error and disable
itself.

Fixes #839 once merged
 2013-11-11 10:01:52 +01:00
Sebastian Grewe
253aa26f97 [FIX] Defaults via Smarty for empty settings 2013-11-11 09:43:48 +01:00
Sebastian Grewe
0164a7b918 [FIX] Wrong column name in worker tables 2013-11-09 16:29:27 +01:00
Sebastian Grewe
5f91cc45bf [FIX] PHP error due to worker change 2013-11-08 16:31:04 +01:00
Sebastian Grewe
1cb23e7ecd Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next 2013-11-08 16:16:58 +01:00
Sebastian Grewe
1f491497bc [IMPROVED] Cache active workers 2013-11-08 16:16:16 +01:00
Sebastian Grewe
ae46d2496d [IMPROVE] Merged block statistics 
* Removed 24 Hour Shares totals
* Expanded Block Overview with shares stats
 2013-11-07 17:00:30 +01:00
root
f8f8b0a997 [FEATURE] calculating-luck 2013-11-07 10:50:32 +01:00
Sebastian Grewe
a4ca4530a3 [IMPROVED] Block statistics 
* [ADDED] Block over times stats to blocks stats page
* [CHANGED] Split default block stats page template up into subtemplates
* [IMPROVED] Single SQL Query for all Block Stats over Time
* [UPDATED] Templates for new SQL Data
 2013-11-06 16:04:36 +01:00
Sebastian Grewe
7785fbf8b7 [FIX] Settings return value on empty result 2013-11-06 14:47:25 +01:00
Sebastian Grewe
f67e63b6fc [REFACTOR] Refactored classes for error handling 
* [ADDED] More error codes
* [MODIFIED] Class updates to use Base Class all the time
* [MODIFIED] Cronjobs have been slightly adjusted
* [ADDED] More base class features
 2013-11-05 14:34:31 +01:00
Sebastian Grewe
04e2bf5932 [IMPROVED] More testing of error handling, block class 2013-11-05 08:19:16 +01:00
Sebastian Grewe
172444d3d8 [IMPROVED] Added logging failed SQL queries to payouts 2013-11-05 07:28:07 +01:00
Sebastian Grewe
ae45939fea [IMPROVED] Re-factored monitoring criticals/errors 
* [ADDED] new monitoring method : endCronjob
* [IMPROVED] Use newly added error codes
* [ADDED] mail notifications, enabled by default
* [ADDED] cron disable on fatal errors with exit code != 0
* [ADDED] Command line swtich: -f = Force running crons even if disabled
* [ADDED] Disabled status in monitoring site

This will improve error handling in our cronjobs. Fatal errors now
require manual intervention by explicityly running crons with the force
option (`-f`). Until they are forced to run, crons will stay disabled.

Fixes #773 once merged
 2013-11-05 07:28:07 +01:00
Sebastian Grewe
d2d7ee6796 Merge pull request #821 from TheSerapher/issue-819 
[FIX] Display issues on SHA coins
 2013-11-04 22:17:04 -08:00
Sebastian Grewe
44e29fc3f2 [FIX] Regression bug creating workers 
Fixes #823 once merged.
 2013-11-05 07:14:39 +01:00
Sebastian Grewe
2e64c4108d [FIX] Worker Hashrates in Account -> My Worker 2013-11-04 18:30:01 +01:00
Sebastian Grewe
4e68de0e5a [FIX] Display issues on SHA coins 
* [FIX] Estimated shares on various places
* [ADDED] Calculate estimated shares based on network diff in stats
  class
* [UPDATED] Themes updated as needed

Fixes #819 once merged
 2013-11-04 18:23:38 +01:00
Sebastian Grewe
556e02024f Merge pull request #820 from TheSerapher/issue-811 
[IMPROVED] Optimized IDLE Worker Query
 2013-11-04 09:17:13 -08:00
Sebastian Grewe
c0e7385332 [ADDED] Re-added custom HTTP port support 2013-11-04 15:25:38 +01:00
Sebastian Grewe
5eefb730ae [FIX] Re-location via HTTPS on login 2013-11-04 14:26:21 +01:00
Sebastian Grewe
f713edf234 Revert "[FIX] Honor custom HTTP ports" 
This reverts commit fc4b718067.
 2013-11-04 14:16:54 +01:00
Sebastian Grewe
83ee00259f [FIX] Fixed typo in cron logs 2013-11-02 18:57:15 +01:00
Sebastian Grewe
ab2b2d6062 Merge pull request #812 from TheSerapher/uptimerobot 
Uptimerobot
 2013-11-02 02:58:03 -07:00
Sebastian Grewe
ab73e9ad0f [IMPROVED] Error Handling, logging 2013-11-02 10:56:46 +01:00
Sebastian Grewe
6ca1179e47 [IMPROVED] Optimized IDLE Worker Query 
Fixes #811
 2013-11-02 10:35:59 +01:00
Sebastian Grewe
ff6a6e0931 Merge branch 'next' of github.com:TheSerapher/php-mpos into next 2013-10-31 13:41:04 +01:00
Sebastian Grewe
35a6c21024 [FIX] Worker hashrates for SHA/Scrypt compat 2013-10-31 13:39:01 +01:00
Sebastian Grewe
efe14ce629 Merge pull request #798 from TheSerapher/issue-797 
[FIX] Exclude invalid shares from statistics
 2013-10-31 00:07:49 -07:00
Sebastian Grewe
fc4b718067 [FIX] Honor custom HTTP ports 
Fixes #803
 2013-10-31 07:55:12 +01:00
Sebastian Grewe
7ec1fcfafb [FIX] Exclude invalid shares from statistics 
* Hashrates
* Sharetes
* Time Graphs

Fixes #797
 2013-10-30 19:26:02 +01:00
obigal
c0756d39df 24 hour pool statistics 2013-10-29 22:25:45 -04:00
obigal
4f3503bbb1 Admin poolworkers average difficulty fixes 2013-10-29 20:13:24 -04:00
Sebastian Grewe
8752b718e3 [FIX] Sort by donation amount not username 2013-10-29 18:13:00 +01:00
Sebastian Grewe
3ee2874110 [FIX] Removed debug output 2013-10-29 18:02:37 +01:00
Sebastian Grewe
272448dc6c [IMPROVED] Allow multi-monitor setup via API Keys 2013-10-29 18:00:21 +01:00
Sebastian Grewe
ef5ac9cbfd [ADDED] Last check footer 2013-10-29 14:54:35 +01:00
root
c4d1ca39c5 [UPDATE] reworked functions 2013-10-29 09:46:32 +01:00
Sebastian Grewe
88a2a29b3b [UPDATE] Adding missing files 2013-10-29 09:23:52 +01:00
root
b0f4edbc13 [IMPROVED] Added Found/Valid/Orphaned to Stats 2013-10-28 21:29:48 +01:00
root
03aef00367 [IMPROVED] Added some block stats to Pool Statistics 2013-10-28 20:42:39 +01:00
Sebastian Grewe
c6dd4086ff Merge pull request #764 from TheSerapher/payout-fixes 
Payout fixes
 2013-10-28 05:20:19 -07:00
Sebastian Grewe
c61c5f096e [MERGE] Fix merge conflicts 2013-10-28 07:14:25 +01:00
Sebastian Grewe
7a95e4c086 Merge pull request #775 from obigal/admin-reports 
Admin panel earnings report
 2013-10-27 22:47:47 -07:00
obigal
1b277c69cf admin panel reports 2013-10-27 10:24:49 -04:00
Sebastian Grewe
a841880fe7 Merge pull request #760 from TheSerapher/issue-759 
Issue 759
 2013-10-27 07:02:02 -07:00
obigal
aeaeb32d4a admin panel pool-workers 2013-10-27 09:45:52 -04:00
Sebastian Grewe
e238323395 Merge pull request #772 from TheSerapher/issue-770 
[FIX] TX Summary for Accounts
 2013-10-27 03:41:36 -07:00
Sebastian Grewe
b8159f06d7 [IMPROVED] Roundstatistics code and templates 
* [IMPROVED] Removed uneeded data array from round page
* [IMRPOVED] Sorted round shares via User ID as key for easier access
* [IMPROVED] Added share count to transaction list in prop
 2013-10-27 09:12:34 +01:00
Sebastian Grewe
bae4f1712c [FIX] TX Summary for Accounts 
Fixes #770
 2013-10-27 08:41:25 +01:00
Sebastian Grewe
a2472284a8 [FIX] Proper fetch Archive Shares 
Is now in-line with getMininumShareId.
 2013-10-27 03:28:41 +01:00
Sebastian Grewe
20a9fc3e28 Revert "[FIX] Fixed potential PPLNS issue" 
This reverts commit ee46e65fca.
 2013-10-27 02:51:03 +01:00
Sebastian Grewe
1d180c3e3d [FIX] Do not include orphans in transaction summary 2013-10-27 02:18:49 +01:00
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
a545362ba5 [FIX] getUserShareDifficulty must return 0 on NULL 2013-10-25 14:48:36 +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
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
1c5b53452a [FIX] Do not parse non-existing cache data, use SQL 2013-10-23 07:55:17 +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
813ad615d4 [FIX] Messed up getIdleWorkers name 2013-10-22 20:29:27 +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
obigal
7e49e7c254 pplns-stats, block-stats paging, dynamic and reverse payout 2013-10-22 09:07:31 -04: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
c89831943b [FIX] Fixed issues with uncached user shares data 2013-10-19 09:02:15 +02:00
Sebastian Grewe
8786a99382 [FIX] Fix sending mails even though diabled 
Fixes #732
 2013-10-18 07:21:51 +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
f636e4fc99 [FIX] Return 0 data not NULL if cache-key missing 2013-10-16 09:35:12 +02: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
0dca798f5c [FIX] Do not notify on missing cache entry 2013-10-07 13:48:48 +02:00
Sebastian Grewe
1dfb7e9702 Merge pull request #673 from TheSerapher/issue-444-theserapher 
Issue 444 theserapher
 2013-10-04 02:27:28 -07: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
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
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
6c3d2d1e96 Allow Public ACL for all round transactions 2013-09-25 10:34:36 +02:00
Sebastian Grewe
716e118041 Update statistics.class.php 
Fixes #664
 2013-09-23 07:11:43 +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
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
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
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
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
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
cdf71cbfba adding account balance to new dashboard via Ajax 2013-09-17 14:27:46 +02:00
Sebastian Grewe
4ffca7d5ac API overhaul for easier handling of API calls 
* [FEATURE] Allow in-class checking for user permissions
* [FEATURE] Allow in-class creation of the JSON data for coherence
* [FEATURE} Added API version in JSON data for client side checks
* [IMPROVEMENT] Adjusted all API calls to use the new JSON layout

**NOTE**: This is breaking backwads compatibility with the old API!
Please adjust your client application to support this new version.
The data array should not change much more other than added features.
 2013-09-17 11:55:54 +02:00
Sebastian Grewe
e88d80cd02 Merge branch 'next' into issue-444-theserapher 2013-09-17 09:42:56 +02:00
Sebastian Grewe
bbe39228e1 Bitcoin Wrapper improvements 
* [FEATURE] Allow for PoS/PoW Detecion in getdifficulty
* [FEATURE] Allow for SHA detecion in getnetworkhashps
* [IMRPOVEMENT] Added caching for bitcoin values (30s only)
 * Will reduce the amount of RPC calls for high load pages
 2013-09-17 09:36:08 +02:00
Sebastian Grewe
faadf7cbaf [FEATURE] Proper login/logout/auth redirects 
* Allow to redirect to referrer page when access is denied
* Logout user and point towards login, add redirect
* Logout user as usual but added save redirects
* Adjusted templates and page codes
 2013-09-14 21:20:12 +02:00
Sebastian Grewe
e6ab8006d1 [FEATURE] Adding more to gauges, adding graph to dashboard 
* Adding live-updates for gauges
* Adding new API calls
* Updated statistics to allow custom intervals
* Disabled caching for API calls for now
* Added new hashrate graph with auto-update

Addresses #444
 2013-09-14 14:43:14 +02:00
Sebastian Grewe
5e1c3ae372 fixing issue mentioned in #145 with payouts 2013-09-12 13:22:39 +02:00
nrpatten
34bc88533f Update mail.class.php 2013-09-12 19:57:30 +10:00
nrpatten
493dfcd85c Update mail.class.php 2013-09-12 19:55:59 +10:00
Sebastian Grewe
62c0641131 Merge branch 'next' into issue-145 2013-09-09 14:53:42 +02:00
Sebastian Grewe
5c11c74974 allow simple authentication checks wihtout logout 2013-09-09 07:45:55 +02:00
Sebastian Grewe
bc7e511177 removing debug echos 2013-09-06 15:00:47 +02:00
Sebastian Grewe
5257001153 fixing blockhash in round block details 2013-09-06 14:55:44 +02:00
Sebastian Grewe
f87a7fc380 Merge branch 'next' into issue-145 2013-09-06 10:55:31 +02:00
Sebastian Grewe
b656be751d indentations 2013-09-06 10:51:55 +02:00
Sebastian Grewe
d4ce764d77 proper allow back/forth on blocks 2013-09-06 10:49:19 +02:00
Sebastian Grewe
b3ba080345 obigals work, cherrypicked 2013-09-06 09:48:08 +02:00
Sebastian Grewe
0e27cda093 Fix: Blocks not being confirmed 
Fixes an issue introduce with #610.
 2013-08-26 11:11:52 +02:00
Sebastian Grewe
e6cf43efa0 Fix: Properly send notifications again 
Fixes #630
 2013-08-23 11:28:07 +02:00
Sebastian Grewe
6eec747be6 fixing PPLNS payouts one last time 2013-08-22 16:16:04 +02:00
Sebastian Grewe
db754c146e Revert "Revert "adjusting pplns target to baseline shares"" 
Reverting the revert .... :-/

This reverts commit 2d27132725.
 2013-08-22 15:20:46 +02:00
Sebastian Grewe
927fc12cb3 fixing admin panel user info 2013-08-22 15:01:00 +02:00
Sebastian Grewe
2d27132725 Revert "adjusting pplns target to baseline shares" 
* Shares are already baselined when calculating rounds

This reverts commit c9a8f8dc65.
 2013-08-22 14:51:30 +02:00
Sebastian Grewe
c9a8f8dc65 adjusting pplns target to baseline shares 2013-08-22 14:39:46 +02:00
Sebastian Grewe
eb435b4072 fixing difficulty per worker value 2013-08-22 12:33:29 +02:00
Sebastian Grewe
6522fb2747 fixing merge conflicts 2013-08-22 11:54:17 +02:00
Sebastian Grewe
1f6ccfd6be Merge pull request #628 from TheSerapher/issue-610 
Issue 610
 2013-08-22 02:47:46 -07:00
Sebastian Grewe
1c24820735 Adding network_confirmations to configuration 
* Added new configuration option `$config['network_confirmations']` to
  dist config
* Default to 120 if not set

This will allow us to define a different confirmation level for user
transactions but still display blocks at their approriate unconfirmed
value when displaying them in the wallet information for admins. Risky
for pool owners but still a viable option.

Fixes #610
 2013-08-22 11:45:40 +02:00
Sebastian Grewe
10a794cd4f Merge pull request #626 from TheSerapher/issue-622 
Issue 622
 2013-08-22 02:36:12 -07:00
Sebastian Grewe
6ec5b4b845 Fixing hashrate graphs 
* Proper initilize array in order
* Fill data after initilizing
* Removed 0 fills

Thanks @iriiria for this fix!

Fixes #624
 2013-08-22 11:33:26 +02:00
Sebastian Grewe
ae1a5c8ed3 Use baseline shares for share class 2013-08-22 11:30:13 +02:00
Sebastian Grewe
b23dd56bc8 Adding baseline shares to statistics class 
* Calculate shares towards our base diff
* Calculate share rate based on actual shares not diff
 2013-08-22 11:29:26 +02:00
Sebastian Grewe
56cfa24eb4 Include worker diff in API 
Addresses #145
 2013-08-20 17:03:41 +02:00
Sebastian Grewe
96066993ac adding per-worker difficulty display 2013-08-20 16:50:40 +02:00
Sebastian Grewe
526701d2e1 Merging with origin/next to get branch updated 2013-08-20 15:55:05 +02:00
Sebastian Grewe
7ec8fa9b95 Moving a lot of settings from config to adminpanel 
* Migrated configuration options to admin panel
* Removed configuration options from config file
* Added help text for each configuration option into panel

Addresses #622 and needs extensive testing by pools. A lot has changed
so pool owners might have to adjust their own templates to match this
new system.
 2013-08-20 12:02:47 +02:00
Sebastian Grewe
7e4c5dab4e Adding unconfirmed blocks to wallet 
First attempt addressing #610, still missing a detection for the actual
confirmation limit required for each block in case one lowers it in the
config.
 2013-08-19 09:31:53 +02:00