--- loncom/homework/bridgetask.pm	2006/06/05 17:15:37	1.128.2.10
+++ loncom/homework/bridgetask.pm	2006/06/24 01:32:25	1.128.2.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.128.2.10 2006/06/05 17:15:37 albertel Exp $
+# $Id: bridgetask.pm,v 1.128.2.12 2006/06/24 01:32:25 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -368,8 +368,8 @@ sub start_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
     my ($status,$accessmsg,$slot);
+    &Apache::structuretags::init_problem_globals('Task');
     if ($target ne 'webgrade') {
-	&Apache::structuretags::init_problem_globals('Task');
 	&Apache::structuretags::initialize_storage();
 	&Apache::lonhomework::showhash(%Apache::lonhomework::history);
 	if ($env{'request.state'} eq 'construct') {
@@ -456,12 +456,33 @@ sub start_Task {
 		    my (undef,undef,$domain,$user)=
 			&Apache::lonxml::whichuser();
 		    my $files = '<ul>';
+		    my $msg;
 		    foreach my $file (@files) {
 			my $url="/uploaded/$domain/$user/portfolio$file";
 			$file = '<tt>'.$file.'</tt>';
 			$files .= '<li>'.$file.'</li>';
+			$msg .= "<p>Submitted file $file</p>\n";
 		    }
 		    $files.='</ul>';
+		    my $subject = "Submission message for $title";
+		    my ($message_status,$comment_status);
+		    my $setting = $env{'course.'.$env{'request.course.id'}.'.task_messages'};
+		    $setting =~ s/^\s*(\S*)\s*$/$1/;
+		    $setting = lc($setting);
+		    if ($setting eq 'only_student'
+			|| $setting eq 'student_and_user_notes_screen') {
+			$message_status =
+			    &Apache::lonmsg::user_normal_msg($user,$domain,$subject,$msg);
+			$message_status = '<p>'.&mt('Message sent to user: [_1]',
+						    $message_status).' </p>';
+		    }
+		    if ($setting eq 'student_and_user_notes_screen') {
+			$comment_status =
+			    &Apache::lonmsg::store_instructor_comment($subject.'<br />'.
+								      $msg,$user,$domain);
+			$comment_status = '<p>'.&mt('Message sent to instructor: [_1]',
+						    $comment_status).' </p>';
+		    }
 
 		    $result.=<<DONESCREEN;
 <h2>$title</h2>
@@ -470,6 +491,8 @@ sub start_Task {
 <hr />
 <p> <a href="/adm/logout">Logout</a> </p>
 <p> <a href="/adm/roles">Change to a different course</a> </p>
+$message_status
+$comment_status
 DONESCREEN
 		} elsif ($status ne 'NOT_YET_VIEWED') {
 		    $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
@@ -995,6 +1018,7 @@ DONEBUTTON
 	$result.=&Apache::response::meta_stores_write('status','string',
 						      'Bridge Task Status');
     }
+    &Apache::structuretags::reset_problem_globals('Task');
     undef($Apache::lonhomework::parsing_a_task);
     return $result;
 }