--- loncom/interface/lonmenu.pm 2003/11/11 20:27:15 1.102 +++ loncom/interface/lonmenu.pm 2005/06/08 02:27:21 1.155 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.102 2003/11/11 20:27:15 albertel Exp $ +# $Id: lonmenu.pm,v 1.155 2005/06/08 02:27:21 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,8 +42,8 @@ use strict; use Apache::lonnet; use Apache::Constants qw(:common); use Apache::lonhtmlcommon(); -use Apache::loncommon; -use Apache::File; +use Apache::loncommon(); +use Apache::lonenc(); use Apache::lonlocal; use vars qw(@desklines $readdesk); @@ -60,6 +60,10 @@ sub initlittle { return &Apache::lonlocal::texthash('ret' => 'Return to Last Location', 'nav' => 'Navigate Contents', 'main' => 'Main Menu', + 'roles' => ($env{'user.adv'}? + 'Roles':'Courses'), + 'docs' => 'Course Documents', + 'exit' => 'Exit', 'launch' => 'Launch Remote Control'); } @@ -69,54 +73,80 @@ sub menubuttons { my $forcereg=shift; my $target =shift; my $registration=shift; + my $titletable=shift; + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['inhibitmenu']); + if (($env{'form.inhibitmenu'} eq 'yes') || + ($ENV{'REQUEST_URI'} eq '/adm/logout')) { return ''; } + my $navmaps=''; my $reloadlink=''; - my $escurl=&Apache::lonnet::escape($ENV{'request.noversionuri'}); - my $escsymb=&Apache::lonnet::escape($ENV{'request.symb'}); - if ($ENV{'browser.interface'} eq 'textual') { + 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'}; + $returnurl =~ s:^/home/([^/]+)/public_html/(.*)$:/priv/$1/$2:; + $escurl = &Apache::lonnet::escape($returnurl); + } + } + 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'} ENDRELOAD } - } + if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { + $docs=(<$lt{'docs'} +ENDDOCS + } + } + my $form=&serverform(); + my $utility=&utilityfunctions(); my $output=(< + $lt{'main'} -$reloadlink $navmaps
- +$form ENDMAINMENU if ($registration) { $output.=&innerregister($forcereg,$target); } return $output."
"; - } elsif ($ENV{'environment.remote'} eq 'off') { + } elsif ($env{'environment.remote'} eq 'off') { # Remote Control is switched off # figure out colors my %lt=&initlittle(); 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(); @@ -128,14 +158,32 @@ ENDMAINMENU my $vlink=&Apache::loncommon::designparm($function.'.vlink',$domain); my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain); # Do we have a NAV link? - if ($ENV{'request.course.id'}) { - $navmaps=(< +$lt{'nav'} +ENDNAV + if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { + $docs=(< -$lt{'nav'} -ENDNAVREM - if (($ENV{'request.noversionuri'}=~/^\/adm\//) && - ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) && - ($ENV{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) { +$lt{'docs'} +ENDDOCS + } + if ( + ($env{'request.noversionuri'}=~m[^/(res|public)/] && + $env{'request.symb'} eq '') + || + (($env{'request.noversionuri'}=~/^\/adm\//) && + ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) && + ($env{'request.noversionuri'}!~ + m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)]) + ) + ) { my $escreload=&Apache::lonnet::escape('return:'); $reloadlink=(< @@ -145,11 +193,17 @@ ENDRELOAD } my $reg=''; if ($registration) { - $reg=&innerregister($forcereg,$target); + $reg=&innerregister($forcereg,$target,$titletable); } + my $form=&serverform(); + my $utility=&utilityfunctions(); + my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif"); return (< + @@ -158,16 +212,24 @@ ENDRELOAD $reloadlink $navmaps +$docs + + +$form
- + $lt{'launch'} - +$lt{'roles'} + +$lt{'exit'} + + LON-CAPA
 - $reg @@ -183,9 +245,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') { @@ -194,11 +256,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; @@ -217,13 +279,18 @@ sub registerurl { sub innerregister { my $forcereg=shift; my $target = shift; + my $titletable = shift; my $result = ''; - if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } + my ($uname,$thisdisfn); + my $const_space = ($env{'request.state'} eq 'construct'); + my $is_const_dir = 0; + + 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); @@ -236,12 +303,13 @@ sub innerregister { if ($noremote) { $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); - if ($maptitle) { + my $restitle=&Apache::lonnet::gettitle(&Apache::lonnet::symbread()); + if ($maptitle && $maptitle ne 'default.sequence') { $newmail.=', '.$maptitle; } if ($restitle) { @@ -254,67 +322,73 @@ sub innerregister { 'You have new messages
': 'swmenu.setstatus("you have","messages");'); } - if ($noremote) { - $newmail.='
'; + if ($env{'request.state'} eq 'construct') { + $newmail = $titletable; + } else { + if ($noremote) { + $newmail.=''; + } } my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');'); my $tablestart=($noremote?'':'').($textinter?'
'.&mt('Skip to Content').'
':''); my $tableend=($noremote?'
':'').($textinter?'':''); # ============================================================================= # ============================ This is for URLs that actually can be registered - if (($ENV{'request.noversionuri'}!~/^\/(res\/)*adm\//) || ($forcereg)) { + if (($env{'request.noversionuri'}!~m|^/(res/)*adm/|) || ($forcereg)) { # -- This applies to homework problems for users with grading privileges - my $hwkadd=''; - if - ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) { - my $crs='/'.$ENV{'request.course.id'}; - if ($ENV{'request.course.sec'}) { - $crs.='_'.$ENV{'request.course.sec'}; - } - $crs=~s/\_/\//g; + my $crs='/'.$env{'request.course.id'}; + if ($env{'request.course.sec'}) { + $crs.='_'.$env{'request.course.sec'}; + } + $crs=~s/\_/\//g; - if (&Apache::lonnet::allowed('vgr',$crs)) { - $hwkadd.=&switch('','',7,1,'subm.gif','view sub-','missions', - "gocmd('/adm/grades','submission')", - 'View user submissions for this assessment resource'); - } + my $hwkadd=''; + if ($env{'request.symb'} ne '' && + $env{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) { if (&Apache::lonnet::allowed('mgr',$crs)) { - $hwkadd.=&switch('','',7,2,'pgrd.gif','problem','grades', + $hwkadd.=&switch('','',7,2,'pgrd.gif','problem[_1]','grades[_3]', "gocmd('/adm/grades','gradingmenu')", 'Modify user grades for this assessment resource'); - } - if (&Apache::lonnet::allowed('opa',$crs)) { - $hwkadd.=&switch('','',7,3,'pparm.gif','problem','parms', - "gocmd('/adm/parmset','set')", - 'Modify deadlines, etc, 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 '' && + &Apache::lonnet::allowed('opa',$crs)) { + $hwkadd.=&switch('','',7,3,'pparm.gif','problem[_2]','parms[_2]', + "gocmd('/adm/parmset','set')", + 'Modify deadlines, etc, for this resource'); + } # -- End Homework ### ### Determine whether or not to display the 'cstr' button for this ### 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"; } # Check that we are on the correct machine my $home = &Apache::lonnet::homeserver($caname,$cadom); - if ($home eq $Apache::lonnet::perlvar{'lonHostID'}) { - $editbutton=&switch - ('','',6,1,$top,,$bottom,$action,$desc); + my $allowed=0; + my @ids=&Apache::lonnet::current_machine_ids(); + foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } + if (!$allowed) { + $editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc); } } ## @@ -323,48 +397,74 @@ 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/; - # Chech that the user has permission to edit this resource + # Check that the user has permission to edit this resource ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1); if (defined($cfudom)) { - if (&Apache::lonnet::homeserver($cfuname,$cfudom) - eq $Apache::lonnet::perlvar{'lonHostID'}) { + my $home=&Apache::lonnet::homeserver($cfuname,$cfudom); + my $allowed=0; + my @ids=&Apache::lonnet::current_machine_ids(); + foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } + if ($allowed) { $cfile=$file; } } } # Finally, turn the button on or off - if ($cfile) { + if ($cfile && !$const_space) { $editbutton=&switch - ('','',6,1,'cstr.gif','edit','resource', + ('','',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"); } } ### ### # Prepare the rest of the buttons - my $menuitems=(<$inlineremote[21] $inlineremote[23] +$inlineremote[61]$inlineremote[62]$inlineremote[63] +$inlineremote[71]$inlineremote[72]$inlineremote[73] +$inlineremote[81]$inlineremote[82]$inlineremote[83] +$inlineremote[91]$inlineremote[92]$inlineremote[93] +ENDINLINE + } + } $result =(< + $timesync $newmail $tablestart $inlinebuttons $tableend -$form - ENDREGTEXT # Registered, graphical output } else { - my $requri=(split(/\?/,$ENV{'request.noversionuri'}))[0]; - $requri=&Apache::lonnet::unescape($requri); + my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); + $requri=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($requri)); + my $cursymb=&Apache::lonenc::check_encrypt($env{'request.symb'}); + my $navstatus=&get_nav_status(); + my $clearcstr; + + if ($env{'user.adv'}) { $clearcstr='clearbut(6,1)'; } $result = (< + ENDREGTHIS } @@ -452,7 +570,7 @@ ENDDONOTREGTEXT # Not registered, graphical $result = (< + @@ -566,19 +695,38 @@ 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(< + ENDMAINCALL } + +sub load_remote_msg { + my ($lowerurl)=@_; + + 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', + "/adm/remote?action=collapse?url=$esclowerurl"); + return(< +
+ +
+

+

$link

+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);'); @@ -588,8 +736,10 @@ sub reopenmenu { sub open { my $returnval=''; - 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'}; unless (shift eq 'unix') { # resizing does not work on linux because of virtual desktop sizes @@ -606,7 +756,7 @@ var menu=window.open("/res/adm/pages/men "height=350,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5"); self.name='loncapaclient'; ENDOPEN - return ''; + return ''; } @@ -614,8 +764,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]=''; @@ -634,12 +784,13 @@ sub switch { $top=&mt($top); $bot=&mt($bot); $desc=&mt($desc); - unless (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { + $img=&mt($img); + 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; @@ -656,24 +807,38 @@ sub switch { if ($nobreak==2) { return ''; } my $text=$top.' '.$bot; $text=~s/\s*\-\s*//gs; + + my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'}; + if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; } my $pic= - ''.$text.''; - if ($nobreak==3) { - $inlineremote[10*$row+$col]="\n". - ''.$text. - ''. - ''.$pic.''; - } elsif ($nobreak) { - $inlineremote[10*$row+$col]="\n". - ''. - ''.$pic. - ''.$text.''; + ''.$text.''; + if (($env{'browser.interface'} eq 'textual') || ($env{'browser.interface'} eq 'faketextual')) { +# Accessibility + if ($nobreak==3) { + $inlineremote[10*$row+$col]="\n". + ''.$text. + ''. + ''.$pic.''; + } elsif ($nobreak) { + $inlineremote[10*$row+$col]="\n". + ''. + ''.$pic. + ''.$text.''; + } else { + $inlineremote[10*$row+$col]="\n". + ''. + ''.$pic. + ''.$desc. + ''; + } } else { - $inlineremote[10*$row+$col]="\n". - ''. - ''.$pic. - ''.$desc. - ''; +# Inline Menu + $inlineremote[10*$row+$col]= + ''.$pic. + ''.$desc. + ''; } } return ''; @@ -695,8 +860,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."');"; } @@ -711,30 +876,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; @@ -761,31 +926,39 @@ 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}) { + $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); - if ($home eq $Apache::lonnet::perlvar{'lonHostID'}) { + my $allowed=0; + my @ids=&Apache::lonnet::current_machine_ids(); + foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } + if ($allowed) { $output.=switch($caname,$cadom, $row,$col,$img,$top,$bot,$act,$desc); } @@ -793,21 +966,25 @@ 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");'; + } } + return $output; } # ======================================================================= 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(< + +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 $utility=&utilityfunctions(); + my $html=&Apache::lonxml::xmlbegin(); $r->print(< +$html + LON-CAPA Main Menu - +$script_tag $bodytag ENDHEADER @@ -939,15 +1226,17 @@ ENDHEADER BEGIN { if (! defined($readdesk)) { { - my $config=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}. - '/mydesk.tab'); - while (my $configline=<$config>) { - $configline=(split(/\#/,$configline))[0]; - $configline=~s/^\s+//; - chomp($configline); - if ($configline) { - $desklines[$#desklines+1]=$configline; - } + 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); } } $readdesk='done';