From 4cce4a373963584197adc667b54c0d7214b601ac Mon Sep 17 00:00:00 2001 From: Tanguy Pruvot Date: Mon, 18 Jan 2016 12:07:19 +0100 Subject: [PATCH] charity: add charity fields on the form and notes --- web/yaamp/models/db_coinsModel.php | 12 +- web/yaamp/modules/coin/index.php | 6 +- web/yaamp/modules/explorer/util.php | 2 +- web/yaamp/modules/site/coin_form.php | 238 ++++++++++++++++----------- 4 files changed, 154 insertions(+), 104 deletions(-) diff --git a/web/yaamp/models/db_coinsModel.php b/web/yaamp/models/db_coinsModel.php index 99f5a27..702924c 100644 --- a/web/yaamp/models/db_coinsModel.php +++ b/web/yaamp/models/db_coinsModel.php @@ -30,20 +30,22 @@ class db_coins extends CActiveRecord public function attributeLabels() { return array( - 'symbol2' => 'Official Symbol (if different)', + 'symbol2' => 'Official Symbol', 'auxpow' => 'AUX PoW', 'dontsell' => 'Don\'t sell', 'sellonbid' => 'Sell on Bid', 'txfee' => 'Tx Fee', - 'program' => 'Daemon process name', - 'conf_folder' => 'Conf. folder prefix', + 'program' => 'Process name', + 'conf_folder' => 'Conf. folder', 'rpchost' => 'RPC Host', 'rpcport' => 'RPC Port', 'rpcuser' => 'RPC User', 'rpcpasswd' => 'RPC Password', - 'serveruser' => 'Server process username', + 'serveruser' => 'Server user', 'hassubmitblock'=> 'Has submitblock', - 'hasmasternodes'=> 'Masternode', + 'hasmasternodes'=> 'Masternodes', + 'market' => 'Preferred market', + 'specifications'=> 'Notes' ); } diff --git a/web/yaamp/modules/coin/index.php b/web/yaamp/modules/coin/index.php index bf72c13..91deb0e 100644 --- a/web/yaamp/modules/coin/index.php +++ b/web/yaamp/modules/coin/index.php @@ -66,10 +66,10 @@ foreach($coins as $coin) $difficulty = Itoa2($coin->difficulty, 3); $created = datetoa2($coin->created); - echo ""; - echo ""; + echo ''; + echo ''; - echo "$coin->name"; + echo ''.$coin->name.''; if($this->admin) echo "$coin->symbol"; diff --git a/web/yaamp/modules/explorer/util.php b/web/yaamp/modules/explorer/util.php index 086fa1d..fc1c152 100644 --- a/web/yaamp/modules/explorer/util.php +++ b/web/yaamp/modules/explorer/util.php @@ -159,7 +159,7 @@ function versionToAlgo($coin, $version) ); $algos['J'] = array( 2 =>'sha256', 3=>'x11', 4=>'x13', 5=>'x15', 6=>'scrypt', - 7 =>'nist5', 8 =>'groestl', 9=>'penta', 10=>'whirl', + 7 =>'nist5', 8 =>'groestl', 9=>'penta', 10=>'whirlpool', 11=>'luffa', 12=>'keccak', 13=>'quark', 15=>'bastion' ); $algos['RICHX'] = array( diff --git a/web/yaamp/modules/site/coin_form.php b/web/yaamp/modules/site/coin_form.php index a782589..9d8936b 100644 --- a/web/yaamp/modules/site/coin_form.php +++ b/web/yaamp/modules/site/coin_form.php @@ -13,162 +13,228 @@ echo CUFHtml::openTag('fieldset', array('class'=>'inlineLabels')); InitMenuTabs('#tabs'); -echo "

"; +echo << +[readonly~=readonly] { + color: gray; +} + +

+end; -echo "
"; +echo '
'; echo CUFHtml::openActiveCtrlHolder($coin, 'name'); echo CUFHtml::activeLabelEx($coin, 'name'); echo CUFHtml::activeTextField($coin, 'name', array('maxlength'=>200)); -echo "

.

"; +echo '

'; echo CUFHtml::closeCtrlHolder(); echo CUFHtml::openActiveCtrlHolder($coin, 'symbol'); echo CUFHtml::activeLabelEx($coin, 'symbol'); -echo CUFHtml::activeTextField($coin, 'symbol', array('maxlength'=>200)); -echo "

.

"; +echo CUFHtml::activeTextField($coin, 'symbol', array('maxlength'=>200,'style'=>'width: 120px;')); +echo '

'; echo CUFHtml::closeCtrlHolder(); echo CUFHtml::openActiveCtrlHolder($coin, 'symbol2'); echo CUFHtml::activeLabelEx($coin, 'symbol2'); -echo CUFHtml::activeTextField($coin, 'symbol2', array('maxlength'=>200)); -echo "

.

"; +echo CUFHtml::activeTextField($coin, 'symbol2', array('maxlength'=>200,'style'=>'width: 120px;')); +echo '

Set it if symbol is different

'; echo CUFHtml::closeCtrlHolder(); echo CUFHtml::openActiveCtrlHolder($coin, 'algo'); echo CUFHtml::activeLabelEx($coin, 'algo'); -echo CUFHtml::activeTextField($coin, 'algo', array('maxlength'=>200)); -echo "

.

"; +echo CUFHtml::activeTextField($coin, 'algo', array('maxlength'=>64,'style'=>'width: 120px;')); +echo '

Mining algorithm

'; echo CUFHtml::closeCtrlHolder(); echo CUFHtml::openActiveCtrlHolder($coin, 'image'); echo CUFHtml::activeLabelEx($coin, 'image'); echo CUFHtml::activeTextField($coin, 'image', array('maxlength'=>200)); -echo "

.

"; +echo '

'; echo CUFHtml::closeCtrlHolder(); -echo CUFHtml::openActiveCtrlHolder($coin, 'reward'); -echo CUFHtml::activeLabelEx($coin, 'reward'); -echo CUFHtml::activeTextField($coin, 'reward', array('maxlength'=>200)); -echo "

.

"; -echo CUFHtml::closeCtrlHolder(); - -echo CUFHtml::openActiveCtrlHolder($coin, 'reward_mul'); -echo CUFHtml::activeLabelEx($coin, 'reward_mul'); -echo CUFHtml::activeTextField($coin, 'reward_mul', array('maxlength'=>200)); -echo "

.

"; +echo CUFHtml::openActiveCtrlHolder($coin, 'txfee'); +echo CUFHtml::activeLabelEx($coin, 'txfee'); +echo CUFHtml::activeTextField($coin, 'txfee', array('maxlength'=>200,'style'=>'width: 100px;','readonly'=>'readonly')); +echo '

'; echo CUFHtml::closeCtrlHolder(); echo CUFHtml::openActiveCtrlHolder($coin, 'block_height'); echo CUFHtml::activeLabelEx($coin, 'block_height'); -echo CUFHtml::activeTextField($coin, 'block_height', array('maxlength'=>200)); -echo "

.

"; +echo CUFHtml::activeTextField($coin, 'block_height', array('readonly'=>'readonly','style'=>'width: 120px;')); +echo '

Current height

'; echo CUFHtml::closeCtrlHolder(); echo CUFHtml::openActiveCtrlHolder($coin, 'target_height'); echo CUFHtml::activeLabelEx($coin, 'target_height'); -echo CUFHtml::activeTextField($coin, 'target_height', array('maxlength'=>200)); -echo "

.

"; +echo CUFHtml::activeTextField($coin, 'target_height', array('maxlength'=>32,'style'=>'width: 120px;')); +echo '

'; +echo CUFHtml::closeCtrlHolder(); + +echo CUFHtml::openActiveCtrlHolder($coin, 'errors'); +echo CUFHtml::activeLabelEx($coin, 'errors'); +echo CUFHtml::activeTextField($coin, 'errors', array('maxlength'=>200,'readonly'=>'readonly','style'=>'width: 600px;')); +echo CUFHtml::closeCtrlHolder(); + +echo CUFHtml::openActiveCtrlHolder($coin, 'specifications'); +echo CUFHtml::activeLabelEx($coin, 'specifications'); +echo CUFHtml::activeTextArea($coin, 'specifications', array('maxlength'=>2048,'lines'=>5,'class'=>'tweetnews-input','style'=>'width: 600px;')); echo CUFHtml::closeCtrlHolder(); echo "
"; ////////////////////////////////////////////////////////////////////////////////////////// -echo "
"; +echo '
'; echo CUFHtml::openActiveCtrlHolder($coin, 'enable'); echo CUFHtml::activeLabelEx($coin, 'enable'); echo CUFHtml::activeCheckBox($coin, 'enable'); -echo "

.

"; +echo '

'; echo CUFHtml::closeCtrlHolder(); echo CUFHtml::openActiveCtrlHolder($coin, 'auto_ready'); echo CUFHtml::activeLabelEx($coin, 'auto_ready'); echo CUFHtml::activeCheckBox($coin, 'auto_ready'); -echo "

.

"; +echo '

Allowed to mine

'; echo CUFHtml::closeCtrlHolder(); echo CUFHtml::openActiveCtrlHolder($coin, 'visible'); echo CUFHtml::activeLabelEx($coin, 'visible'); echo CUFHtml::activeCheckBox($coin, 'visible'); -echo "

.

"; +echo '

Visibility for the public

'; echo CUFHtml::closeCtrlHolder(); echo CUFHtml::openActiveCtrlHolder($coin, 'installed'); echo CUFHtml::activeLabelEx($coin, 'installed'); echo CUFHtml::activeCheckBox($coin, 'installed'); -echo "

.

"; +echo '

Required to be visible in the Wallets board

'; echo CUFHtml::closeCtrlHolder(); echo CUFHtml::openActiveCtrlHolder($coin, 'auxpow'); echo CUFHtml::activeLabelEx($coin, 'auxpow'); echo CUFHtml::activeCheckBox($coin, 'auxpow'); -echo "

.

"; -echo CUFHtml::closeCtrlHolder(); - -// echo CUFHtml::openActiveCtrlHolder($coin, 'index_avg'); -// echo CUFHtml::activeLabelEx($coin, 'index_avg'); -// echo CUFHtml::activeTextField($coin, 'index_avg', array('maxlength'=>200)); -// echo "

.

"; -// echo CUFHtml::closeCtrlHolder(); - -echo CUFHtml::openActiveCtrlHolder($coin, 'dontsell'); -echo CUFHtml::activeLabelEx($coin, 'dontsell'); -echo CUFHtml::activeCheckBox($coin, 'dontsell'); -echo "

.

"; -echo CUFHtml::closeCtrlHolder(); - -echo CUFHtml::openActiveCtrlHolder($coin, 'sellonbid'); -echo CUFHtml::activeLabelEx($coin, 'sellonbid'); -echo CUFHtml::activeCheckBox($coin, 'sellonbid'); -echo "

.

"; -echo CUFHtml::closeCtrlHolder(); - -echo CUFHtml::openActiveCtrlHolder($coin, 'txfee'); -echo CUFHtml::activeLabelEx($coin, 'txfee'); -echo CUFHtml::activeTextField($coin, 'txfee', array('maxlength'=>200)); -echo "

.

"; +echo '

Merged mining

'; echo CUFHtml::closeCtrlHolder(); echo CUFHtml::openActiveCtrlHolder($coin, 'master_wallet'); echo CUFHtml::activeLabelEx($coin, 'master_wallet'); echo CUFHtml::activeTextField($coin, 'master_wallet', array('maxlength'=>200)); -echo "

.

"; +echo '

The pool wallet address

'; echo CUFHtml::closeCtrlHolder(); -echo CUFHtml::openActiveCtrlHolder($coin, 'errors'); -echo CUFHtml::activeLabelEx($coin, 'errors'); -echo CUFHtml::activeTextField($coin, 'errors', array('maxlength'=>200)); -echo "

.

"; +echo CUFHtml::openActiveCtrlHolder($coin, 'reward'); +echo CUFHtml::activeLabelEx($coin, 'reward'); +echo CUFHtml::activeTextField($coin, 'reward', array('maxlength'=>200,'readonly'=>'readonly','style'=>'width: 120px;')); +echo '

PoW block value

'; +echo CUFHtml::closeCtrlHolder(); + +echo CUFHtml::openActiveCtrlHolder($coin, 'reward_mul'); +echo CUFHtml::activeLabelEx($coin, 'reward_mul'); +echo CUFHtml::activeTextField($coin, 'reward_mul', array('maxlength'=>200,'style'=>'width: 120px;')); +echo '

Adjust the block reward if incorrect

'; +echo CUFHtml::closeCtrlHolder(); + +echo CUFHtml::openActiveCtrlHolder($coin, 'charity_percent'); +echo CUFHtml::activeLabelEx($coin, 'charity_percent'); +echo CUFHtml::activeTextField($coin, 'charity_percent', array('maxlength'=>10,'style'=>'width: 30px;')); +echo '

Reward for foundation or dev fees, generally between 1 and 10 %

'; +echo CUFHtml::closeCtrlHolder(); + +echo CUFHtml::openActiveCtrlHolder($coin, 'charity_address'); +echo CUFHtml::activeLabelEx($coin, 'charity_address'); +echo CUFHtml::activeTextField($coin, 'charity_address', array('maxlength'=>200)); +echo '

Foundation address if "dev fees" are required

'; +echo CUFHtml::closeCtrlHolder(); + +echo CUFHtml::openActiveCtrlHolder($coin, 'hassubmitblock'); +echo CUFHtml::activeLabelEx($coin, 'hassubmitblock'); +echo CUFHtml::activeCheckBox($coin, 'hassubmitblock'); +echo '

Enable if submitblock method is present

'; +echo CUFHtml::closeCtrlHolder(); + +echo CUFHtml::openActiveCtrlHolder($coin, 'txmessage'); +echo CUFHtml::activeLabelEx($coin, 'txmessage'); +echo CUFHtml::activeCheckBox($coin, 'txmessage'); +echo '

Block template with a tx message

'; +echo CUFHtml::closeCtrlHolder(); + +echo CUFHtml::openActiveCtrlHolder($coin, 'hasmasternodes'); +echo CUFHtml::activeLabelEx($coin, 'hasmasternodes'); +echo CUFHtml::activeCheckBox($coin, 'hasmasternodes'); +echo '

Require "payee" and "payee_amount" fields in getblocktemplate (DASH)

'; echo CUFHtml::closeCtrlHolder(); echo "
"; ////////////////////////////////////////////////////////////////////////////////////////// -echo "
"; +echo '
'; + +echo CUFHtml::openActiveCtrlHolder($coin, 'dontsell'); +echo CUFHtml::activeLabelEx($coin, 'dontsell'); +echo CUFHtml::activeCheckBox($coin, 'dontsell'); +echo '

Disable auto send to exchange

'; +echo CUFHtml::closeCtrlHolder(); + +echo CUFHtml::openActiveCtrlHolder($coin, 'sellonbid'); +echo CUFHtml::activeLabelEx($coin, 'sellonbid'); +echo CUFHtml::activeCheckBox($coin, 'sellonbid'); +echo '

Reduce the sell price on exchanges

'; +echo CUFHtml::closeCtrlHolder(); + +echo CUFHtml::openActiveCtrlHolder($coin, 'market'); +echo CUFHtml::activeLabelEx($coin, 'market'); +echo CUFHtml::activeTextField($coin, 'market', array('maxlength'=>200)); +echo '

Selected exchange

'; +echo CUFHtml::closeCtrlHolder(); + +//echo CUFHtml::openActiveCtrlHolder($coin, 'marketid'); +//echo CUFHtml::activeLabelEx($coin, 'marketid'); +//echo CUFHtml::activeTextField($coin, 'marketid', array('maxlength'=>20,'style'=>'width: 120px;')); +//echo "

Required on cryptsy ?

"; +//echo CUFHtml::closeCtrlHolder(); + +//echo CUFHtml::openActiveCtrlHolder($coin, 'deposit_address'); +//echo CUFHtml::activeLabelEx($coin, 'deposit_address'); +//echo CUFHtml::activeTextField($coin, 'deposit_address', array('maxlength'=>20)); +//echo "

For donations or exchange withdraws ?

"; +//echo CUFHtml::closeCtrlHolder(); + +//echo CUFHtml::openActiveCtrlHolder($coin, 'deposit_minimum'); +//echo CUFHtml::activeLabelEx($coin, 'deposit_minimum'); +//echo CUFHtml::activeTextField($coin, 'deposit_minimum', array('maxlength'=>20,'style'=>'width: 120px;')); +//echo "

Unused

"; +//echo CUFHtml::closeCtrlHolder(); + +echo '
'; + +////////////////////////////////////////////////////////////////////////////////////////// + +echo '
'; echo CUFHtml::openActiveCtrlHolder($coin, 'program'); echo CUFHtml::activeLabelEx($coin, 'program'); -echo CUFHtml::activeTextField($coin, 'program', array('maxlength'=>128)); -echo "

.

"; +echo CUFHtml::activeTextField($coin, 'program', array('maxlength'=>128,'style'=>'width: 180px;')); +echo '

Daemon process name

'; echo CUFHtml::closeCtrlHolder(); echo CUFHtml::openActiveCtrlHolder($coin, 'conf_folder'); echo CUFHtml::activeLabelEx($coin, 'conf_folder'); -echo CUFHtml::activeTextField($coin, 'conf_folder', array('maxlength'=>128)); -echo "

.

"; +echo CUFHtml::activeTextField($coin, 'conf_folder', array('maxlength'=>128,'style'=>'width: 180px;')); +echo '

Generally close to the process name (.bitcoin)

'; echo CUFHtml::closeCtrlHolder(); echo CUFHtml::openActiveCtrlHolder($coin, 'rpchost'); echo CUFHtml::activeLabelEx($coin, 'rpchost'); -echo CUFHtml::activeTextField($coin, 'rpchost', array('maxlength'=>128)); -echo "

.

"; +echo CUFHtml::activeTextField($coin, 'rpchost', array('maxlength'=>128,'style'=>'width: 180px;')); +echo '

Daemon (Wallet) IP

'; echo CUFHtml::closeCtrlHolder(); if(empty($coin->rpcport)) @@ -176,8 +242,8 @@ if(empty($coin->rpcport)) echo CUFHtml::openActiveCtrlHolder($coin, 'rpcport'); echo CUFHtml::activeLabelEx($coin, 'rpcport'); -echo CUFHtml::activeTextField($coin, 'rpcport', array('maxlength'=>5)); -echo "

.

"; +echo CUFHtml::activeTextField($coin, 'rpcport', array('maxlength'=>5,'style'=>'width: 60px;')); +echo '

'; echo CUFHtml::closeCtrlHolder(); if(empty($coin->rpcuser)) @@ -185,8 +251,8 @@ if(empty($coin->rpcuser)) echo CUFHtml::openActiveCtrlHolder($coin, 'rpcuser'); echo CUFHtml::activeLabelEx($coin, 'rpcuser'); -echo CUFHtml::activeTextField($coin, 'rpcuser', array('maxlength'=>128)); -echo "

.

"; +echo CUFHtml::activeTextField($coin, 'rpcuser', array('maxlength'=>128,'style'=>'width: 180px;')); +echo '

'; echo CUFHtml::closeCtrlHolder(); // generate a random password @@ -196,31 +262,13 @@ if(empty($coin->rpcpasswd)) echo CUFHtml::openActiveCtrlHolder($coin, 'rpcpasswd'); echo CUFHtml::activeLabelEx($coin, 'rpcpasswd'); echo CUFHtml::activeTextField($coin, 'rpcpasswd', array('maxlength'=>128)); -echo "

.

"; +echo '

'; echo CUFHtml::closeCtrlHolder(); echo CUFHtml::openActiveCtrlHolder($coin, 'serveruser'); echo CUFHtml::activeLabelEx($coin, 'serveruser'); -echo CUFHtml::activeTextField($coin, 'serveruser', array('maxlength'=>35)); -echo "

.

"; -echo CUFHtml::closeCtrlHolder(); - -echo CUFHtml::openActiveCtrlHolder($coin, 'hassubmitblock'); -echo CUFHtml::activeLabelEx($coin, 'hassubmitblock'); -echo CUFHtml::activeCheckBox($coin, 'hassubmitblock'); -echo "

.

"; -echo CUFHtml::closeCtrlHolder(); - -echo CUFHtml::openActiveCtrlHolder($coin, 'txmessage'); -echo CUFHtml::activeLabelEx($coin, 'txmessage'); -echo CUFHtml::activeCheckBox($coin, 'txmessage'); -echo "

.

"; -echo CUFHtml::closeCtrlHolder(); - -echo CUFHtml::openActiveCtrlHolder($coin, 'hasmasternodes'); -echo CUFHtml::activeLabelEx($coin, 'hasmasternodes'); -echo CUFHtml::activeCheckBox($coin, 'hasmasternodes'); -echo "

.

"; +echo CUFHtml::activeTextField($coin, 'serveruser', array('maxlength'=>35,'style'=>'width: 180px;')); +echo '

Daemon process username

'; echo CUFHtml::closeCtrlHolder(); if ($coin->id) {