removed images.

[gosa.git] / gosa-si / modules / ServerPackages.pm

diff --git a/gosa-si/modules/ServerPackages.pm b/gosa-si/modules/ServerPackages.pm
index 45492912e654135ce7ef8d7a060220bf5bc10bf7..d50cdea1600645fa4ed259ffee29409123523ab4 100644 (file)
--- a/gosa-si/modules/ServerPackages.pm
+++ b/gosa-si/modules/ServerPackages.pm
@@ -10,14 +10,6 @@ use warnings;
 use GOSA::GosaSupportDaemon;
 use Data::Dumper;
 
-#use IO::Socket::INET;
-#use XML::Simple;
-#use Data::Dumper;
-#use NetAddr::IP;
-#use Net::LDAP;
-#use Socket;
-#use Net::hostent;
-
 my $event_dir = "/usr/lib/gosa-si/server/ServerPackages";
 use lib "/usr/lib/gosa-si/server/ServerPackages";
 
@@ -29,12 +21,10 @@ END {}
 
 # import local events
 my ($error, $result, $event_hash) = &import_events($event_dir);
-if ($error == 0) {
-    foreach my $log_line (@$result) {
+foreach my $log_line (@$result) {
+    if ($log_line =~ / succeed: /) {
         &main::daemon_log("0 DEBUG: ServerPackages - $log_line", 7);
-    }
-} else {
-    foreach my $log_line (@$result) {
+    } else {
         &main::daemon_log("0 ERROR: ServerPackages - $log_line", 1);
     }
 }
@@ -43,7 +33,7 @@ if ($error == 0) {
 
 sub get_module_info {
     my @info = ($main::server_address,
-            $main::foreign_server_key,            
+            $main::ServerPackages_key,         
             );
     return \@info;
 }
@@ -60,7 +50,7 @@ sub process_incoming_msg {
 
 
     # if message is being forwarded from another server, strip of header prefixes
-    $header =~ s/^gosa_|job_//;
+    $header =~ s/^gosa_|^job_//;
     $msg =~ s/<header>gosa_(\w+)<\/header>|<header>job_(\w+)<\/header>/<header>$1<\/header>/;