RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #800 from nicoschtein/patch-4

Browse Source 
Issue 799
This commit is contained in:
Sebastian Grewe 2013-10-30 13:29:52 -07:00
commit e1ffce6a38
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cronjobs/pplns_payout.php
View File

@ -231,7 +231,7 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
} }
} else { } else {
$aMailData = array( $aMailData = array(
'email' => $setting->getValue('website_email'), 'email' => $setting->getValue('system_error_email'),
'subject' => 'Payout processing aborted', 'subject' => 'Payout processing aborted',
'Error' => 'Potential double payout detected. All payouts halted until fixed!', 'Error' => 'Potential double payout detected. All payouts halted until fixed!',
'BlockID' => $aBlock['id'], 'BlockID' => $aBlock['id'],

2
cronjobs/proportional_payout.php
View File

@ -125,7 +125,7 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
} else { } else {
$log->logFatal('Possible double payout detected. Aborted.'); $log->logFatal('Possible double payout detected. Aborted.');
$aMailData = array( $aMailData = array(
'email' => $setting->getValue('website_email'), 'email' => $setting->getValue('system_error_email'),
'subject' => 'Payout Failure: Double Payout', 'subject' => 'Payout Failure: Double Payout',
'Error' => 'Possible double payout detected', 'Error' => 'Possible double payout detected',
'BlockID' => $aBlock['id'], 'BlockID' => $aBlock['id'],

7
public/include/config/admin_settings.inc.php
View File

@ -172,6 +172,13 @@ $aSettings['acl'][] = array(
'name' => 'acl_round_statistics', 'value' => $setting->getValue('acl_round_statistics'), 'name' => 'acl_round_statistics', 'value' => $setting->getValue('acl_round_statistics'),
'tooltip' => 'Make the round statistics page private (users only) or public.' 'tooltip' => 'Make the round statistics page private (users only) or public.'
); );
$aSettings['system'][] = array(
'display' => 'E-mail address for system error notifications', 'type' => 'text',
'size' => 25,
'default' => 'test@example.com',
'name' => 'system_error_email', 'value' => $setting->getValue('system_error_email'),
'tooltip' => 'The email address for system errors notifications, like cronjobs failures.'
);
$aSettings['system'][] = array( $aSettings['system'][] = array(
'display' => 'Disable e-mail confirmations', 'type' => 'select', 'display' => 'Disable e-mail confirmations', 'type' => 'select',
'options' => array( 0 => 'No', 1 => 'Yes' ), 'options' => array( 0 => 'No', 1 => 'Yes' ),