From 6d9195b7470aa4225c59c0a1c4a7b214502098b0 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 31 Oct 2013 12:13:45 +0100 Subject: [PATCH 1/8] [IMPROVED] make Gettingstarted more dynamic --- public/include/config/global.inc.dist.php | 18 ++++++++++++++++++ .../templates/mmcFE/gettingstarted/default.tpl | 18 +++++++++--------- .../templates/mpos/gettingstarted/default.tpl | 18 +++++++++--------- 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/public/include/config/global.inc.dist.php b/public/include/config/global.inc.dist.php index 1609b8b8..4a139582 100644 --- a/public/include/config/global.inc.dist.php +++ b/public/include/config/global.inc.dist.php @@ -69,6 +69,24 @@ $config['wallet']['host'] = 'localhost:19334'; $config['wallet']['username'] = 'testnet'; $config['wallet']['password'] = 'testnet'; + + + +/** + * Getting Started Config + * + * This is displayed on GettingStarted Page + * to make it more dynamic + * + * + **/ +$config['gettingstarted']['coinname'] = 'Litecoin'; +$config['gettingstarted']['coinurl'] = 'http://www.litecoin.org'; +$config['gettingstarted']['stratumport'] = '3333'; + + + + /** * API configuration to fetch prices for set currency * diff --git a/public/templates/mmcFE/gettingstarted/default.tpl b/public/templates/mmcFE/gettingstarted/default.tpl index f609a6b8..d242dd4e 100644 --- a/public/templates/mmcFE/gettingstarted/default.tpl +++ b/public/templates/mmcFE/gettingstarted/default.tpl @@ -7,9 +7,9 @@
  • 2. Download a miner.
  • 3. Configure your miner. @@ -17,29 +17,29 @@ - +
    STRATUM:stratum+tcp://{$smarty.server.SERVER_NAME}
    PORT:3333
    PORT:{$SITESTRATUMPORT}
    Username:Weblogin.Worker
    Password:Worker Password

    If you use a command-line miner, type:

    - 
    ./cgminer --scrypt -o stratum+tcp://{$smarty.server.SERVER_NAME}:3333 -u Weblogin.Worker -p Worker password
    + 
    ./cgminer --scrypt -o stratum+tcp://{$smarty.server.SERVER_NAME}:{$SITESTRATUMPORT} -u Weblogin.Worker -p Worker password

    If you want, you can create additional workers with usernames and passwords of your choice Here

    • -
  • 4. Create a Litecoin address to recieve payments. +
  • 4. Create a {$SITECOINNAME} address to recieve payments.
  • 5. Advanced cgminer settings / FAQ
    • {include file="global/block_footer.tpl"} diff --git a/public/templates/mpos/gettingstarted/default.tpl b/public/templates/mpos/gettingstarted/default.tpl index 5e677acd..128bc46c 100644 --- a/public/templates/mpos/gettingstarted/default.tpl +++ b/public/templates/mpos/gettingstarted/default.tpl @@ -9,9 +9,9 @@
  • 2. Download a miner.
  • 3. Configure your miner. @@ -19,29 +19,29 @@ - +
    STRATUM:stratum+tcp://{$smarty.server.SERVER_NAME}
    PORT:3333
    PORT:{$SITESTRATUMPORT}
    Username:Weblogin.Worker
    Password:Worker Password

    If you use a command-line miner, type:

    - 
    ./cgminer --scrypt -o stratum+tcp://{$smarty.server.SERVER_NAME}:3333 -u Weblogin.Worker -p Worker password
    + 
    ./cgminer --scrypt -o stratum+tcp://{$smarty.server.SERVER_NAME}:{$SITESTRATUMPORT} -u Weblogin.Worker -p Worker password

    If you want, you can create additional workers with usernames and passwords of your choice Here

    • -
  • 4. Create a Litecoin address to recieve payments. +
  • 4. Create a {$SITECOINNAME} address to recieve payments.
  • 5. Advanced cgminer settings / FAQ
    • From 126563c8f715a95c84beada39b8bbf2f137c8061 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 31 Oct 2013 12:16:52 +0100 Subject: [PATCH 2/8] [IMPROVED] changed decimal places to 4 to display low cost coins --- .../templates/mmcFE/statistics/pool/contributors_hashrate.tpl | 4 ++-- .../templates/mpos/statistics/pool/contributors_hashrate.tpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl b/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl index eaa0a3fc..97b2b3b9 100644 --- a/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl +++ b/public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl @@ -20,7 +20,7 @@ {if $CONTRIBHASHES[contrib].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$CONTRIBHASHES[contrib].account|escape}{/if} {($CONTRIBHASHES[contrib].hashrate * $GLOBAL.hashmods.personal)|number_format:"2"} {$estday|number_format:"3"} - {if $GLOBAL.config.price.currency}{($estday * $GLOBAL.price)|default:"n/a"|number_format:"2"}{/if} + {if $GLOBAL.config.price.currency}{($estday * $GLOBAL.price)|default:"n/a"|number_format:"4"}{/if} {/section} {if $listed != 1 && $GLOBAL.userdata.username|default:"" && $GLOBAL.userdata.hashrate|default:"0" > 0} @@ -30,7 +30,7 @@ {$GLOBAL.userdata.username|escape} {$GLOBAL.userdata.hashrate} {$myestday|number_format:"3"|default:"n/a"} - {if $GLOBAL.config.price.currency}{($myestday * $GLOBAL.price)|default:"n/a"|number_format:"2"}{/if} + {if $GLOBAL.config.price.currency}{($myestday * $GLOBAL.price)|default:"n/a"|number_format:"4"}{/if} {/if} diff --git a/public/templates/mpos/statistics/pool/contributors_hashrate.tpl b/public/templates/mpos/statistics/pool/contributors_hashrate.tpl index 38f37894..f54a36e3 100644 --- a/public/templates/mpos/statistics/pool/contributors_hashrate.tpl +++ b/public/templates/mpos/statistics/pool/contributors_hashrate.tpl @@ -23,7 +23,7 @@ {if $CONTRIBHASHES[contrib].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$CONTRIBHASHES[contrib].account|escape}{/if} {$CONTRIBHASHES[contrib].hashrate|number_format} {$estday|number_format:"3"} - {if $GLOBAL.config.price.currency}{($estday * $GLOBAL.price)|default:"n/a"|number_format:"2"}{/if} + {if $GLOBAL.config.price.currency}{($estday * $GLOBAL.price)|default:"n/a"|number_format:"4"}{/if} {/section} {if $listed != 1 && $GLOBAL.userdata.username|default:"" && $GLOBAL.userdata.hashrate|default:"0" > 0} @@ -34,7 +34,7 @@ {$GLOBAL.userdata.username|escape} {$GLOBAL.userdata.hashrate} {$myestday|number_format:"3"|default:"n/a"} - {if $GLOBAL.config.price.currency}{($myestday * $GLOBAL.price)|default:"n/a"|number_format:"2"}{/if} + {if $GLOBAL.config.price.currency}{($myestday * $GLOBAL.price)|default:"n/a"|number_format:"4"}{/if} {/if} From 19734294222210869b1519e5bad812048504dc20 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 31 Oct 2013 13:09:30 +0100 Subject: [PATCH 3/8] [IMPROVED] forgot declaration in sites --- public/include/pages/gettingstarted.inc.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/include/pages/gettingstarted.inc.php b/public/include/pages/gettingstarted.inc.php index aecab054..3c040a56 100644 --- a/public/include/pages/gettingstarted.inc.php +++ b/public/include/pages/gettingstarted.inc.php @@ -4,6 +4,10 @@ if (!defined('SECURITY')) die('Hacking attempt'); +$smarty->assign("SITESTRATUMPORT", $config['gettingstarted']['coinname']); +$smarty->assign("SITECOINNAME", $config['gettingstarted']['coinname']); +$smarty->assign("SITECOINURL", $config['gettingstarted']['coinurl']); + // Tempalte specifics $smarty->assign("CONTENT", "default.tpl"); ?> From 3b7d36059f5e4a579211cced8b1612ae9f681e0f Mon Sep 17 00:00:00 2001 From: root Date: Thu, 31 Oct 2013 14:25:50 +0100 Subject: [PATCH 4/8] [IMPROVED] another mistake :) --- public/include/pages/gettingstarted.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/include/pages/gettingstarted.inc.php b/public/include/pages/gettingstarted.inc.php index 3c040a56..2f30151a 100644 --- a/public/include/pages/gettingstarted.inc.php +++ b/public/include/pages/gettingstarted.inc.php @@ -4,7 +4,7 @@ if (!defined('SECURITY')) die('Hacking attempt'); -$smarty->assign("SITESTRATUMPORT", $config['gettingstarted']['coinname']); +$smarty->assign("SITESTRATUMPORT", $config['gettingstarted']['stratumport']); $smarty->assign("SITECOINNAME", $config['gettingstarted']['coinname']); $smarty->assign("SITECOINURL", $config['gettingstarted']['coinurl']); From 2c10504aa5f3d899a58c556847f1f1169d05d8df Mon Sep 17 00:00:00 2001 From: root Date: Thu, 31 Oct 2013 14:29:19 +0100 Subject: [PATCH 5/8] [FIX] added to mobile template --- .../mobile/statistics/pool/contributors_hashrate.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/templates/mobile/statistics/pool/contributors_hashrate.tpl b/public/templates/mobile/statistics/pool/contributors_hashrate.tpl index 9745f831..e02c50fa 100644 --- a/public/templates/mobile/statistics/pool/contributors_hashrate.tpl +++ b/public/templates/mobile/statistics/pool/contributors_hashrate.tpl @@ -19,7 +19,7 @@ {if $CONTRIBHASHES[contrib].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$CONTRIBHASHES[contrib].account|escape}{/if} {$CONTRIBHASHES[contrib].hashrate|number_format} {$estday|number_format:"3"} - {($estday * $GLOBAL.price)|default:"n/a"|number_format:"2"} + {($estday * $GLOBAL.price)|default:"n/a"|number_format:"4"} {/section} {if $listed != 1 && $GLOBAL.userdata.username|default:"" && $GLOBAL.userdata.hashrate|default:"0" > 0} @@ -28,7 +28,7 @@ {$GLOBAL.userdata.username} {$GLOBAL.userdata.hashrate} {$estday|number_format:"3"|default:"n/a"} - {($estday * $GLOBAL.price)|default:"n/a"|number_format:"2"} + {($estday * $GLOBAL.price)|default:"n/a"|number_format:"4"} {/if} From a2abba947ef1a33356caa01cfbac46363b4fc280 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Thu, 31 Oct 2013 14:30:22 +0100 Subject: [PATCH 6/8] Update README.md --- README.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 51abc689..4b5674be 100644 --- a/README.md +++ b/README.md @@ -50,8 +50,6 @@ Requirements This setup has been tested on Ubuntu 12.04, Ubuntu 13.04 and CentOS. It should also work on any related distribution (RHEL, Debian). -For support on how to get `litecoind` or `pushpoold` to work, please ask -in the appropriate forums. Be aware that `MPOS` is **only** for pooled mining. Solo Mining is not supported. They will never match an upstream share, solo miners do not create @@ -77,16 +75,16 @@ The following feature have been implemented so far: * Fully re-written GUI with [Smarty][2] templates * Mobile WebUI -* **NEW** VARDIFF Support +* Scrypt, **NEW** SHA256, VARDIFF Support * Reward Systems * Propotional * PPS * PPLNS * Statistics are cached in Memcache by Cronjob for quick data access -* **NEW** New Theme - * **NEW** Live Dashboard - * **NEW** AJAX Support - * **NEW** Overhauled API +* New Theme + * Live Dashboard + * AJAX Support + * Overhauled API * Web User accounts * Re-Captcha protected registration form * Worker accounts From b681add0e4efc7db8dae5e234024d3837ca2d3ca Mon Sep 17 00:00:00 2001 From: root Date: Thu, 31 Oct 2013 16:58:00 +0100 Subject: [PATCH 7/8] [FIX] added default variables --- public/templates/mmcFE/gettingstarted/default.tpl | 8 ++++---- public/templates/mpos/gettingstarted/default.tpl | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/public/templates/mmcFE/gettingstarted/default.tpl b/public/templates/mmcFE/gettingstarted/default.tpl index d242dd4e..9450bd08 100644 --- a/public/templates/mmcFE/gettingstarted/default.tpl +++ b/public/templates/mmcFE/gettingstarted/default.tpl @@ -17,18 +17,18 @@ - +
    STRATUM:stratum+tcp://{$smarty.server.SERVER_NAME}
    PORT:{$SITESTRATUMPORT}
    PORT:{$SITESTRATUMPORT|default:"3333"}
    Username:Weblogin.Worker
    Password:Worker Password

    If you use a command-line miner, type:

    - 
    ./cgminer --scrypt -o stratum+tcp://{$smarty.server.SERVER_NAME}:{$SITESTRATUMPORT} -u Weblogin.Worker -p Worker password
    + 
    ./cgminer --scrypt -o stratum+tcp://{$smarty.server.SERVER_NAME}:{$SITESTRATUMPORT|default:"3333"} -u Weblogin.Worker -p Worker password

    If you want, you can create additional workers with usernames and passwords of your choice Here

    -
  • 4. Create a {$SITECOINNAME} address to recieve payments. +
  • 4. Create a {$SITECOINNAME|default:"Litecoin"} address to recieve payments.
      -
    • Downloading the client & block chain: Download the {$SITECOINNAME} client from the here. +
    • Downloading the client & block chain: Download the {$SITECOINNAME|default:"Litecoin"} client from the here.

      Generate a new address and input it on your account page to receive payments.

    diff --git a/public/templates/mpos/gettingstarted/default.tpl b/public/templates/mpos/gettingstarted/default.tpl index 128bc46c..2dcd4357 100644 --- a/public/templates/mpos/gettingstarted/default.tpl +++ b/public/templates/mpos/gettingstarted/default.tpl @@ -19,18 +19,18 @@ - +
    STRATUM:stratum+tcp://{$smarty.server.SERVER_NAME}
    PORT:{$SITESTRATUMPORT}
    PORT:{$SITESTRATUMPORT|default:"3333"}
    Username:Weblogin.Worker
    Password:Worker Password

    If you use a command-line miner, type:

    - 
    ./cgminer --scrypt -o stratum+tcp://{$smarty.server.SERVER_NAME}:{$SITESTRATUMPORT} -u Weblogin.Worker -p Worker password
    + 
    ./cgminer --scrypt -o stratum+tcp://{$smarty.server.SERVER_NAME}:{$SITESTRATUMPORT|default:"3333"} -u Weblogin.Worker -p Worker password

    If you want, you can create additional workers with usernames and passwords of your choice Here

    • -
  • 4. Create a {$SITECOINNAME} address to recieve payments. +
  • 4. Create a {$SITECOINNAME|default:"Litecoin"} address to recieve payments.
      -
    • Downloading the client & block chain: Download the {$SITECOINNAME} client from here. +
    • Downloading the client & block chain: Download the {$SITECOINNAME|default:"Litecoin"} client from here.

      Generate a new address and input it on your account page to receive payments.

    From 819edaa811036831b9f179ad7385e3d2ef94f455 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Thu, 31 Oct 2013 18:59:16 +0100 Subject: [PATCH 8/8] Update README.md Added related projects. --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 4b5674be..5035cb36 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,15 @@ Other customizations are also possible but will require merging changes together on non-existing features in `MPOS`. For the vast majority, adjusting themes should be enough to highlight your pool from others. 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, standlone 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 + Contributing ============