Removed usePrototype flag, its activated always now.

[gosa.git] / gosa-si / server / events / server_server_com.pm

diff --git a/gosa-si/server/events/server_server_com.pm b/gosa-si/server/events/server_server_com.pm
index 66eaf77fa869f38099a3b1409c9ca79db7573ea0..98f11a5675ec325034860c88aaf62f1396de9123 100644 (file)
--- a/gosa-si/server/events/server_server_com.pm
+++ b/gosa-si/server/events/server_server_com.pm
@@ -1,6 +1,16 @@
 package server_server_com;
+
+use strict;
+use warnings;
+
 use Exporter;
-@ISA = qw(Exporter);
+use Data::Dumper;
+use GOSA::GosaSupportDaemon;
+use Time::HiRes qw( usleep);
+use Socket;
+
+our @ISA = qw(Exporter);
+
 my @events = (
     'information_sharing',
     'new_server',
@@ -10,15 +20,8 @@ my @events = (
     'foreign_job_updates',
     'confirm_usr_msg',
     );
-@EXPORT = @events;
-
-use strict;
-use warnings;
-use Data::Dumper;
-use GOSA::GosaSupportDaemon;
-use Time::HiRes qw( usleep);
-use Socket;
-
+    
+our @EXPORT = @events;
 
 BEGIN {}
 
@@ -46,10 +49,10 @@ sub information_sharing {
             &main::daemon_log("$session_id ERROR: 'new_user'-tag in incoming msg has no content!", 1);
 
         } else {
+                       my @user_list;
             # Add each user to login_users_db
             foreach my $new_user_info (@$new_user_list) {
                 my ($client, $user) = split(/;/, $new_user_info);
-                &main::daemon_log("$session_id INFO: server '$source' reports user '$user' is logged in at client '$client'", 5);
                 my %add_hash = ( table=>$main::login_users_tn, 
                         primkey=> ['client', 'user'],
                         client=>$client,
@@ -58,10 +61,16 @@ sub information_sharing {
                         regserver=>$source,
                         ); 
                 my ($res, $error_str) = $main::login_users_db->add_dbentry( \%add_hash );
-                if ($res != 0)  {
+                if ($res != 0)  
+                               {
                     &main::daemon_log("$session_id ERROR: cannot add entry to known_clients: $error_str", 1);
                 }
+                               else
+                               {
+                                       push(@user_list, "'$user' at '$client'");
+                               }
             }
+                       &main::daemon_log("$session_id INFO: server '$source' reports the following logged in user: ".join(", ", @user_list), 5);
         }
     }
 
@@ -79,9 +88,9 @@ sub information_sharing {
             my $res = $main::login_users_db->exec_statement($sql);
 
             # Add each user to login_users_db
+                       my @user_list;
             foreach my $user_db_info (@$user_db_list) {
                 my ($client, $user) = split(/;/, $user_db_info);
-                &main::daemon_log("$session_id INFO: server '$source' reports user '$user' is logged in at client '$client'", 5);
                 my %add_hash = ( table=>$main::login_users_tn, 
                         primkey=> ['client', 'user'],
                         client=>$client,
@@ -93,7 +102,12 @@ sub information_sharing {
                 if ($res != 0)  {
                     &main::daemon_log("$session_id ERROR: cannot add entry to known_clients: $error_str", 1);
                 }
+                               else
+                               {
+                                       push(@user_list, "'$user' at '$client'");
+                               }
             }
+                       &main::daemon_log("$session_id INFO: server '$source' reports the following logged in user: ".join(", ", @user_list), 5);
         }
     }