Fixed URL extraction

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

diff --git a/gosa-si/modules/GosaSupportDaemon.pm b/gosa-si/modules/GosaSupportDaemon.pm
index 2044f54c1f34f1f2a17790740165c67ae9ce8ea0..5e6baca9ed67b0099b07490e5cb61513180b29b9 100644 (file)
--- a/gosa-si/modules/GosaSupportDaemon.pm
+++ b/gosa-si/modules/GosaSupportDaemon.pm
@@ -27,7 +27,6 @@ use Crypt::Rijndael;
 use Digest::MD5  qw(md5 md5_hex md5_base64);
 use MIME::Base64;
 use XML::Simple;
-use utf8;
 
 my $op_hash = {
     'eq' => '=',
@@ -144,98 +143,6 @@ sub add_content2xml_hash {
 }
 
 
-#===  FUNCTION  ================================================================
-#         NAME:  encrypt_msg
-#   PARAMETERS:  msg - string - message to encrypt
-#                my_cipher - ref - reference to a Crypt::Rijndael object
-#      RETURNS:  crypted_msg - string - crypted message
-#  DESCRIPTION:  crypts the incoming message with the Crypt::Rijndael module
-#===============================================================================
-#sub encrypt_msg {
-#    my ($msg, $key) = @_;
-#    my $my_cipher = &create_ciphering($key);
-#    {
-#      use bytes;
-#      $msg = "\0"x(16-length($msg)%16).$msg;
-#    }
-#    $msg = $my_cipher->encrypt($msg);
-#    chomp($msg = &encode_base64($msg));
-#    # there are no newlines allowed inside msg
-#    $msg=~ s/\n//g;
-#    return $msg;
-#}
-
-
-#===  FUNCTION  ================================================================
-#         NAME:  decrypt_msg
-#   PARAMETERS:  crypted_msg - string - message to decrypt
-#                my_cipher - ref - reference to a Crypt::Rijndael object
-#      RETURNS:  msg - string - decrypted message
-#  DESCRIPTION:  decrypts the incoming message with the Crypt::Rijndael module
-#===============================================================================
-#sub decrypt_msg {
-#    my ($msg, $my_cipher) = @_ ;
-#    
-#    if(defined $msg && defined $my_cipher) {
-#        $msg = &decode_base64($msg);
-#    }
-#    $msg = $my_cipher->decrypt($msg); 
-#    $msg =~ s/\0*//g;
-#    return $msg;
-#    my ($msg, $key) = @_ ;
-#    $msg = &decode_base64($msg);
-#    my $my_cipher = &create_ciphering($key);
-#    $msg = $my_cipher->decrypt($msg); 
-#    $msg =~ s/\0*//g;
-#    return $msg;
-#}
-
-
-#===  FUNCTION  ================================================================
-#         NAME:  create_ciphering
-#   PARAMETERS:  passwd - string - used to create ciphering
-#      RETURNS:  cipher - object
-#  DESCRIPTION:  creates a Crypt::Rijndael::MODE_CBC object with passwd as key
-#===============================================================================
-#sub create_ciphering {
-#    my ($passwd) = @_;
-#    $passwd = substr(md5_hex("$passwd") x 32, 0, 32);
-#    my $iv = substr(md5_hex('GONICUS GmbH'),0, 16);
-#
-#    #daemon_log("iv: $iv", 7);
-#    #daemon_log("key: $passwd", 7);
-#    my $my_cipher = Crypt::Rijndael->new($passwd , Crypt::Rijndael::MODE_CBC());
-#    $my_cipher->set_iv($iv);
-#    return $my_cipher;
-#}
-
-
-#===  FUNCTION  ================================================================
-#         NAME:  open_socket
-#   PARAMETERS:  PeerAddr string something like 192.168.1.1 or 192.168.1.1:10000
-#                [PeerPort] string necessary if port not appended by PeerAddr
-#      RETURNS:  socket IO::Socket::INET
-#  DESCRIPTION:  open a socket to PeerAddr
-#===============================================================================
-#sub open_socket {
-#    my ($PeerAddr, $PeerPort) = @_ ;
-#    if(defined($PeerPort)){
-#        $PeerAddr = $PeerAddr.":".$PeerPort;
-#    }
-#    my $socket;
-#    $socket = new IO::Socket::INET(PeerAddr => $PeerAddr,
-#            Porto => "tcp",
-#            Type => SOCK_STREAM,
-#            Timeout => 5,
-#            );
-#    if(not defined $socket) {
-#        return;
-#    }
-#    &daemon_log("open_socket: $PeerAddr", 7);
-#    return $socket;
-#}
-
-
 sub get_time {
     my ($seconds, $minutes, $hours, $monthday, $month,
             $year, $weekday, $yearday, $sommertime) = localtime(time);
@@ -284,7 +191,7 @@ sub db_res2xml {
 
     my $len_db_res= keys %{$db_res};
     for( my $i= 1; $i<= $len_db_res; $i++ ) {
-        $xml .= "<answer$i>";
+        $xml .= "\n<answer$i>";
         my $hash= $db_res->{$i};
         while ( my ($column_name, $column_value) = each %{$hash} ) {
             $xml .= "<$column_name>";