From e55c3102140d7a47a6525f823a8fc90a7cc3e1af Mon Sep 17 00:00:00 2001
From: rettenbe <rettenbe@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 2 Jun 2008 08:56:45 +0000
Subject: [PATCH] bufix gosa-is-server: moved new_ping to ping

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11134 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-si/client/events/corefunctions.pm | 32 +++++++++++++-------------
 gosa-si/server/events/gosaTriggered.pm | 31 ++++++++++++-------------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/gosa-si/client/events/corefunctions.pm b/gosa-si/client/events/corefunctions.pm
index 93087f014..223d486b1 100644
--- a/gosa-si/client/events/corefunctions.pm
+++ b/gosa-si/client/events/corefunctions.pm
@@ -475,24 +475,24 @@ sub detect_hardware {
 }
 
 
-sub ping {
-    my ($msg, $msg_hash) = @_ ;
-    my $header = @{$msg_hash->{'header'}}[0];
-    my $source = @{$msg_hash->{'source'}}[0];
-    my $target = @{$msg_hash->{'target'}}[0];
-    my $session_id = @{$msg_hash->{'session_id'}}[0];
-
-   
-    # switch target and source and send msg back
-    my $out_hash = &main::create_xml_hash("got_ping", $target, $source);
-    &add_content2xml_hash($out_hash, "session_id", $session_id);
-    my $out_msg = &main::create_xml_string($out_hash);
-    return $out_msg;
-
-}
+#sub ping {
+#    my ($msg, $msg_hash) = @_ ;
+#    my $header = @{$msg_hash->{'header'}}[0];
+#    my $source = @{$msg_hash->{'source'}}[0];
+#    my $target = @{$msg_hash->{'target'}}[0];
+#    my $session_id = @{$msg_hash->{'session_id'}}[0];
+#
+#   
+#    # switch target and source and send msg back
+#    my $out_hash = &main::create_xml_hash("got_ping", $target, $source);
+#    &add_content2xml_hash($out_hash, "session_id", $session_id);
+#    my $out_msg = &main::create_xml_string($out_hash);
+#    return $out_msg;
+#
+#}
 
 
-sub new_ping {
+sub ping {
     my ($msg, $msg_hash) = @_ ;
     my $header = @{$msg_hash->{'header'}}[0];
     my $source = @{$msg_hash->{'source'}}[0];
diff --git a/gosa-si/server/events/gosaTriggered.pm b/gosa-si/server/events/gosaTriggered.pm
index 14916f642..1d9ccf6f4 100644
--- a/gosa-si/server/events/gosaTriggered.pm
+++ b/gosa-si/server/events/gosaTriggered.pm
@@ -8,7 +8,6 @@ my @events = (
     "gen_smb_hash",
     "trigger_reload_ldap_config",
     "ping",
-    "new_ping",
     "network_completition",
     "set_activated_for_installation",
     "new_key_for_client",
@@ -341,22 +340,22 @@ sub get_client_for_login_usr {
 }
 
 
+#sub ping {
+#    my ($msg, $msg_hash, $session_id) = @_ ;
+#    my $out_msg = $msg;
+#    my $jobdb_id = @{$msg_hash->{'jobdb_id'}}[0];
+#    if( defined $jobdb_id) {
+#        my $sql_statement = "UPDATE $main::job_queue_tn SET status='processed' WHERE id=jobdb_id";
+#        &main::daemon_log("$session_id DEBUG: $sql_statement", 7); 
+#        my $res = $main::job_db->exec_statement($sql_statement);
+#    }
+#
+#    $out_msg =~ s/<header>gosa_/<header>/;
+#
+#    my @out_msg_l = ( $out_msg );
+#    return @out_msg_l;
+#}
 sub ping {
-    my ($msg, $msg_hash, $session_id) = @_ ;
-    my $out_msg = $msg;
-    my $jobdb_id = @{$msg_hash->{'jobdb_id'}}[0];
-    if( defined $jobdb_id) {
-        my $sql_statement = "UPDATE $main::job_queue_tn SET status='processed' WHERE id=jobdb_id";
-        &main::daemon_log("$session_id DEBUG: $sql_statement", 7); 
-        my $res = $main::job_db->exec_statement($sql_statement);
-    }
-
-    $out_msg =~ s/<header>gosa_/<header>/;
-
-    my @out_msg_l = ( $out_msg );
-    return @out_msg_l;
-}
-sub new_ping {
     my ($msg, $msg_hash, $session_id) = @_ ;
     my ($sql, $res);
     my $out_msg = $msg;
-- 
2.30.2