From fdf734e37fc2f2910eb94dbea626294a198b7573 Mon Sep 17 00:00:00 2001
From: rettenbe <rettenbe@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 6 Nov 2008 15:01:29 +0000
Subject: [PATCH] new gosa-si package

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12942 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-si/client/events/gosaTriggered.pm | 9 ---------
 gosa-si/debian/changelog               | 6 ++++++
 gosa-si/gosa-si-client                 | 2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/gosa-si/client/events/gosaTriggered.pm b/gosa-si/client/events/gosaTriggered.pm
index 2f6517e2c..6edc2758f 100644
--- a/gosa-si/client/events/gosaTriggered.pm
+++ b/gosa-si/client/events/gosaTriggered.pm
@@ -133,15 +133,6 @@ sub usr_msg {
 
     my $feedback = system("/usr/bin/goto-notify user-message '$to' '$subject' '$message' '$rand_file' &" );
 
-    # give gosa-si-server feedback, that msg was received
-#    $msg =~ s/<header>usr_msg<\/header>/<header>confirm_usr_msg<\/header>/g;
-#    my $out_hash = &create_xml_hash("confirm_usr_msg", $target, $source);
-#    &add_content2xml_hash($out_hash, 'usr', $to);
-#    &add_content2xml_hash($out_hash, 'subject', @{$msg_hash->{'subject'}}[0]);
-#    &add_content2xml_hash($out_hash, 'message', @{$msg_hash->{'message'}}[0]);
-
-
-#    return &create_xml_string($out_hash);
     return
 }
 
diff --git a/gosa-si/debian/changelog b/gosa-si/debian/changelog
index fcef306bc..1fe64c888 100644
--- a/gosa-si/debian/changelog
+++ b/gosa-si/debian/changelog
@@ -1,3 +1,9 @@
+gosa-si (1.3-1) etch; urgency=low
+
+  * User messages handling for server-server communication implemented
+
+ -- Andreas Rettenberger <rettenbe@gonicus.de>  Thu, 06 Nov 2008 15:58:25 +0100
+
 gosa-si (1.2-2) etch; urgency=low
 
   * Removed broken mysql module from package 
diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index 962102fe6..9c7e09e2f 100755
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
@@ -824,7 +824,7 @@ sub trigger_seen_messages {
             my %data = ('usr'=>$usr, 'subject'=>$subject, 'message'=>$message);
             my $confirm_msg = &build_msg("confirm_usr_msg", $target, $source, \%data);
             my $send_error = &send_msg_to_target($confirm_msg, $server_address, $server_key);
-            
+
             # Delete file
             if (not $send_error) {
                 system("rm $goto_dir/$goto_file");
-- 
2.30.2