Merge pull request #2105 from raistlinthewiz/development

Fixed php warnings caused by api/getpoolinfo
This commit is contained in:
Sebastian Grewe 2014-04-10 12:55:59 +02:00
commit 190bf86de8

View File

@ -10,26 +10,26 @@ $user_id = $api->checkAccess($user->checkApiKey($_REQUEST['api_key']), @$_REQUES
// Output JSON format // Output JSON format
$data = array( $data = array(
// coin info // coin info
'currency' => $config[currency], 'currency' => $config['currency'],
'coinname' => $config[gettingstarted][coinname], 'coinname' => $config['gettingstarted']['coinname'],
// coin algorithm info // coin algorithm info
'cointarget' => $config[cointarget], 'cointarget' => $config['cointarget'],
'coindiffchangetarget' => $config[coindiffchangetarget], 'coindiffchangetarget' => $config['coindiffchangetarget'],
'algorithm' => $config[algorithm], 'algorithm' => $config['algorithm'],
// stratum // stratum
'stratumport' => $config[gettingstarted][stratumport], 'stratumport' => $config['gettingstarted']['stratumport'],
// payments // payments
'payout_system' => $config[payout_system], 'payout_system' => $config['payout_system'],
'confirmations' => $config[confirmations], 'confirmations' => $config['confirmations'],
'min_ap_threshold' => $config[ap_threshold][min], 'min_ap_threshold' => $config['ap_threshold']['min'],
'max_ap_threshold' => $config[ap_threshold][max], 'max_ap_threshold' => $config['ap_threshold']['max'],
'reward_type' => $config[payout_system] == 'pps' ? $config['pps']['reward']['type'] : $config['reward_type'], 'reward_type' => $config['payout_system'] == 'pps' ? $config['pps']['reward']['type'] : $config['reward_type'],
'reward' => $config[payout_system] == 'pps' ? $config['pps']['reward']['default'] : $config['reward'], 'reward' => $config['payout_system'] == 'pps' ? $config['pps']['reward']['default'] : $config['reward'],
// fees // fees
'txfee' => $config[txfee_manual], // make it backwards compatible 'txfee' => $config['txfee_manual'], // make it backwards compatible
'txfee_manual' => $config[txfee_manual], 'txfee_manual' => $config['txfee_manual'],
'txfee_auto' => $config[txfee_auto], 'txfee_auto' => $config['txfee_auto'],
'fees' => $config[fees] 'fees' => $config['fees']
); );
echo $api->get_json($data); echo $api->get_json($data);