--- loncom/interface/lonnotify.pm	2006/03/16 20:27:26	1.14
+++ loncom/interface/lonnotify.pm	2006/05/01 19:37:33	1.18
@@ -87,10 +87,6 @@ sub add_script {
 sub start_page {
     my ($jscript,$bread_title,$formname) = @_;
 
-    my $html = &Apache::lonxml::xmlbegin();
-
-    my $head = &Apache::loncommon::head('Notification E-mail',$jscript);
-
     my $loadcode;
     if ((defined($env{'form.origin'})) 
 	&& ($env{'form.command'} eq 'compose' 
@@ -108,18 +104,15 @@ sub start_page {
         }
     }
     
-    $loadcode = ' onLoad="'.$loadcode.'" '; 
-    my $bodytag = 
-	&Apache::loncommon::bodytag('Broadcast e-mail to users', undef,
-				    $loadcode);
-
+    my $start_page = 
+	&Apache::loncommon::start_page('Broadcast e-mail to users', $jscript,
+				       {'add_entries' => 
+					    {'onload' => $loadcode,},});
     my $breadcrumbs =
-	&Apache::lonhtmlcommon::breadcrumbs(undef,$bread_title,
+	&Apache::lonhtmlcommon::breadcrumbs($bread_title,
 					    'Broadcast_system_email');
     my $output = <<"ENDONE";
-$html
-$head
-$bodytag
+$start_page
 $breadcrumbs
 <br />
 <form name="$formname" method="POST">
@@ -301,9 +294,8 @@ ENDSCRIPT
                     $rowColor = $rowColor2;
                 }
                 my $recipients = '';
-                my ($date,$subj,$sname,$sdom) =
+                my ($date,undef,$sname,$sdom) =
                                   &Apache::lonmsg::unpackmsgid($msgid,undef,1);
-                $subj = &Apache::lonnet::escape($subj);
                 $date = &Apache::lonlocal::locallocaltime($date);
                 foreach my $user (sort(keys(%{$dcmail{$msgid}{recipient}}))) {
                     $recipients .= $dcmail{$msgid}{recipient}{$user}.', ';
@@ -314,9 +306,8 @@ ENDSCRIPT
             }
         } else {
             foreach my $msgid (sort(keys(%dcmail))) {
-                my ($date,$subj,$sname,$sdom) =
+                my ($date,undef,$sname,$sdom) =
                                    &Apache::lonmsg::unpackmsgid($msgid,undef,1);
-                $subj = &Apache::lonnet::escape($subj);
                 if ($env{'form.sortby'} eq 'subject') {
                     push @{$Sortby{$dcmail{$msgid}{subject}}},$msgid;
                 } elsif ($env{'form.sortby'} eq 'message') {
@@ -350,9 +341,8 @@ ENDSCRIPT
                         }
                         $recipients =~ s/,\s$//;
                     }
-                    my ($date,$subj,$sname,$sdom) =
+                    my ($date,undef,$sname,$sdom) =
                                    &Apache::lonmsg::unpackmsgid($msgid,undef,1);
-                    $subj = &Apache::lonnet::escape($subj);
                     $date = &Apache::lonlocal::locallocaltime($date);
                     $output .=  '<tr bgcolor="'.$rowColor.'"><td><small>'.$date.'</small></td><td><small>'.&cr_to_br($dcmail{$msgid}{subject}).'</small></td><td><small>'.$sname.':'.$sdom.'</small></td><td><small>'.&cr_to_br($dcmail{$msgid}{message}).'</small></td><td><small>'.$recipients.'</small></td></tr>'."\n";
                     $rowNum ++;