--- loncom/interface/lonnotify.pm	2006/05/01 19:37:33	1.18
+++ 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) = @_;
@@ -624,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>';
             }
         }
@@ -703,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>
@@ -729,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");