[BACK]Return to lonnotify.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonnotify.pm between versions 1.2 and 1.3

version 1.2, 2005/10/04 20:17:51 version 1.3, 2005/10/05 18:50:08
Line 394  function initialize_codes() { Line 394  function initialize_codes() {
   
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs      my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs
             (undef,'Choose e-mail audience','Broadcast_system_email');              (undef,'Choose e-mail audience','Broadcast_system_email');
     my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($cdom,$cdom);      my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($cdom);
     my $output = <<"ENDONE";      my $output = <<"ENDONE";
 $html  $html
 <head>  <head>
Line 500  ENDONE Line 500  ENDONE
     my $col_width = '200';      my $col_width = '200';
   
     &form_elements(\%longtypes,\%authtypes);      &form_elements(\%longtypes,\%authtypes);
     foreach my $auth (%authtypes) {      foreach my $auth (keys(%authtypes)) {
         if (exists($env{'form.'.$auth})) {          if (exists($env{'form.'.$auth})) {
              my $default = $env{'form.'.$auth};               my $default = $env{'form.'.$auth};
              $default =~ s/^,+//;               $default =~ s/^,+//;
Line 695  sub broadcast_email { Line 695  sub broadcast_email {
 sub get_user_info {  sub get_user_info {
     my ($user,%email_defaults,$ltext) = @_;      my ($user,%email_defaults,$ltext) = @_;
     my ($uname,$udom) = split(/:/,$user);      my ($uname,$udom) = split(/:/,$user);
     my %userinfo = &Apache::lonnet::get('environment',['permanenetemail','notification','critnotification',],$udom,$uname);  
     my @emailtypes = ('permanentemail','critnotification','notification');      my @emailtypes = ('permanentemail','critnotification','notification');
       my %userinfo = &Apache::lonnet::get('environment',\@emailtypes,$udom,$uname);
     my $email = '';      my $email = '';
     foreach my $type (@emailtypes) {      foreach my $type (@emailtypes) {
         $email = $userinfo{$type};          $email = $userinfo{$type};
Line 811  sub unpackagemail { Line 811  sub unpackagemail {
             my $value=$parser->get_text('/'.$entry);              my $value=$parser->get_text('/'.$entry);
             my ($username,$email);              my ($username,$email);
             if ($entry eq 'recipient') {              if ($entry eq 'recipient') {
                 my $attr = $token->[2];                  $username = $token->[2]{'username'};
                 $username = $$attr{'username'};  
                 $username = &HTML::Entities::decode($username,'<>&"');                  $username = &HTML::Entities::decode($username,'<>&"');
                 $content{recipients}{$username} =                   $content{recipients}{$username} = 
                       &HTML::Entities::decode($value,'<>&"');                        &HTML::Entities::decode($value,'<>&"');
Removed from v.1.2  
changed lines
  Added in v.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>