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

Diff for /loncom/interface/lonannounce.pm between versions 1.45 and 1.53

version 1.45, 2006/01/16 21:24:29 version 1.53, 2006/05/12 15:53:10
Line 64  $help Line 64  $help
 <tr><td>$lt{'end'}:</td><td>$enddateform</td></tr></table>  <tr><td>$lt{'end'}:</td><td>$enddateform</td></tr></table>
 <textarea name="msg" rows="4" cols="60">$text</textarea>  <textarea name="msg" rows="4" cols="60">$text</textarea>
 <br />  <br />
 <!-- <label><input type="checkbox" name="rsspost" /> $lt{'incrss'}</label> -->  <label><input type="checkbox" name="rsspost" /> $lt{'incrss'}</label>
 <br /><input type="button" onClick="trysubmit()" value="$lt{'post'}" /><hr />  <br /><input type="button" onClick="trysubmit()" value="$lt{'post'}" /><hr />
 ENDFORM  ENDFORM
 }  }
Line 81  sub readcalendar { Line 81  sub readcalendar {
         }          }
     }      }
   
     if ($courseid eq $env{'request.course.id'}) {      my $can_see_hidden = $env{'request.role.adv'};
  my $can_see_hidden = $env{'request.role.adv'};      my $navmap = Apache::lonnavmaps::navmap->new();
  my $navmap = Apache::lonnavmaps::navmap->new();      my %resourcedata=
  my %resourcedata=   &Apache::lonnet::dump('resourcedata',$coursedom,$coursenum);
     &Apache::lonnet::dump('resourcedata',$coursedom,$coursenum);      foreach my $thiskey (sort keys %resourcedata) {
  foreach my $thiskey (sort keys %resourcedata) {   if ($resourcedata{$thiskey.'.type'}=~/^date/) {
     if ($resourcedata{$thiskey.'.type'}=~/^date/) {      my ($course,$middle,$part,$name)=
  my ($course,$middle,$part,$name)=   ($thiskey=~/^(\w+)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
     ($thiskey=~/^(\w+)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);      my $section=&mt('All Students');
  my $section=&mt('All Students');      if ($middle=~/^\[(.*)\]\./) {
  if ($middle=~/^\[(.*)\]\./) {   my $sec=$1;
     my $sec=$1;   # if we have a section don't show ones that aren't ours
     # if we have a section don't show ones that aren't ours   if ($env{'request.course.sec'} &&
     if ($env{'request.course.sec'} &&      $env{'request.course.sec'} ne $sec) { next; }
  $env{'request.course.sec'} ne $sec) { next; }   # if a student without a section don't show any section ones
     # if a student without a section don't show any section ones   if (!$env{'request.role.adv'} &&
     if (!$env{'request.role.adv'} &&      !$env{'request.course.sec'}) { next; }
  !$env{'request.course.sec'}) { next; }   $section=&mt('Group/Section').': '.$1;
     $section=&mt('Group/Section').': '.$1;   $middle=~s/^\[(.*)\]\.//;
     $middle=~s/^\[(.*)\]\.//;      }
       $middle=~s/\.$//;
       my $realm=&mt('All Resources');
       if ($middle eq '___(all)') {
    if (!$can_see_hidden && !$navmap) {
       next;
    }
       } elsif ($middle=~/^(.+)\_\_\_\(all\)$/) {
    my $map_url=$1;
    if (!$can_see_hidden && !$navmap) {
       next;
    }
    if (!$can_see_hidden) {
       my $res = $navmap->getResourceByUrl($map_url);
       if ($res && $res->randomout()) { next; }
  }   }
  $middle=~s/\.$//;   $realm=&mt('Folder/Map').': '.&Apache::lonnet::gettitle($map_url);
  my $realm=&mt('All Resources');      } elsif ($middle) {
  if ($middle=~/^(.+)\_\_\_\(all\)$/) {   if (!$can_see_hidden && !$navmap) {
     my $map_url=$1;      next;
     if (!$can_see_hidden && !$navmap) {  
  next;  
     }  
     if (!$can_see_hidden) {  
  my $res = $navmap->getResourceByUrl($map_url);  
  if ($res && $res->randomout()) { next; }  
     }  
     $realm=&mt('Folder/Map').': '.&Apache::lonnet::gettitle($map_url);  
  } elsif ($middle) {  
     if (!$can_see_hidden && !$navmap) {  
  next;  
     }  
     if (!$can_see_hidden) {  
  my $res = $navmap->getBySymb($middle);  
  if ($res && $res->randomout()) { next; }  
     }  
     $realm=&mt('Resource').': '.&Apache::lonnet::gettitle($middle);  
  }   }
  my $datetype='';   if (!$can_see_hidden) {
  if ($name eq 'duedate') {       my $res = $navmap->getBySymb($middle);
     $datetype=&mt('Due');       if ($res && $res->randomout()) { next; }
    }
    $realm=&mt('Resource').': '.&Apache::lonnet::gettitle($middle);
       }
       my $datetype='';
       if ($name eq 'duedate') { 
    $datetype=&mt('Due'); 
 # see if accidentally answerdate is before duedate  # see if accidentally answerdate is before duedate
     my $answerkey=$thiskey;   my $answerkey=$thiskey;
     $answerkey=~s/duedate$/answerdate/;   $answerkey=~s/duedate$/answerdate/;
     if ($resourcedata{$thiskey}>$resourcedata{$answerkey}) {   if ($resourcedata{$thiskey}>$resourcedata{$answerkey}) {
  $datetype='Due and Answer Available';      $datetype=&mt('Due and Answer Available');
     }  
  }   }
  if ($name eq 'opendate') { $datetype=&mt('Opening'); }      }
  if ($name eq 'answerdate') {      if ($name eq 'opendate') { $datetype=&mt('Opening'); }
       if ($name eq 'answerdate') {
 # see if accidentally answerdate is before duedate  # see if accidentally answerdate is before duedate
     my $duekey=$thiskey;   my $duekey=$thiskey;
     $duekey=~s/answerdate$/duedate/;   $duekey=~s/answerdate$/duedate/;
     if ($resourcedata{$duekey}>$resourcedata{$thiskey}) {   if ($resourcedata{$duekey}>$resourcedata{$thiskey}) {
 # forget it  # forget it
  next;      next;
     }    } 
     $datetype=&mt('Answer Available');    $datetype=&mt('Answer Available'); 
  }      }
  $returnhash{$courseid.'@'.$resourcedata{$thiskey}.'_'.      $returnhash{$courseid.'@'.$resourcedata{$thiskey}.'_'.
     $resourcedata{$thiskey}}=      $resourcedata{$thiskey}}=
     'INTERNAL:'.$datetype.': '.$realm.' ('.$section.')';      'INTERNAL:'.$datetype.': '.$realm.' ('.$section.')';
     }  
  }   }
     }      }
     return %returnhash;      return %returnhash;
 }  }
   
 sub emptycell {  sub emptycell {
     return '<td bgcolor="#AAAAAA">&nbsp;</td>';      return '<td class="LC_calendar_day_empty">&nbsp;</td>';
 }  }
   
 sub normalcell {  sub normalcell {
     my ($day,$month,$year,$text)=@_;      my ($day,$month,$year,$text)=@_;
     my $output='';      my $output;
     my @items=&order($text);      my @items=&order($text);
     foreach my $item (@items) {      foreach my $item (@items) {
         if ($item) {          if ($item) {
Line 189  sub normalcell { Line 191  sub normalcell {
     $fullmsg=~s/[\n\r]/\\n/gs;      $fullmsg=~s/[\n\r]/\\n/gs;
             $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\'');              $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\'');
             $fullmsg=~s/&/\\&/g;              $fullmsg=~s/&/\\&/g;
       my $short_msg = substr($msg,0,20).((length($msg) > 20)?'...':'');
       if (defined($output)) { $output.='<br />'; }
             $output.='<a href="javascript:alert('."'$fullmsg'".')">'.              $output.='<a href="javascript:alert('."'$fullmsg'".')">'.
        substr($msg,0,20).'...</a><br />';         $short_msg.'</a>';
        }         }
     }      }
     return '<td valign="top"'.      return '<td class="LC_calendar_day'.
  ((($day eq $todayhash{'day'}) &&   ((($day eq $todayhash{'day'}) &&
           ($month eq $todayhash{'month'}) &&            ($month eq $todayhash{'month'}) &&
           ($year eq $todayhash{'year'}))?' bgcolor="#FFFF00"':'').            ($year eq $todayhash{'year'}))?'_current':'').
            '>'.&tfont('<b>'.&picklink($day,$day,$month,$year).'</b><br />'.$output).'</td>';             '" ><b>'.&picklink($day,$day,$month,$year).'</b><br />'.$output.'</td>';
 }  }
   
 sub plaincell {  sub plaincell {
     my ($text)=@_;      my ($text)=@_;
     my $output='';      my $output;
     my @items=&order($text);      my @items=&order($text);
     foreach my $item (@items) {      foreach my $item (@items) {
         if ($item) {          if ($item) {
Line 217  sub plaincell { Line 221  sub plaincell {
      $fullmsg=~s/[\n\r]/\\n/gs;       $fullmsg=~s/[\n\r]/\\n/gs;
             $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\'');              $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\'');
             $fullmsg=~s/&/\\&/g;              $fullmsg=~s/&/\\&/g;
       my $short_msg = substr($msg,0,80).((length($msg) > 80)?'...':'');
       if (defined($output)) { $output.='<br />'; }
             $output.='<a href="javascript:alert('."'$fullmsg'".')">'.              $output.='<a href="javascript:alert('."'$fullmsg'".')">'.
        substr($msg,0,80).'...</a><br />';         $short_msg.'</a>';
        }         }
     }      }
     return $output;      return $output;
Line 295  sub showday { Line 301  sub showday {
    }     }
 }  }
   
 sub tfont {  
     my $text=shift;  
     if ($env{'form.pickdate'} eq 'yes') {  
  return '<font size="1">'.$text.'</font>';  
     } else {  
  return $text;  
     }  
 }  
   
 sub picklink {  sub picklink {
     my ($text,$day,$month,$year)=@_;      my ($text,$day,$month,$year)=@_;
     if ($env{'form.pickdate'} eq 'yes') {      if ($env{'form.pickdate'} eq 'yes') {
Line 331  function dialin(day,month,year) { Line 328  function dialin(day,month,year) {
 </script>  </script>
 ENDDIA  ENDDIA
 }  }
   # ----------------------------------------------------- Summarize all calendars
   sub get_all_calendars {
       my %allcal=();
       foreach my $course (sort(&Apache::loncommon::findallcourses())) {
    %allcal=(%allcal,&readcalendar($course));
       }
       return %allcal;
   }
   
   sub output_ics_file {
       my ($r)=@_;
   # RFC 2445 wants CRLF
       my $crlf="\015\012";
   # Header
       $r->print("BEGIN:VCALENDAR$crlf");
       $r->print("VERSION:2.0$crlf");
       $r->print("PRODID:-//LONCAPA//LONCAPA Calendar Output//EN$crlf");
       my %allcal=&get_all_calendars();
       foreach my $event (keys(%allcal)) {
    my ($courseid,$startdate,$enddate)=($event=~/^(\w+)\@(\d+)\_(\d+)$/);
    my $uid=$event;
    $uid=~s/[\W\_]/-/gs;
    $uid.='@loncapa';
    my $summary=$allcal{$event};
    $summary=~s/^INTERNAL\://;
    $summary=~s/\s+/ /gs;
           $summary=$env{'course.'.$courseid.'.description'}.': '.$summary;
    $r->print("BEGIN:VEVENT$crlf");
    $r->print("DTSTART:".&Apache::loncommon::utc_string($startdate).$crlf);
    $r->print("DTEND:".&Apache::loncommon::utc_string($enddate).$crlf);
    $r->print("SUMMARY:$summary$crlf");
    $r->print("UID:$uid$crlf");
    $r->print("END:VEVENT$crlf");
       }
   # Footer
       $r->print("END:VCALENDAR$crlf");
   }
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
       if ($r->uri=~/\.(ics|ical)$/) {
           &Apache::loncommon::content_type($r,'text/calendar');
    &output_ics_file($r);
    return OK;
       }
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
     return OK if $r->header_only;      return OK if $r->header_only;
Line 342  sub handler { Line 381  sub handler {
     my $today=time;      my $today=time;
     %todayhash=&Apache::loncommon::timehash($today);      %todayhash=&Apache::loncommon::timehash($today);
 # ----------------------------------------------------------------- Check marks  # ----------------------------------------------------------------- Check marks
     %showedcheck=();      undef(%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','pickdate','formname','element']);                               ['month','year','pickdate','formname','element']);
Line 366  sub handler { Line 404  sub handler {
                                      'dlsav' => -1 ));                                       'dlsav' => -1 ));
     my $weekday=$firstday{'weekday'};      my $weekday=$firstday{'weekday'};
 # ------------------------------------------------------------ Print the screen  # ------------------------------------------------------------ Print the screen
     my $html=&Apache::lonxml::xmlbegin();      my $js = <<ENDDOCUMENT;
     $r->print(<<ENDDOCUMENT);  <script type="text/javascript">
 $html  
 <head>  
 <title>The LearningOnline Network with CAPA</title>  
 <script>  
   
     function trysubmit() {      function trysubmit() {
         document.anno.action.value="new";          document.anno.action.value="new";
Line 383  $html Line 417  $html
  document.anno.submit();   document.anno.submit();
     }      }
 </script>  </script>
 </head>  
 ENDDOCUMENT  ENDDOCUMENT
   
     if ($pickdatemode) {      if ($pickdatemode) {
 # no big header in pickdate mode  # no big header in pickdate mode
  $r->print(&Apache::loncommon::bodytag("Pick a Date",'','',1).   $r->print(&Apache::loncommon::start_page("Pick a Date",$js,
    {'only_body' => 1,}).
   &dialscript().    &dialscript().
   '<font size="1">');    '<font size="1">');
     } else {      } else {
        $r->print(&Apache::loncommon::bodytag("Announcements and Calendar"));         $r->print(&Apache::loncommon::start_page("Announcements and Calendar",
    $js));
     }      }
 # does this user have privileges to post, etc?  # does this user have privileges to post, etc?
     my $allowed=0;      my $allowed=0;
Line 487  SERVERANNOUNCE Line 523  SERVERANNOUNCE
         &editfield($r,$today,$tomorrow,'');          &editfield($r,$today,$tomorrow,'');
     }      }
 # ----------------------------------------------------- Summarize all calendars  # ----------------------------------------------------- Summarize all calendars
     my %allcal=();      my %allcal=&get_all_calendars();
     foreach my $course (&Apache::loncommon::findallcourses()) {  
  %allcal=(%allcal,&readcalendar($course));  
     }  
   
 # ------------------------------- Initialize table and forward backward buttons  # ------------------------------- Initialize table and forward backward buttons
     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); }
Line 507  SERVERANNOUNCE Line 539  SERVERANNOUNCE
     if (($year<1970) || ($year>2037)) {      if (($year<1970) || ($year>2037)) {
  $r->print('<h3>No calendar available for this date.</h3>'.   $r->print('<h3>No calendar available for this date.</h3>'.
  '<a href="/adm/announcements?month='.$todayhash{'month'}.   '<a href="/adm/announcements?month='.$todayhash{'month'}.
  '&year='.$todayhash{'year'}.'">Current Month</a></body></html>');   '&year='.$todayhash{'year'}.'">Current Month</a>'.
     &Apache::loncommon::end_page());
  return OK;   return OK;
     }      }
   
       my $class = "LC_calendar";
       if ($env{'form.pickdate'} eq 'yes') {
    $class .= " LC_calendar_pickdate";
       }
     $r->print(      $r->print(
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.   '<a href="/adm/announcements?month='.$pm.'&year='.$py.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.   ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
Line 518  SERVERANNOUNCE Line 556  SERVERANNOUNCE
  '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.   '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
  '&year='.$todayhash{'year'}.   '&year='.$todayhash{'year'}.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a><p>'.   ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a><p>'.
         '<table border="2" cols="7" rows="5"><tr><th>'.          '<table class="'.$class.'" cols="7" rows="5"><tr>
 &tfont(&mt('Sun'))  <th>'.&mt('Sun').'</th>
 .'</th><th>'.  <th>'.&mt('Mon').'</th>
 &tfont(&mt('Mon'))  <th>'.&mt('Tue').'</th>
 .'</th><th>'.  <th>'.&mt('Wed').'</th>
 &tfont(&mt('Tue'))  <th>'.&mt('Thu').'</th>
 .'</th><th>'.  <th>'.&mt('Fri').'</th>
 &tfont(&mt('Wed'))  <th>'.&mt('Sat').'</th></tr>');
 .'</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 559  SERVERANNOUNCE Line 590  SERVERANNOUNCE
 # ------------------------------------------------------------------- End table  # ------------------------------------------------------------------- End table
     $r->print('</table>');      $r->print('</table>');
 # ----------------------------------------------------------------- Check marks  # ----------------------------------------------------------------- Check marks
     %showedcheck=();      undef(%showedcheck);
     undef %showedcheck;  
 # --------------------------------------------------------------- Remove button  # --------------------------------------------------------------- Remove button
     if ($allowed) { $r->print('<input type="button" onClick="removesub()" value="Remove Checked Entries">'.      if ($allowed) { $r->print('<input type="button" onClick="removesub()" value="Remove Checked Entries">'.
       &Apache::loncommon::help_open_topic('Calendar_Remove_Announcement').'</form>'); }        &Apache::loncommon::help_open_topic('Calendar_Remove_Announcement').'</form>'); }
Line 572  SERVERANNOUNCE Line 602  SERVERANNOUNCE
  '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.   '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
  '&year='.$todayhash{'year'}.   '&year='.$todayhash{'year'}.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a></p>'.   ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a></p>'.
  ($pickdatemode?'</font>':'').   ($pickdatemode?'</font>':'').&Apache::loncommon::end_page());
  '</body></html>');      $r->print('<a href="/adm/announcements.ics">'.&mt('Download your Calendar as iCalendar File').'</a>');
     return OK;      return OK;
 }   } 
   
Removed from v.1.45  
changed lines
  Added in v.1.53

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