--- loncom/interface/lonnotify.pm	2007/03/08 01:58:45	1.26
+++ loncom/interface/lonnotify.pm	2008/12/03 21:16:21	1.31
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Sending messages
 #
-# $Id: lonnotify.pm,v 1.26 2007/03/08 01:58:45 albertel Exp $
+# $Id: lonnotify.pm,v 1.31 2008/12/03 21:16:21 schafran Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -149,9 +149,9 @@ function next_page(caller) {
     $output .= '<input type="hidden" name="command" />';
     $output .= '<table class="LC_notify_front_page">'.
               '<tr><td><a href="javascript:next_page('."'new'".')">'.
-              'Send a new e-mail message to selected users from this domain</a></td></tr><tr>'.
+              &mt('Send a new e-mail to selected users from this domain').'</a></td></tr><tr>'.
               '<td><a href="javascript:next_page('."'view'".')">'.
-              'Display e-mail sent by Domain Coordinators in this domain'.
+              &mt('Display e-mail sent by Domain Coordinators in this domain').
               '</a></td></tr></table>';
     $output .= &end_page();
 
@@ -378,7 +378,7 @@ sub print_selection_form {
                'buil' => 'Building valid e-mail address from username, if missing from preferences:',
                'kerb' => 'Kerberos: enter default for each realm used in the domain, with comma separation of entries',
                'infs' => 'Internal, Filesystem and Local authentication: enter single default.',
-               'comp' => 'Compose Message'
+               'comp' => 'Compose E-mail'
            );
     &Apache::lonhtmlcommon::add_breadcrumb
           ({text=>"Select Audience"});
@@ -410,7 +410,7 @@ sub print_selection_form {
                      internal => 'text',
                      krb4 => 'text',
                      krb5 => 'text',
-                     local => 'text',
+                     localauth => 'text',
                      unix => 'text',
                    );
     $jscript .= &Apache::lonhtmlcommon::set_form_elements(\%elements);
@@ -480,7 +480,7 @@ sub print_composition_form {
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"javascript:goBack('pick_target')",
           text=>"Select Audience"},
-         {text=>"Compose Message"});
+         {text=>"Compose E-mail"});
     my $jscript = &Apache::loncommon::check_uncheck_jscript();
     $jscript .= qq|
 function goBack(target) {
@@ -505,7 +505,7 @@ function goBack(target) {
 			  'Broadcast e-mail to users', $formname));
 
     my $coursefilter = $env{'form.coursepick'};
-    my %courses = ();
+    my %courses;
     if ($coursefilter eq 'all') {
         %courses = &Apache::lonnet::courseiddump($cdom,'.','.','.','.','.',
                                                  undef,undef,'Course');
@@ -527,8 +527,8 @@ function goBack(target) {
     } elsif ($coursefilter eq 'specific') {
         if ($env{'form.coursetotal'} > 1) {
             my @course_ids = split(/&&/,$env{'form.courselist'});
-            foreach (@course_ids) {
-                $courses{$_} = '';
+            foreach my $cid (@course_ids) {
+                $courses{$cid} = '';
             }
         } else {
             $courses{$env{'form.courselist'}} = '';
@@ -581,7 +581,10 @@ function goBack(target) {
         $access{$type} = $type;
     }
     foreach my $course_id (keys(%courses)) {
-        my ($cdom,$cnum) = split(/_/,$course_id);
+        my %coursehash = 
+            &Apache::lonnet::coursedescription($course_id,{'one_time' => 1});
+        my $cdom = $coursehash{'domain'};
+        my $cnum = $coursehash{'num'};
         &Apache::loncommon::get_course_users($cdom,$cnum,\%access,\@roles,\@sections,\%users);
     }
     foreach my $role (keys(%users)) {
@@ -639,7 +642,7 @@ function goBack(target) {
         $output .= &Apache::lonhtmlcommon::row_title(&mt('Sender e-mail address'));
         $output .= '<input type="text" name="sender" value="'.$sender.'" />';
         $output .= &Apache::lonhtmlcommon::row_closure();
-        $output .= &Apache::lonhtmlcommon::submit_row(&mt('Submit'),'process',&mt('Send Message'));
+        $output .= &Apache::lonhtmlcommon::submit_row(&mt('Submit'),'process',&mt('Send'));
         $output .= &Apache::lonhtmlcommon::end_pick_box();
     } else {
         $output .= $lt{'nore'}."\n".
@@ -671,7 +674,7 @@ ENDSCRIPT
           text=>"Select audience"});
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"javascript:goBack('compose')",
-          text=>"Compose Message"});
+          text=>"Compose E-mail"});
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"/adm/notify?command=process",
           text=>"Outcome"});
@@ -707,7 +710,7 @@ ENDSCRIPT
     } else {
         $output .= 'No mail sent - no recipients identified'; 
     }
-    $output .= '<br /><a href="/adm/notify">Send another message?</a>'."\n";
+    $output .= '<br /><a href="/adm/notify">'.&mt('Send another e-mail').'</a>'."\n";
     $output .= '<input type="hidden" name="command" />'."\n".
                '<input type="hidden" name="origin" value="'.$formname.'" />'."\n";
     $output .= &Apache::lonhtmlcommon::echo_form_input(['command','origin']);
@@ -775,7 +778,7 @@ sub form_elements {
                    krb5 => 'Kerberos 5',
                    internal => 'Internal (LON-CAPA)',
                    unix => 'Filesystem (UNIX)',
-                   local => 'Local/Customized',
+                   localauth => 'Local/Customized',
                    );
    return;
 }