--- loncom/interface/lonmenu.pm 2005/03/10 15:32:03 1.151 +++ loncom/interface/lonmenu.pm 2006/03/16 22:21:15 1.167 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.151 2005/03/10 15:32:03 www Exp $ +# $Id: lonmenu.pm,v 1.167 2006/03/16 22:21:15 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,7 +39,7 @@ package Apache::lonmenu; use strict; -use Apache::lonnet(); +use Apache::lonnet; use Apache::Constants qw(:common); use Apache::lonhtmlcommon(); use Apache::loncommon(); @@ -60,11 +60,12 @@ sub initlittle { return &Apache::lonlocal::texthash('ret' => 'Return to Last Location', 'nav' => 'Navigate Contents', 'main' => 'Main Menu', - 'roles' => ($ENV{'user.adv'}? + 'roles' => ($env{'user.adv'}? 'Roles':'Courses'), 'docs' => 'Course Documents', 'exit' => 'Exit', - 'launch' => 'Launch Remote Control'); + 'launch' => 'Launch Remote Control', + 'groups' => 'Groups'); } # ============================= This gets called at the top of the body section @@ -76,44 +77,64 @@ sub menubuttons { my $titletable=shift; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']); - if (($ENV{'form.inhibitmenu'} eq 'yes') || + if (($env{'form.inhibitmenu'} eq 'yes') || ($ENV{'REQUEST_URI'} eq '/adm/logout')) { return ''; } - + my %lt=&initlittle(); my $navmaps=''; my $reloadlink=''; my $docs=''; - my $escurl=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'})); - my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($ENV{'request.symb'})); - if ($ENV{'request.state'} eq 'construct') { - if (($ENV{'request.noversionuri'} eq '') || (!defined($ENV{'request.noversionuri'}))) { - my $returnurl = $ENV{'request.filename'}; + my $groups=''; + my $showgroups=0; + my $escurl=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'})); + my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.symb'})); + my $face= 'face="Arial,Helvetica,sans-serif"'; + if ($env{'request.state'} eq 'construct') { + if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) { + my $returnurl = $env{'request.filename'}; $returnurl =~ s:^/home/([^/]+)/public_html/(.*)$:/priv/$1/$2:; $escurl = &Apache::lonnet::escape($returnurl); } } - if ($ENV{'browser.interface'} eq 'textual') { + if ($env{'request.course.id'}) { + my %coursegroups; + my $viewgrps_permission = + &Apache::lonnet::allowed('vcg',$env{'request.course.id'}); + if (!$viewgrps_permission) { + %coursegroups = &Apache::lonnet::get_active_groups($env{'user.domain'},$env{'user.name'},$env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}); + } + if ((keys(%coursegroups) > 0) || ($viewgrps_permission)) { + $showgroups = 1; + } + } + + if ($env{'browser.interface'} eq 'textual') { # Textual display only - my %lt=&initlittle(); $pgbg='#FFFFFF'; $tabbg='#FFFFFF'; $font='#000000'; - if ($ENV{'request.course.id'}) { + if ($env{'request.course.id'}) { $navmaps=(<$lt{'nav'} ENDNAV - if (($ENV{'request.noversionuri'}=~/^\/adm\//) && - ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) && - ($ENV{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) { + if (($env{'request.noversionuri'}=~/^\/adm\//) && + ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) && + ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) { my $escreload=&Apache::lonnet::escape('return:'); $reloadlink=(<$lt{'ret'} +$lt{'ret'} ENDRELOAD } - if (&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'})) { + if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { $docs=(<$lt{'docs'} +$lt{'docs'} ENDDOCS } + if ($showgroups) { + $groups =(< +$lt{'groups'} +ENDGROUPS + } } my $form=&serverform(); my $utility=&utilityfunctions(); @@ -123,9 +144,9 @@ ENDDOCS $utility $lt{'main'} -$reloadlink $navmaps $docs -$lt{'roles'} -$lt{'exit'} +$reloadlink $navmaps $docs $groups +$lt{'roles'} +$lt{'exit'}
- +
$reloadlink $navmaps $docs +$groups +$lt{'launch'} $form
-$lt{'main'} +$lt{'main'} -$lt{'launch'} -$lt{'roles'} +$lt{'roles'} -$lt{'exit'} +$lt{'exit'} - +Logo LON-CAPA
- @@ -245,9 +298,9 @@ sub registerurl { my $forcereg=shift; my $target = shift; my $result = ''; - if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } + if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } my $force_title=''; - if ($ENV{'request.state'} eq 'construct') { + if ($env{'request.state'} eq 'construct') { $force_title=&Apache::lonxml::display_title(); } if ($target eq 'edit') { @@ -256,11 +309,11 @@ sub registerurl { &Apache::loncommon::browser_and_searcher_javascript(). "\n\n"; } - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off') || - ((($ENV{'request.publicaccess'}) || + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off') || + ((($env{'request.publicaccess'}) || (!&Apache::lonnet::is_on_map( - &Apache::lonnet::unescape($ENV{'request.noversionuri'})))) && + &Apache::lonnet::unescape($env{'request.noversionuri'})))) && (!$forcereg))) { return $result. ''.$force_title; @@ -282,15 +335,15 @@ sub innerregister { my $titletable = shift; my $result = ''; my ($uname,$thisdisfn); - my $const_space = ($ENV{'request.state'} eq 'construct'); + my $const_space = ($env{'request.state'} eq 'construct'); my $is_const_dir = 0; - if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } + if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } $Apache::lonxml::registered=1; - my $textinter=($ENV{'browser.interface'} eq 'textual'); - my $noremote=($ENV{'environment.remote'} eq 'off'); + my $textinter=($env{'browser.interface'} eq 'textual'); + my $noremote=($env{'environment.remote'} eq 'off'); my $textual=($textinter || $noremote); @@ -301,13 +354,14 @@ sub innerregister { my $newmail=''; if ($noremote) { - $newmail='
'; + $newmail='
'; } - if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) { - my ($mapurl,$rid,$resurl)=&Apache::lonnet::decode_symb($ENV{'request.symb'}); - $newmail.=$ENV{'course.'.$ENV{'request.course.id'}.'.description'}; + if (($textual) && ($env{'request.symb'}) && ($env{'request.course.id'})) { + my ($mapurl,$rid,$resurl)= + &Apache::lonnet::decode_symb(&Apache::lonnet::symbread()); + $newmail.=$env{'course.'.$env{'request.course.id'}.'.description'}; my $maptitle=&Apache::lonnet::gettitle($mapurl); - my $restitle=&Apache::lonnet::gettitle($resurl); + my $restitle=&Apache::lonnet::gettitle(&Apache::lonnet::symbread()); if ($maptitle && $maptitle ne 'default.sequence') { $newmail.=', '.$maptitle; } @@ -321,11 +375,11 @@ sub innerregister { 'You have new messages
': 'swmenu.setstatus("you have","messages");'); } - if ($ENV{'request.state'} eq 'construct') { + if ($env{'request.state'} eq 'construct') { $newmail = $titletable; } else { if ($noremote) { - $newmail.='
'; + $newmail.='
'; } } my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');'); @@ -333,29 +387,28 @@ sub innerregister { my $tableend=($noremote?'':'').($textinter?'':''); # ============================================================================= # ============================ This is for URLs that actually can be registered - if (($ENV{'request.noversionuri'}!~m|^/(res/)*adm/|) || ($forcereg)) { + if (($env{'request.noversionuri'}!~m|^/(res/)*adm/|) || ($forcereg)) { # -- This applies to homework problems for users with grading privileges - my $crs='/'.$ENV{'request.course.id'}; - if ($ENV{'request.course.sec'}) { - $crs.='_'.$ENV{'request.course.sec'}; + my $crs='/'.$env{'request.course.id'}; + if ($env{'request.course.sec'}) { + $crs.='_'.$env{'request.course.sec'}; } $crs=~s/\_/\//g; my $hwkadd=''; - if ($ENV{'request.symb'} ne '' && - $ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) { - if (&Apache::lonnet::allowed('vgr',$crs)) { - $hwkadd.=&switch('','',7,1,'subm.gif','view sub-[_1]','missions[_1]', - "gocmd('/adm/grades','submission')", - 'View user submissions for this assessment resource'); - } + if ($env{'request.symb'} ne '' && + $env{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form|task)$/) { if (&Apache::lonnet::allowed('mgr',$crs)) { $hwkadd.=&switch('','',7,2,'pgrd.gif','problem[_1]','grades[_3]', "gocmd('/adm/grades','gradingmenu')", 'Modify user grades for this assessment resource'); + } elsif (&Apache::lonnet::allowed('vgr',$crs)) { + $hwkadd.=&switch('','',7,2,'subm.gif','view sub-[_1]','missions[_1]', + "gocmd('/adm/grades','submission')", + 'View user submissions for this assessment resource'); } } - if ($ENV{'request.symb'} ne '' && + if ($env{'request.symb'} ne '' && &Apache::lonnet::allowed('opa',$crs)) { $hwkadd.=&switch('','',7,3,'pparm.gif','problem[_2]','parms[_2]', "gocmd('/adm/parmset','set')", @@ -367,17 +420,17 @@ sub innerregister { ### resource ### my $editbutton = ''; - if ($ENV{'user.author'}) { - if ($ENV{'request.role'}=~/^(ca|au)/) { + if ($env{'user.author'}) { + if ($env{'request.role'}=~/^(ca|au)/) { # Set defaults for authors my ($top,$bottom) = ('con-','struct'); - my $action = "go('/priv/".$ENV{'user.name'}."');"; - my $cadom = $ENV{'request.role.domain'}; - my $caname = $ENV{'user.name'}; + my $action = "go('/priv/".$env{'user.name'}."');"; + my $cadom = $env{'request.role.domain'}; + my $caname = $env{'user.name'}; my $desc = "Enter my resource construction space"; # Set defaults for co-authors - if ($ENV{'request.role'} =~ /^ca/) { - ($cadom,$caname)=($ENV{'request.role'}=~/(\w+)\/(\w+)$/); + if ($env{'request.role'} =~ /^ca/) { + ($cadom,$caname)=($env{'request.role'}=~/(\w+)\/(\w+)$/); ($top,$bottom) = ('co con-','struct'); $action = "go('/priv/".$caname."');"; $desc = "Enter construction space as co-author"; @@ -397,8 +450,8 @@ sub innerregister { my $cfile=''; my $cfuname=''; my $cfudom=''; - if ($ENV{'request.filename'}) { - my $file=&Apache::lonnet::declutter($ENV{'request.filename'}); + if ($env{'request.filename'}) { + my $file=&Apache::lonnet::declutter($env{'request.filename'}); $file=~s/^(\w+)\/(\w+)/\/priv\/$2/; # Check that the user has permission to edit this resource ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1); @@ -418,7 +471,10 @@ sub innerregister { ('','',6,1,'cstr.gif','edit[_1]','resource[_2]', "go('".$cfile."');","Edit this resource"); } elsif ($editbutton eq '') { - $editbutton=&clear(6,1); + $editbutton=&switch('','',6,1,'port.gif', + 'port-[_1]','folio[_1]', + "go('/adm/portfolio');", + "Enter my portfolio space"); } } ### @@ -427,7 +483,7 @@ sub innerregister { my $menuitems; if ($const_space) { my ($uname,$thisdisfn) = - ($ENV{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|); + ($env{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|); my $currdir = '/priv/'.$uname.'/'.$thisdisfn; if ($currdir =~ m-/$-) { $is_const_dir = 1; @@ -441,8 +497,8 @@ s&7&1&del.gif&delete[_1]&resource[_2]&go s&7&2&prt.gif&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$thisdisfn')&Prepare a printable document ENDMENUITEMS } - } elsif (defined($ENV{'request.course.id'}) && - $ENV{'request.symb'} ne '') { + } elsif (defined($env{'request.course.id'}) && + $env{'request.symb'} ne '') { $menuitems=(< @@ -544,7 +600,6 @@ var swmenu=null; swmenu.switchbutton (3,1,'reload.gif','return','location','go(reloadURL)','Return to the last known location in the course sequence'); } - swmenu.clearbut(7,1); swmenu.clearbut(7,2); swmenu.clearbut(7,3); swmenu.menucltim=swmenu.setTimeout( @@ -602,14 +657,14 @@ ENDDONOTREGTHIS } sub loadevents() { - if ($ENV{'request.state'} eq 'construct' || - $ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } + if ($env{'request.state'} eq 'construct' || + $env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } return 'LONCAPAreg();'; } sub unloadevents() { - if ($ENV{'request.state'} eq 'construct' || - $ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } + if ($env{'request.state'} eq 'construct' || + $env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } return 'LONCAPAstale();'; } @@ -617,8 +672,8 @@ sub unloadevents() { sub startupremote { my ($lowerurl)=@_; - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return (''); } # @@ -693,8 +748,8 @@ ENDSETFLAGS } sub maincall() { - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ''; } return(< main(); @@ -705,8 +760,8 @@ ENDMAINCALL sub load_remote_msg { my ($lowerurl)=@_; - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ''; } my $esclowerurl=&Apache::lonnet::escape($lowerurl); my $link=&mt('Continue on in Inline Menu mode', @@ -723,8 +778,8 @@ ENDREMOTEFORM # ================================================================= Reopen menu sub reopenmenu { - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ''; } my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'}; my $nothing = &Apache::lonhtmlcommon::javascript_nothing(); return('window.open('.$nothing.',"'.$menuname.'","",false);'); @@ -734,8 +789,8 @@ sub reopenmenu { sub open { my $returnval=''; - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ''; } my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'}; @@ -762,8 +817,8 @@ ENDOPEN sub clear { my ($row,$col)=@_; - unless (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { + unless (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return "\n".qq(window.status+='.';swmenu.clearbut($row,$col);); } else { $inlineremote[10*$row+$col]=''; @@ -783,12 +838,12 @@ sub switch { $bot=&mt($bot); $desc=&mt($desc); $img=&mt($img); - unless (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { + unless (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { # Remote return "\n". qq(window.status+='.';swmenu.switchbutton($row,$col,"$img","$top","$bot","$act","$desc");); - } elsif ($ENV{'browser.interface'} eq 'textual') { + } elsif ($env{'browser.interface'} eq 'textual') { # Accessibility if ($nobreak==2) { return ''; } my $text=$top.' '.$bot; @@ -812,7 +867,7 @@ sub switch { ''.$text.''; - if (($ENV{'browser.interface'} eq 'textual') || ($ENV{'browser.interface'} eq 'faketextual')) { + if (($env{'browser.interface'} eq 'textual') || ($env{'browser.interface'} eq 'faketextual')) { # Accessibility if ($nobreak==3) { $inlineremote[10*$row+$col]="\n". @@ -858,8 +913,8 @@ sub secondlevel { sub openmenu { my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'}; - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ''; } my $nothing = &Apache::lonhtmlcommon::javascript_nothing(); return "window.open(".$nothing.",'".$menuname."');"; } @@ -874,30 +929,30 @@ sub inlinemenu { sub rawconfig { my $textualoverride=shift; my $output=''; - unless (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { + unless (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { $output.= "window.status='Opening Remote Control';var swmenu=".&openmenu(). "\nwindow.status='Configuring Remote Control ';"; } else { unless ($textualoverride) { return ''; } } - my $uname=$ENV{'user.name'}; - my $udom=$ENV{'user.domain'}; - my $adv=$ENV{'user.adv'}; - my $author=$ENV{'user.author'}; + my $uname=$env{'user.name'}; + my $udom=$env{'user.domain'}; + my $adv=$env{'user.adv'}; + my $author=$env{'user.author'}; my $crs=''; - if ($ENV{'request.course.id'}) { - $crs='/'.$ENV{'request.course.id'}; - if ($ENV{'request.course.sec'}) { - $crs.='_'.$ENV{'request.course.sec'}; + if ($env{'request.course.id'}) { + $crs='/'.$env{'request.course.id'}; + if ($env{'request.course.sec'}) { + $crs.='_'.$env{'request.course.sec'}; } $crs=~s/\_/\//g; } - my $pub=($ENV{'request.state'} eq 'published'); - my $con=($ENV{'request.state'} eq 'construct'); - my $rol=$ENV{'request.role'}; - my $requested_domain = $ENV{'request.role.domain'}; + my $pub=($env{'request.state'} eq 'published'); + my $con=($env{'request.state'} eq 'construct'); + my $rol=$env{'request.role'}; + my $requested_domain = $env{'request.role.domain'}; foreach (@desklines) { my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc)=split(/\:/,$_); $prt=~s/\$uname/$uname/g; @@ -924,32 +979,32 @@ sub rawconfig { $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc); } } elsif ($pro eq 'course') { - if ($ENV{'request.course.fn'}) { + if ($env{'request.course.fn'}) { $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc); } } elsif ($pro =~ /^courseenv_(.*)$/) { my $key = $1; - if ($ENV{'course.'.$ENV{'request.course.id'}.'.'.$key}) { + if ($env{'course.'.$env{'request.course.id'}.'.'.$key}) { $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'}:'')) + 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') { if ($author) { - if ((($prt eq 'rca') && ($ENV{'request.role'}=~/^ca/)) || - (($prt eq 'rau') && ($ENV{'request.role'}=~/^au/))) { + if ((($prt eq 'rca') && ($env{'request.role'}=~/^ca/)) || + (($prt eq 'rau') && ($env{'request.role'}=~/^au/))) { # Check that we are on the correct machine my $cadom=$requested_domain; - my $caname=$ENV{'user.name'}; + my $caname=$env{'user.name'}; if ($prt eq 'rca') { ($cadom,$caname)= - ($ENV{'request.role'}=~/(\w+)\/(\w+)$/); + ($env{'request.role'}=~/(\w+)\/(\w+)$/); } $act =~ s/\$caname/$caname/g; my $home = &Apache::lonnet::homeserver($caname,$cadom); @@ -964,8 +1019,8 @@ sub rawconfig { } } } - unless (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { + unless (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { $output.="\nwindow.status='Synchronizing Time';swmenu.syncclock(1000*".time.");\nwindow.status='Remote Control Configured.';"; if (&Apache::lonmsg::newmail()) { $output.='swmenu.setstatus("you have","messages");'; @@ -978,8 +1033,8 @@ sub rawconfig { # ======================================================================= Close sub close { - if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ''; } my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'}; return(< @@ -1003,7 +1058,7 @@ sub footer { } sub nav_control_js { - my $nav=($ENV{'environment.remotenavmap'} eq 'on'); + my $nav=($env{'environment.remotenavmap'} eq 'on'); return (< @@ -1153,7 +1212,7 @@ ENDCONSTSPACEFORM sub get_nav_status { my $navstatus="swmenu.w_loncapanav_flag="; - if ($ENV{'environment.remotenavmap'} eq 'on') { + if ($env{'environment.remotenavmap'} eq 'on') { $navstatus.="1"; } else { $navstatus.="-1"; @@ -1166,25 +1225,25 @@ sub get_nav_status { sub handler { my $r = shift; + &Apache::loncommon::no_cache($r); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; my $form; - if ($ENV{'environment.remote'} ne 'off' && - $ENV{'browser.interface'} ne 'textual') { + if ($env{'environment.remote'} ne 'off' && + $env{'browser.interface'} ne 'textual') { $form=&serverform(); } - my $bodytag=&Apache::loncommon::bodytag('Main Menu'); my $function='student'; - if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) { + if ($env{'request.role'}=~/^(cc|in|ta|ep)/) { $function='coordinator'; } - if ($ENV{'request.role'}=~/^(su|dc|ad|li)/) { + if ($env{'request.role'}=~/^(su|dc|ad|li)/) { $function='admin'; } - if (($ENV{'request.role'}=~/^(au|ca)/) || - ($ENV{'request.noversionuri'}=~/^(\/priv|\~)/)) { + if (($env{'request.role'}=~/^(au|ca)/) || + ($env{'request.noversionuri'}=~/^(\/priv|\~)/)) { $function='author'; } my $domain=&Apache::loncommon::determinedomain(); @@ -1192,7 +1251,7 @@ sub handler { $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain); $font=&Apache::loncommon::designparm($function.'.font',$domain); my $script_tag; - if ($ENV{'environment.remote'} ne 'off') { + if ($env{'environment.remote'} ne 'off') { my $utility=&utilityfunctions('/adm/menu'); $script_tag=(< @@ -1201,44 +1260,36 @@ $utility ENDSCRIPT } # ---- Print the screen, pretend to be in text mode to generate text-based menu - unless ($ENV{'browser.interface'} eq 'textual') { - $ENV{'browser.interface'}='faketextual'; - $ENV{'environment.remote'}='off'; - } - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -LON-CAPA Main Menu -$script_tag - -$bodytag -ENDHEADER + unless ($env{'browser.interface'} eq 'textual') { + $env{'browser.interface'}='faketextual'; + $env{'environment.remote'}='off'; + } + $r->print(&Apache::loncommon::start_page('Main Menu',$script_tag)); $r->print(''.&inlinemenu().'
'.$form); - $r->print(''); + $r->print(&Apache::loncommon::end_page()); return OK; } # ================================================================ Main Program BEGIN { - if (! defined($readdesk)) { - { - my $tabfile = $Apache::lonnet::perlvar{'lonTabDir'}.'/mydesk.tab'; - if ( CORE::open( my $config,"<$tabfile") ) { - while (my $configline=<$config>) { - $configline=(split(/\#/,$configline))[0]; - $configline=~s/^\s+//; - chomp($configline); - if ($configline) { - $desklines[$#desklines+1]=$configline; - } - } - CORE::close($config); + if (! defined($readdesk)) { + { + my $tabfile = $Apache::lonnet::perlvar{'lonTabDir'}.'/mydesk.tab'; + if ( CORE::open( my $config,"<$tabfile") ) { + while (my $configline=<$config>) { + $configline=(split(/\#/,$configline))[0]; + $configline=~s/^\s+//; + chomp($configline); + if ($configline) { + push(@desklines,$configline); + } + } + CORE::close($config); + } + } + $readdesk='done'; } - } - $readdesk='done'; - } } 1;