Udpated logging

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6452 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/personal/connectivity/main.inc b/plugins/personal/connectivity/main.inc
index 386324826fdbbfcb226424ff55de79c732ab927f..5911fc53a37f06d655c435d481efc021671cb8b6 100644 (file)
--- 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 ();
     /* 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');
 
       del_lock ($ui->dn);
       sess_del ('edit');
 

diff --git a/plugins/personal/environment/main.inc b/plugins/personal/environment/main.inc
index 059b5bd27d9fed8a98275b826a1c6efce7b44f04..fcca1cb6751fc1d3043d6e0c74e956e521a4c287 100644 (file)
--- 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 ();
     /* 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');
 
       del_lock ($ui->dn);
       sess_del ('edit');
 

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index e4b953d700d630196eb82486211dc8a4deee7bb2..f5f4cc2dd25d669740c0cac7c47eb8c656f28454 100644 (file)
--- 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))  {
 
         /* 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)){
         }
 
         /* 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")) {
         }
 
         /* 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)){
         }
 
         /* 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 */
         }
 
         /* Sending Image */

diff --git a/plugins/personal/generic/main.inc b/plugins/personal/generic/main.inc
index 48c1a225fd53475778fbcb584b1d0b0d54e775a7..7bf40176ce48663b98fe09d928637ed04cb46d84 100644 (file)
--- 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);
         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 {
 
 
     } else {
 


@@ -114,7 +114,6 @@ if (!$remove_lock){
     /* No errors, save object */
     if (count ($message) == 0){
       $user->save ();
     /* 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');
 
       del_lock ($ui->dn);
       sess_del ('edit');
 

diff --git a/plugins/personal/mail/main.inc b/plugins/personal/mail/main.inc
index d88189b908e6181cde4f52650b84313c6f01577e..f79cb140d49d1573e0d866793b4547a32e4c3954 100644 (file)
--- 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 ();
     /* 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');
 
       del_lock ($ui->dn);
       sess_del ('edit');
 

diff --git a/plugins/personal/nagios/main.inc b/plugins/personal/nagios/main.inc
index 0f58081124c1b5abdf6b1482516420f6500c965b..30b1101f65d5be9f4431666499a0c83a69a9bf20 100644 (file)
--- 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 ();
     /* 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');
 
       del_lock ($ui->dn);
       sess_del ('edit');
 

diff --git a/plugins/personal/netatalk/main.inc b/plugins/personal/netatalk/main.inc
index bdab63162c4b404386eb11639ca2df6f434c198a..aec2b9a49a07f121fd83fd0d2e4ade737b3bf0e5 100644 (file)
--- 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();
     /* 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');
 
       del_lock($ui->dn);
       sess_del('edit');
 

diff --git a/plugins/personal/password/main.inc b/plugins/personal/password/main.inc
index a3a98640a0c6cb5bc72cb8e83ee27b04c94fce2e..1954e2ed606afc95d01b5cfdce18ba8d64e37a01 100644 (file)
--- 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']);
           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));
           $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 e1ba25f475a9da9f4b6981d8e211c20838059cb9..d9af554e0ee6185708c2b56e1a7d34e2c1e321b1 100644 (file)
--- 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 ();
     /* 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');
 
       del_lock ($ui->dn);
       sess_del ('edit');
 

diff --git a/plugins/personal/samba/main.inc b/plugins/personal/samba/main.inc
index 614fa5df6eb0f41fdc460170a00607b68f43841b..d1725d1927746773f4cd9cf34d8478a6dc55eec1 100644 (file)
--- 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 ();
     /* 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');
 
       del_lock ($ui->dn);
       sess_del ('edit');