index f069da1d4eb46362f612591af2f2c8e161374f8a..3f651b8becfa02dbeac9d5cc32b5938674ae1305 100644 (file)
}
sub send_user_msg {
+ my ($msg, $msg_hash, $session_id) = @_ ;
+ my $header = @{$msg_hash->{'header'}}[0];
+ my $source = @{$msg_hash->{'source'}}[0];
+ my $target = @{$msg_hash->{'target'}}[0];
+
+ #my $subject = &decode_base64(@{$msg_hash->{'subject'}}[0]);
+ my $subject = @{$msg_hash->{'subject'}}[0];
+ my $from = @{$msg_hash->{'from'}}[0];
+ my $to = @{$msg_hash->{'to'}}[0];
+ my $delivery_time = @{$msg_hash->{'delivery_time'}}[0];
+ #my $message = &decode_base64(@{$msg_hash->{'message'}}[0]);
+ my $message = @{$msg_hash->{'message'}}[0];
+
+ # keep job queue uptodate if necessary
+ 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);
+ }
+
+ # error handling
+ if (not $delivery_time =~ /^\d{14}$/) {
+ my $error_string = "delivery_time '$delivery_time' is not a valid timestamp, please use format 'yyyymmddhhmmss'";
+ &main::daemon_log("$session_id ERROR: $error_string", 1);
+ return &create_xml_string(&create_xml_hash($header, $target, $source, $error_string));
+ }
+
+ # add incoming message to messaging_db
+ my $func_dic = {table=>$main::messaging_tn,
+ primkey=>['id'],
+ subject=>$subject,
+ message_from=>$from,
+ message_to=>$to,
+ flag=>"n",
+ direction=>"in",
+ delivery_time=>$delivery_time,
+ message=>$message,
+ timestamp=>&get_time(),
+ };
+ my $res = $main::messaging_db->add_dbentry($func_dic);
+ if (not $res == 0) {
+ &main::daemon_log("$session_id ERROR: gosaTriggered.pm: cannot add message to message_db: $res", 1);
+ } else {
+ &main::daemon_log("$session_id INFO: gosaTriggered.pm: message with subject '$subject' successfully added to message_db", 5);
+ }
+
+ return;
+}
+
+sub send_user_msg_OLD {
my ($msg, $msg_hash, $session_id) = @_ ;
my @out_msg_l;
my @user_list;
# error handling
if( not @user_list && not @group_list ) {
- &main::daemon_log("WARNING: no user-tag or a group-tag specified in 'send_user_msg'", 3);
+ &main::daemon_log("$session_id WARNING: no user-tag or a group-tag specified in 'send_user_msg'", 3);
return ("<xml><header>$header</header><source>GOSA</source><target>GOSA</target>".
"<error_string>no user-tag or a group-tag specified in 'send_user_msg'</error_string></xml>");
}
if( not defined $message ) {
- &main::daemon_log("WARNING: no message-tag specified in 'send_user_msg'", 3);
+ &main::daemon_log("$session_id WARNING: no message-tag specified in 'send_user_msg'", 3);
return ("<xml><header>$header</header><source>GOSA</source><target>GOSA</target>".
"<error_string>no message-tag specified in 'send_user_msg'</error_string></xml>");
}
# resolve groups to users
+ my $ldap_handle = &main::get_ldap_handle($session_id);
if( @group_list ) {
- # build ldap connection
- &main::refresh_ldap_handle();
- if( not defined $main::ldap_handle ) {
- &main::daemon_log("ERROR: cannot connect to ldap", 1);
+ if( not defined $ldap_handle ) {
+ &main::daemon_log("$session_id ERROR: cannot connect to ldap", 1);
return ();
}
- foreach my $group (@group_list) {
- # Perform search
- my $mesg = $main::ldap_handle->search(
+ foreach my $group (@group_list) { # Perform search
+ my $mesg = $ldap_handle->search(
base => $main::ldap_base,
scope => 'sub',
attrs => ['memberUid'],
push(@out_msg_l, $msg);
&main::change_goto_state('locked', \@{$msg_hash->{target}}, $session_id);
- &main::change_fai_state('localboot', \@{$msg_hash->{target}}, $session_id);
+ &main::change_fai_state('install', \@{$msg_hash->{target}}, $session_id);
# delete all jobs from jobqueue which correspond to fai
my $sql_statement = "DELETE FROM $main::job_queue_tn WHERE (macaddress='$macaddress' AND ".