Commit Graph

259 Commits

Author SHA1 Message Date
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
4954f14923 Merge branch 'next' into issue-444-theserapher 2013-09-18 11:03:07 +02:00
Sebastian Grewe
fbf2a86162 [FIX] Properly redirect after login 2013-09-18 07:24:34 +02:00
Sebastian Grewe
e7f62134f1 adding cold wallet coin display and setting 2013-09-17 16:15:18 +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
ffe6a01003 Merge branch 'next' into issue-444-theserapher 2013-09-17 09:56:36 +02:00
Sebastian Grewe
b8029c04f3 use wrapper to fetch last network block 2013-09-17 09:55:41 +02:00
Sebastian Grewe
e88d80cd02 Merge branch 'next' into issue-444-theserapher 2013-09-17 09:42:56 +02:00
Sebastian Grewe
baaf743218 use bitcoin wrapper method for getdiff calls 2013-09-17 09:42:41 +02:00
Sebastian Grewe
af21cafea5 use new bitcoin method wrapper for public API 2013-09-17 09:39:37 +02:00
Sebastian Grewe
ae9459eb92 Merge branch 'next' into issue-444-theserapher 2013-09-16 17:46:31 +02:00
Sebastian Grewe
29246a1f11 add cached share information to dashboard data API 2013-09-16 16:21:23 +02:00
Sebastian Grewe
8ad5a234c0 fixing website name in pub api 2013-09-16 15:41:23 +02:00
Sebastian Grewe
b533ea11a7 Updated hashrate graphs in dashboard
* [FEATURE] Display both pool and personal hashrate
* [FEATURE] Use EnhancedLegendRendere to toggle lines in graph
* [IMPROVEMENT] Unified Ajax call for graph and gauges
* [IMPROVEMENT] Allow `getdashboarddata` to supply raw hashrate values
2013-09-16 09:59:22 +02:00
Sebastian Grewe
7a73fbf099 API optimizations
* [IMRPOVEMENT] Do not include smarty globals, they are not needed on the API
* [IMPROVEMENT] Display correct runtimeinformation of entire script, not
  just the SQL queries
2013-09-15 17:29:44 +02:00
Sebastian Grewe
728ee2dd11 Feature update and Improvement to Dashboard
* [FEATURE] Dasboard honors Ajax interval for hashrate graph
* [IMPROVEMENT] Load graph plugins on graph template not on master template
2013-09-14 23:01:31 +02:00
Sebastian Grewe
8c96e166b7 [FEATURE] Added Ajax Data Interval Setting
* Allows Admins to change the SQL Interval used in queries
 * Default: 300 seconds / 5 minutes
 * Allowed: 1 minute, 5 minutes, 10 minutes
 * Tooltop in admin panel explains this setting
* Added data interval to API call for dashboard
* Added additional output to gauges footer

Addresses #444
2013-09-14 21:45:31 +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
727ed1f79a adding gethashps changes to dashboard 2013-09-14 19:32:37 +02:00
Sebastian Grewe
4e19de4c7a Unified gauges Ajax
* Single call for all data
* Use proper hash units as configured in pool
* New API call for dashboard data that has adjusted output
2013-09-14 17:03:19 +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
c20c9619a4 Update wallet.inc.php 2013-09-14 09:37:08 +02:00
Sebastian Grewe
f35c7cedc8 adding network hashrate to poolstatus 2013-09-13 10:28:12 +02:00
Sebastian Grewe
5e09208f54 adding share-rate to getuserstatus API 2013-09-13 09:35:14 +02:00
nrpatten
61f6f5b94b Create contactform.inc.php 2013-09-12 20:03:58 +10:00
nrpatten
ff6bd18749 Create contactform.inc.php 2013-09-12 20:01:28 +10:00
Sebastian Grewe
e2011a68b0 [FIX] Unconfirmed Wallet Balance
Fixes #646
2013-09-12 08:30:34 +02:00
Sebastian Grewe
f738b426f2 cleaned up dashboard page file 2013-09-09 16:07:42 +02:00
Sebastian Grewe
0dd1cc7d50 template updates for new empty content 2013-09-09 07:46:36 +02:00
Sebastian Grewe
82e8941c02 Merge branch 'next' into issue-444-theserapher 2013-09-07 23:55:49 +02:00
Sebastian Grewe
98688d5839 Updated testing template
* Removed unneeded template icons
* Added new icon font
* Added icons to navbard
* Added full admin features

Updates #444
2013-09-07 23:49:45 +02:00
Sebastian Grewe
bc7e511177 removing debug echos 2013-09-06 15:00:47 +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
ab6a4f57d3 further implemetation into mmcfe-ng 2013-09-06 10:29:42 +02:00
Sebastian Grewe
b3ba080345 obigals work, cherrypicked 2013-09-06 09:48:08 +02:00
Sebastian Grewe
5b353ab759 Merge branch 'next' into issue-543 2013-09-06 09:40:28 +02:00
Sebastian Grewe
cecbcb7d4b Adding testing theme for #444
This is just a WiP to test a new website template. Taken online from
source referenced in the sidebar footer.

Very nice and clean look, have not had the time to add all features yet
and is only used to demonstrate it.
2013-08-26 20:07:54 +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
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
c057efce3e Merge pull request #616 from TheSerapher/issue-605
Issue 605
2013-08-19 01:00:12 -07:00
Sebastian Grewe
59bd71c75d Fixing admin requests
Fixes #605
2013-08-19 09:59:41 +02:00
Sebastian Grewe
d6422ea5a8 Merge pull request #602 from TheSerapher/issue-582
Adding QRCodes under Accounts
2013-08-19 00:38:37 -07: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
Sebastian Grewe
a56907ba00 Adding gethourlyhashrates API call
Fixes #608
2013-08-15 10:08:48 +02:00
Sebastian Grewe
16557465e4 Added: getuserbalance API call
* Adds getbalance to API
* Admins: Can fetch any users balance
* Users: Can fetch only their own balance

Fixes #605
2013-08-15 08:58:50 +02:00
Sebastian Grewe
fcf5a21ce3 Adding QRCodes under Accounts
* Added: API String QR Code for #582 and #591

This will allow more QRCodes being added that are specific to an
account. The require library is added and the API string can be used as
an example how codes are generated.

Fixes #582
2013-08-14 11:44:29 +02:00
Sebastian Grewe
031b4940cd admin should see all transactions in summary 2013-08-08 12:05:06 +02:00
Sebastian Grewe
1a459a7913 Adding transaction summary by types
Addresses #581
2013-08-08 12:02:39 +02:00
Sebastian Grewe
c568683152 Adding empty example for round stat integration
Addresses #543
2013-08-08 10:01:33 +02:00
Sebastian Grewe
c9139034a4 Merge pull request #573 from TheSerapher/issue-549
Make block count on stats page configurable
2013-08-07 21:44:30 -07:00
Sebastian Grewe
df28e77319 fixing payout cron display 2013-08-05 17:51:31 +02:00
Sebastian Grewe
367f057e6d Refactored monitoring page
* Allow easier addition of new crons to the monitor list
* Make the data generation dynamic instead of hard to adjust lists

Fixes #559 upon merge.
2013-08-05 17:45:56 +02:00
Sebastian Grewe
4d77a7d299 Refactored admin panel settings
This will allow easier integration of new settings managed by the admin
panel. Includes setting types, tooltips, tabs etc.

No open ticket, just figured I'd add this.
2013-08-05 10:02:39 +02:00
Sebastian Grewe
2ced75b752 Merge pull request #556 from TheSerapher/issue-536
Issue 536
2013-08-05 00:20:53 -07:00
Sebastian Grewe
d59b8ef563 Make block count on stats page configurable
Fixes #549
2013-08-05 09:18:52 +02:00
Sebastian Grewe
c25e54f79c Adding Admin MOTD
* Adding MOTD to admin settings
* Adding MOTD to smarty_globals as regular INFO popup

Fixes #545
2013-08-01 16:25:43 +02:00
Sebastian Grewe
4eb6c59cb3 Refactored getTransactions, unified admin/user view
* Removed getAllTransactions method
* Unified getTransactions for users and admins
* Added filter abilities to user transaction view

This should speed up things a fair bit for transaction heavy pools.

Addresses #536
2013-08-01 11:00:54 +02:00
Sebastian Grewe
52f58807b0 Refactored admin transactions
* Properly generate the bind_params statement
* Extended from Base Class
* Added methods to Base Class

Addresses #536
2013-08-01 10:40:49 +02:00
Sebastian Grewe
60bf687d1c increased limit back to 30 2013-07-31 17:11:26 +02:00
Sebastian Grewe
68c8d29a01 removed line by accident 2013-07-31 17:10:26 +02:00
Sebastian Grewe
4c37ab4950 Find actual row count without LIMITs applied
Addresses #542
2013-07-31 17:09:30 +02:00
Nicolas Schteinschraber
5a377d6106 Issue #537 2013-07-31 03:44:49 -03:00
Sebastian Grewe
c7f952a27a Display network hashrate in public API
Instead of 0 show the actual hashrate, still shows 0 if unable to
connect to RPC server.

Fixes #511
2013-07-24 09:12:29 +02:00
Sebastian Grewe
35d1f5fa92 Merge pull request #498 from TheSerapher/manual-payout-cron
Adding manual payout cron
2013-07-23 05:36:49 -07:00
Sebastian Grewe
7209f570f4 properly fetch account balance 2013-07-23 14:16:20 +02:00
Sebastian Grewe
760f1a679e Allow admin to disable notification system
This addresses #497 and allows the admins to disable notifications
through the admin panel. Might be used by those relying on clients using
the API instead.

Once merged it will fix #497.
2013-07-23 13:06:38 +02:00
Sebastian Grewe
a6c8d507dc Merge pull request #501 from TheSerapher/issue-260
Issue 260
2013-07-23 03:55:20 -07:00
Sebastian Grewe
63b942a7e1 Adding No Fee option to admin panel
Admins can disable a users fee via admin panel now.

Fixes #260
2013-07-23 10:56:45 +02:00
Sebastian Grewe
330169ae58 more fixes and log cleanup 2013-07-23 10:53:47 +02:00
Sebastian Grewe
1a5d216b7a Allow adjusting the tx row limit 2013-07-23 09:08:57 +02:00
Sebastian Grewe
1d6cbd44a6 Adding new admin transaction view
* Added transaction filters
* Added proper paging support
* Removed the tabs that caused confusion
* Added transaction status column

Fixes #404
2013-07-23 09:03:36 +02:00
Sebastian Grewe
4b6582ac35 More colorful monitoring output
* Added colorized start/end times
* Added Success/Error image for Active status
* Added color to runtime status
2013-07-22 16:42:23 +02:00
Sebastian Grewe
ee5e2c46c6 Adding manual payout cron
This will avoid double payouts via the website. Payouts will be
requested by users and processed by a cron. If, for whatever reason,
users do add two requests (it is checked if a payout exists) they would
only have one successful payout until their account balance is back up
to a save value to trigger the payout.

This should fix any issues with manual payouts being exploited through
the website. Will require some testing by others to ensure things work
as expected.
2013-07-22 16:14:22 +02:00
Sebastian Grewe
7fce187ab0 Admin Panel Setting to disable/enable AP/MP
This will allow admins to temporarily or permanantly enable and disable
auto and manual payout processing.

Fixes #488
2013-07-19 11:12:28 +02:00
Sebastian Grewe
43923fe4e9 only fetch blockhash for valid blocks 2013-07-19 09:49:48 +02:00
Sebastian Grewe
6641cf7f5c Adding notifications and start/end times
Fixes #486
2013-07-18 15:41:52 +02:00
Sebastian Grewe
1cd39099ee Merge pull request #483 from TheSerapher/issue-446
Issue 446
2013-07-18 02:05:45 -07:00
Sebastian Grewe
33a058dc4b Merge pull request #482 from TheSerapher/issue-467
Issue 467
2013-07-18 01:49:47 -07:00
Sebastian Grewe
6d379e8e58 Removing debug output 2013-07-18 09:45:20 +02:00
Sebastian Grewe
73ec707381 Adds blockhash to blockexplorer URL
* Changed blockexplorer URL to use Blockhash instead of height
* Added calls to find current networks blocks blockhash
* Propagated changes onto temmplate
* Added new dist configuration for new blockexplorer URL

Fixes #446
2013-07-18 09:43:16 +02:00
Sebastian Grewe
d492b532b7 Adding ability to disable the sites API functions
Addresses #467 and will fix upon merge.
2013-07-17 09:43:02 +02:00
Sebastian Grewe
a12499ecd9 Fixing negative time since last block
This will fix #466 if approved by reporter.
2013-07-16 21:55:52 +02:00
Sebastian Grewe
7b929ed3e4 Fixing PHP Warning on resetting failed login count
Addresses #330 and further cleans PHP Log
2013-07-15 16:16:40 +02:00
Sebastian Grewe
501f369b4e Further fixes to PHP warnings
Addresses #330 and further cleans up the PHP log.
2013-07-15 15:31:18 +02:00
Sebastian Grewe
525c0ab009 Fixing PHP Warning on unsert token on register
Addresses #330 and cleans up PHP Log
2013-07-15 14:28:54 +02:00
Sebastian Grewe
0f00f7d322 Another fix for registration issues
Addresses #330
2013-07-15 13:46:20 +02:00
Sebastian Grewe
8f72062558 Fixing issue with registration disabled and invitations
This will fix an issue with certain combinations of registration and/or
invitations being enabled or disabled.

Addresses #330
2013-07-15 13:44:22 +02:00
Sebastian Grewe
7f4f5cd343 Make invitations configurable via admin panel
Invitations can now be configured through admin panel settings. By
default, invitations are enabled. Invitation system is also available if
registrations are disabled. To completely remove the ability of new
users to sign up, disable both registration and invitations.

Fixes #330
2013-07-15 12:43:29 +02:00
Sebastian Grewe
bd32dfa9f8 Adding invitation system to mmcfe-ng core
This will allow users to send invitations to other people via email.
Each account will still need to confirm the email address if the option
is enabled.

Addresses #330, will need to allow pool operators to enable this feature
even with registrations turned off.
2013-07-15 12:26:31 +02:00
Sebastian Grewe
0ede05a6fd Adding email verification
* Adding mail verification during account registration
* Added new dist file option for mail verification
* Added account confirmation page using tokens
* Added mail class into user class for password resets
* Moved password reset template
* Adjusted account registration page
* Adjusted user class for email confirmation

Also fixed a bug with smarty_cache_key not being used properly if smarty
is disabled. Key still needs to be available even if caching is disabled

Addresses #330 and prepare the ticket for invitation only system.
2013-07-15 12:26:31 +02:00
Sebastian Grewe
29d5d36a7e WiP for one time tokens
* Added token type class
* Storing Token Type as ID not varchar
* Added new system to user class and fixed issues with it
* Started on mail verification process in user class
* Updated autoloader
* Updated change password template

Addresses #330
2013-07-15 12:26:31 +02:00
Sebastian Grewe
8ec1d2cab3 Adding anonymous account support
* Added anonymous flag to accounts table
* Added checkbox for anonymous flag in edit account page
* Updated user class to support new flag
* Updated statistics class to support anonymous and donations
* Updated all templates showing usernames to show anonymous instead
* Added new SQL `ALTER TABLE` file for upgrading the table

Fixes #419 once merged.
2013-07-12 10:33:42 +02:00
Sebastian Grewe
5bf2cd0202 Merge pull request #442 from TheSerapher/issue-430
Issue 430
2013-07-11 08:56:50 -07:00
Sebastian Grewe
09c0087775 Add tickerupdate to cron monitoring
Fixes #439
2013-07-11 16:50:24 +02:00
Sebastian Grewe
e0d43141b5 Merge pull request #438 from TheSerapher/issue-431
Adding last runtime to monitoring page
2013-07-11 07:45:38 -07:00
Sebastian Grewe
739bd9c7b6 Properly cache on a per-user basis
This will fix an issue with templates of other users being applied to
different users logged in. Basically the first cached page would be
displayed for all users.

Created a new cache key for smarty to allow the user ID to be reference
in the cache key. Hence each user has their own cached file which will
be used.

Improved caching by creating subdirectories for cached files. This way
we won't run into a file limit per directory with a lot of cached files.

This fixes #430 and the mentioned issue in that report.
2013-07-11 13:45:54 +02:00
Sebastian Grewe
875572813b Adding last runtime to monitoring page
Displays the date/time of the last successful run.

Fixes #431
2013-07-11 13:25:22 +02:00
Sebastian Grewe
17829cfd4a always assign default content 2013-07-11 09:13:50 +02:00