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

Diff for /loncom/interface/lonnotify.pm between versions 1.11 and 1.13

version 1.11, 2005/12/10 00:46:34 version 1.13, 2006/03/16 20:13:06
Line 56  sub handler { Line 56  sub handler {
     my $origin = $env{'form.origin'};      my $origin = $env{'form.origin'};
   
     &Apache::lonhtmlcommon::clear_breadcrumbs();      &Apache::lonhtmlcommon::clear_breadcrumbs();
     my %ltext=&Apache::lonlocal::texthash(  
                'note' => 'Notification E-mail',  
     );  
     my $function = &Apache::loncommon::get_users_function();      my $function = &Apache::loncommon::get_users_function();
     my $loadcode;      my $loadcode;
     my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg');      my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg');
Line 75  sub handler { Line 73  sub handler {
     }      }
     my $loaditems = ' onLoad="'.$loadcode.'" ';       my $loaditems = ' onLoad="'.$loadcode.'" '; 
     my $bodytag = &Apache::loncommon::bodytag('Broadcast e-mail to users',$function,$loaditems);      my $bodytag = &Apache::loncommon::bodytag('Broadcast e-mail to users',$function,$loaditems);
     my $html=&Apache::lonxml::xmlbegin();  
     &Apache::lonhtmlcommon::add_breadcrumb      &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>'/adm/notify',          ({href=>'/adm/notify',
           text=>"Broadcast E-mail"});            text=>"Broadcast E-mail"});
     if ($command eq 'process') {      if ($command eq 'process') {
         &print_request_receipt($r,$command,$cdom,$tablecolor,$bodytag,$html,\%ltext);          &print_request_receipt($r,$command,$cdom,$tablecolor,$bodytag);
     } elsif ($command eq 'compose') {      } elsif ($command eq 'compose') {
         &print_composition_form($r,$command,$cdom,$tablecolor,$bodytag,$html,\%ltext);          &print_composition_form($r,$command,$cdom,$tablecolor,$bodytag);
     } elsif ($command eq 'pick_target') {      } elsif ($command eq 'pick_target') {
         &print_selection_form($r,$command,$cdom,$tablecolor,$bodytag,$html,\%ltext);          &print_selection_form($r,$command,$cdom,$tablecolor,$bodytag);
     } elsif ($command eq 'pick_display') {      } elsif ($command eq 'pick_display') {
         &print_display_option_form($r,$command,$cdom,$tablecolor,$bodytag,$html,\%ltext);          &print_display_option_form($r,$command,$cdom,$tablecolor,$bodytag);
     } elsif ($command eq 'display') {      } elsif ($command eq 'display') {
         &print_display($r,$command,$cdom,$tablecolor,$bodytag,$html,\%ltext);          &print_display($r,$command,$cdom,$tablecolor,$bodytag);
     } else {      } else {
         &print_front_page($r,'front',$cdom,$tablecolor,$bodytag,$html,\%ltext);          &print_front_page($r,'front',$cdom,$tablecolor,$bodytag);
     }      }
     return OK;      return OK;
 }  }
   
   sub add_script {
       my ($js) = @_;
       return '<script type="text/javascript">'."\n".$js."\n".'</script>';
   }
   
   sub start_page {
       my ($jscript,$bodytag,$bread_title,$formname) = @_;
   
       my $html = &Apache::lonxml::xmlbegin();
   
       my $head = &Apache::loncommon::head('Notification E-mail',$jscript);
   
       my $breadcrumbs =
    &Apache::lonhtmlcommon::breadcrumbs(undef,$bread_title,
       'Broadcast_system_email');
       my $output = <<"ENDONE";
   $html
   $head
   $bodytag
   $breadcrumbs
   <br />
   <form name="$formname" method="POST">
   ENDONE
   
       return $output;
   }
   
   sub end_page {
       return '</form>'.&Apache::loncommon::end_page();
   }
   
 sub print_front_page {  sub print_front_page {
     my ($r,$formname,$cdom,$tablecolor,$bodytag,$html,$ltext) = @_;      my ($r,$formname,$cdom,$tablecolor,$bodytag) = @_;
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs  
             (undef,'Broadcast e-mail to Domain','Broadcast_system_email');  
     my $jscript = qq|      my $jscript = qq|
 function next_page(caller) {  function next_page(caller) {
     if (caller == 'view') {      if (caller == 'view') {
Line 110  function next_page(caller) { Line 137  function next_page(caller) {
     document.front.submit()      document.front.submit()
 }  }
     |;       |; 
     my %lt=&Apache::lonlocal::texthash(  
                'note' => 'Notification E-mail',      my $output = &start_page(&add_script($jscript), $bodytag,
     );       'Broadcast e-mail to Domain', $formname);
     my $output = <<"ENDONE";  
 $html      $output .= '<input type="hidden" name="command" />';
 <head>  
  <title>LON-CAPA $lt{'note'}</title>  
 <script type"text/javascript">  
 $jscript  
 </script>  
 </head>  
 $bodytag  
 $breadcrumbs  
 <br />  
 ENDONE  
     $output .= '<form name="'.$formname.'" method="post">'.  
               '<input type="hidden" name="command" />';  
     $output .= &Apache::lonhtmlcommon::start_pick_box();      $output .= &Apache::lonhtmlcommon::start_pick_box();
     $output .= '<table cellspacing="8" cellpadding="8">'.      $output .= '<table cellspacing="8" cellpadding="8">'.
               '<tr><td><a href="javascript:next_page('."'new'".')">'.                '<tr><td><a href="javascript:next_page('."'new'".')">'.
Line 135  ENDONE Line 150  ENDONE
               'Display e-mail sent by Domain Coordinators in this domain'.                'Display e-mail sent by Domain Coordinators in this domain'.
               '</a></td></tr></table>';                '</a></td></tr></table>';
     $output .= &Apache::lonhtmlcommon::end_pick_box();      $output .= &Apache::lonhtmlcommon::end_pick_box();
     $output .= qq(      $output .= &end_page();
 </form>  
 </body>  
 </html>);  
     $r->print($output);      $r->print($output);
     return;      return;
 }  }
   
 sub print_display_option_form {  sub print_display_option_form {
     my ($r,$formname,$cdom,$tablecolor,$bodytag,$html,$ltext) = @_;      my ($r,$formname,$cdom,$tablecolor,$bodytag) = @_;
     &Apache::lonhtmlcommon::add_breadcrumb      &Apache::lonhtmlcommon::add_breadcrumb({text=>"Display options"});
          ({text=>"Display options"});  
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs  
             (undef,'Broadcast e-mail display options','Broadcast_system_email');  
     my $table_width = '';      my $table_width = '';
     my $col_width = '200';      my $col_width = '200';
     my $cmd = 'display';      my $cmd = 'display';
     my $submit_text = 'Display e-mail';      my $submit_text = 'Display e-mail';
     my @roles = ('dc');      my @roles = ('dc');
     my $now = time;      my $now = time;
     my %lt=&Apache::lonlocal::texthash(  
                'note' => 'Notification E-mail',  
     );  
     my $startdateform = &Apache::lonhtmlcommon::date_setter($formname,      my $startdateform = &Apache::lonhtmlcommon::date_setter($formname,
                                                             'startdate',                                                              'startdate',
                                                             $now);                                                              $now);
Line 180  sub print_display_option_form { Line 189  sub print_display_option_form {
         sender => 'checkbox',          sender => 'checkbox',
     );      );
     my $jscript = &Apache::lonhtmlcommon::set_form_elements(\%elements);      my $jscript = &Apache::lonhtmlcommon::set_form_elements(\%elements);
     my $output = <<"ENDONE";  
 $html      my $output = &start_page(&add_script($jscript), $bodytag,
 <head>       'Broadcast e-mail display options', $formname);
  <title>LON-CAPA $lt{'note'}</title>  
 <script type"text/javascript">  
 $jscript  
 </script>  
 </head>  
 $bodytag  
 $breadcrumbs  
 <br />  
 <form method="post" name="$formname">  
 ENDONE  
     $output .= &Apache::lonhtmlcommon::start_pick_box($table_width);      $output .= &Apache::lonhtmlcommon::start_pick_box($table_width);
     $output .= &Apache::lonhtmlcommon::row_title($col_width,$tablecolor,&mt('Date range'));      $output .= &Apache::lonhtmlcommon::row_title($col_width,$tablecolor,&mt('Date range'));
     $output .= '<td><table><tr><td>Earliest to display: </td><td>'.      $output .= '<td><table><tr><td>Earliest to display: </td><td>'.
Line 218  ENDONE Line 218  ENDONE
     $output .= &Apache::lonhtmlcommon::row_closure();      $output .= &Apache::lonhtmlcommon::row_closure();
     $output .= &Apache::lonhtmlcommon::submit_row($col_width,$tablecolor,&mt('Submit'),$cmd,$submit_text);      $output .= &Apache::lonhtmlcommon::submit_row($col_width,$tablecolor,&mt('Submit'),$cmd,$submit_text);
     $output .= &Apache::lonhtmlcommon::end_pick_box();      $output .= &Apache::lonhtmlcommon::end_pick_box();
     $output .= qq(      $output .= qq(<input type="hidden" name="sortby" value="date" />\n).
 <input type="hidden" name="sortby" value="date" />   &end_page();
 </form>  
 </body>  
 </html>);  
     $r->print($output);      $r->print($output);
     return;      return;
 }  }
   
 sub print_display {  sub print_display {
     my ($r,$formname,$cdom,$tablecolor,$bodytag,$html,$ltext) = @_;      my ($r,$formname,$cdom,$tablecolor,$bodytag) = @_;
     &Apache::lonhtmlcommon::add_breadcrumb      &Apache::lonhtmlcommon::add_breadcrumb
          ({href=>"javascript:goBack('pick_display')",           ({href=>"javascript:goBack('pick_display')",
           text=>"Display options"},            text=>"Display options"},
          {text=>"E-mail display"});           {text=>"E-mail display"});
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs  
             (undef,'Display Broadcast e-mail','Broadcast_system_email');  
     my $table_width = '';      my $table_width = '';
     my $col_width = '200';      my $col_width = '200';
     my $rowColor1 = "#ffffff";      my $rowColor1 = "#ffffff";
Line 259  function goBack(target) { Line 255  function goBack(target) {
 }  }
   
 ENDSCRIPT  ENDSCRIPT
     my $output = <<"ENDONE";  
 $html      my $output = &start_page(&add_script($jscript), $bodytag,
 <head>       'Display Broadcast e-mail', $formname);
  <title>LON-CAPA $$ltext{'note'}</title>  
  <script type"text/javascript">  
 $jscript  
  </script>  
 </head>  
 $bodytag  
 $breadcrumbs  
 <br />  
 <form method="post" name="$formname">  
 ENDONE  
   
     foreach my $msgid (keys(%sentmail)) {      foreach my $msgid (keys(%sentmail)) {
         my %content = &Apache::lonmsg::unpackagemsg($sentmail{$msgid});          my %content = &Apache::lonmsg::unpackagemsg($sentmail{$msgid});
Line 379  ENDONE Line 365  ENDONE
     $output .= qq(<input type="hidden" name="origin" value="$formname" />\n);      $output .= qq(<input type="hidden" name="origin" value="$formname" />\n);
     $output .= qq(<input type="hidden" name="command" />\n);      $output .= qq(<input type="hidden" name="command" />\n);
     $output .= qq(<input type="hidden" name="sortby" value="$curr_sortby" />\n);      $output .= qq(<input type="hidden" name="sortby" value="$curr_sortby" />\n);
     $output .= qq(      $output .= &end_page();
 </form>  
 </body  
 </html>);  
     $r->print($output);      $r->print($output);
     return;      return;
 }  }
   
 sub print_selection_form {  sub print_selection_form {
     my ($r,$formname,$cdom,$tablecolor,$bodytag,$html,$ltext) = @_;      my ($r,$formname,$cdom,$tablecolor,$bodytag) = @_;
     my %coursecodes = ();      my %coursecodes = ();
     my %codes = ();      my %codes = ();
     my @codetitles = ();      my @codetitles = ();
Line 404  sub print_selection_form { Line 387  sub print_selection_form {
     my $table_width = '100%';      my $table_width = '100%';
     my $col_width = '200';      my $col_width = '200';
     my %lt=&Apache::lonlocal::texthash(      my %lt=&Apache::lonlocal::texthash(
                'note' => 'Notification E-mail',   
                'buil' => 'Building valid e-mail address from username, if missing from preferences:',                 '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',                 '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.',                 'infs' => 'Internal, Filesystem and Local authentication: enter single default.',
Line 423  sub print_selection_form { Line 405  sub print_selection_form {
         }          }
     }      }
   
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs  
             (undef,'Choose e-mail audience','Broadcast_system_email');  
     my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($cdom);      my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($cdom);
   
     my %elements = (      my %elements = (
Line 474  function setCourseCat(formname) { Line 454  function setCourseCat(formname) {
 }  }
 |;   |; 
     }      }
     my $output = <<"ENDONE";  
 $html  
 <head>      my $output = &start_page(&add_script($jscript).$cb_jscript,
  <title>LON-CAPA $lt{'note'}</title>       $bodytag, 'Choose e-mail audience', $formname);
 <script type"text/javascript">  
 $jscript      $output .= &Apache::lonhtmlcommon::start_pick_box($table_width);
 </script>      my @roles = ('ow','cc','in','ta','ep','st','cr');
 $cb_jscript      my %longtypes = ();
 </head>      my %authtypes = ();
 $bodytag      &form_elements(\%longtypes,\%authtypes);
 $breadcrumbs      my $descrip = $lt{'buil'}.' 
 <br />  
 <form method="post" name="$formname">  
 ENDONE  
    $output .= &Apache::lonhtmlcommon::start_pick_box($table_width);  
    my @roles = ('ow','cc','in','ta','ep','st','cr');  
    my %longtypes = ();  
    my %authtypes = ();  
    &form_elements(\%longtypes,\%authtypes);  
    my $descrip = $lt{'buil'}.'   
 <ul>  <ul>
 <li>'.$lt{'kerb'}.'<br />(e.g., MSU.EDU=msu.edu, MSUE.EDU=msue.msu.edu).</li>  <li>'.$lt{'kerb'}.'<br />(e.g., MSU.EDU=msu.edu, MSUE.EDU=msue.msu.edu).</li>
 <li>'.$lt{'infs'}.'</li>  <li>'.$lt{'infs'}.'</li>
 </ul>'."\n";  </ul>'."\n";
    my $submit_text = $lt{'comp'};      my $submit_text = $lt{'comp'};
    my $cmd = 'compose';      my $cmd = 'compose';
    $output .= &Apache::lonhtmlcommon::role_select_row(\@roles,$col_width,$tablecolor,'Roles');      $output .= &Apache::lonhtmlcommon::role_select_row(\@roles,$col_width,$tablecolor,'Roles');
    $output .= &Apache::lonhtmlcommon::course_select_row($col_width,$tablecolor,'Courses',$formname,$totcodes,\@codetitles,\%idlist,\%idlist_titles);      $output .= &Apache::lonhtmlcommon::course_select_row($col_width,$tablecolor,'Courses',$formname,$totcodes,\@codetitles,\%idlist,\%idlist_titles);
    $output .= &Apache::lonhtmlcommon::status_select_row(\%longtypes,$col_width,$tablecolor,&mt('Access status'));      $output .= &Apache::lonhtmlcommon::status_select_row(\%longtypes,$col_width,$tablecolor,&mt('Access status'));
    $output .= &Apache::lonhtmlcommon::email_default_row(\%authtypes,$col_width,$tablecolor,&mt('Username -> Email conversion'),$descrip);      $output .= &Apache::lonhtmlcommon::email_default_row(\%authtypes,$col_width,$tablecolor,&mt('Username -> Email conversion'),$descrip);
    $output .= &Apache::lonhtmlcommon::submit_row($col_width,$tablecolor,&mt('Submit'),$cmd,$submit_text);      $output .= &Apache::lonhtmlcommon::submit_row($col_width,$tablecolor,&mt('Submit'),$cmd,$submit_text);
    $output .= &Apache::lonhtmlcommon::end_pick_box();      $output .= &Apache::lonhtmlcommon::end_pick_box();
    $output .= qq(      $output .= &end_page();
 </form>  
 </body>  
 </html>);  
     $r->print($output);      $r->print($output);
     return;      return;
 }  }
   
 sub print_composition_form {  sub print_composition_form {
     my ($r,$formname,$cdom,$tablecolor,$bodytag,$html,$ltext) = @_;      my ($r,$formname,$cdom,$tablecolor,$bodytag) = @_;
     &Apache::lonhtmlcommon::add_breadcrumb      &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"javascript:goBack('pick_target')",          ({href=>"javascript:goBack('pick_target')",
           text=>"Select Audience"},            text=>"Select Audience"},
Line 527  function goBack(target) { Line 495  function goBack(target) {
     document.$formname.submit();      document.$formname.submit();
 }  }
 |;  |;
     my $breadcrumbs = (&Apache::lonhtmlcommon::breadcrumbs  
         (undef,'Broadcast e-mail to users','Broadcast_system_email'));  
   
     my %lt=&Apache::lonlocal::texthash(      my %lt=&Apache::lonlocal::texthash(
                       'note' => 'Notification E-mail',  
                       'nore' => 'No recipients identified',                        'nore' => 'No recipients identified',
                       'emad' => 'e-mail address',                        'emad' => 'e-mail address',
                    );                     );
Line 543  function goBack(target) { Line 508  function goBack(target) {
                    );                     );
     $jscript .= &Apache::lonhtmlcommon::set_form_elements(\%elements);      $jscript .= &Apache::lonhtmlcommon::set_form_elements(\%elements);
   
     $r->print(<<ENDONE);      $r->print(&start_page(&add_script($jscript), $bodytag,
 $html    'Broadcast e-mail to users', $formname));
 <head>  
  <title>LON-CAPA $lt{'note'}</title>  
 <script type="text/javascript">  
 $jscript  
 </script>  
 </head>  
 $bodytag $breadcrumbs  
 <br />   
 ENDONE  
     my $coursefilter = $env{'form.coursepick'};      my $coursefilter = $env{'form.coursepick'};
     my %courses = ();      my %courses = ();
     if ($coursefilter eq 'all') {      if ($coursefilter eq 'all') {
Line 646  ENDONE Line 603  ENDONE
             }              }
         }          }
     }      }
     my $output  = '<form name="'.$formname.'" method="post">'."\n";      my $output;
       
     if ($totalrecip > 0) {      if ($totalrecip > 0) {
         $output .= &Apache::lonhtmlcommon::start_pick_box($table_width);          $output .= &Apache::lonhtmlcommon::start_pick_box($table_width);
Line 693  ENDONE Line 650  ENDONE
     }      }
     $output .= '<input type="hidden" name="origin" value="'.$formname.'" />'."\n";      $output .= '<input type="hidden" name="origin" value="'.$formname.'" />'."\n";
     $output .= &Apache::lonhtmlcommon::echo_form_input(['command','origin','subject','message','recipient','sender'],);      $output .= &Apache::lonhtmlcommon::echo_form_input(['command','origin','subject','message','recipient','sender'],);
     $output .= '</form></body></html>';      $output .= &end_page();
     $r->print($output);      $r->print($output);
     return;      return;
 }  }
   
   
 sub print_request_receipt {  sub print_request_receipt {
     my ($r,$formname,$dom,$tablecolor,$bodytag,$html,$ltext) =@_;      my ($r,$formname,$dom,$tablecolor,$bodytag) =@_;
     my @recipients = &Apache::loncommon::get_env_multiple('form.recipient');      my @recipients = &Apache::loncommon::get_env_multiple('form.recipient');
     my $subject = $env{'form.subject'};      my $subject = $env{'form.subject'};
     my $message = $env{'form.message'};      my $message = $env{'form.message'};
Line 711  function goBack(target) { Line 668  function goBack(target) {
     document.$formname.submit();      document.$formname.submit();
 }  }
 ENDSCRIPT  ENDSCRIPT
   
     &Apache::lonhtmlcommon::add_breadcrumb      &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"javascript:goBack('pick_target')",          ({href=>"javascript:goBack('pick_target')",
           text=>"Select audience"});            text=>"Select audience"});
Line 720  ENDSCRIPT Line 678  ENDSCRIPT
     &Apache::lonhtmlcommon::add_breadcrumb      &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"/adm/notify?command=process",          ({href=>"/adm/notify?command=process",
           text=>"Outcome"});            text=>"Outcome"});
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs  
             (undef,'E-mail Delivery','Broadcast_system_email');  
     my $output = <<ENDONE;      my $output = &start_page(&add_script($jscript), $bodytag,
 $html       'E-mail Delivery', $formname);
 <head>  
  <title>LON-CAPA Notification E-mail</title>  
 <script type="text/javascript">  
 $jscript  
 </script>  
 </head>  
 $bodytag  
 $breadcrumbs  
 <br />  
 <form name="$formname" method="post">  
 ENDONE  
     $output .= &Apache::lonhtmlcommon::start_pick_box();      $output .= &Apache::lonhtmlcommon::start_pick_box();
     my @deliveries = ();      my @deliveries = ();
     &broadcast_email(\@recipients,$subject,$from,$message,\@deliveries);      &broadcast_email(\@recipients,$subject,$from,$message,\@deliveries);
Line 771  ENDONE Line 719  ENDONE
     $output .= '<input type="hidden" name="command" />'."\n".      $output .= '<input type="hidden" name="command" />'."\n".
                '<input type="hidden" name="origin" value="'.$formname.'" />'."\n";                 '<input type="hidden" name="origin" value="'.$formname.'" />'."\n";
     $output .= &Apache::lonhtmlcommon::echo_form_input(['command','origin']);      $output .= &Apache::lonhtmlcommon::echo_form_input(['command','origin']);
     $output .= '      $output .= &end_page();
 </form>  
 </body>  
 </html>';  
     $r->print($output);      $r->print($output);
     return;      return;
 }  }
   
 sub broadcast_email {  sub broadcast_email {
     my ($recipients,$subject,$from,$message,$deliveries,$ltext)=@_;      my ($recipients,$subject,$from,$message,$deliveries)=@_;
 # Should implement staggered delivery for large numbers of recipients?.  # Should implement staggered delivery for large numbers of recipients?.
     foreach my $user (@{$recipients}) {      foreach my $user (@{$recipients}) {
         my $msg = new Mail::Send;          my $msg = new Mail::Send;
Line 827  sub get_user_info { Line 772  sub get_user_info {
 }  }
   
 sub form_elements {  sub form_elements {
    my ($longtypes,$authtypes,$ltext) = @_;     my ($longtypes,$authtypes) = @_;
    %{$longtypes} = (     %{$longtypes} = (
                    active => 'Currently has access',                     active => 'Currently has access',
                    previous => 'Previously had access',                     previous => 'Previously had access',
Line 844  sub form_elements { Line 789  sub form_elements {
 }  }
   
 sub store_mail {  sub store_mail {
     my ($subject,$message,$domain,$recipients,$attachmenturl,$ltext) = @_;      my ($subject,$message,$domain,$recipients,$attachmenturl) = @_;
     my $msgid;      my $msgid;
     ($msgid,$message) = &Apache::lonmsg::packagemsg($subject,$message,undef,undef,      ($msgid,$message) = &Apache::lonmsg::packagemsg($subject,$message,undef,undef,
                         $attachmenturl,$recipients,undef,undef,'dcmail');                          $attachmenturl,$recipients,undef,undef,'dcmail');
Removed from v.1.11  
changed lines
  Added in v.1.13

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