Added some ssh works. Not working in the moment.

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

diff --git a/gosa-si/modules/GosaSupportDaemon.pm b/gosa-si/modules/GosaSupportDaemon.pm
index 056fdc4e5e90ca2252d71afc351bf504912225ad..b3a43167718f6a03a631abf084648b2af918c64e 100644 (file)
--- a/gosa-si/modules/GosaSupportDaemon.pm
+++ b/gosa-si/modules/GosaSupportDaemon.pm
@@ -10,6 +10,7 @@ my @functions = (
     "create_xml_string",
     "transform_msg2hash",
     "get_time",
+    "get_utc_time",
     "build_msg",
     "db_res2xml",
     "db_res2si_msg",
@@ -34,6 +35,7 @@ my @functions = (
     "read_configfile",
     "check_opsi_res",
     "calc_timestamp",
+    "opsi_callobj2string",
     ); 
 @EXPORT = @functions;
 use strict;
@@ -180,10 +182,8 @@ sub add_content2xml_hash {
 
 
 sub get_time {
-       # Add an optional offset in seconds
-       my $offset = $1 if shift =~ /^(\d+)$/ || 0;
        my ($seconds, $minutes, $hours, $monthday, $month,
-               $year, $weekday, $yearday, $sommertime) = localtime(time+$offset);
+               $year, $weekday, $yearday, $sommertime) = localtime;
        $hours = $hours < 10 ? $hours = "0".$hours : $hours;
        $minutes = $minutes < 10 ? $minutes = "0".$minutes : $minutes;
        $seconds = $seconds < 10 ? $seconds = "0".$seconds : $seconds;
@@ -192,7 +192,13 @@ sub get_time {
        $monthday = $monthday < 10 ? $monthday = "0".$monthday : $monthday;
        $year+=1900;
        return "$year$month$monthday$hours$minutes$seconds";
+}
+
 
+sub get_utc_time {
+    my $utc_time = qx(date --utc +%Y%m%d%H%M%S);
+    $utc_time =~ s/\s$//;
+    return $utc_time;
 }
 
 
@@ -518,7 +524,13 @@ sub import_events {
 
     if ($error == 0) {
         while (defined (my $event = readdir ($DIR))) {
-            if( $event eq "." || $event eq ".." ) { next; }  
+            if( $event eq "." || $event eq ".." || ($event =~ /^\.pm$/)) { next; }  
+
+                       # Check config file to exclude disabled event plugins (i.e. Opsi)
+                       if ($event eq "opsi_com.pm" &&  $main::opsi_enabled ne "true")  { 
+                               &main::daemon_log("0 WARNING: opsi-module is installed but not enabled in config file, please set under section '[OPSI]': 'enabled=true'", 3);  
+                               next; 
+                       }
 
             # try to import event module
             eval{ require $event; };
@@ -666,9 +678,8 @@ sub get_local_ip_for_remote_ip {
                 last;
             }
         }
-    } else {
-               daemon_log("0 WARNING: get_local_ip_for_remote_ip() was called with a non-ip parameter: '$remote_ip'", 1);
-       }
+    } 
+
        return $result;
 }
 
@@ -747,9 +758,11 @@ sub run_as {
        }
        my $cmd_line= "$sudo_cmd su - $uid -c '$command'";
        open(PIPE, "$cmd_line |");
-       my $result = {'resultCode' => $?};
-       $result->{'command'} = $cmd_line;
+       my $result = {'command' => $cmd_line};
        push @{$result->{'output'}}, <PIPE>;
+       close(PIPE);
+       my $exit_value = $? >> 8;
+       $result->{'resultCode'} = $exit_value;
        return $result;
 }
 
@@ -793,7 +806,7 @@ sub read_configfile {
     my $cfg;
     if( defined( $cfg_file) && ( (-s $cfg_file) > 0 )) {
         if( -r $cfg_file ) {
-            $cfg = Config::IniFiles->new( -file => $cfg_file );
+            $cfg = Config::IniFiles->new( -file => $cfg_file, -nocase => 1 );
         } else {
             print STDERR "Couldn't read config file!";
         }
@@ -829,7 +842,8 @@ sub check_opsi_res {
 }
 
 sub calc_timestamp {
-    my ($timestamp, $operation, $value) = @_ ;
+    my ($timestamp, $operation, $value, $entity) = @_ ;
+       $entity = defined $entity ? $entity : "seconds";
     my $res_timestamp = 0;
     
     $value = int($value);
@@ -844,17 +858,31 @@ sub calc_timestamp {
             );
 
     if ($operation eq "plus" || $operation eq "+") {
-        $dt->add( seconds => $value);
+        $dt->add($entity => $value);
         $res_timestamp = $dt->ymd('').$dt->hms('');
     }
 
     if ($operation eq "minus" || $operation eq "-") {
-        $dt->subtract(seconds => $value);
+        $dt->subtract($entity => $value);
         $res_timestamp = $dt->ymd('').$dt->hms('');
     }
 
     return $res_timestamp;
 }
 
+sub opsi_callobj2string {
+    my ($callobj) = @_;
+    my @callobj_string;
+    while(my ($key, $value) = each(%$callobj)) {
+        my $value_string = "";
+        if (ref($value) eq "ARRAY") {
+            $value_string = join(",", @$value);
+        } else {
+            $value_string = $value;
+        }
+        push(@callobj_string, "$key=$value_string")
+    }
+    return join(", ", @callobj_string);
+}
 
 1;