From 2dd333b5d85261d7581170cd4b6b3384ffaf61d4 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Mon, 1 Jul 2013 12:47:33 +0200 Subject: [PATCH] Changing wallet error message from litecoind Since plenty scrypt based currencies are supported, changed error message to say `wallet` instead of `litecoind` when failing to connect to RPC service. --- public/include/pages/account/edit.inc.php | 2 +- public/include/pages/admin/wallet.inc.php | 2 +- public/include/pages/api/getdifficulty.inc.php | 2 +- public/include/pages/statistics/pool.inc.php | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/include/pages/account/edit.inc.php b/public/include/pages/account/edit.inc.php index 5b717cee..5548dd82 100644 --- a/public/include/pages/account/edit.inc.php +++ b/public/include/pages/account/edit.inc.php @@ -50,7 +50,7 @@ if ($user->isAuthenticated()) { $notification->sendNotification($_SESSION['USERDATA']['id'], 'manual_payout', $aMailData); } } else { - $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to connect to litecoind RPC service', 'TYPE' => 'errormsg'); + $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to connect to wallet RPC service', 'TYPE' => 'errormsg'); } } else { $_SESSION['POPUP'][] = array('CONTENT' => 'Insufficient funds, you need more than ' . $config['txfee'] . ' ' . $conifg['currency'] . ' to cover transaction fees', 'TYPE' => 'errormsg'); diff --git a/public/include/pages/admin/wallet.inc.php b/public/include/pages/admin/wallet.inc.php index 45ff5af4..479ff919 100644 --- a/public/include/pages/admin/wallet.inc.php +++ b/public/include/pages/admin/wallet.inc.php @@ -13,7 +13,7 @@ if ($bitcoin->can_connect() === true){ $dBalance = $bitcoin->query('getbalance'); } else { $dBalance = 0; - $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to connect to litecoind RPC service: ' . $bitcoin->can_connect(), 'TYPE' => 'errormsg'); + $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to connect to wallet RPC service: ' . $bitcoin->can_connect(), 'TYPE' => 'errormsg'); } $smarty->assign("BALANCE", $dBalance); diff --git a/public/include/pages/api/getdifficulty.inc.php b/public/include/pages/api/getdifficulty.inc.php index 0a133464..0e9cb6f9 100644 --- a/public/include/pages/api/getdifficulty.inc.php +++ b/public/include/pages/api/getdifficulty.inc.php @@ -7,7 +7,7 @@ die('Hacking attempt'); // Check user token $id = $user->checkApiKey($_REQUEST['api_key']); -// Fetch data from litecoind +// Fetch data from wallet if ($bitcoin->can_connect() === true){ if (!$dDifficulty = $memcache->get('dDifficulty')) { $dDifficulty = $bitcoin->query('getdifficulty'); diff --git a/public/include/pages/statistics/pool.inc.php b/public/include/pages/statistics/pool.inc.php index 17129628..323066f2 100644 --- a/public/include/pages/statistics/pool.inc.php +++ b/public/include/pages/statistics/pool.inc.php @@ -4,7 +4,7 @@ if (!defined('SECURITY')) die('Hacking attempt'); -// Fetch data from litecoind +// Fetch data from wallet if ($bitcoin->can_connect() === true){ $dDifficulty = $bitcoin->getdifficulty(); if (is_array($dDifficulty) && array_key_exists('proof-of-work', $dDifficulty)) @@ -13,7 +13,7 @@ if ($bitcoin->can_connect() === true){ } else { $dDifficulty = 1; $iBlock = 0; - $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to connect to litecoind RPC service: ' . $bitcoin->can_connect(), 'TYPE' => 'errormsg'); + $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to connect to wallet RPC service: ' . $bitcoin->can_connect(), 'TYPE' => 'errormsg'); } // Top share contributors