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

Diff for /loncom/interface/lonannounce.pm between versions 1.58 and 1.62

version 1.58, 2006/07/03 03:11:07 version 1.62, 2006/11/29 07:46:39
Line 80  sub readcalendar { Line 80  sub readcalendar {
    $returnhash{$courseid.'@'.$item}=$thiscal{$item};     $returnhash{$courseid.'@'.$item}=$thiscal{$item};
         }          }
     }      }
       my $can_see_hidden = ($env{'request.role.adv'} &&
     return %returnhash if ($courseid ne $env{'request.course.id'});    ($courseid eq $env{'request.course.id'}));
       
     my $can_see_hidden = $env{'request.role.adv'};      my $navmap;
     my $navmap;# = Apache::lonnavmaps::navmap->new();      if ($courseid eq $env{'request.course.id'}) {
    $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) {
Line 281  sub display_msg { Line 283  sub display_msg {
   
     my $output = $msg->{'datetype'}. ': '.$msg->{'realm'};      my $output = $msg->{'datetype'}. ': '.$msg->{'realm'};
     if (exists($msg->{'url'})) {      if (exists($msg->{'url'})) {
  $output .= ': '.&Apache::lonnet::gettitle($msg->{'url'});   my $displayurl=&Apache::lonnet::gettitle($msg->{'url'});
    if ($msg->{'url'}!~/\Q$displayurl\E$/) {
       $output .= ' - '.$displayurl;
    }
     }      }
     if (exists($msg->{'symb'})) {      if (exists($msg->{'symb'})) {
  $output .= ': '.&Apache::lonnet::gettitle($msg->{'symb'});   my $displaysymb=&Apache::lonnet::gettitle($msg->{'symb'});
    if ($msg->{'symb'}!~/\Q$displaysymb\E$/) {
       $output .= ' - '.$displaysymb;
    }
     }      }
     $output .= ' ('.$msg->{'section'}.') ';      $output .= ' ('.$msg->{'section'}.') ';
     return $output;      return $output;
Line 350  ENDDIA Line 358  ENDDIA
 # ----------------------------------------------------- Summarize all calendars  # ----------------------------------------------------- Summarize all calendars
 sub get_all_calendars {  sub get_all_calendars {
     my %allcal=();      my %allcal=();
     foreach my $course (sort(&Apache::loncommon::findallcourses())) {      my %courses = &Apache::loncommon::findallcourses();
       foreach my $course (sort(keys(%courses))) {
  %allcal=(%allcal,&readcalendar($course));   %allcal=(%allcal,&readcalendar($course));
     }      }
     return %allcal;      return %allcal;
Line 487  SERVERANNOUNCE Line 496  SERVERANNOUNCE
 # list servers  # list servers
     foreach my $host (sort(keys(%Apache::lonnet::hostname))) {      foreach my $host (sort(keys(%Apache::lonnet::hostname))) {
  if (&Apache::lonnet::allowed('psa',$Apache::lonnet::hostdom{$host})) {   if (&Apache::lonnet::allowed('psa',$Apache::lonnet::hostdom{$host})) {
     $r->print ('<br /><input type="checkbox" name="postto_'.$host.'" /> '.      $r->print ('<br /><label><input type="checkbox" name="postto_'.$host.'" /> '.
        $host.' <tt>'.$Apache::lonnet::hostname{$host}.'</tt> '.         $host.' <tt>'.$Apache::lonnet::hostname{$host}.'</tt> '.
        '<a href="http://'.$Apache::lonnet::hostname{$host}.         '</label><a href="http://'.$Apache::lonnet::hostname{$host}.
        '/announcement.txt" target="annowin">current</a>');         '/announcement.txt" target="annowin">current</a>');
  }   }
     }      }
Removed from v.1.58  
changed lines
  Added in v.1.62

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