From c7a6bddfb2aa9096808f64c5d5ed8f5b0b5ecbe2 Mon Sep 17 00:00:00 2001 From: Till Date: Fri, 14 Apr 2023 07:55:21 +0200 Subject: [PATCH] Replaced LOGLEVEL_WARNING with LOGLEVEL_WARN --- server/lib/classes/services.inc.php | 2 +- .../mail_plugin_dkim.inc.php | 2 +- .../mongo_clientdb_plugin.inc.php~ | 30 +++++++------- .../mysql_clientdb_plugin.inc.php | 40 +++++++++---------- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/server/lib/classes/services.inc.php b/server/lib/classes/services.inc.php index 0914081672..0cd8244701 100644 --- a/server/lib/classes/services.inc.php +++ b/server/lib/classes/services.inc.php @@ -57,7 +57,7 @@ class services { // call_user_method($function_name,$app->loaded_modules[$module_name],$action); return call_user_func(array($app->loaded_modules[$module_name], $function_name), $action); } else { - $app->log("Unable to restart $service_name. Service not registered.", LOGLEVEL_WARNING); + $app->log("Unable to restart $service_name. Service not registered.", LOGLEVEL_WARN); return array('output' => '', 'retval' => 0); } diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php index b937f82275..4114148f11 100755 --- a/server/plugins-available/mail_plugin_dkim.inc.php +++ b/server/plugins-available/mail_plugin_dkim.inc.php @@ -155,7 +155,7 @@ class mail_plugin_dkim { $app->system->mkdirpath($mail_config['dkim_path'], 0750, $amavis_user, $amavis_group); } else { $app->system->mkdirpath($mail_config['dkim_path'], 0755); - $app->log('No user amavis or vscan found - using root for '.$mail_config['dkim_path'], LOGLEVEL_WARNING); + $app->log('No user amavis or vscan found - using root for '.$mail_config['dkim_path'], LOGLEVEL_WARN); } } else { if (!$app->system->checkpath($mail_config['dkim_path'])) { diff --git a/server/plugins-available/mongo_clientdb_plugin.inc.php~ b/server/plugins-available/mongo_clientdb_plugin.inc.php~ index 6258583874..41c7679818 100644 --- a/server/plugins-available/mongo_clientdb_plugin.inc.php~ +++ b/server/plugins-available/mongo_clientdb_plugin.inc.php~ @@ -516,7 +516,7 @@ class mongo_clientdb_plugin { if ((bool) $db_user) { if ($user == 'root') { - $app->log("User root not allowed for client databases", LOGLEVEL_WARNING); + $app->log("User root not allowed for client databases", LOGLEVEL_WARN); } else { if (!$this->addUser($db, array( 'username' => $user, @@ -526,14 +526,14 @@ class mongo_clientdb_plugin { "dbAdmin" ) ))) { - $app->log("Error while adding user: ".$user." to DB: ".$db, LOGLEVEL_WARNING); + $app->log("Error while adding user: ".$user." to DB: ".$db, LOGLEVEL_WARN); } } } if ($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { if ($user == 'root') { - $app->log("User root not allowed for client databases", LOGLEVEL_WARNING); + $app->log("User root not allowed for client databases", LOGLEVEL_WARN); } else { if (!$this->addUser($db, array( 'username' => $ro_user, @@ -542,7 +542,7 @@ class mongo_clientdb_plugin { "read" ) ))) { - $app->log("Error while adding read-only user: ".$user." to DB: ".$db, LOGLEVEL_WARNING); + $app->log("Error while adding read-only user: ".$user." to DB: ".$db, LOGLEVEL_WARN); } } } @@ -607,7 +607,7 @@ class mongo_clientdb_plugin { if ((bool) $old_db_user) { if ($old_db_user['database_user'] == 'root') { - $app->log("User root not allowed for client databases", LOGLEVEL_WARNING); + $app->log("User root not allowed for client databases", LOGLEVEL_WARN); } else { $this->dropUser($old_db_user['database_user'], $db); } @@ -620,7 +620,7 @@ class mongo_clientdb_plugin { if ((bool) $old_db_user) { if ($old_db_user['database_user'] == 'root') { - $app->log("User root not allowed for client databases", LOGLEVEL_WARNING); + $app->log("User root not allowed for client databases", LOGLEVEL_WARN); } else { $this->dropUser($old_db_user['database_user'], $db); } @@ -631,7 +631,7 @@ class mongo_clientdb_plugin { if ($data['new']['database_user_id'] != $data['old']['database_user_id']) { if ((bool) $db_user) { if ($user == 'root') { - $app->log("User root not allowed for client databases", LOGLEVEL_WARNING); + $app->log("User root not allowed for client databases", LOGLEVEL_WARN); } else { $this->addUser($db, array( 'username' => $user, @@ -649,7 +649,7 @@ class mongo_clientdb_plugin { if ($data['new']['database_ro_user_id'] != $data['old']['database_ro_user_iduser_id']) { if ((bool) $db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { if ($ro_user == 'root') { - $app->log("User root not allowed for client databases", LOGLEVEL_WARNING); + $app->log("User root not allowed for client databases", LOGLEVEL_WARN); } else { $this->addUser($db, array( 'username' => $ro_user, @@ -671,7 +671,7 @@ class mongo_clientdb_plugin { if ($this->renameDB($oldName, $newName)) { $app->log("Renamed MongoDB database: ".$old_name." -> ".$new_name, LOGLEVEL_DEBUG); } else { - $app->log("Renaming MongoDB database failed: ".$old_name." -> ".$new_name, LOGLEVEL_WARNING); + $app->log("Renaming MongoDB database failed: ".$old_name." -> ".$new_name, LOGLEVEL_WARN); } } */ @@ -710,7 +710,7 @@ class mongo_clientdb_plugin { if ($this->dropDB($db_to_drop)) { $app->log("Dropping MongoDB database: ".$db_to_drop, LOGLEVEL_DEBUG); } else { - $app->log("Error while dropping MongoDB database: ".$db_to_drop, LOGLEVEL_WARNING); + $app->log("Error while dropping MongoDB database: ".$db_to_drop, LOGLEVEL_WARN); } $this->disconnect(); @@ -770,13 +770,13 @@ class mongo_clientdb_plugin { ))) { $app->log("Created user: ".$data['new']['database_user']." in DB: ".$db, LOGLEVEL_DEBUG); } else { - $app->log("Couldn't create user: ".$data['new']['database_user']." in DB: ".$db, LOGLEVEL_WARNING); + $app->log("Couldn't create user: ".$data['new']['database_user']." in DB: ".$db, LOGLEVEL_WARN); } } else { - $app->log("Couldn't drop user: ".$data['old']['database_user']." in DB: ".$db, LOGLEVEL_WARNING); + $app->log("Couldn't drop user: ".$data['old']['database_user']." in DB: ".$db, LOGLEVEL_WARN); } } else { - $app->log("User: ".$data['new']['database_user']." already exists in DB: ".$db, LOGLEVEL_WARNING); + $app->log("User: ".$data['new']['database_user']." already exists in DB: ".$db, LOGLEVEL_WARN); } } } @@ -794,7 +794,7 @@ class mongo_clientdb_plugin { if ($this->changePassword($db, $data['new']['database_user'], md5($data['new']['database_password_mongo']))) { $app->log("Changed user's: ".$data['new']['database_user']." password in DB: ".$db, LOGLEVEL_DEBUG); } else { - $app->log("Couldn't change user's: ".$data['new']['database_user']." password in DB: ".$db, LOGLEVEL_WARNING); + $app->log("Couldn't change user's: ".$data['new']['database_user']." password in DB: ".$db, LOGLEVEL_WARN); } } } @@ -825,7 +825,7 @@ class mongo_clientdb_plugin { if ($this->dropUser($data['old']['database_user']) === true) { $app->log("Dropped MongoDB user: ".$data['old']['database_user'], LOGLEVEL_DEBUG); } else { - $app->log("Error while dropping MongoDB user: ".$data['old']['database_user'], LOGLEVEL_WARNING); + $app->log("Error while dropping MongoDB user: ".$data['old']['database_user'], LOGLEVEL_WARN); } $this->disconnect(); diff --git a/server/plugins-available/mysql_clientdb_plugin.inc.php b/server/plugins-available/mysql_clientdb_plugin.inc.php index 9cf750a84d..589e60d4ef 100644 --- a/server/plugins-available/mysql_clientdb_plugin.inc.php +++ b/server/plugins-available/mysql_clientdb_plugin.inc.php @@ -280,7 +280,7 @@ class mysql_clientdb_plugin { if ($link->query('CREATE DATABASE `'.$link->escape_string($data['new']['database_name']).'`'.$query_charset_table)) { $app->log('Created MySQL database: '.$data['new']['database_name'], LOGLEVEL_DEBUG); } else { - $app->log('Unable to create the database: '.$link->error, LOGLEVEL_WARNING); + $app->log('Unable to create the database: '.$link->error, LOGLEVEL_WARN); } // Create the database user if database is active @@ -299,11 +299,11 @@ class mysql_clientdb_plugin { $host_list .= 'localhost'; if($db_user) { - if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARN); else $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $host_list, $link, '', ($data['new']['quota_exceeded'] == 'y' ? 'rd' : 'rw')); } if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { - if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARN); else $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link, '', 'r'); } @@ -491,17 +491,17 @@ class mysql_clientdb_plugin { // Create the database user if database was disabled before if($data['new']['active'] == 'y') { if($db_user) { - if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARN); else $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $host_list, $link, '', ($data['new']['quota_exceeded'] == 'y' ? 'rd' : 'rw')); } if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { - if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARN); else $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link, '', 'r'); } } elseif($data['new']['active'] == 'n' && $data['old']['active'] == 'y') { // revoke database user, if inactive if($old_db_user) { if($old_db_user['database_user'] == 'root'){ - $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + $app->log('User root not allowed for Client databases', LOGLEVEL_WARN); } else { // Find out users to drop and users to revoke $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $old_host_list); @@ -512,7 +512,7 @@ class mysql_clientdb_plugin { } if($old_db_ro_user && $data['old']['database_user_id'] != $data['old']['database_ro_user_id']) { if($old_db_ro_user['database_user'] == 'root'){ - $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + $app->log('User root not allowed for Client databases', LOGLEVEL_WARN); } else { // Find out users to drop and users to revoke $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_ro_user_id'], $old_host_list); @@ -530,7 +530,7 @@ class mysql_clientdb_plugin { if($data['old']['database_user_id'] && $data['old']['database_user_id'] != $data['new']['database_ro_user_id']) { if($old_db_user) { if($old_db_user['database_user'] == 'root'){ - $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + $app->log('User root not allowed for Client databases', LOGLEVEL_WARN); } else { // Find out users to drop and users to revoke $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $old_host_list); @@ -540,7 +540,7 @@ class mysql_clientdb_plugin { } } if($db_user) { - if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARN); else $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $host_list, $link, '', ($data['new']['quota_exceeded'] == 'y' ? 'rd' : 'rw')); } } @@ -548,7 +548,7 @@ class mysql_clientdb_plugin { if($data['old']['database_ro_user_id'] && $data['old']['database_ro_user_id'] != $data['new']['database_user_id']) { if($old_db_ro_user) { if($old_db_ro_user['database_user'] == 'root'){ - $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + $app->log('User root not allowed for Client databases', LOGLEVEL_WARN); } else { // Find out users to drop and users to revoke $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_ro_user_id'], $old_host_list); @@ -558,7 +558,7 @@ class mysql_clientdb_plugin { } } if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { - if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARN); else $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link, '', 'r'); } } @@ -570,19 +570,19 @@ class mysql_clientdb_plugin { if($data['new']['remote_access'] == 'y') { if($db_user) { if($db_user['database_user'] == 'root'){ - $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + $app->log('User root not allowed for Client databases', LOGLEVEL_WARN); } else { $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['new']['remote_ips'], $link, '', ($data['new']['quota_exceeded'] == 'y' ? 'rd' : 'rw')); } } if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { - if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARN); else $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['new']['remote_ips'], $link, '', 'r'); } } else { if($old_db_user) { if($old_db_user['database_user'] == 'root'){ - $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + $app->log('User root not allowed for Client databases', LOGLEVEL_WARN); } else { // Find out users to drop and users to revoke $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $data['old']['remote_ips']); @@ -592,7 +592,7 @@ class mysql_clientdb_plugin { } if($old_db_ro_user && $data['old']['database_user_id'] != $data['old']['database_ro_user_id']) { if($old_db_ro_user['database_user'] == 'root'){ - $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + $app->log('User root not allowed for Client databases', LOGLEVEL_WARN); } else { // Find out users to drop and users to revoke $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_ro_user_id'], $data['old']['remote_ips']); @@ -606,7 +606,7 @@ class mysql_clientdb_plugin { //* Change remote access list if($old_db_user) { if($old_db_user['database_user'] == 'root'){ - $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + $app->log('User root not allowed for Client databases', LOGLEVEL_WARN); } else { // Find out users to drop and users to revoke $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $data['old']['remote_ips']); @@ -616,7 +616,7 @@ class mysql_clientdb_plugin { } if($db_user) { if($db_user['database_user'] == 'root'){ - $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + $app->log('User root not allowed for Client databases', LOGLEVEL_WARN); } else { $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['new']['remote_ips'], $link, '', ($data['new']['quota_exceeded'] == 'y' ? 'rd' : 'rw')); } @@ -624,7 +624,7 @@ class mysql_clientdb_plugin { if($old_db_ro_user && $data['old']['database_user_id'] != $data['old']['database_ro_user_id']) { if($old_db_ro_user['database_user'] == 'root'){ - $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + $app->log('User root not allowed for Client databases', LOGLEVEL_WARN); } else { // Find out users to drop and users to revoke $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_ro_user_id'], $data['old']['remote_ips']); @@ -635,7 +635,7 @@ class mysql_clientdb_plugin { if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { if($db_ro_user['database_user'] == 'root'){ - $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + $app->log('User root not allowed for Client databases', LOGLEVEL_WARN); } else { $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['new']['remote_ips'], $link, '', 'r'); } @@ -689,7 +689,7 @@ class mysql_clientdb_plugin { if($link->query('DROP DATABASE `'.$link->escape_string($data['old']['database_name'].'`'))) { $app->log('Dropping MySQL database: '.$data['old']['database_name'], LOGLEVEL_DEBUG); } else { - $app->log('Error while dropping MySQL database: '.$data['old']['database_name'].' '.$link->error, LOGLEVEL_WARNING); + $app->log('Error while dropping MySQL database: '.$data['old']['database_name'].' '.$link->error, LOGLEVEL_WARN); } $link->close(); -- GitLab