Skip to content

[FIX] Disable API calls if not enabled #2297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheSerapher merged 1 commit into from
Jul 22, 2014
Merged

[FIX] Disable API calls if not enabled #2297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/pages/dashboard.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
$smarty->assign('BLOCKSFOUND', $aLastBlocks);
$smarty->assign('DISABLED_DASHBOARD', $setting->getValue('disable_dashboard'));
$smarty->assign('DISABLED_DASHBOARD_API', $setting->getValue('disable_dashboard_api'));
$smarty->assign('DISABLED_API', $setting->getValue('disable_api'));
$smarty->assign('ESTIMATES', array('shares' => $iEstShares, 'percent' => $dEstPercent));
$smarty->assign('NETWORK', array('difficulty' => $dDifficulty, 'block' => $iBlock, 'EstNextDifficulty' => $dEstNextDifficulty, 'EstTimePerBlock' => $dExpectedTimePerBlock, 'BlocksUntilDiffChange' => $iBlocksUntilDiffChange));
$smarty->assign('INTERVAL', $interval / 60);
Expand Down
2 changes: 2 additions & 0 deletions templates/bootstrap/dashboard/default.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
{include file="dashboard/overview/default.tpl"}
{include file="dashboard/round_statistics/$PAYOUT_SYSTEM/default.tpl"}
{include file="dashboard/account_data/default.tpl"}
{if !$DISABLED_API}
{include file="dashboard/worker_information/default.tpl"}
{/if}
{include file="dashboard/blocks/default.tpl"}
</div>
</div>
Expand Down
10 changes: 6 additions & 4 deletions templates/bootstrap/dashboard/js/api.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ $(document).ready(function(){
return;
}
if (blocks[0].height > lastBlock) {
if(canCreateSoundJS) {
if(canCreateSoundJS) {
createjs.Sound.play('ding');
}
lastBlock = blocks[0].height;
Expand Down Expand Up @@ -234,6 +234,7 @@ $(document).ready(function(){
});
})();

{/literal}{if !$DISABLED_API}{literal}
// Worker process to update active workers in the account details table
(function worker2() {
$.ajax({
Expand All @@ -250,7 +251,9 @@ $(document).ready(function(){
}
});
})();
{/literal}{/if}{literal}

{/literal}{if !$DISABLED_API}{literal}
// Worker process to update user account balances
// Our worker process to keep worker information updated
(function worker3() {
Expand All @@ -265,7 +268,8 @@ $(document).ready(function(){
}
});
})();

{/literal}{/if}{literal}

// Mute Button
$('#muteButton').click(function(){
if(muteFlag == 2) {
Expand All @@ -280,8 +284,6 @@ $(document).ready(function(){
$(this).find($(".fa")).removeClass('fa-volume-up').addClass('fa-volume-off');
}
});


});
{/literal}
</script>