Commit Graph

239 Commits

Author SHA1 Message Date
Sebastian Grewe
4d51331883 trying new layout for stats page 2013-06-12 11:31:37 +02:00
Sebastian Grewe
27b4c4473f Adding bonus to unconfirmed calculations 2013-06-12 09:17:50 +02:00
Sebastian Grewe
a006ea782a Adding confirmed and unconfirmed balance
* Added SQL code to support both balances
* Added sidebar entries
* Modified auto_payout to use new index
* Mofified account page to use new index

Addresses #140 but needs to be tested!
2013-06-12 09:13:14 +02:00
Sebastian Grewe
888461221f Merge branch 'next' of github.com:TheSerapher/php-mmcfe-ng into next 2013-06-11 16:33:18 +02:00
Sebastian Grewe
eb42993c2b formatting some numbers 2013-06-11 16:32:53 +02:00
Sebastian Grewe
8c937cf0b1 made prop default payout system in config 2013-06-11 15:44:16 +02:00
Sebastian Grewe
786926a328 fixing newline on footer 2013-06-10 20:39:41 +02:00
Sebastian Grewe
da6e217ac2 removing debug dump output 2013-06-10 20:23:53 +02:00
Sebastian Grewe
d2daed3317 Fixing montoring checkboxes
This will fix #163
2013-06-10 20:21:42 +02:00
Sebastian Grewe
b782857c41 Adding new config option payout_system
* Change templates based on the payout system used
* Modified sidebar for new PPS method

Further addresses #70
2013-06-10 18:56:28 +02:00
Sebastian Grewe
e8f8b2f5f4 Changed getLockedBalance and added SQL
* New SQL file for upgrade includes next changes
* Properly calculate getLockedBalance based on shares

Further addresses #70
2013-06-10 18:56:06 +02:00
Sebastian Grewe
666fde91b6 adding PPS value to sidebard 2013-06-10 18:54:54 +02:00
Sebastian Grewe
4745a2f6f8 Adding support for PPS payout method
This commit changed a few things in the backend and classes code:

* Any <type>_PPS transaction does NOT need to be confirmed
* Queries updated for added <type>_PPS transactions
* Template updated to properly display these transactions

Cronjob

* Added pps_payput cron to run payouts based on worker submitted shares
* **IMPORTANT**: Can NOT be run with proportional_payout!

Addresses #70
2013-06-10 18:49:57 +02:00
Sebastian Grewe
56f3d57c35 further improved checkboxes 2013-06-10 18:37:14 +02:00
Sebastian Grewe
b1d698e686 Allow users to change their email address
* Added email to account page
* No confirmation required as of yet

Fixes #142
2013-06-10 10:54:57 +02:00
Sebastian Grewe
9e74175ca3 Make email mandatory during registration
Partially addresses #142
2013-06-10 10:45:46 +02:00
Sebastian Grewe
b1f3c9bece Fixing manual payout race condition
* Mark manual payout active
* Run payout logics
* Reset manual payout

This ensures only one manual transaction can be run at a time.
If any users starts a manual payout others have to wait until the site
completed loading and finished the transaction process.

As long as we don't have too many users doing a manual payout at the
same time this should not be an issue. Best for users is using auto
payouts anyway.

This addresses #149
2013-06-10 10:38:05 +02:00
Sebastian Grewe
463f199040 Update edit.inc.php
Emergency fix: Transactions are not aborted if RPC transfer failed.
2013-06-10 11:31:49 +03:00
Sebastian Grewe
4e284895a8 Adding support for block finder bonus
* Added new configuration option `block_bonus`, see `global.inc.dist.php`, default 0
* Added new transaction types: `Bonus` and `Orphan_Bonus`
* Changes transaction table structure, added upgrade SQL
* Changed findblock cron to credit bonus to finder
* Modified transactions class to reflect changes

Fixes #148
2013-06-10 10:11:56 +02:00
Sebastian Grewe
bc485ec213 Merge pull request #151 from TheSerapher/issue-144
Issue 144 : Add notification handler and settings
2013-06-09 23:57:53 -07:00
Sebastian Grewe
6eeff19ff5 Fixing issue with notification cron
* Updated getAllActive to search by type
2013-06-09 16:44:32 +02:00
Sebastian Grewe
bbffdeb689 Allow pagination on Transaction page
* Added pager to all three transaction tables
* Added two additional pagination definitions to JS
* Added pagination ID to pagination template
2013-06-09 16:38:12 +02:00
Sebastian Grewe
b2b853d3e0 Added manual payout notification
* Added mail template for manual payouts
* Added code to account page to notify via mail on payout
* Added new option to notification setting template

Adds another feature to #144
2013-06-09 15:24:58 +02:00
Sebastian Grewe
d723f4e8ef Adding notification on automatic payout
* Added new mail template
* Added notification code to auto_payout cron
2013-06-09 15:17:14 +02:00
Sebastian Grewe
4ea8b6c695 Adding new notification system for new blocks
* Modified findblocks cron
* Modified notifications cron for new structure
* Improved notification class
* Added new template for new_block type
* Moved idle_worker type template
* Added new_block type to notification settings
2013-06-09 14:26:18 +02:00
Sebastian Grewe
88ade9cfa3 Adding support for various notifications
* Adding new SQL upgrade for notifications
* Added support for per user notification settings
* Added account_id to notifications table
* Added new notification_settings table
* Added new account page: notifications

Addresses #144
2013-06-09 13:10:58 +02:00
Sebastian Grewe
d20efb3caa Merge pull request #141 from TheSerapher/issue-139
Issue 139
2013-06-07 11:10:56 -07:00
Sebastian Grewe
02eb400de9 proper whitespacing 2013-06-07 20:09:54 +02:00
Sebastian Grewe
efdbff8e53 Do not include unconfirmed transactions in balance view
This will fix #139 showing wrong liquid asset counts. Since
that was confusing I ensured confirmations are included in the calculations.
2013-06-07 20:07:55 +02:00
Sebastian Grewe
4da9fd2369 Working notification system
* Added things to mail templates
* Modified user password reset call for new mail template
* Added BASEPATH to smarty code to ensure templates are compiled in the
  proper directory
* Updated mail and notification class
* Updated notification cron
* Added notification cron to run-cron list
2013-06-07 15:36:35 +02:00
Sebastian Grewe
69a3761be5 Adding notification reset once worker is active
Go through all active notifications (active means they are not notified
again) and check if their state has changed. If so, mark as inactive and
allow for re-notification of the same type and data.
2013-06-07 15:36:35 +02:00
Sebastian Grewe
9ac2dadd97 Progress on notifications
* Added main mail class
* notification class extends mail class
* Added mail template for IDLE workers
* Added notification table to SQL structure

This works already but once notified the status is not reset as soon as
a worker is active again. Need to think of a system to do that
automatically.

Addresses #116
2013-06-07 15:36:35 +02:00
Sebastian Grewe
c69fbe4fc4 Add worker montioring to template and worker class
* Add configurable monitoring for workers into template
* Store monitoring status in DB

First commit for #116
2013-06-07 15:36:35 +02:00
Sebastian Grewe
671a2d01ca Properly display both shares and hashrates
* As proposed in #132 thi allows for both shares and hashsrates

Fixes #132.
2013-06-07 09:02:58 +02:00
Sebastian Grewe
6802bac4b9 Merge pull request #132 from TheSerapher/issue-130
Re-Adding shares for admin user panel
2013-06-06 23:43:07 -07:00
Sebastian Grewe
4b05846a78 Re-Adding shares for admin user panel
* Re-enables estimations
* Still fixes #130 which had issues with hashrates, those are still
  fixed
2013-06-07 08:42:07 +02:00
Sebastian Grewe
c80fae30d2 Merge pull request #131 from TheSerapher/issue-130
Fixing admin panel user display
2013-06-06 23:34:40 -07:00
Sebastian Grewe
f63485a539 Fixing admin panel user display
* Fixes #130. Removed total shares in favor of the hashrate.
* Fixes hashrate display.
* Added pagination template file to include pagination on other pages in
the future.
2013-06-07 08:33:14 +02:00
Sebastian Grewe
1046bd113d minor template update for contributor shares 2013-06-07 00:54:24 +02:00
Sebastian Grewe
84f48efa41 minor template update for contributor hashrates 2013-06-07 00:51:25 +02:00
Sebastian Grewe
6a8979d20b Fixing critical issue with manual- and autopayouts
This is a proposed fix for #128:

* Mark auto_payout running via DB setting, unlock when done
* Just before actually sending money, check for running cron

Please refer to the ticket for details
2013-06-06 23:23:54 +02:00
Sebastian Grewe
7c1d51cc7a Add API call for getuserstatus
Fixes #126, see Github Wiki for documentation
2013-06-06 22:40:51 +02:00
Sebastian Grewe
4691e077e2 Ensure no old blocks shares are counter for new ones
When finding more than a single block between runs it added shares to a
new block from a previous one. Properly fetch the last highest share ID
from the database prior to scanning for shares assigned to a block.

Fixes #124
2013-06-06 22:27:34 +02:00
Sebastian Grewe
2a442eff56 Merge pull request #121 from TheSerapher/proper-credits
adding proper credits since only the UI code is still the original
2013-06-06 08:28:59 -07:00
Sebastian Grewe
c7e9aaac09 adding proper credits since only the UI code is still the original 2013-06-06 17:28:41 +02:00
Sebastian Grewe
d5866207c1 Adding admin only API call: getuserworkers <id>
* Require valid token and admin access
* Grab full worker information for a user
 * Matches the Worker List on the Account page
* See Wiki for full documentation
2013-06-06 17:18:55 +02:00
Sebastian Grewe
3094c9bb9d re-adjusting template again 2013-06-06 16:54:21 +02:00
Sebastian Grewe
2c56066763 changed time-range for graphs 2013-06-06 15:15:27 +02:00
Sebastian Grewe
e3702a5804 better looking worker table 2013-06-06 13:37:05 +02:00
Sebastian Grewe
7e76bb4a63 properly display username in graph 2013-06-06 12:02:58 +02:00