--- loncom/interface/lonnotify.pm	2006/03/16 20:27:26	1.14
+++ loncom/interface/lonnotify.pm	2006/05/30 12:46:09	1.19
@@ -34,6 +34,8 @@ use Apache::lonlocal;
 use Mail::Send;
 use HTML::TokeParser;
 use HTML::Entities;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 sub handler {
     my ($r) = @_;
@@ -87,10 +89,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 +106,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 +296,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 +308,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 +343,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 ++;
@@ -634,7 +626,7 @@ function goBack(target) {
         }
         foreach my $username (sort(keys(%recipients))) {
             if ($recipients{$username} =~ /\@/) {
-                my $value=&Apache::lonnet::escape($username).':'.&Apache::lonnet::escape($recipients{$username});
+                my $value=&escape($username).':'.&escape($recipients{$username});
                 $output .= '<tr><td><input type="checkbox" name="recipient" value="'.$value.'" /></td><td>'.$username.'</td><td>&nbsp;&nbsp;</td><td>'.$recipients{$username}.'</td></tr>';
             }
         }
@@ -713,7 +705,7 @@ ENDSCRIPT
                         <td>';
         foreach my $person (@deliveries) {
             my ($username,$email) = split(/:/,$person);
-            $output .= &Apache::lonnet::unescape($email).'&nbsp;('.&Apache::lonnet::unescape($username).')<br />'."\n";
+            $output .= &unescape($email).'&nbsp;('.&unescape($username).')<br />'."\n";
         }
         $output .= '</td>
                    </tr>
@@ -739,8 +731,8 @@ sub broadcast_email {
     foreach my $user (@{$recipients}) {
         my $msg = new Mail::Send;
         my ($username,$to) = split(/:/,$user);
-        $username = &Apache::lonnet::unescape($username);
-        $to = &Apache::lonnet::unescape($to);
+        $username = &unescape($username);
+        $to = &unescape($to);
         $msg->to($to);
         $msg->subject($subject);
         $msg->add('From',"$from");