[FIX] Tabbing
[Improved] Wording [Improved] Logic of conditions
This commit is contained in:
parent
5661b9cda6
commit
3bd21a9372
@ -34,16 +34,9 @@ if ($bitcoin->can_connect() !== true) {
|
|||||||
$log->logFatal(" unable to connect to RPC server, exiting");
|
$log->logFatal(" unable to connect to RPC server, exiting");
|
||||||
$monitoring->endCronjob($cron_name, 'E0006', 1, true);
|
$monitoring->endCronjob($cron_name, 'E0006', 1, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($setting->getValue('disable_manual_payouts') != 1) {
|
if ($setting->getValue('disable_manual_payouts') != 1) {
|
||||||
// Fetch outstanding payout requests
|
// Fetch outstanding payout requests
|
||||||
if (!$aPayouts = $oPayout->getUnprocessedPayouts()) {
|
if ($aPayouts = $oPayout->getUnprocessedPayouts()) {
|
||||||
$log->logFatal("\tFailed Processing Manual Payment Queue...");
|
|
||||||
$monitoring->endCronjob($cron_name, 'E0050', 1, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (count($aPayouts > 0)) $log->logDebug(" found " . count($aPayouts) . " queued manual payout requests");
|
|
||||||
|
|
||||||
if (count($aPayouts) > 0) {
|
if (count($aPayouts) > 0) {
|
||||||
$log->logInfo("\tStarting Manual Payments...");
|
$log->logInfo("\tStarting Manual Payments...");
|
||||||
$log->logInfo("\tAccount ID\tUsername\tBalance\t\tCoin Address");
|
$log->logInfo("\tAccount ID\tUsername\tBalance\t\tCoin Address");
|
||||||
@ -58,7 +51,6 @@ if ($setting->getValue('disable_manual_payouts') != 1) {
|
|||||||
$log->logFatal('unable to mark transactions ' . $aData['id'] . ' as processed. ERROR: ' . $oPayout->getCronError());
|
$log->logFatal('unable to mark transactions ' . $aData['id'] . ' as processed. ERROR: ' . $oPayout->getCronError());
|
||||||
$monitoring->endCronjob($cron_name, 'E0010', 1, true);
|
$monitoring->endCronjob($cron_name, 'E0010', 1, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
$log->logInfo("\t" . $aData['account_id'] . "\t\t" . $aData['username'] . "\t" . $dBalance . "\t\t" . $aData['coin_address']);
|
$log->logInfo("\t" . $aData['account_id'] . "\t\t" . $aData['username'] . "\t" . $dBalance . "\t\t" . $aData['coin_address']);
|
||||||
try {
|
try {
|
||||||
$txid = $bitcoin->sendtoaddress($aData['coin_address'], $dBalance - $config['txfee_manual']);
|
$txid = $bitcoin->sendtoaddress($aData['coin_address'], $dBalance - $config['txfee_manual']);
|
||||||
@ -66,7 +58,6 @@ if ($setting->getValue('disable_manual_payouts') != 1) {
|
|||||||
$log->logError('Skipping payment. Failed to send balance to coin address: ' . $aData['coin_address'] . ' ERROR: ' . $e->getMessage());
|
$log->logError('Skipping payment. Failed to send balance to coin address: ' . $aData['coin_address'] . ' ERROR: ' . $e->getMessage());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($transaction->addTransaction($aData['account_id'], $dBalance - $config['txfee_manual'], 'Debit_MP', NULL, $aData['coin_address'], $txid) && $transaction->addTransaction($aData['account_id'], $config['txfee_manual'], 'TXFee', NULL, $aData['coin_address'])) {
|
if ($transaction->addTransaction($aData['account_id'], $dBalance - $config['txfee_manual'], 'Debit_MP', NULL, $aData['coin_address'], $txid) && $transaction->addTransaction($aData['account_id'], $config['txfee_manual'], 'TXFee', NULL, $aData['coin_address'])) {
|
||||||
// Mark all older transactions as archived
|
// Mark all older transactions as archived
|
||||||
if (!$transaction->setArchived($aData['account_id'], $transaction->insert_id))
|
if (!$transaction->setArchived($aData['account_id'], $transaction->insert_id))
|
||||||
@ -87,7 +78,8 @@ if ($setting->getValue('disable_manual_payouts') != 1) {
|
|||||||
$log->logFatal('User has a remaining balance of ' . $aBalance['confirmed'] . ' after a successful payout!');
|
$log->logFatal('User has a remaining balance of ' . $aBalance['confirmed'] . ' after a successful payout!');
|
||||||
$monitoring->endCronjob($cron_name, 'E0065', 1, true);
|
$monitoring->endCronjob($cron_name, 'E0065', 1, true);
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
$log->logFatal('Failed to add new Debit_MP transaction in database for user ' . $user->getUserName($aData['account_id']) . ' ERROR: ' . $transaction->getCronError());
|
$log->logFatal('Failed to add new Debit_MP transaction in database for user ' . $user->getUserName($aData['account_id']) . ' ERROR: ' . $transaction->getCronError());
|
||||||
$monitoring->endCronjob($cron_name, 'E0064', 1, true);
|
$monitoring->endCronjob($cron_name, 'E0064', 1, true);
|
||||||
}
|
}
|
||||||
@ -95,37 +87,40 @@ if ($setting->getValue('disable_manual_payouts') != 1) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
else if (empty($aPayouts)) {
|
||||||
|
$log->logInfo("\tNo new manual payout requests.");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$log->logFatal("\tFailed Processing Manual Payment Queue...");
|
||||||
|
$monitoring->endCronjob($cron_name, 'E0050', 1, true);
|
||||||
|
}
|
||||||
|
if (count($aPayouts > 0)) $log->logDebug(" found " . count($aPayouts) . " queued manual payout requests");
|
||||||
|
}
|
||||||
|
else {
|
||||||
$log->logDebug("Manual payouts are disabled via admin panel");
|
$log->logDebug("Manual payouts are disabled via admin panel");
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($setting->getValue('disable_auto_payouts') != 1) {
|
if ($setting->getValue('disable_auto_payouts') != 1) {
|
||||||
// Fetch all users balances
|
// Fetch all users balances
|
||||||
if (!$users = $transaction->getAPQueue()) {
|
if (!$users = $transaction->getAPQueue()) {
|
||||||
$log->logFatal("\tFailed Processing Auto Payment Payment Queue. ERROR: " . $transaction->getCronError());
|
|
||||||
$monitoring->endCronjob($cron_name, 'E0050', 1, true);
|
|
||||||
}
|
|
||||||
if (count($users) > 0) $log->logDebug(" found " . count($users) . " queued payout(s)");
|
|
||||||
|
|
||||||
// Go through users and run transactions
|
|
||||||
if (!empty($users)) {
|
if (!empty($users)) {
|
||||||
|
if (count($users) > 0) $log->logDebug(" found " . count($users) . " queued payout(s)");
|
||||||
|
// Go through users and run transactions
|
||||||
$log->logInfo("\tStarting Auto Payments...");
|
$log->logInfo("\tStarting Auto Payments...");
|
||||||
$log->logInfo("\tUserID\tUsername\tBalance\tThreshold\tAddress");
|
$log->logInfo("\tUserID\tUsername\tBalance\tThreshold\tAddress");
|
||||||
|
|
||||||
foreach ($users as $aUserData) {
|
foreach ($users as $aUserData) {
|
||||||
$dBalance = $aUserData['confirmed'];
|
$dBalance = $aUserData['confirmed'];
|
||||||
$log->logInfo("\t" . $aUserData['id'] . "\t" . $aUserData['username'] . "\t" . $dBalance . "\t" . $aUserData['ap_threshold'] . "\t\t" . $aUserData['coin_address']);
|
$log->logInfo("\t" . $aUserData['id'] . "\t" . $aUserData['username'] . "\t" . $dBalance . "\t" . $aUserData['ap_threshold'] . "\t\t" . $aUserData['coin_address']);
|
||||||
|
|
||||||
// Only run if balance meets threshold and can pay the potential transaction fee
|
// Only run if balance meets threshold and can pay the potential transaction fee
|
||||||
if ($dBalance > $aUserData['ap_threshold'] && $dBalance > $config['txfee_auto']) {
|
if ($dBalance > $aUserData['ap_threshold'] && $dBalance > $config['txfee_auto']) {
|
||||||
// Send balance, fees are reduced later by RPC Server
|
// Send balance, fees are reduced later by RPC Server
|
||||||
try {
|
try {
|
||||||
$txid = $bitcoin->sendtoaddress($aUserData['coin_address'], $dBalance - $config['txfee_auto']);
|
$txid = $bitcoin->sendtoaddress($aUserData['coin_address'], $dBalance - $config['txfee_auto']);
|
||||||
} catch (Exception $e) {
|
}
|
||||||
|
catch (Exception $e) {
|
||||||
$log->logError('Skipping payment. Failed to send balance to coin address: ' . $aData['coin_address'] . ' ERROR: ' . $e->getMessage());
|
$log->logError('Skipping payment. Failed to send balance to coin address: ' . $aData['coin_address'] . ' ERROR: ' . $e->getMessage());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create transaction record
|
// Create transaction record
|
||||||
if ($transaction->addTransaction($aUserData['id'], $dBalance - $config['txfee_auto'], 'Debit_AP', NULL, $aUserData['coin_address'], $txid) && $transaction->addTransaction($aUserData['id'], $config['txfee_auto'], 'TXFee', NULL, $aUserData['coin_address'])) {
|
if ($transaction->addTransaction($aUserData['id'], $dBalance - $config['txfee_auto'], 'Debit_AP', NULL, $aUserData['coin_address'], $txid) && $transaction->addTransaction($aUserData['id'], $config['txfee_auto'], 'TXFee', NULL, $aUserData['coin_address'])) {
|
||||||
// Mark all older transactions as archived
|
// Mark all older transactions as archived
|
||||||
@ -143,20 +138,28 @@ if ($setting->getValue('disable_auto_payouts') != 1) {
|
|||||||
$log->logFatal('User has a remaining balance of ' . $aBalance['confirmed'] . ' after a successful payout!');
|
$log->logFatal('User has a remaining balance of ' . $aBalance['confirmed'] . ' after a successful payout!');
|
||||||
$monitoring->endCronjob($cron_name, 'E0065', 1, true);
|
$monitoring->endCronjob($cron_name, 'E0065', 1, true);
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
$log->logFatal('Failed to add new Debit_AP transaction in database for user ' . $user->getUserName($aUserData['id']) . ' ERROR: ' . $transaction->getCronError());
|
$log->logFatal('Failed to add new Debit_AP transaction in database for user ' . $user->getUserName($aUserData['id']) . ' ERROR: ' . $transaction->getCronError());
|
||||||
$monitoring->endCronjob($cron_name, 'E0064', 1, true);
|
$monitoring->endCronjob($cron_name, 'E0064', 1, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
}
|
||||||
|
else if(empty($users)) {
|
||||||
|
$log->logInfo("\tNo Auto payments eligible.");
|
||||||
$log->logDebug("Users have not configured their AP > 0");
|
$log->logDebug("Users have not configured their AP > 0");
|
||||||
}
|
}
|
||||||
} else {
|
else{
|
||||||
|
$log->logFatal("\tFailed Processing Auto Payment Payment Queue. ERROR: " . $transaction->getCronError());
|
||||||
|
$monitoring->endCronjob($cron_name, 'E0050', 1, true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
$log->logDebug("Auto payouts disabled via admin panel");
|
$log->logDebug("Auto payouts disabled via admin panel");
|
||||||
}
|
}
|
||||||
$log->logInfo("\tCompleted Payouts");
|
$log->logInfo("\tCompleted Payouts");
|
||||||
|
|
||||||
// Cron cleanup and monitoring
|
// Cron cleanup and monitoring
|
||||||
require_once('cron_end.inc.php');
|
require_once('cron_end.inc.php');
|
||||||
?>
|
?>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user