Diff for /loncom/interface/lonannounce.pm between versions 1.8 and 1.20

version 1.8, 2003/04/30 15:49:45 version 1.20, 2003/09/17 19:45:39
Line 32  use strict; Line 32  use strict;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use Apache::loncommon;  use Apache::loncommon;
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
   use Apache::lonlocal;
   use HTML::Entities();
   
   my %todayhash;
   my %showedcheck;
   
   sub editfield {
       my ($r,$start,$end,$text)=@_;
       # Deal with date forms
       my $startdateform = &Apache::lonhtmlcommon::date_setter('anno',
                                                               'startdate',
                                                               $start);
       my $enddateform = &Apache::lonhtmlcommon::date_setter('anno',
                                                             'enddate',
                                                             $end);
   
       $r->print(<<ENDFORM);
   <form name="anno" method="post">
   <input type="hidden" value=''          name="action"      >
   <table><tr><td>Starting date:</td><td>$startdateform</td></tr>
   <tr><td>Ending date:</td><td>$enddateform</td></tr></table>
   <textarea name="msg" rows="4" cols="60">$text</textarea>
   <input type="button" onClick="trysubmit()" value="Post Announcement"><hr>
   ENDFORM
   }
   
 sub readcalendar {  sub readcalendar {
     my $courseid=shift;      my $courseid=shift;
Line 52  sub emptycell { Line 77  sub emptycell {
 }  }
   
 sub normalcell {  sub normalcell {
     my ($day,$text)=@_;      my ($day,$month,$year,$text)=@_;
     my $output='';      my $output='';
     foreach (split(/\_\_\_\&\&\&\_\_\_/,$text)) {      foreach (split(/\_\_\_\&\&\&\_\_\_/,$text)) {
         if ($_) {          if ($_) {
     my ($courseid,$start,$end,@msg)=split(/\@/,$_);      my ($courseid,$start,$end,@msg)=split(/\@/,$_);
             my $msg=join('@',@msg);              my $msg=join('@',@msg);
             my $fullmsg=$ENV{'course.'.$courseid.'.description'}.': '.$msg;              my $fullmsg=$ENV{'course.'.$courseid.'.description'}.
    ', '.localtime($start).' - '.localtime($end).': '.$msg;
             if ($courseid eq $ENV{'request.course.id'}) {              if ($courseid eq $ENV{'request.course.id'}) {
               if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {                if ((&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))
                  && (!$showedcheck{$start.'_'.$end})
          && ($ENV{'form.pickdate'} ne 'yes')) {
                $output.='<input type="checkbox" name="remove_'.$start.'_'.                 $output.='<input type="checkbox" name="remove_'.$start.'_'.
    $end.'">';     $end.'">';
                  $showedcheck{$start.'_'.$end}=1;
       }        }
     }      }
               $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\'');
               $fullmsg=~s/&/\\&/g;
               $output.='<a href="javascript:alert('."'$fullmsg'".')">'.
          substr($msg,0,20).'...</a><br />';
          }
       }
       return '<td'.
    ((($day eq $todayhash{'day'}) &&
             ($month eq $todayhash{'month'}) &&
             ($year eq $todayhash{'year'}))?' bgcolor="#FFFF00"':'').
              '>'.&tfont('<b>'.&picklink($day,$day,$month,$year).'</b><br>'.$output).'</td>';
   }
   
   sub plaincell {
       my ($text)=@_;
       my $output='';
       foreach (split(/\_\_\_\&\&\&\_\_\_/,$text)) {
           if ($_) {
       my ($courseid,$start,$end,@msg)=split(/\@/,$_);
               my $msg=join('@',@msg);
               my $fullmsg=$ENV{'course.'.$courseid.'.description'}.
    ', '.localtime($start).' - '.localtime($end).': '.$msg;
               $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\'');
               $fullmsg=~s/&/\\&/g;
             $output.='<a href="javascript:alert('."'$fullmsg'".')">'.              $output.='<a href="javascript:alert('."'$fullmsg'".')">'.
        substr($msg,0,20).'...</a><br>';         substr($msg,0,40).'...</a><br />';
        }         }
     }      }
     return '<td><b>'.$day.'</b><br>'.$output.'</td>';      return $output;
   }
   
   sub listcell {
       my ($text)=@_;
       my $output='';
       foreach (split(/\_\_\_\&\&\&\_\_\_/,$text)) {
           if ($_) {
       my ($courseid,$start,$end,@msg)=split(/\@/,$_);
               my $msg=join('@',@msg);
               my $fullmsg=localtime($start).' to '.localtime($end).':<br /><b>'.
                  $msg.'</b>';
               $output.='<li>'.$fullmsg.'</li>';
          }
       }
       return $output;
 }  }
   
 sub nextday {  sub nextday {
Line 79  sub nextday { Line 147  sub nextday {
 }  }
   
 sub showday {  sub showday {
     my ($tk,%allcal)=@_;      my ($tk,$mode,%allcal)=@_;
     my %th=&Apache::loncommon::timehash($tk);      my %th=&Apache::loncommon::timehash($tk);
     my ($nextday,$nextmonth)=&nextday(%th);      my ($nextday,$nextmonth)=&nextday(%th);
     my $outp='';      my $outp='';
Line 91  sub showday { Line 159  sub showday {
             $allcal{$_};              $allcal{$_};
         }          }
     }      }
     return ($nextday,$nextmonth,&normalcell($th{'day'},$outp));      unless ($mode) {
          return ($nextday,$nextmonth,&normalcell(
                  $th{'day'},$th{'month'},$th{'year'},$outp));
      } elsif ($outp) {
          if ($mode==1) {
             return '<br />'.&plaincell($outp);
         } else {
             return '<ul>'.&listcell($outp).'</ul>';
         }
      } else {
          return '';
      }
   }
   
   sub tfont {
       my $text=shift;
       if ($ENV{'form.pickdate'} eq 'yes') {
    return '<font size="1">'.$text.'</font>';
       } else {
    return $text;
       }
   }
   
   sub picklink {
       my ($text,$day,$month,$year)=@_;
       if ($ENV{'form.pickdate'} eq 'yes') {
    return '<a href="javascript:dialin('.$day.','.$month.','.$year.')">'.
       $text.'</a>';
       } else {
    return $text;
       }
   }
   
   sub dialscript {
       return (<<ENDDIA);
   <script language="Javascript">
   function dialin(day,month,year) {
    opener.document.$ENV{'form.formname'}.$ENV{'form.element'}\_year.value=year;
       var slct=opener.document.$ENV{'form.formname'}.$ENV{'form.element'}\_month;
       var i;
       for (i=0;i<slct.length;i++) {
           if (slct.options[i].value==month) { slct.selectedIndex=i; }
       }
       opener.document.$ENV{'form.formname'}.$ENV{'form.element'}\_day.value=day;
       opener.$ENV{'form.element'}\_checkday();
       self.close();
   }
   </script>
   ENDDIA
 }  }
   
 sub handler {  sub handler {
Line 102  sub handler { Line 218  sub handler {
   
 # ---------------------------------------------------------- Get time right now  # ---------------------------------------------------------- Get time right now
     my $today=time;      my $today=time;
     my %todayhash=&Apache::loncommon::timehash($today);      %todayhash=&Apache::loncommon::timehash($today);
   # ----------------------------------------------------------------- Check marks
       %showedcheck=();
       undef %showedcheck;
 # ---------------------------------------------------------- Get month and year  # ---------------------------------------------------------- Get month and year
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['month','year']);                               ['month','year','pickdate','formname','element']);
 # --------------------------------------------------- Decide what month to show  # --------------------------------------------------- Decide what month to show
     my $year=$todayhash{'year'};      my $year=$todayhash{'year'};
     if ($ENV{'form.year'}) { $year=$ENV{'form.year'}; }      if ($ENV{'form.year'}) { $year=$ENV{'form.year'}; }
     my $month=$todayhash{'month'};      my $month=$todayhash{'month'};
     if ($ENV{'form.month'}) { $month=$ENV{'form.month'}; }      if ($ENV{'form.month'}) { $month=$ENV{'form.month'}; }
   
   # ---------------------------------------------- See if we are in pickdate mode
       my $pickdatemode=($ENV{'form.pickdate'} eq 'yes');
       my $pickinfo='&pickdate=yes&formname='.$ENV{'form.formname'}.
    '&element='.$ENV{'form.element'};
 # --------------------------------------------- Find out first day of the month  # --------------------------------------------- Find out first day of the month
   
     my %firstday=&Apache::loncommon::timehash(      my %firstday=&Apache::loncommon::timehash(
Line 121  sub handler { Line 244  sub handler {
                                      'dlsav' => $todayhash{'dlsav'} ));                                       'dlsav' => $todayhash{'dlsav'} ));
     my $weekday=$firstday{'weekday'};      my $weekday=$firstday{'weekday'};
 # ------------------------------------------------------------ Print the screen  # ------------------------------------------------------------ Print the screen
     my $pjump_function = &Apache::lonhtmlcommon::pjump_javascript_definition();  
     $r->print(<<ENDDOCUMENT);      $r->print(<<ENDDOCUMENT);
 <html>  <html>
 <head>  <head>
 <title>The LearningOnline Network with CAPA</title>  <title>The LearningOnline Network with CAPA</title>
 <script>  <script>
     function pclose() {  
         parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",  
                  "height=350,width=350,scrollbars=no,menubar=no");  
         parmwin.close();  
     }  
   
     $pjump_function  
   
     function dateset() {  
         if (document.anno.pres_marker.value=='end') {  
            document.anno.enddate.value=  
        document.anno.pres_value.value;  
         }  
         if (document.anno.pres_marker.value=='start') {  
            document.anno.startdate.value=  
        document.anno.pres_value.value;  
         }  
         pclose();  
     }  
   
     function trysubmit() {      function trysubmit() {
         if (document.anno.startdate.value=='') {  
     alert("Announcements must have a starting date");  
             return '';  
         }  
         if (document.anno.enddate.value=='') {  
     alert("Announcements must have a starting date");  
             return '';  
         }  
         if (document.anno.startdate.value>document.anno.enddate.value) {  
     alert("Starting date is later than ending date");  
             return '';  
         }  
         document.anno.action.value="new";          document.anno.action.value="new";
  document.anno.submit();   document.anno.submit();
     }      }
Line 171  sub handler { Line 263  sub handler {
 </script>  </script>
 </head>  </head>
 ENDDOCUMENT  ENDDOCUMENT
     $r->print(&Apache::loncommon::bodytag("Announcements and Calendar"));      if ($pickdatemode) {
   # no big header in pickdate mode
    $r->print(&Apache::loncommon::bodytag("Pick a Date",'','',1).
     &dialscript().
     '<font size="1">');
       } else {
          $r->print(&Apache::loncommon::bodytag("Announcements and Calendar"));
       }
 # does this user have privileges to post, etc?  # does this user have privileges to post, etc?
     my $allowed=0;      my $allowed=0;
     if ($ENV{'request.course.id'}) {      if ($ENV{'request.course.id'}) {
        $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'});         $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'});
     }      }
   # does this user have privileges to post to servers?
       my $serverpost=0;
       if ($ENV{'request.role.domain'}) {
    $serverpost=&Apache::lonnet::allowed('psa',
        $ENV{'request.role.domain'});
       } else {
    $serverpost=&Apache::lonnet::allowed('psa','/');
       }
   # -------------------------------- BUT: do no fancy stuff when in pickdate mode
       if ($pickdatemode) { 
    $serverpost=0; 
    $allowed=0;
       }
   # ------------------------------------------------------------ Process commands
       if ($serverpost) {
    if ($ENV{'form.serveraction'}) {
       foreach (keys %ENV) {
    if ($_=~/^form\.postto\_(\w+)/) {
       $r->print( 
    '<br />Posting '.$1.': '.&Apache::lonnet::postannounce
    ($1,$ENV{'form.serverannnounce'}));
    }
       }
    }
    $r->print(<<SERVERANNOUNCE);
   <form name="serveranno" method="post">
   <h3>Post Server Announcements</h3>
   Post announcements to the system login and roles screen<br />
   <i>(leave blank to delete announcement)</i><br />
   <textarea name="serverannnounce" cols="60" rows="5"></textarea><br />
   Check machines:<br />
   SERVERANNOUNCE
   # list servers
       foreach (sort keys %Apache::lonnet::hostname) {
    if (&Apache::lonnet::allowed('psa',$Apache::lonnet::hostdom{$_})) {
       $r->print ('<br /><input type="checkbox" name="postto_'.$_.'" /> '.
          $_.' <tt>'.$Apache::lonnet::hostname{$_}.'</tt> '.
          '<a href="http://'.$Apache::lonnet::hostname{$_}.
          '/announcement.txt" target="annowin">current</a>');
    }
       }
       $r->print(
     '<br /><input type="submit" name="serveraction" value="Post"></form><hr />');
       }
     if ($allowed) {      if ($allowed) {
         my $coursenum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};          my $coursenum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
         my $coursedom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};          my $coursedom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
 # ----------------------------------------------------- Store new submitted one  # ----------------------------------------------------- Store new submitted one
         if ($ENV{'form.action'} eq 'new') {          if ($ENV{'form.action'} eq 'new') {
       my $startdate = 
    &Apache::lonhtmlcommon::get_date_from_form('startdate');
       my $enddate   = 
    &Apache::lonhtmlcommon::get_date_from_form('enddate');
       unless ($startdate=~/^\d+$/) { $startdate=time; }
               unless ($enddate=~/^\d+$/) { $enddate=$startdate+1; }
               if ($startdate>$enddate) {
    my $buffer=$startdate;
    $startdate=$enddate;
    $enddate=$buffer;
               }
     &Apache::lonnet::put('calendar',{       &Apache::lonnet::put('calendar',{ 
  $ENV{'form.startdate'}.'_'.$ENV{'form.enddate'} =>    $startdate.'_'.$enddate => 
     $ENV{'form.msg'} },$coursedom,$coursenum);      $ENV{'form.msg'} },$coursedom,$coursenum);
         }          }
 # ---------------------------------------------------------------- Remove items  # ---------------------------------------------------------------- Remove items
Line 202  ENDDOCUMENT Line 355  ENDDOCUMENT
         $tomorrowhash{'day'}++;          $tomorrowhash{'day'}++;
         my $tomorrow=&Apache::loncommon::maketime(%tomorrowhash);          my $tomorrow=&Apache::loncommon::maketime(%tomorrowhash);
                   
  $r->print(<<ENDFORM);          &editfield($r,$today,$tomorrow,'');
 <form name="anno" method="post">  
 <input type="hidden" value=''          name="action"      >  
 <input type="hidden" value=''          name="pres_value"  >  
 <input type="hidden" value=''          name="pres_type"   >  
 <input type="hidden" value=''          name="pres_marker" >  
 <input type="hidden" value='$today'    name="startdate"   >  
 <input type="hidden" value='$tomorrow' name="enddate"     >  
 <a   
  href="javascript:pjump('date_start','Starting Date',document.anno.startdate.value,'start','anno.pres','dateset');"  
 >Set Starting Date</a>  
 <a   
  href="javascript:pjump('date_end','Ending Date',document.anno.enddate.value,'end','anno.pres','dateset');"  
 >Set Ending Date</a><p>  
 <textarea name="msg" rows="4" cols="60">  
 </textarea>  
 <input type="button" onClick="trysubmit()" value="Post Announcement"><hr>  
 <input type="button" onClick="removesub()" value="Remove Marked"><hr>  
 ENDFORM  
     }      }
 # ----------------------------------------------------- Summarize all calendars  # ----------------------------------------------------- Summarize all calendars
     my %allcal=();      my %allcal=();
Line 232  ENDFORM Line 367  ENDFORM
     my ($pm,$py,$fm,$fy)=($month-1,$year,$month+1,$year);      my ($pm,$py,$fm,$fy)=($month-1,$year,$month+1,$year);
     if ($pm<1) { ($pm,$py)=(12,$year-1); }      if ($pm<1) { ($pm,$py)=(12,$year-1); }
     if ($fm>12){ ($fm,$fy)=(1,$year+1); }      if ($fm>12){ ($fm,$fy)=(1,$year+1); }
     $r->print('<h1>'.('','January','February','March','April','May',  
       'June','July','August','September','October',      $r->print('<h1>'.('',&mt('January'),&mt('February'),&mt('March'),
                       'November','December')[$month].' '.$year.'</h1>'.        &mt('April'),&mt('May'),
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.'">Previous Month</a> '.        &mt('June'),&mt('July'),&mt('August'),
  '<a href="/adm/announcements?month='.$fm.'&year='.$fy.'">Next Month</a><p>'.                        &mt('September'),&mt('October'),
         '<table border="2" cols="7" rows="5"><tr><th>Sun</th><th>Mon</th>'.                        &mt('November'),&mt('December'))[$month].' '.
         '<th>Tue</th><th>Wed</th><th>Thu</th><th>Fri</th><th>Sat</th></tr>');                $year.'</h1>');
   # Reached the end of times, give up
       if (($year<1970) || ($year>2037)) {
    $r->print('<h3>No calendar available for this date.</h3>'.
    '<a href="/adm/announcements?month='.$todayhash{'month'}.
    '&year='.$todayhash{'year'}.'">Current Month</a></body></html>');
    return OK;
       }
       $r->print(
    '<a href="/adm/announcements?month='.$pm.'&year='.$py.
    ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
    '<a href="/adm/announcements?month='.$fm.'&year='.$fy.
    ($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.
    '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
    '&year='.$todayhash{'year'}.
    ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a><p>'.
           '<table border="2" cols="7" rows="5"><tr><th>'.
   &tfont(&mt('Sun'))
   .'</th><th>'.
   &tfont(&mt('Mon'))
   .'</th><th>'.
   &tfont(&mt('Tue'))
   .'</th><th>'.
   &tfont(&mt('Wed'))
   .'</th><th>'.
   &tfont(&mt('Thu'))
   .'</th><th>'.
   &tfont(&mt('Fri'))
   .'</th><th>'.
   &tfont(&mt('Sat'))
   .'</th></tr>');
   
     my $tk=&Apache::loncommon::maketime(%firstday);      my $tk=&Apache::loncommon::maketime(%firstday);
     my $outp;      my $outp;
Line 248  ENDFORM Line 413  ENDFORM
     $r->print('<tr>');      $r->print('<tr>');
     for (my $i=0;$i<$weekday;$i++) { $r->print(&emptycell); }      for (my $i=0;$i<$weekday;$i++) { $r->print(&emptycell); }
     for (my $i=$weekday;$i<=6;$i++) {       for (my $i=$weekday;$i<=6;$i++) { 
         ($tk,$nm,$outp)=&showday($tk,%allcal);          ($tk,$nm,$outp)=&showday($tk,0,%allcal);
         $r->print($outp);          $r->print($outp);
     }      }
     $r->print('</tr>');      $r->print('</tr>');
Line 256  ENDFORM Line 421  ENDFORM
     for (my $k=0;$k<=3;$k++) {      for (my $k=0;$k<=3;$k++) {
         $r->print('<tr>');          $r->print('<tr>');
         for (my $i=0;$i<=6;$i++) {          for (my $i=0;$i<=6;$i++) {
             ($tk,$nm,$outp)=&showday($tk,%allcal);              ($tk,$nm,$outp)=&showday($tk,0,%allcal);
             if ($month!=$nm) { $outp=&emptycell; }              if ($month!=$nm) { $outp=&emptycell; }
             $r->print($outp);              $r->print($outp);
         }          }
Line 264  ENDFORM Line 429  ENDFORM
     }      }
 # ------------------------------------------------------------------- End table  # ------------------------------------------------------------------- End table
     $r->print('</table>');      $r->print('</table>');
     if ($allowed) { $r->print('</form>'); }  # ----------------------------------------------------------------- Check marks
       %showedcheck=();
       undef %showedcheck;
   # --------------------------------------------------------------- Remove button
       if ($allowed) { $r->print('<input type="button" onClick="removesub()" value="Remove Checked Entries"></form>'); }
     $r->print('<p>'.      $r->print('<p>'.
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.'">Previous Month</a> '.   '<a href="/adm/announcements?month='.$pm.'&year='.$py.
  '<a href="/adm/announcements?month='.$fm.'&year='.$fy.'">Next Month</a><p>'.   ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
    '<a href="/adm/announcements?month='.$fm.'&year='.$fy.
    ($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.
    '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
    '&year='.$todayhash{'year'}.
    ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a></p>'.
    ($pickdatemode?'</font>':'').
  '</body></html>');   '</body></html>');
     return OK;      return OK;
 }   } 

Removed from v.1.8  
changed lines
  Added in v.1.20


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