Skip to content

Commit c7a6bdd

Browse files
tbrehmtbrehm
committed
Replaced LOGLEVEL_WARNING with LOGLEVEL_WARN
1 parent d0f92fc commit c7a6bdd

File tree

4 files changed

+37
-37
lines changed

4 files changed

+37
-37
lines changed

‎server/lib/classes/services.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ function restartService($service_name, $action = 'restart') {
5757
// call_user_method($function_name,$app->loaded_modules[$module_name],$action);
5858
return call_user_func(array($app->loaded_modules[$module_name], $function_name), $action);
5959
} else {
60-
$app->log("Unable to restart $service_name. Service not registered.", LOGLEVEL_WARNING);
60+
$app->log("Unable to restart $service_name. Service not registered.", LOGLEVEL_WARN);
6161
return array('output' => '', 'retval' => 0);
6262
}
6363

‎server/plugins-available/mail_plugin_dkim.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ private function check_system() {
155155
$app->system->mkdirpath($mail_config['dkim_path'], 0750, $amavis_user, $amavis_group);
156156
} else {
157157
$app->system->mkdirpath($mail_config['dkim_path'], 0755);
158-
$app->log('No user amavis or vscan found - using root for '.$mail_config['dkim_path'], LOGLEVEL_WARNING);
158+
$app->log('No user amavis or vscan found - using root for '.$mail_config['dkim_path'], LOGLEVEL_WARN);
159159
}
160160
} else {
161161
if (!$app->system->checkpath($mail_config['dkim_path'])) {

‎server/plugins-available/mongo_clientdb_plugin.inc.php~‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ class mongo_clientdb_plugin {
516516

517517
if ((bool) $db_user) {
518518
if ($user == 'root') {
519-
$app->log("User root not allowed for client databases", LOGLEVEL_WARNING);
519+
$app->log("User root not allowed for client databases", LOGLEVEL_WARN);
520520
} else {
521521
if (!$this->addUser($db, array(
522522
'username' => $user,
@@ -526,14 +526,14 @@ class mongo_clientdb_plugin {
526526
"dbAdmin"
527527
)
528528
))) {
529-
$app->log("Error while adding user: ".$user." to DB: ".$db, LOGLEVEL_WARNING);
529+
$app->log("Error while adding user: ".$user." to DB: ".$db, LOGLEVEL_WARN);
530530
}
531531
}
532532
}
533533

534534
if ($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) {
535535
if ($user == 'root') {
536-
$app->log("User root not allowed for client databases", LOGLEVEL_WARNING);
536+
$app->log("User root not allowed for client databases", LOGLEVEL_WARN);
537537
} else {
538538
if (!$this->addUser($db, array(
539539
'username' => $ro_user,
@@ -542,7 +542,7 @@ class mongo_clientdb_plugin {
542542
"read"
543543
)
544544
))) {
545-
$app->log("Error while adding read-only user: ".$user." to DB: ".$db, LOGLEVEL_WARNING);
545+
$app->log("Error while adding read-only user: ".$user." to DB: ".$db, LOGLEVEL_WARN);
546546
}
547547
}
548548
}
@@ -607,7 +607,7 @@ class mongo_clientdb_plugin {
607607

608608
if ((bool) $old_db_user) {
609609
if ($old_db_user['database_user'] == 'root') {
610-
$app->log("User root not allowed for client databases", LOGLEVEL_WARNING);
610+
$app->log("User root not allowed for client databases", LOGLEVEL_WARN);
611611
} else {
612612
$this->dropUser($old_db_user['database_user'], $db);
613613
}
@@ -620,7 +620,7 @@ class mongo_clientdb_plugin {
620620

621621
if ((bool) $old_db_user) {
622622
if ($old_db_user['database_user'] == 'root') {
623-
$app->log("User root not allowed for client databases", LOGLEVEL_WARNING);
623+
$app->log("User root not allowed for client databases", LOGLEVEL_WARN);
624624
} else {
625625
$this->dropUser($old_db_user['database_user'], $db);
626626
}
@@ -631,7 +631,7 @@ class mongo_clientdb_plugin {
631631
if ($data['new']['database_user_id'] != $data['old']['database_user_id']) {
632632
if ((bool) $db_user) {
633633
if ($user == 'root') {
634-
$app->log("User root not allowed for client databases", LOGLEVEL_WARNING);
634+
$app->log("User root not allowed for client databases", LOGLEVEL_WARN);
635635
} else {
636636
$this->addUser($db, array(
637637
'username' => $user,
@@ -649,7 +649,7 @@ class mongo_clientdb_plugin {
649649
if ($data['new']['database_ro_user_id'] != $data['old']['database_ro_user_iduser_id']) {
650650
if ((bool) $db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) {
651651
if ($ro_user == 'root') {
652-
$app->log("User root not allowed for client databases", LOGLEVEL_WARNING);
652+
$app->log("User root not allowed for client databases", LOGLEVEL_WARN);
653653
} else {
654654
$this->addUser($db, array(
655655
'username' => $ro_user,
@@ -671,7 +671,7 @@ class mongo_clientdb_plugin {
671671
if ($this->renameDB($oldName, $newName)) {
672672
$app->log("Renamed MongoDB database: ".$old_name." -> ".$new_name, LOGLEVEL_DEBUG);
673673
} else {
674-
$app->log("Renaming MongoDB database failed: ".$old_name." -> ".$new_name, LOGLEVEL_WARNING);
674+
$app->log("Renaming MongoDB database failed: ".$old_name." -> ".$new_name, LOGLEVEL_WARN);
675675
}
676676
}
677677
*/
@@ -710,7 +710,7 @@ class mongo_clientdb_plugin {
710710
if ($this->dropDB($db_to_drop)) {
711711
$app->log("Dropping MongoDB database: ".$db_to_drop, LOGLEVEL_DEBUG);
712712
} else {
713-
$app->log("Error while dropping MongoDB database: ".$db_to_drop, LOGLEVEL_WARNING);
713+
$app->log("Error while dropping MongoDB database: ".$db_to_drop, LOGLEVEL_WARN);
714714
}
715715

716716
$this->disconnect();
@@ -770,13 +770,13 @@ class mongo_clientdb_plugin {
770770
))) {
771771
$app->log("Created user: ".$data['new']['database_user']." in DB: ".$db, LOGLEVEL_DEBUG);
772772
} else {
773-
$app->log("Couldn't create user: ".$data['new']['database_user']." in DB: ".$db, LOGLEVEL_WARNING);
773+
$app->log("Couldn't create user: ".$data['new']['database_user']." in DB: ".$db, LOGLEVEL_WARN);
774774
}
775775
} else {
776-
$app->log("Couldn't drop user: ".$data['old']['database_user']." in DB: ".$db, LOGLEVEL_WARNING);
776+
$app->log("Couldn't drop user: ".$data['old']['database_user']." in DB: ".$db, LOGLEVEL_WARN);
777777
}
778778
} else {
779-
$app->log("User: ".$data['new']['database_user']." already exists in DB: ".$db, LOGLEVEL_WARNING);
779+
$app->log("User: ".$data['new']['database_user']." already exists in DB: ".$db, LOGLEVEL_WARN);
780780
}
781781
}
782782
}
@@ -794,7 +794,7 @@ class mongo_clientdb_plugin {
794794
if ($this->changePassword($db, $data['new']['database_user'], md5($data['new']['database_password_mongo']))) {
795795
$app->log("Changed user's: ".$data['new']['database_user']." password in DB: ".$db, LOGLEVEL_DEBUG);
796796
} else {
797-
$app->log("Couldn't change user's: ".$data['new']['database_user']." password in DB: ".$db, LOGLEVEL_WARNING);
797+
$app->log("Couldn't change user's: ".$data['new']['database_user']." password in DB: ".$db, LOGLEVEL_WARN);
798798
}
799799
}
800800
}
@@ -825,7 +825,7 @@ class mongo_clientdb_plugin {
825825
if ($this->dropUser($data['old']['database_user']) === true) {
826826
$app->log("Dropped MongoDB user: ".$data['old']['database_user'], LOGLEVEL_DEBUG);
827827
} else {
828-
$app->log("Error while dropping MongoDB user: ".$data['old']['database_user'], LOGLEVEL_WARNING);
828+
$app->log("Error while dropping MongoDB user: ".$data['old']['database_user'], LOGLEVEL_WARN);
829829
}
830830

831831
$this->disconnect();

‎server/plugins-available/mysql_clientdb_plugin.inc.php‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ function db_insert($event_name, $data) {
280280
if ($link->query('CREATE DATABASE `'.$link->escape_string($data['new']['database_name']).'`'.$query_charset_table)) {
281281
$app->log('Created MySQL database: '.$data['new']['database_name'], LOGLEVEL_DEBUG);
282282
} else {
283-
$app->log('Unable to create the database: '.$link->error, LOGLEVEL_WARNING);
283+
$app->log('Unable to create the database: '.$link->error, LOGLEVEL_WARN);
284284
}
285285

286286
// Create the database user if database is active
@@ -299,11 +299,11 @@ function db_insert($event_name, $data) {
299299
$host_list .= 'localhost';
300300

301301
if($db_user) {
302-
if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
302+
if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARN);
303303
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'));
304304
}
305305
if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) {
306-
if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
306+
if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARN);
307307
else $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link, '', 'r');
308308
}
309309

@@ -491,17 +491,17 @@ function db_update($event_name, $data) {
491491
// Create the database user if database was disabled before
492492
if($data['new']['active'] == 'y') {
493493
if($db_user) {
494-
if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
494+
if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARN);
495495
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'));
496496
}
497497
if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) {
498-
if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
498+
if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARN);
499499
else $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link, '', 'r');
500500
}
501501
} elseif($data['new']['active'] == 'n' && $data['old']['active'] == 'y') { // revoke database user, if inactive
502502
if($old_db_user) {
503503
if($old_db_user['database_user'] == 'root'){
504-
$app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
504+
$app->log('User root not allowed for Client databases', LOGLEVEL_WARN);
505505
} else {
506506
// Find out users to drop and users to revoke
507507
$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 @@ function db_update($event_name, $data) {
512512
}
513513
if($old_db_ro_user && $data['old']['database_user_id'] != $data['old']['database_ro_user_id']) {
514514
if($old_db_ro_user['database_user'] == 'root'){
515-
$app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
515+
$app->log('User root not allowed for Client databases', LOGLEVEL_WARN);
516516
} else {
517517
// Find out users to drop and users to revoke
518518
$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 @@ function db_update($event_name, $data) {
530530
if($data['old']['database_user_id'] && $data['old']['database_user_id'] != $data['new']['database_ro_user_id']) {
531531
if($old_db_user) {
532532
if($old_db_user['database_user'] == 'root'){
533-
$app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
533+
$app->log('User root not allowed for Client databases', LOGLEVEL_WARN);
534534
} else {
535535
// Find out users to drop and users to revoke
536536
$drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $old_host_list);
@@ -540,15 +540,15 @@ function db_update($event_name, $data) {
540540
}
541541
}
542542
if($db_user) {
543-
if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
543+
if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARN);
544544
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'));
545545
}
546546
}
547547
if($data['new']['database_ro_user_id'] != $data['old']['database_ro_user_id']) {
548548
if($data['old']['database_ro_user_id'] && $data['old']['database_ro_user_id'] != $data['new']['database_user_id']) {
549549
if($old_db_ro_user) {
550550
if($old_db_ro_user['database_user'] == 'root'){
551-
$app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
551+
$app->log('User root not allowed for Client databases', LOGLEVEL_WARN);
552552
} else {
553553
// Find out users to drop and users to revoke
554554
$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 @@ function db_update($event_name, $data) {
558558
}
559559
}
560560
if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) {
561-
if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
561+
if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARN);
562562
else $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link, '', 'r');
563563
}
564564
}
@@ -570,19 +570,19 @@ function db_update($event_name, $data) {
570570
if($data['new']['remote_access'] == 'y') {
571571
if($db_user) {
572572
if($db_user['database_user'] == 'root'){
573-
$app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
573+
$app->log('User root not allowed for Client databases', LOGLEVEL_WARN);
574574
} else {
575575
$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'));
576576
}
577577
}
578578
if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) {
579-
if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
579+
if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARN);
580580
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');
581581
}
582582
} else {
583583
if($old_db_user) {
584584
if($old_db_user['database_user'] == 'root'){
585-
$app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
585+
$app->log('User root not allowed for Client databases', LOGLEVEL_WARN);
586586
} else {
587587
// Find out users to drop and users to revoke
588588
$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 @@ function db_update($event_name, $data) {
592592
}
593593
if($old_db_ro_user && $data['old']['database_user_id'] != $data['old']['database_ro_user_id']) {
594594
if($old_db_ro_user['database_user'] == 'root'){
595-
$app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
595+
$app->log('User root not allowed for Client databases', LOGLEVEL_WARN);
596596
} else {
597597
// Find out users to drop and users to revoke
598598
$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 @@ function db_update($event_name, $data) {
606606
//* Change remote access list
607607
if($old_db_user) {
608608
if($old_db_user['database_user'] == 'root'){
609-
$app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
609+
$app->log('User root not allowed for Client databases', LOGLEVEL_WARN);
610610
} else {
611611
// Find out users to drop and users to revoke
612612
$drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $data['old']['remote_ips']);
@@ -616,15 +616,15 @@ function db_update($event_name, $data) {
616616
}
617617
if($db_user) {
618618
if($db_user['database_user'] == 'root'){
619-
$app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
619+
$app->log('User root not allowed for Client databases', LOGLEVEL_WARN);
620620
} else {
621621
$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'));
622622
}
623623
}
624624

625625
if($old_db_ro_user && $data['old']['database_user_id'] != $data['old']['database_ro_user_id']) {
626626
if($old_db_ro_user['database_user'] == 'root'){
627-
$app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
627+
$app->log('User root not allowed for Client databases', LOGLEVEL_WARN);
628628
} else {
629629
// Find out users to drop and users to revoke
630630
$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 @@ function db_update($event_name, $data) {
635635

636636
if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) {
637637
if($db_ro_user['database_user'] == 'root'){
638-
$app->log('User root not allowed for Client databases', LOGLEVEL_WARNING);
638+
$app->log('User root not allowed for Client databases', LOGLEVEL_WARN);
639639
} else {
640640
$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');
641641
}
@@ -689,7 +689,7 @@ function db_delete($event_name, $data) {
689689
if($link->query('DROP DATABASE `'.$link->escape_string($data['old']['database_name'].'`'))) {
690690
$app->log('Dropping MySQL database: '.$data['old']['database_name'], LOGLEVEL_DEBUG);
691691
} else {
692-
$app->log('Error while dropping MySQL database: '.$data['old']['database_name'].' '.$link->error, LOGLEVEL_WARNING);
692+
$app->log('Error while dropping MySQL database: '.$data['old']['database_name'].' '.$link->error, LOGLEVEL_WARN);
693693
}
694694

695695
$link->close();

0 commit comments

Comments
 (0)