--- loncom/interface/lonmenu.pm 2003/02/13 20:35:39 1.35 +++ loncom/interface/lonmenu.pm 2006/09/05 17:36:09 1.202.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.35 2003/02/13 20:35:39 www Exp $ +# $Id: lonmenu.pm,v 1.202.2.1 2006/09/05 17:36:09 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,34 +25,648 @@ # # http://www.lon-capa.org/ # -# (TeX Conversion Module # -# 05/29/00,05/30 Gerd Kortemeyer) +# There are two parameters controlling the action of this module: +# +# browser.interface - if this is 'textual', it overrides the second parameter +# and goes to screen reader PDA mode +# +# environment.remote - if this is 'on', the routines controll the remote +# control, otherwise they render the main window controls; ignored it +# browser.interface is 'textual' # -# 10/05,05/28,05/30,06/01,06/08,06/09,07/04,08/07 Gerd Kortemeyer -# 02/15/02 Matthew Hall package Apache::lonmenu; use strict; use Apache::lonnet; -use Apache::Constants qw(:common); -use Apache::loncommon; -use Apache::File; +use Apache::lonhtmlcommon(); +use Apache::loncommon(); +use Apache::lonenc(); +use Apache::lonlocal; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + use vars qw(@desklines $readdesk); + +my @inlineremote; + +# ================================================================ Little texts + +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', + 'login' => 'Log In', + 'launch' => 'Launch Remote Control', + 'groups' => 'Groups', + 'gdoc' => 'Group Documents', + ); +} + +# ============================= This gets called at the top of the body section + +sub menubuttons { + my $forcereg=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 ''; } + + if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } + + my %lt=&initlittle(); + my $navmaps=''; + my $reloadlink=''; + my $docs=''; + my $groups=''; + my $showgroups=0; + my $escurl=&escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'})); + my $escsymb=&escape(&Apache::lonenc::check_encrypt($env{'request.symb'})); + + my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif"); + $logo = 'LON-CAPA Logo'; + + 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 = &escape($returnurl); + } + } + if ($env{'request.course.id'}) { + my %coursegroups; + my $viewgrps_permission = + &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); + 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 + 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)(\?|$)/)) { + my $escreload=&escape('return:'); + $reloadlink=(<$lt{'ret'} +ENDRELOAD + } + if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { + $docs=(<$lt{'docs'} +ENDDOCS + } + if ($showgroups) { + $groups =(<$lt{'groups'} +ENDGROUPS + } + } + my $form=&serverform(); + my $utility=&utilityfunctions(); + my $output=(< +// BEGIN LON-CAPA Internal +$utility + +
+$lt{'main'} +$reloadlink $navmaps $docs $groups +$lt{'roles'} +$lt{'exit'} +
+
+ +$form +ENDMAINMENU + if ($registration) { $output.=&innerregister($forcereg); } + return $output."
"; + } elsif ($env{'environment.remote'} eq 'off') { +# Remote Control is switched off +# figure out colors + my %lt=&initlittle(); + + my $domain=&Apache::loncommon::determinedomain(); + my $function =&Apache::loncommon::get_users_function(); + my $link=&Apache::loncommon::designparm($function.'.link',$domain); + my $alink=&Apache::loncommon::designparm($function.'.alink',$domain); + my $vlink=&Apache::loncommon::designparm($function.'.vlink',$domain); + my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain); + if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') { + return (< + + $logo + + + $lt{'login'} + + + + +ENDINLINEMENU + } +# Do we have a NAV link? + if ($env{'request.course.id'}) { + my $link='/adm/navmaps?postdata='.$escurl.'&postsymb='. + $escsymb; + if ($env{'environment.remotenavmap'} eq 'on') { + $link="javascript:gonav('".$link."')"; + } + $navmaps=(<$lt{'nav'} +ENDNAV +my $is_group = (&Apache::loncommon::course_type() eq 'Group'); + if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { + my $text = ($is_group) ? $lt{'gdoc'} : $lt{'docs'}; + $docs=(<$text +ENDDOCS + } + if ($showgroups) { + $groups =(<$lt{'groups'} +ENDGROUPS + } + 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=&escape('return:'); + $reloadlink=(<$lt{'ret'} +ENDRELOAD + } + } + if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) { + my $escreload=&escape('return:'); + $reloadlink=(<$lt{'ret'} +ENDCRELOAD + } + my $reg=''; + if ($registration) { + $reg=&innerregister($forcereg,$titletable); + } + my $form=&serverform(); + my $utility=&utilityfunctions(); + my $remote; + if ($env{'user.adv'}) { + $remote = ''.$lt{'launch'}.'' + } + + my $helplink=&Apache::loncommon::top_nav_help('Help'); + return (< +// BEGIN LON-CAPA Internal +// + + + +$logo + +$reloadlink +$navmaps +$docs +$groups +$remote + + + + +
$lt{'main'}$lt{'roles'}$helplink$lt{'exit'}
+$form + +$reg +ENDINLINEMENU + } else { + return ''; + } +} + +# ====================================== This gets called in the header section + +sub registerurl { + my ($forcereg) = @_; + my $result = ''; + if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } + my $force_title=''; + if ($env{'request.state'} eq 'construct') { + $force_title=&Apache::lonxml::display_title(); + } + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off') || + ((($env{'request.publicaccess'}) || + (!&Apache::lonnet::is_on_map( + &unescape($env{'request.noversionuri'})))) && + (!$forcereg))) { + return $result. + ''.$force_title; + } +# Graphical display after login only + if ($env{'request.registered'} && !$forcereg) { return ''; } + $result.=&innerregister($forcereg); + return $result.$force_title; +} + +# =========== This gets called in order to register a URL, both with the Remote +# =========== and in the body of the document + +sub innerregister { + my ($forcereg, $titletable) = @_; + my $result = ''; + my ($uname,$thisdisfn); + my $const_space = ($env{'request.state'} eq 'construct'); + my $is_const_dir = 0; + + if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } + + $env{'request.registered'} = 1; + + my $textinter=($env{'browser.interface'} eq 'textual'); + my $noremote=($env{'environment.remote'} eq 'off'); + + my $textual=($textinter || $noremote); + + undef(@inlineremote); + + my $reopen=&Apache::lonmenu::reopenmenu(); + + my $newmail=''; + if ($noremote) { + $newmail=''; + } + if (&Apache::lonmsg::newmail()) { + if ($textual) { + $newmail.= ''; + } else { + $newmail= 'swmenu.setstatus("you have","messages");'; + } + } elsif (($textual) + && ($env{'request.symb'}) + && ($env{'request.course.id'})) { + $newmail.= ''; + } + if ($env{'request.state'} eq 'construct') { + $newmail = $titletable; + } else { + if ($noremote) { + $newmail.='
+ '. + &mt('You have new messages').''; + 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(&Apache::lonnet::symbread()); + if ($maptitle && $maptitle ne 'default.sequence') { + $newmail.=', '.$maptitle; + } + if ($restitle) { + $newmail.=': '.$restitle; + } + $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'}!~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'}; + } + $crs=~s/\_/\//g; + + my $hwkadd=''; + 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 '' && + &Apache::lonnet::allowed('opa',$crs)) { + $hwkadd.=&switch('','',7,3,'pparm.gif','problem[_2]','parms[_2]', + "gocmd('/adm/parmset','set')", + 'Modify parameter settings 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)/) { + # 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 $desc = "Enter my resource construction space"; + # Set defaults for co-authors + 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); + 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); + } + } + ## + ## Determine if user can edit url. + ## + my $cfile=''; + my $cfuname=''; + my $cfudom=''; + 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); + if (defined($cfudom)) { + 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 && !$const_space) { + $editbutton=&switch + ('','',6,1,'cstr.gif','edit[_1]','resource[_2]', + "go('".$cfile."');","Edit this resource"); + } elsif ($editbutton eq '') { + $editbutton=&clear(6,1); + } + } + ### + ### +# Prepare the rest of the buttons + my $menuitems; + if ($const_space) { + my ($uname,$thisdisfn) = + ($env{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|); + my $currdir = '/priv/'.$uname.'/'.$thisdisfn; + if ($currdir =~ m-/$-) { + $is_const_dir = 1; + } else { + $currdir =~ s#[^/]+$##; + my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn); + $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 =(< +// BEGIN LON-CAPA Internal + +$timesync +$newmail +$tablestart +$inlinebuttons +$tableend + + +ENDREGTEXT +# Registered, graphical output + } else { + my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); + $requri=&Apache::lonenc::check_encrypt(&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 = (< +// BEGIN LON-CAPA Internal +var swmenu=null; + + function LONCAPAreg() { + swmenu=$reopen; + swmenu.clearTimeout(swmenu.menucltim); + $timesync + $newmail + $buttons + swmenu.currentURL="$requri"; + swmenu.reloadURL=swmenu.currentURL+window.location.search; + swmenu.currentSymb="$cursymb"; + swmenu.reloadSymb="$cursymb"; + swmenu.currentStale=0; + $navstatus + $hwkadd + $editbutton + } + + function LONCAPAstale() { + swmenu=$reopen + swmenu.currentStale=1; + if (swmenu.reloadURL!='' && swmenu.reloadURL!= null) { + swmenu.switchbutton + (3,1,'reload.gif','return','location','go(reloadURL)','Return to the last known location in the course sequence'); + } + swmenu.clearbut(7,2); + swmenu.clearbut(7,3); + swmenu.menucltim=swmenu.setTimeout( + 'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+ + 'clearbut(9,1);clearbut(9,3);clearbut(6,3);$clearcstr', + 2000); + } + +// END LON-CAPA Internal + +ENDREGTHIS + } +# ============================================================================= + } else { +# ========================================== This can or will not be registered + if ($textual) { +# Not registered, textual + $result= (< +// BEGIN LON-CAPA Internal +var swmenu=null; + + function LONCAPAreg() { + swmenu=$reopen + $timesync + swmenu.currentStale=1; + swmenu.clearbut(2,1); + swmenu.clearbut(2,3); + swmenu.clearbut(8,1); + swmenu.clearbut(8,2); + swmenu.clearbut(8,3); + if (swmenu.currentURL) { + swmenu.switchbutton + (3,1,'reload.gif','return','location','go(currentURL)'); + } else { + swmenu.clearbut(3,1); + } + } + + function LONCAPAstale() { + } + +// END LON-CAPA Internal + +ENDDONOTREGTHIS + } +# ============================================================================= + } + return $result; +} + +sub loadevents() { + if ($env{'request.state'} eq 'construct' || + $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } + return 'LONCAPAreg();'; +} + +sub unloadevents() { + if ($env{'request.state'} eq 'construct' || + $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } + return 'LONCAPAstale();'; +} + # ============================================================= Start up remote sub startupremote { my ($lowerurl)=@_; - if ($ENV{'browser.interface'} eq 'textual') { + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return (''); } +# +# The Remote actually gets launched! +# my $configmenu=&rawconfig(); + my $esclowerurl=&escape($lowerurl); + my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited'); return(< - + @@ -106,28 +722,51 @@ ENDSETFLAGS } sub maincall() { - if ($ENV{'browser.interface'} eq 'textual') { 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=&escape($lowerurl); + my $link=&mt('Continue on in Inline Menu mode', + "/adm/remote?action=collapse&url=$esclowerurl"); + return(< +
+ +
+

+

$link

+ENDREMOTEFORM +} # ================================================================= Reopen menu sub reopenmenu { - my $nothing=''; - if ($ENV{'browser.interface'} eq 'textual') { return ''; } + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ''; } my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'}; - if ($ENV{'browser.type'} eq 'explorer') { $nothing='javascript:void(0);'; } - return('window.open("'.$nothing.'","'.$menuname.'","",false);'); + my $nothing = &Apache::lonhtmlcommon::javascript_nothing(); + return('window.open('.$nothing.',"'.$menuname.'","",false);'); } # =============================================================== Open the menu sub open { my $returnval=''; - if ($ENV{'browser.interface'} eq 'textual') { 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 @@ -141,48 +780,95 @@ ENDRESIZE $returnval.=(<'.$returnval.''; + return ''; } -# ============================================================ Switch Menu Item - -sub switchmenu { - my ($row,$col,$imgsrc,$texttop,$textbot,$action,$description)=@_; - if ($ENV{'browser.interface'} eq 'textual') { return ''; } - my $openwin=&openmenu(); - return(< - var swmenu=$openwin - swmenu.switchbutton($row,$col,"$imgsrc","$texttop","$textbot","$action","$description"); - -ENDSMENU -} # ================================================================== Raw Config sub clear { my ($row,$col)=@_; - unless ($ENV{'browser.interface'} eq 'textual') { + unless (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return "\n".qq(window.status+='.';swmenu.clearbut($row,$col);); - } else { return ''; } + } else { + $inlineremote[10*$row+$col]=''; + return ''; + } } +# ============================================ Switch a button or create a link # Switch acts on the javascript that is executed when a button is clicked. # The javascript is usually similar to "go('/adm/roles')" or "cstrgo(..)". + sub switch { - my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc)=@_; + my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$nobreak)=@_; $act=~s/\$uname/$uname/g; $act=~s/\$udom/$udom/g; - unless ($ENV{'browser.interface'} eq 'textual') { + $top=&mt($top); + $bot=&mt($bot); + $desc=&mt($desc); + $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') { +# Accessibility + if ($nobreak==2) { return ''; } + my $text=$top.' '.$bot; + $text=~s/\s*\-\s*//gs; + if ($nobreak) { + $inlineremote[10*$row+$col]= + ''.$text.''; + } else { + $inlineremote[10*$row+$col]="\n
". + $desc.' '.$text.''; + } } else { +# Inline Remote + if ($nobreak==2) { return ''; } my $text=$top.' '.$bot; - $text=~s/\- //; - return '
'.$text.' '.$desc; + $text=~s/\s*\-\s*//gs; + + my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'}; + if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; } + my $pic= + ''.$text.''; + if ($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 { +# Inline Menu + $inlineremote[10*$row+$col]= + ''.$pic. + ''.$desc.''; + } } + return ''; } sub secondlevel { @@ -201,46 +887,56 @@ sub secondlevel { sub openmenu { my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'}; - if ($ENV{'browser.interface'} eq 'textual') { return ''; } - if ($ENV{'browser.type'} eq 'explorer') { - return "window.open('javascript:void(0);','".$menuname."');"; - } else { - return "window.open('','".$menuname."');"; - } + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ''; } + my $nothing = &Apache::lonhtmlcommon::javascript_nothing(); + return "window.open(".$nothing.",'".$menuname."');"; +} + +sub inlinemenu { + @inlineremote=(); + undef @inlineremote; + &rawconfig(1); + return join('',map { (defined($_)?$_:'') } @inlineremote); } sub rawconfig { my $textualoverride=shift; my $output=''; - unless ($ENV{'browser.interface'} eq 'textual') { + 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'}; - foreach (@desklines) { - my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc)=split(/\:/,$_); + 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 my $line (@desklines) { + my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc)=split(/\:/,$line); $prt=~s/\$uname/$uname/g; $prt=~s/\$udom/$udom/g; $prt=~s/\$crs/$crs/g; $prt=~s/\$requested_domain/$requested_domain/g; + my $type = &Apache::loncommon::course_type(); + if ($type eq 'Group') { + $desc = &convert_menu_function($desc,$type); + } if ($pro eq 'clear') { $output.=&clear($row,$col); } elsif ($pro eq 'any') { @@ -256,28 +952,44 @@ sub rawconfig { $output.=&secondlevel( $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)) { $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'}:'')) + )) { + $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); } @@ -285,19 +997,25 @@ sub rawconfig { } } } - unless ($ENV{'browser.interface'} eq 'textual') { + 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') { return ''; } + if (($env{'browser.interface'} eq 'textual') || + ($env{'environment.remote'} eq 'off')) { return ''; } my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'}; return(< +