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

363 Commits

Author SHA1 Message Date
Sebastian Grewe
4954f14923 Merge branch 'next' into issue-444-theserapher 2013-09-18 11:03:07 +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
Sebastian Grewe
04786aafb5 Merge branch 'next' into issue-145 2013-09-17 08:53:21 +02:00
Sebastian Grewe
0af26e7647 moving templates for old themes 2013-09-16 17:53:50 +02:00
Sebastian Grewe
aa10b6efc1 [FEATURE] Adding hashrate modifiers 
* Allow admins to set hashrate speed displays via admin panel
 * Personal
 * Pool
 * Network
* Allows for easier integration of SHA coins

Fixes #652
 2013-09-13 13:36:36 +02:00
Sebastian Grewe
62c0641131 Merge branch 'next' into issue-145 2013-09-09 14:53:42 +02:00
Sebastian Grewe
8ae36844f1 fixing some PHP warnings 2013-09-07 20:53:28 +02:00
Sebastian Grewe
f87a7fc380 Merge branch 'next' into issue-145 2013-09-06 10:55:31 +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
75d0dfe5f7 adding share rate to all sidebars 2013-08-22 14:18:04 +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
eacb8dff03 updated templates 2013-08-22 11:30:27 +02:00
Sebastian Grewe
36d64b27fd adding share rate to prop sidebar 2013-08-22 11:28:01 +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
2e4a94ff8c Merge pull request #615 from TheSerapher/issue-612 
Removing IRC reference
 2013-08-19 00:40:10 -07:00
Sebastian Grewe
f8f50fdc05 Removing IRC reference 
Fixes #612
 2013-08-19 09:39:45 +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
14c0535b10 Fill empty hours with proper data 
* Properly sort the array prior to sending it back
 * Sort from current to one hour earlier for proper data display
 * Adjusted templates to use new sorted arrays

Fixes #606
 2013-08-15 09:58:33 +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
e5cb4d0886 Fixing combined hashrate graph 
This shouuld fix #598 with graphs being completely off
 2013-08-14 11:23:14 +02:00
Sebastian Grewe
184ad5d58b fixing color of total percentage again 2013-08-14 11:15:49 +02:00
Sebastian Grewe
567b8e1655 Fix rounding issues on total row 
* Use actual percentages to calculate the total to ensure
  the rows average matches the totals average

Fixes #596
 2013-08-14 11:10:58 +02:00
Sebastian Grewe
0679601fbd Initilize totals with 0 values 
Addresses #596
 2013-08-14 11:03:56 +02:00
Sebastian Grewe
c0e8459519 fix coloring of total percentage 2013-08-14 10:59:50 +02:00
Sebastian Grewe
85e22bc02f Adding totals to block statistics 
* Total expected shares
* Total actual shares
* Average Percentage
 2013-08-12 10:07:19 +02:00
Sebastian Grewe
7214d27d9e make blocks list sortable 2013-08-09 14:58:46 +02:00
Sebastian Grewe
71abaf29f3 Merge pull request #583 from TheSerapher/issue-581 
Issue 581
 2013-08-09 05:58:12 -07:00
Sebastian Grewe
d42b66d94e removing useless strings 2013-08-08 12:09:50 +02:00
Sebastian Grewe
1a459a7913 Adding transaction summary by types 
Addresses #581
 2013-08-08 12:02:39 +02:00
Sebastian Grewe
92623902b2 adding round shares back to PPS sidebar 2013-08-08 10:03:33 +02:00
Sebastian Grewe
c568683152 Adding empty example for round stat integration 
Addresses #543
 2013-08-08 10:01:33 +02:00
Sebastian Grewe
aad8271a13 Fix blockexplorer links to use blockhash not height 
Fixes #571
 2013-08-08 09:42:10 +02:00
obigal
360bd22dc6 Updates 2013-08-07 09:42:06 +02:00
obigal
45d5db65c8 Update default.tpl 2013-08-07 09:34:55 +02:00
obigal
86d4ec18cd Update authenticated.tpl 2013-08-07 09:34:01 +02:00
obigal
ef234fe80b Vardiff/pushpool and pps payout support 2013-08-07 09:29:48 +02:00
obigal
c3a63d58ce Updates 2013-08-07 09:29:48 +02:00
obigal
2d2f480888 Update default.tpl 2013-08-07 09:29:48 +02:00
obigal
2b1c628238 Update authenticated.tpl 2013-08-07 09:29:47 +02:00
Sebastian Grewe
073a42cfc8 Fixing worker hashrates and activity status 
* Fix hashrate calculations and include archived shares
* Fix worker activity to only check for our_result = Y shares
* Mark as active if worker has a hashrate > 0, removes a query

Addresses #561, crons need to be updated to remove the active flag from
as the worker activity and check the hashrate instead.
 2013-08-07 09:20:08 +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
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
3c57d5bd0a fixing missing template warnings 2013-08-01 11:29:16 +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
fd8b07f02a Removing orphaned credits from Sidebars 
This will remove some confusion for users.

Addresses #524
 2013-07-31 08:59:02 +02:00
Nicolas Schteinschraber
5a377d6106 Issue #537 2013-07-31 03:44:49 -03:00
Sebastian Grewe
86633e1603 Adding JS/CSS code to project 
Instead of calling remote sites, deploy the JS and CSS locally. Will
allow HTTPs sites to work properly.

Fixes #521
 2013-07-24 16:37:22 +02:00
Sebastian Grewe
c0b0d438b8 Catch errors on missing templates 
Pages that are missing a template will cause a error 500. We now catch
this and display a default string.

Fixes #513
 2013-07-24 14:56:34 +02:00
Sebastian Grewe
eca77d551c Changed percentages for invalids, pool efficiency 
This should address #514 with negative efficiencies. Formulas were
wrong.

Will fix #514 when merged.
 2013-07-24 10:00:27 +02:00
Sebastian Grewe
777e160cf3 cleaning PHP Notice from log 2013-07-23 16:55:05 +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
4f46e9f781 remove worker monitoring if notifications are disabled 2013-07-23 13:11:39 +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
9c2cefd2c3 adding blockexplorer link if URL configured 2013-07-23 12:10:32 +02:00
Sebastian Grewe
24a277312c fixing TXFee display and filter 2013-07-23 12:01:45 +02:00
Sebastian Grewe
fb24ad81ae fixing php warning 2013-07-23 11:52:01 +02:00
Sebastian Grewe
9899507839 Fix some reported issues in #260 2013-07-23 11:05:45 +02: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
ed259a5b44 properly deal with Fee_PPS and Donation_PPS 2013-07-23 09:21:11 +02:00
Sebastian Grewe
61cea524d1 properly use limit for pagination 2013-07-23 09:18:50 +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
2c3eac1f67 proper coloring for start/end times 2013-07-22 16:47:50 +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
44c31fe630 Merge pull request #500 from TheSerapher/issue-488 
Admin Panel Setting to disable/enable AP/MP
 2013-07-22 05:55:12 -07:00
Sebastian Grewe
36a74b0bbf Fix transaction table, adjust transaction class 
* Ensure we also check newly added blocks for unconfirmed tx
* Only list orphaned transactions in the orphaned tab

Fixes #490
 2013-07-21 17:25:09 +02:00
Sebastian Grewe
7d801a561c Fixing Orphan showing as unconfirmed 
* Fixes orphaned transactions showing as unconfirmed too
* Fixes transaction tables to show orphaned credits in green, not red

Fixes #490
 2013-07-21 08:20:53 +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
5f161cdbb0 Merge pull request #487 from TheSerapher/issue-486 
Adding notifications and start/end times
 2013-07-18 06:42:15 -07:00
Sebastian Grewe
6641cf7f5c Adding notifications and start/end times 
Fixes #486
 2013-07-18 15:41:52 +02:00
Sebastian Grewe
7cf3ff3d88 Fix anonymous detection in share contributors list 
Fixes #484
 2013-07-18 13:55:05 +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
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
72ed08c92c Adding tooltip help for anonymous account flag 
Fixes #459
 2013-07-18 09:30:44 +02:00
Sebastian Grewe
8393053641 Disabel API references if API disabled 
This will turn off displaying any API references and links when API was
turned off in the configuration.

Fixes #467
 2013-07-18 09:04:59 +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
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
ab620f1fe0 Merge pull request #443 from TheSerapher/issue-432 
Get rid of Orphan transaction types
 2013-07-12 00:46:45 -07: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
7466689b50 further escapes on templates 2013-07-11 15:55:32 +02:00
Sebastian Grewe
08359c0d19 Further escaping of user inputs 2013-07-11 15:53:38 +02:00
Sebastian Grewe
5b50422675 Fixing XSS for user registration 2013-07-11 15:49:08 +02:00
Sebastian Grewe
dfde017267 Get rid of Orphan transaction types 
This fixes #432 and puts orphans on the same system as unconfirmed
transactions.
 2013-07-11 14:26:53 +02:00