Skip to content
Snippets Groups Projects
Commit a5571501 authored by A. Täffner's avatar A. Täffner
Browse files
parent 68476826
No related branches found
No related tags found
1 merge request!436imported vladki's fix for nightly db quota messages
...@@ -457,7 +457,7 @@ class cronjob_quota_notify extends cronjob { ...@@ -457,7 +457,7 @@ class cronjob_quota_notify extends cronjob {
'{database_name}' => $rec['database_name'], '{database_name}' => $rec['database_name'],
'{admin_mail}' => ($global_config['admin_mail'] != ''? $global_config['admin_mail'] : 'root'), '{admin_mail}' => ($global_config['admin_mail'] != ''? $global_config['admin_mail'] : 'root'),
'{used}' => $app->functions->formatBytes($monitor['size']), '{used}' => $app->functions->formatBytes($monitor['size']),
'{quota}' => $quota.' MB', '{quota}' => $app->functions->formatBytes($quota),
'{ratio}' => number_format($used_ratio * 100, 2, '.', '').'%' '{ratio}' => number_format($used_ratio * 100, 2, '.', '').'%'
); );
...@@ -479,15 +479,13 @@ class cronjob_quota_notify extends cronjob { ...@@ -479,15 +479,13 @@ class cronjob_quota_notify extends cronjob {
//* reset notification date //* reset notification date
if($rec['last_quota_notification']) $app->dbmaster->datalogUpdate('web_database', array("last_quota_notification" => null), 'database_id', $rec['database_id']); if($rec['last_quota_notification']) $app->dbmaster->datalogUpdate('web_database', array("last_quota_notification" => null), 'database_id', $rec['database_id']);
$app->dbmaster->datalogUpdate('web_database', array("last_quota_notification" => array("SQL" => "CURDATE()")), 'database_id', $rec['database_id']);
// send notification - everything ok again // send notification - everything ok again
if($rec['last_quota_notification'] && $web_config['overquota_notify_onok'] == 'y' && ($web_config['overquota_db_notify_admin'] == 'y' || $web_config['overquota_db_notify_client'] == 'y')) { if($rec['last_quota_notification'] && $web_config['overquota_notify_onok'] == 'y' && ($web_config['overquota_db_notify_admin'] == 'y' || $web_config['overquota_db_notify_client'] == 'y')) {
$placeholders = array( $placeholders = array(
'{database_name}' => $rec['database_name'], '{database_name}' => $rec['database_name'],
'{admin_mail}' => ($global_config['admin_mail'] != ''? $global_config['admin_mail'] : 'root'), '{admin_mail}' => ($global_config['admin_mail'] != ''? $global_config['admin_mail'] : 'root'),
'{used}' => $app->functions->formatBytes($monitor['size']), '{used}' => $app->functions->formatBytes($monitor['size']),
'{quota}' => $quota.' MB', '{quota}' => $app->functions->formatBytes($quota),
'{ratio}' => number_format($used_ratio * 100, 2, '.', '').'%' '{ratio}' => number_format($used_ratio * 100, 2, '.', '').'%'
); );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment