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

Diff for /loncom/interface/lonannounce.pm between versions 1.42 and 1.43

version 1.42, 2006/01/12 23:03:41 version 1.43, 2006/01/12 23:36:45
Line 33  use Apache::Constants qw(:common); Line 33  use Apache::Constants qw(:common);
 use Apache::loncommon;  use Apache::loncommon;
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonnavmaps();
 use Apache::lonrss();  use Apache::lonrss();
 use Apache::lonnet;  use Apache::lonnet;
 use HTML::Entities();  use HTML::Entities();
Line 79  sub readcalendar { Line 80  sub readcalendar {
    $returnhash{$courseid.'@'.$item}=$thiscal{$item};     $returnhash{$courseid.'@'.$item}=$thiscal{$item};
         }          }
     }      }
   
     if ($courseid eq $env{'request.course.id'}) {      if ($courseid eq $env{'request.course.id'}) {
    my $can_see_hidden = $env{'request.role.adv'};
    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) {
Line 101  sub readcalendar { Line 105  sub readcalendar {
  $middle=~s/\.$//;   $middle=~s/\.$//;
  my $realm=&mt('All Resources');   my $realm=&mt('All Resources');
  if ($middle=~/^(.+)\_\_\_\(all\)$/) {   if ($middle=~/^(.+)\_\_\_\(all\)$/) {
     $realm=&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1);      my $map_url=$1;
       if (!$can_see_hidden) {
    my $res = $navmap->getResourceByUrl($map_url);
    if ($res->randomout()) { next; }
       }
       $realm=&mt('Folder/Map').': '.&Apache::lonnet::gettitle($map_url);
  } elsif ($middle) {   } elsif ($middle) {
       if (!$can_see_hidden) {
    my $res = $navmap->getBySymb($middle);
    if ($res->randomout()) { next; }
       }
     $realm=&mt('Resource').': '.&Apache::lonnet::gettitle($middle);      $realm=&mt('Resource').': '.&Apache::lonnet::gettitle($middle);
  }   }
  my $datetype='';   my $datetype='';
Removed from v.1.42  
changed lines
  Added in v.1.43

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