diff --git a/api.php b/api.php index 9fbc183..2765ef5 100755 --- a/api.php +++ b/api.php @@ -362,11 +362,10 @@ if ($q == "getAddress") { */ $height = san($data['height']); $block = san($data['block']); - $includeMiningRewards = san($data['includeMiningRewards'] ?? ''); - if(empty($includeMiningRewards) || $includeMiningRewards == '0' || $includeMiningRewards == 'false') - $includeMiningRewards = false; - else - $includeMiningRewards = true; + $includeMiningRewards = ( + isset($data['includeMiningRewards']) && + !($data['includeMiningRewards'] === '0' || $data['includeMiningRewards'] === 'false') + ); $ret = $trx->get_transactions($height, $block, $includeMiningRewards); diff --git a/include/transaction.inc.php b/include/transaction.inc.php index 1f3ac5e..e01ca76 100755 --- a/include/transaction.inc.php +++ b/include/transaction.inc.php @@ -612,11 +612,11 @@ class Transaction if (empty($id) && empty($height)) { return false; } - $version_limit = $includeMiningRewards ? 0 : 1; + $versionLimit = $includeMiningRewards ? 0 : 1; if (!empty($id)) { - $r = $db->run("SELECT * FROM transactions WHERE block=:id AND version >= :version", [":id" => $id, ":version" => $version_limit]); + $r = $db->run("SELECT * FROM transactions WHERE block=:id AND version >= :version", [":id" => $id, ":version" => $versionLimit]); } else { - $r = $db->run("SELECT * FROM transactions WHERE height=:height AND version >= :version", [":height" => $height, ":version" => $version_limit]); + $r = $db->run("SELECT * FROM transactions WHERE height=:height AND version >= :version", [":height" => $height, ":version" => $versionLimit]); } $res = []; foreach ($r as $x) {