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

Diff for /loncom/interface/lonmenu.pm between versions 1.80 and 1.82

version 1.80, 2003/07/05 10:07:11 version 1.82, 2003/08/06 17:23:49
Line 334  c&8&1 Line 334  c&8&1
 c&8&2  c&8&2
 s&8&3&prt.gif&prepare&printout&gopost('/adm/printout',currentURL)&Prepare a printable document  s&8&3&prt.gif&prepare&printout&gopost('/adm/printout',currentURL)&Prepare a printable document
 s&9&1&sbkm.gif&set&bookmark&set_bookmark()&Set a bookmark for this resource&2  s&9&1&sbkm.gif&set&bookmark&set_bookmark()&Set a bookmark for this resource&2
 s&9&2&vbkm.gif&view&bookmark&edit_bookmarks()&Use or edit my bookmark collection&2  
 s&9&3&anot.gif&anno-&tations&annotate()&Make notes and annotations about this resource&2  s&9&3&anot.gif&anno-&tations&annotate()&Make notes and annotations about this resource&2
 ENDMENUITEMS  ENDMENUITEMS
         unless ($ENV{'REQUEST_URI'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {          unless ($ENV{'REQUEST_URI'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
Line 714  sub rawconfig { Line 713  sub rawconfig {
                $output.=&secondlevel(                 $output.=&secondlevel(
   $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc);    $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc);
             }              }
         } elsif (($pro=~/p(\w+)/) && ($prt)) {          } elsif (($pro=~/^p(\w+)/) && ($prt)) {
     if (&Apache::lonnet::allowed($1,$prt)) {      if (&Apache::lonnet::allowed($1,$prt)) {
                $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);                 $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
             }              }
Line 722  sub rawconfig { Line 721  sub rawconfig {
             if ($ENV{'request.course.fn'}) {              if ($ENV{'request.course.fn'}) {
                $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);                 $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
     }      }
           } elsif ($pro =~ /^course_(.*)$/) {
               # Check for permissions inside of a course
               if (($ENV{'request.course.id'}) &&
                   (&Apache::lonnet::allowed($1,$ENV{'request.course.id'}.
               ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))
                    )) {
                   $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
       }
         } elsif ($pro eq 'author') {          } elsif ($pro eq 'author') {
             if ($author) {              if ($author) {
                 if ((($prt eq 'rca') && ($ENV{'request.role'}=~/^ca/)) ||                  if ((($prt eq 'rca') && ($ENV{'request.role'}=~/^ca/)) ||
Removed from v.1.80  
changed lines
  Added in v.1.82

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