diff --git a/cronjobs/auto_payout.php b/cronjobs/auto_payout.php index 548e5de8..bf87f41c 100755 --- a/cronjobs/auto_payout.php +++ b/cronjobs/auto_payout.php @@ -22,6 +22,14 @@ limitations under the License. // Include all settings and classes require_once('shared.inc.php'); +if ($setting->getValue('disable_ap') == 1) { + $log->logInfo(" auto payout disabled via admin panel"); + $monitoring->setStatus($cron_name . "_active", "yesno", 0); + $monitoring->setStatus($cron_name . "_message", "message", "Auto-Payout disabled"); + $monitoring->setStatus($cron_name . "_status", "okerror", 1); + exit(0); +} + if ($bitcoin->can_connect() !== true) { $log->logFatal(" unable to connect to RPC server, exiting"); $monitoring->setStatus($cron_name . "_active", "yesno", 0); @@ -34,7 +42,7 @@ if ($bitcoin->can_connect() !== true) { $users = $user->getAllAutoPayout(); // Quick summary -$log->logInfo(" found " . count($users) . " queued payout(s)"); +if (count($users) > 0) $log->logInfo(" found " . count($users) . " queued payout(s)"); // Go through users and run transactions if (! empty($users)) { diff --git a/public/include/pages/account/edit.inc.php b/public/include/pages/account/edit.inc.php index 9ab38e49..503542fc 100644 --- a/public/include/pages/account/edit.inc.php +++ b/public/include/pages/account/edit.inc.php @@ -12,6 +12,8 @@ if ($user->isAuthenticated()) { case 'cashOut': if ($setting->getValue('manual_payout_active') == 1) { $_SESSION['POPUP'][] = array('CONTENT' => 'A manual payout is in progress. Please try again later.', 'TYPE' => 'errormsg'); + } else if ($setting->getValue('disable_mp') == 1) { + $_SESSION['POPUP'][] = array('CONTENT' => 'Manual payouts are disabled.', 'TYPE' => 'info'); } else { $setting->setValue('manual_payout_active', 1); $continue = true; diff --git a/public/include/pages/admin/settings.inc.php b/public/include/pages/admin/settings.inc.php index 9bc7ef3b..5999b00d 100644 --- a/public/include/pages/admin/settings.inc.php +++ b/public/include/pages/admin/settings.inc.php @@ -20,6 +20,8 @@ if (@$_REQUEST['do'] == 'save' && !empty($_REQUEST['data'])) { $smarty->assign("MAINTENANCE", $setting->getValue('maintenance')); $smarty->assign("LOCKREGISTRATION", $setting->getValue('lock_registration')); $smarty->assign("DISABLEINVITATIONS", $setting->getValue('disable_invitations')); +$smarty->assign("DISABLEAP", $setting->getValue('disable_ap')); +$smarty->assign("DISABLEMP", $setting->getValue('disable_mp')); // Tempalte specifics $smarty->assign("CONTENT", "default.tpl"); diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php index fe1868d6..5f47bd65 100644 --- a/public/include/smarty_globals.inc.php +++ b/public/include/smarty_globals.inc.php @@ -46,6 +46,7 @@ $aGlobal = array( 'price' => $setting->getValue('price'), 'blockexplorer' => $config['blockexplorer'], 'chaininfo' => $config['chaininfo'], + 'disable_mp' => $setting->getValue('disable_mp'), 'config' => array( 'website' => $config['website'], 'accounts' => $config['accounts'], diff --git a/public/templates/mmcFE/account/edit/default.tpl b/public/templates/mmcFE/account/edit/default.tpl index c3b28f42..71221f12 100644 --- a/public/templates/mmcFE/account/edit/default.tpl +++ b/public/templates/mmcFE/account/edit/default.tpl @@ -20,6 +20,7 @@ {include file="global/block_footer.tpl"} +{if !$GLOBAL.disable_mp} {include file="global/block_header.tpl" BLOCK_HEADER="Cash Out"}

