Merge MPOS changes

.gitignore

@@ -1,21 +1,26 @@
 # Local Config
-/public/include/config/global.inc.php
-/public/include/config/security.inc.php
+/include/config/global.inc.php
+/include/config/security.inc.php
 
 # Templates
-/public/templates/compile/*.php
-/public/templates/compile/**
-/public/templates/cache/*.php
-/public/templates/cache/**
+/templates/compile/*.php
+/templates/compile/**
+/templates/cache/*.php
+/templates/cache/**
 
 # Logs
 /cronjobs/logs
 /cronjobs/logs/**.txt.*.gz
 /logs/*
 
 # Test configs
-public/include/config/global.inc.scrypt.php
-public/include/config/global.inc.sha.php
+/include/config/global.inc.test.php
+/include/config/global.inc.scrypt.php
+/include/config/global.inc.sha.php
+
+# Test files
+/scripts/test.php
+/cronjobs/test.php
 
 # IDE Settings
 /.idea/*
@@ -29,3 +34,13 @@ public/include/config/global.inc.sha.php
 /public/sitemap.gz
 /public/sitemap.tar.gz
 /public/.htaccess
+
+/vendor/
+
+tests/_output/*
+
+# NetBeans Project Directory
+/nbproject/*
+
+# No need for composer.lock
+/composer.lock

.htaccess

@@ -1,3 +1,10 @@
 ErrorDocument 404 /public/index.php?page=error&action=404
 RedirectMatch 404 /logs(/|$)
-Options -Indexes
+RedirectMatch 404 /templates(/|$)
+RedirectMatch 404 /include(/|$)
+RedirectMatch 404 /scripts(/|$)
+RedirectMatch 404 /sql(/|$)
+RedirectMatch 404 /upgrade(/|$)
+RedirectMatch 404 /cronjobs(/|$)
+RedirectMatch 404 /tests(/|$)
+Options -Indexes

.scrutinizer.yml

@@ -0,0 +1,9 @@
+tools:
+    external_code_coverage: true
+checks:
+    php:
+        code_rating: true
+        duplication: true
+filter:
+    paths:
+        - include/classes/*

.travis.yml

@@ -0,0 +1,42 @@
+language: php
+
+php:
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+matrix:
+  allow_failures:
+    - php: hhvm
+
+branches:
+  except:
+    - gh-pages
+
+
+
+install:
+  - wget http://selenium-release.storage.googleapis.com/2.42/selenium-server-standalone-2.42.2.jar
+  - composer global require "fxp/composer-asset-plugin:~1.1.1"
+  - composer install
+
+
+before_script:
+  - sudo chmod 777 /etc/hosts
+  - echo 127.0.0.1 mining > /etc/hosts
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - sleep 5
+  - java -jar selenium-server-standalone-2.42.2.jar -port 4444 &
+  - "mysql -e 'create database mpos;'"
+  - echo "USE mysql;\nUPDATE user SET password=PASSWORD('mining') WHERE user='travis';\nFLUSH PRIVILEGES;\n" | mysql -u root
+  - nohup php -S bone:8000 public/index.php &
+
+script:
+  - php vendor/bin/codecept build
+  - php vendor/bin/codecept run unit --coverage --coverage-html --coverage-xml --env travis
+
+after_script:
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover tests/_output/coverage.xml

CHANGELOG.md

@@ -1,6 +1,67 @@
-0.0.1 (Mar 7th 2013)
---------------------
+1.0.5 (XXX XXth XXXX)
+---------------------
 
-* WiP Upload of all files currently available
-* Added upstream script collections
-* Added SQL structure 
+* Fixed worker name scaling issues on mobile devices (Thanks @nrpatten)
+* Fixed user information table formatting (Thanks @pokari1986)
+* Fixed empty auto-payout threshold value for accounts page
+* Removed config disable check popup for admins on all pages
+* Added blockchain download status for admin feedback (admin setup check)
+* Added peer state to wallet info state if no peers are connected
+
+1.0.4 (Jun 19th 2015)
+---------------------
+
+* Honor anonymous attribute when sending block finder mails
+* Display admin warning if no transfer fees are set
+* Moved admin_checks.php into the admin panel/system/setup
+ * Checks are now loaded individually from pages/admin/checks
+
+1.0.3 (Apr 29th 2015)
+---------------------
+
+* HOTFIX: Database upgrade from `1.0.0` to `1.0.1` did not work as
+  intended
+
+1.0.2 (Apr 28th 2015)
+---------------------
+
+* Allow SSO accross MPOS pools
+  * Added a new config options
+    * `$config['db']['shared']['acounts']`, defaults to `$config['db']['name']`
+    * `$config['db']['shared']['workers']`, defaults to `$config['db']['name']`
+    * `$config['db']['shared']['news']`, defaults to `$config['db']['name']`
+  * Will access `accounts`, `pool_workers` and `news` on shared table
+  * Does not allow splitting `accounts` and `pool_woker` across database hosts
+  * Required `$config['cookie']['domain']` to be set
+    * You need to use the top domain shared between hosts as the setting
+    * e.g. `ltc.thepool.com` and `btc.thepool.com` it has to be `.thepool.com` (NOTE the leading .)
+* Increased information on `Admin -> Wallet Info`
+  * Added block count to Wallet Status
+  * Added number of accounts to Wallet Status
+  * Added Peer information
+  * Added last 25 transactions
+    * Can be changed via Admin System Settings -> Wallet
+  * Always show all accounts
+* Updated Auto Payout Threshold to be stored in `coin_address` table
+  * Existing thresholds will be migrated when upgrading
+  * Update to `1.0.1` for the database using the upgrade script supplied in MPOS
+* Updated Bootstrap to 3.3.4
+* Updated MorrisJS to 0.5.1
+* Updated RaphaelJS to 2.1.2
+* Updated Bootstrap Switch to 3.3.2
+* Updated CLEditor to 1.4.5
+* Removed unneeded JS files
+* Removed unneeded CSS files
+* Fixed ding for block notifications not playing on Safari
+* Fixed manual payout warning to show when account balance is too low
+
+1.0.1 (Apr 15th 2015)
+---------------------
+
+* Updated jQuery and SoundJS
+* Removed unneeded JS files
+
+1.0.0 (Jan 18th 2015)
+---------------------
+
+* First (non-beta) public release of MPOS

README.md

@@ -1,45 +1,23 @@
-Description [ ![Codeship Status for TheSerapher/php-mpos](https://www.codeship.io/projects/40fa7600-61a6-0131-3fd3-367b94dc0d60/status?branch=next)](https://www.codeship.io/projects/12276)
-===========
-
-MPOS is a web based Mining Portal for various crypto currencies. It was created by [TheSerapher](https://github.com/TheSerapher) and has hence grown quite large. Recently it was migrated into a Github Organization to make development easier. It's a community driven open source project. Support can be requested on IRC at https://webchat.freenode.net/?channels=#mpos
+[![Build Status](https://travis-ci.org/MPOS/php-mpos.png?branch=master)](https://travis-ci.org/MPOS/php-mpos) [![Code Climate](https://codeclimate.com/github/MPOS/php-mpos/badges/gpa.svg)](https://codeclimate.com/github/MPOS/php-mpos) [![Code Coverage](https://scrutinizer-ci.com/g/MPOS/php-mpos/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/MPOS/php-mpos/?branch=master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/MPOS/php-mpos/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/MPOS/php-mpos/?branch=master) master<br />
+[![Build Status](https://travis-ci.org/MPOS/php-mpos.png?branch=development)](https://travis-ci.org/MPOS/php-mpos) [![Code Coverage](https://scrutinizer-ci.com/g/MPOS/php-mpos/badges/coverage.png?b=development)](https://scrutinizer-ci.com/g/MPOS/php-mpos/?branch=development) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/MPOS/php-mpos/badges/quality-score.png?b=development)](https://scrutinizer-ci.com/g/MPOS/php-mpos/?branch=development)  development
 
+Description
+===========
 
-**NOTE**: This project is still under development and commits are happening on a daily basis.
-I do not recommend using this for a live setup as of yet. Wait for the later Release Candidate
-if you wish to run your pool with it. Testing pools are much appreciated though!
+MPOS is a web based Mining Portal for various crypto currencies. It was originally created by [TheSerapher](https://github.com/TheSerapher) and has hence grown quite large. It's now used by many pools out there and is a good starting point to learn more about mining and running pools in general. There is no active development done on the project by the orignal developers but we still merge PRs!
 
 Donations
 =========
 
 Donations to this project are going directly to [TheSerapher](https://github.com/TheSerapher), the original author of this project:
 
-* LTC address: `Lge95QR2frp9y1wJufjUPCycVsg5gLJPW8`
 * BTC address: `1HuYK6WPU8o3yWCrAaADDZPRpL5QiXitfv`
-* DOGE Address: `D6YtvxFGBmaD8Yq3i8LZsBQVPvCbZwCDzF`
-* Cryptsy Trade Key: `6ff7292142463b7b80cbbbdfc52334ba89727b11`
+* LTC address: `Lge95QR2frp9y1wJufjUPCycVsg5gLJPW8`
 
 Website Footer
 ==============
 
-When you decide to use `MPOS` please be so kind and leave the footer intact. You are not the author of the software and should honor those that have worked on it. I don't mind changing the LTC donation address at the bottom, but keep in mind who really wrote this software and would deserve those ;-).
-
-Donors
-======
-
-These people have supported this project with a donation:
-
-* [obigal](https://github.com/obigal)
-* [vias](https://github.com/vias79)
-* [WKNiGHT](https://github.com/WKNiGHT-)
-* [ZC](https://github.com/zccopwrx)
-* Nutnut
-* Caberhagen (http://litecoin-pool.ch)
-* Mining4All (https://www.mining4all.eu/)
-* [xisi](https://github.com/xisi)
-* [PCFiL](https://github.com/PCFiL)
-* [rog1121](https://github.com/rog1121)(https://rapidhash.net)
-* [Wow, Much Pool](http://www.wowmuchpool.com/)
-* webxassDE (https://www.suchcoins.com/)
+When you decide to use `MPOS` please be so kind and leave the footer intact. You are not the author of the software and should honor those that have worked on it. Keeping the footer intact helps spreading the word. Leaving the donation address untouched allows miners to donate to the author.
 
 Pools running MPOS
 ==================
@@ -79,23 +57,22 @@ The following feature have been implemented so far:
 
 * Fully re-written GUI with [Smarty][2] templates
  * Full file based template support
- * **NEW** SQL based templates
-* Mobile WebUI
-* Scrypt, SHA256, VARDIFF Support
+* VARDIFF Support
 * Reward Systems
  * Propotional, PPS and PPLNS
 * New Theme
  * Live Dashboard
  * AJAX Support
  * Overhauled API
+ * Bootstrap
 * Web User accounts
  * Re-Captcha protected registration form
 * Worker accounts
  * Worker activity
  * Worker hashrates
 * Pool statistics
 * Block statistics
-* Pool donations, fees and block bonuses
+* Pool donations, bonuses, fees and block bonuses
 * Manual and auto payout
 * Transaction list
 * Admin Panel
@@ -105,24 +82,24 @@ The following feature have been implemented so far:
  * User Transactions
  * News Posts
  * Pool Settings
- * Templates
  * Pool Workers
  * User Reports
- * Template Overwrite
 * Notification system
  * IDLE Workers
  * New blocks found in pool
  * Auto Payout
  * Manual Payout
 * User-to-user Invitation System
-* Support for various coins via config
+* Support for various coins via coin class and config
  * All scrypt coins
  * All sha256d coins
+ * All x11 coins
+ * Others may be supported by creating a custom coin class 
 
 Installation
 ============
 
-Please take a look at the [Quick Start Guide](https://github.com/TheSerapher/php-mpos/wiki/Quick-Start-Guide). This will give you an idea how to setup `MPOS`.
+Please take a look at the [Quick Start Guide](https://github.com/TheSerapher/php-mpos/wiki/Quick-Start-Guide). This will give you an idea how to setup `MPOS`. Please be aware that the `master` branch is our currently considered stable system while `development` is used as a test bed for all upcoming changes for `master`. If you wish to run a stable, well tested system ensure you run `git checkout master`. If you decide to stick to the `development` branch with bleeding edge code and potential bugs, just `git clone` the project.
 
 Customization
 =============
@@ -131,7 +108,7 @@ This project was meant to allow users to easily customize the system and templat
 If you are just using the system, there will be no need to adjust anything. Things will work out of the box! But if you plan on creating
 your own theme, things are pretty easy:
 
-* Create a new theme folder in `public/templates/`
+* Create a new theme folder in `templates/`
 * Create a new site_assets folder in `public/site_assets`
 * Create your own complete custom template or copy from an existing one
 * Change your theme in the `Admin Panel` and point it to the newly created folder
@@ -144,38 +121,27 @@ on non-existing features in `MPOS`. For the vast majority, adjusting themes shou
 
 In all that, I humbly ask to keep the `MPOS` author reference and Github URL intact.
 
-Related Software
-================
-
-There are a few other projects out there that take advantage of MPOS and it's included API. Here a quick list that you can check out for yourself:
-
-* [MPOS IRC Bot](https://github.com/WKNiGHT-/mpos-bot) written in Python, standalone bot, using the MPOS API
-* [MPOS Eggdrop Module](https://github.com/iAmShorty/mpos-eggdrop-tcl) written in TCL, adding MPOS commands to this bot, using the MPOS API
-* [Windows Phone Pool App](http://www.windowsphone.com/en-us/store/app/meeneminermonitor/7ec6eac7-a642-409b-96c8-57b5cfdf45cf)
-* [iPhone iMPOS App](https://itunes.apple.com/us/app/impos/id742179239?mt=8)
-
 Contributing
 ============
 
 You can contribute to this project in different ways:
 
 * Report outstanding issues and bugs by creating an [Issue][1]
-* Suggest feature enhancements also via [Issues][1]
-* Fork the project, create a branch and file a pull request to improve the code itself
-
-If you wish to participate contact the team on IRC: https://webchat.freenode.net/?channels=#mpos - we will point you to the proper channels!
+* Fork the project, create a branch and file a pull request **against development** to improve the code itself
 
 Contact
 =======
 
-You can find the team on Freenode.net, #MPOS.
+This product is not actively developed anymore. For setup and installation support, please find help in other channels.
+This projects issue tracker is used for bugs and issues with the core code, not for general help in setting up and running 
+pool.
 
 Team Members
 ============
 
-Author and Github Owner: [TheSerapher](https://github.com/TheSerapher) aka Sebastian Grewe
+Author and Project Owner: [TheSerapher](https://github.com/TheSerapher) aka Sebastian Grewe
 
-Developers:
+Past developers that helped on MPOS in the early days:
 
 * [nrpatten](https://github.com/nrpatten)
 * [Aim](https://github.com/fspijkerman)

codeception.yml

@@ -0,0 +1,21 @@
+actor: Tester
+paths:
+    tests: tests
+    log: tests/_output
+    data: tests/_data
+    helpers: tests/_support
+settings:
+    bootstrap: _bootstrap.php
+    colors: true
+    memory_limit: 1024M
+modules:
+    config:
+        Db:
+            dsn: ''
+            user: ''
+            password: ''
+            dump: tests/_data/dump.sql
+coverage:
+    whitelist:
+        include:
+            - include/classes/*

composer.json

@@ -0,0 +1,16 @@
+{
+    "name": "MPOS/php-mpos",
+    "description": "MPOS stands for Mining Portal Open Source. A unified mining interface for various Scrypt and SHA256d Crypto-currencies!",
+    "require-dev": {
+        "codeception/codeception": "~2.0"
+    },
+    "authors": [
+        {
+            "name": "Sebastian Grewe",
+            "email": "[email protected]"
+        }
+    ],
+    "require": {
+        "google/recaptcha": "~1.1"
+    }
+}

cronjobs/blockupdate.php

@@ -80,4 +80,3 @@
 }
 
 require_once('cron_end.inc.php');
-?>