[LON-CAPA-cvs] cvs: loncom /interface lonnotify.pm

albertel lon-capa-cvs@mail.lon-capa.org
Wed, 05 Oct 2005 18:50:12 -0000


albertel		Wed Oct  5 14:50:12 2005 EDT

  Modified files:              
    /loncom/interface	lonnotify.pm 
  Log:
  - some pokes 
  
  
Index: loncom/interface/lonnotify.pm
diff -u loncom/interface/lonnotify.pm:1.2 loncom/interface/lonnotify.pm:1.3
--- loncom/interface/lonnotify.pm:1.2	Tue Oct  4 16:17:51 2005
+++ loncom/interface/lonnotify.pm	Wed Oct  5 14:50:08 2005
@@ -394,7 +394,7 @@
 
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs
             (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";
 $html
 <head>
@@ -500,7 +500,7 @@
     my $col_width = '200';
 
     &form_elements(\%longtypes,\%authtypes);
-    foreach my $auth (%authtypes) {
+    foreach my $auth (keys(%authtypes)) {
         if (exists($env{'form.'.$auth})) {
              my $default = $env{'form.'.$auth};
              $default =~ s/^,+//;
@@ -695,8 +695,8 @@
 sub get_user_info {
     my ($user,%email_defaults,$ltext) = @_;
     my ($uname,$udom) = split(/:/,$user);
-    my %userinfo = &Apache::lonnet::get('environment',['permanenetemail','notification','critnotification',],$udom,$uname);
     my @emailtypes = ('permanentemail','critnotification','notification');
+    my %userinfo = &Apache::lonnet::get('environment',\@emailtypes,$udom,$uname);
     my $email = '';
     foreach my $type (@emailtypes) {
         $email = $userinfo{$type};
@@ -811,8 +811,7 @@
             my $value=$parser->get_text('/'.$entry);
             my ($username,$email);
             if ($entry eq 'recipient') {
-                my $attr = $token->[2];
-                $username = $$attr{'username'};
+                $username = $token->[2]{'username'};
                 $username = &HTML::Entities::decode($username,'<>&"');
                 $content{recipients}{$username} = 
                       &HTML::Entities::decode($value,'<>&"');