X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fmodules%2FGosaSupportDaemon.pm;h=b3a43167718f6a03a631abf084648b2af918c64e;hb=c7c87bf20a909ed7ff997aa879cd9146e74316af;hp=5de3ec4524d6632ccbee2478561596e0a1863f48;hpb=be41dcff9d2eedbf5a41119e9385ccc3034db88b;p=gosa.git

diff --git a/gosa-si/modules/GosaSupportDaemon.pm b/gosa-si/modules/GosaSupportDaemon.pm
index 5de3ec452..b3a431677 100644
--- 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",
@@ -33,6 +34,8 @@ my @functions = (
     "inform_all_other_si_server",
     "read_configfile",
     "check_opsi_res",
+    "calc_timestamp",
+    "opsi_callobj2string",
     ); 
 @EXPORT = @functions;
 use strict;
@@ -44,6 +47,7 @@ use MIME::Base64;
 use XML::Simple;
 use Data::Dumper;
 use Net::DNS;
+use DateTime;
 
 
 my $op_hash = {
@@ -178,17 +182,23 @@ sub add_content2xml_hash {
 
 
 sub get_time {
-    my ($seconds, $minutes, $hours, $monthday, $month,
-            $year, $weekday, $yearday, $sommertime) = localtime(time);
-    $hours = $hours < 10 ? $hours = "0".$hours : $hours;
-    $minutes = $minutes < 10 ? $minutes = "0".$minutes : $minutes;
-    $seconds = $seconds < 10 ? $seconds = "0".$seconds : $seconds;
-    $month+=1;
-    $month = $month < 10 ? $month = "0".$month : $month;
-    $monthday = $monthday < 10 ? $monthday = "0".$monthday : $monthday;
-    $year+=1900;
-    return "$year$month$monthday$hours$minutes$seconds";
+	my ($seconds, $minutes, $hours, $monthday, $month,
+		$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;
+	$month+=1;
+	$month = $month < 10 ? $month = "0".$month : $month;
+	$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;
 }
 
 
@@ -228,7 +238,7 @@ sub db_res2xml {
 
     my $len_db_res= keys %{$db_res};
     for( my $i= 1; $i<= $len_db_res; $i++ ) {
-        $xml .= "\n<answer>";
+        $xml .= "\n<answer$i>";
         my $hash= $db_res->{$i};
         while ( my ($column_name, $column_value) = each %{$hash} ) {
             $xml .= "<$column_name>";
@@ -236,7 +246,7 @@ sub db_res2xml {
             if( $column_name eq "xmlmessage" ) {
                 $xml_content = &encode_base64($column_value);
             } else {
-                $xml_content = $column_value;
+                $xml_content = defined $column_value ? $column_value : "";
             }
             $xml .= $xml_content;
             $xml .= "</$column_name>"; 
@@ -514,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; };
@@ -662,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;
 }
 
@@ -743,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;
 }
 
@@ -789,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!";
         }
@@ -824,5 +841,48 @@ sub check_opsi_res {
     return 0;
 }
 
+sub calc_timestamp {
+    my ($timestamp, $operation, $value, $entity) = @_ ;
+	$entity = defined $entity ? $entity : "seconds";
+    my $res_timestamp = 0;
+    
+    $value = int($value);
+    $timestamp = int($timestamp);
+    $timestamp =~ /(\d{4})(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)/;
+    my $dt = DateTime->new( year   => $1,
+            month  => $2,
+            day    => $3,
+            hour   => $4,
+            minute => $5,
+            second => $6,
+            );
+
+    if ($operation eq "plus" || $operation eq "+") {
+        $dt->add($entity => $value);
+        $res_timestamp = $dt->ymd('').$dt->hms('');
+    }
+
+    if ($operation eq "minus" || $operation eq "-") {
+        $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;