From 24332d07bc0fc35125dfc2f5e8bd8524c557602b Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 23 May 2007 08:52:54 +0000 Subject: [PATCH] Udpated logging git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6452 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/personal/connectivity/main.inc | 1 - plugins/personal/environment/main.inc | 1 - plugins/personal/generic/class_user.inc | 8 ++++---- plugins/personal/generic/main.inc | 3 +-- plugins/personal/mail/main.inc | 1 - plugins/personal/nagios/main.inc | 1 - plugins/personal/netatalk/main.inc | 1 - plugins/personal/password/main.inc | 2 +- plugins/personal/posix/main.inc | 1 - plugins/personal/samba/main.inc | 1 - 10 files changed, 6 insertions(+), 14 deletions(-) diff --git a/plugins/personal/connectivity/main.inc b/plugins/personal/connectivity/main.inc index 386324826..5911fc53a 100644 --- a/plugins/personal/connectivity/main.inc +++ b/plugins/personal/connectivity/main.inc @@ -74,7 +74,6 @@ if (!$remove_lock){ /* No errors, save object */ if (count ($message) == 0){ $connectivity->save (); - gosa_log ("User/connectivity object'".$ui->dn."' has been saved"); del_lock ($ui->dn); sess_del ('edit'); diff --git a/plugins/personal/environment/main.inc b/plugins/personal/environment/main.inc index 059b5bd27..fcca1cb67 100644 --- a/plugins/personal/environment/main.inc +++ b/plugins/personal/environment/main.inc @@ -67,7 +67,6 @@ if (!$remove_lock){ /* No errors, save object */ if (count ($message) == 0){ $environment->save (); - gosa_log ("User/environment object '".$ui->dn."' has been saved"); del_lock ($ui->dn); sess_del ('edit'); diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc index e4b953d70..f5f4cc2dd 100644 --- a/plugins/personal/generic/class_user.inc +++ b/plugins/personal/generic/class_user.inc @@ -881,22 +881,22 @@ class user extends plugin /* Load the new uploaded Photo */ if(!$handle = imagick_blob2image($this->photoData)) { - gosa_log("Can't Load image"); + @log::log("debug","users/".get_class($this),"",array(),"Could not access uploaded image"); } /* Resizing image to 147x200 and blur */ if(!imagick_resize($handle,147,200,IMAGICK_FILTER_GAUSSIAN,0)){ - gosa_log("imagick_resize failed"); + @log::log("debug","users/".get_class($this),"",array(),"Could not resize uploaded image"); } /* Converting image to JPEG */ if(!imagick_convert($handle,"JPEG")) { - gosa_log("Can't Convert to JPEG"); + @log::log("debug","users/".get_class($this),"",array(),"Could not convert uploaded image to jepg"); } /* Creating binary Code for the Image */ if(!$dump = imagick_image2blob($handle)){ - gosa_log("Can't create blob for image"); + @log::log("debug","users/".get_class($this),"",array(),"Could not create new user image"); } /* Sending Image */ diff --git a/plugins/personal/generic/main.inc b/plugins/personal/generic/main.inc index 48c1a225f..7bf40176c 100644 --- a/plugins/personal/generic/main.inc +++ b/plugins/personal/generic/main.inc @@ -94,7 +94,7 @@ if (!$remove_lock){ return ($display); } change_password ($user->dn, $_POST['new_password'], 0, $user->pw_storage); - gosa_log ("Password for '".$user->dn."' has been changed"); + @log::log("modify","users/".get_class($this),"",array(),"Password has been changed"); } else { @@ -114,7 +114,6 @@ if (!$remove_lock){ /* No errors, save object */ if (count ($message) == 0){ $user->save (); - gosa_log ("User/generic object'".$ui->dn."' has been saved"); del_lock ($ui->dn); sess_del ('edit'); diff --git a/plugins/personal/mail/main.inc b/plugins/personal/mail/main.inc index d88189b90..f79cb140d 100644 --- a/plugins/personal/mail/main.inc +++ b/plugins/personal/mail/main.inc @@ -69,7 +69,6 @@ if (!$remove_lock){ /* No errors, save object */ if (count ($message) == 0){ $mailAccount->save (); - gosa_log ("User/mail object'".$ui->dn."' has been saved"); del_lock ($ui->dn); sess_del ('edit'); diff --git a/plugins/personal/nagios/main.inc b/plugins/personal/nagios/main.inc index 0f5808112..30b1101f6 100644 --- a/plugins/personal/nagios/main.inc +++ b/plugins/personal/nagios/main.inc @@ -70,7 +70,6 @@ if (!$remove_lock){ /* No errors, save object */ if (count ($message) == 0){ $nagiosAccount->save (); - gosa_log ("User/nagios object'".$ui->dn."' has been saved"); del_lock ($ui->dn); sess_del ('edit'); diff --git a/plugins/personal/netatalk/main.inc b/plugins/personal/netatalk/main.inc index bdab63162..aec2b9a49 100644 --- a/plugins/personal/netatalk/main.inc +++ b/plugins/personal/netatalk/main.inc @@ -65,7 +65,6 @@ if (!$remove_lock) { /* No errors, save object */ if (count($message) == 0) { $netatalk->save(); - gosa_log("User/netatalk object'".$ui->dn."' has been saved"); del_lock($ui->dn); sess_del('edit'); diff --git a/plugins/personal/password/main.inc b/plugins/personal/password/main.inc index a3a98640a..1954e2ed6 100644 --- a/plugins/personal/password/main.inc +++ b/plugins/personal/password/main.inc @@ -94,7 +94,7 @@ if (!$remove_lock){ show_errors($message); } else { change_password ($ui->dn, $_POST['new_password']); - gosa_log ("User/password has been changed"); + @log::log("modify","users/".get_class($this),$ui->dn,array(),"User has been changed"); $ui->password= $_POST['new_password']; $_SESSION['ui']= $ui; $display= $smarty->fetch(get_template_path("changed.tpl", TRUE)); diff --git a/plugins/personal/posix/main.inc b/plugins/personal/posix/main.inc index e1ba25f47..d9af554e0 100644 --- a/plugins/personal/posix/main.inc +++ b/plugins/personal/posix/main.inc @@ -71,7 +71,6 @@ if (!$remove_lock){ /* No errors, save object */ if (count ($message) == 0){ $posixAccount->save (); - gosa_log ("User/posix object'".$ui->dn."' has been saved"); del_lock ($ui->dn); sess_del ('edit'); diff --git a/plugins/personal/samba/main.inc b/plugins/personal/samba/main.inc index 614fa5df6..d1725d192 100644 --- a/plugins/personal/samba/main.inc +++ b/plugins/personal/samba/main.inc @@ -70,7 +70,6 @@ if (!$remove_lock){ /* No errors, save object */ if (count ($message) == 0){ $sambaAccount->save (); - gosa_log ("User/samba object'".$ui->dn."' has been saved"); del_lock ($ui->dn); sess_del ('edit'); -- 2.30.2