--- loncom/interface/lonmenu.pm 2004/04/01 15:29:40 1.107 +++ loncom/interface/lonmenu.pm 2004/11/11 19:55:44 1.125 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.107 2004/04/01 15:29:40 albertel Exp $ +# $Id: lonmenu.pm,v 1.125 2004/11/11 19:55:44 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,10 +39,10 @@ package Apache::lonmenu; use strict; -use Apache::lonnet; +use Apache::lonnet(); use Apache::Constants qw(:common); use Apache::lonhtmlcommon(); -use Apache::loncommon; +use Apache::loncommon(); use Apache::lonlocal; use vars qw(@desklines $readdesk); @@ -68,10 +68,14 @@ sub menubuttons { my $forcereg=shift; my $target =shift; my $registration=shift; + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['inhibitmenu']); + if ($ENV{'form.inhibitmenu'} eq 'yes') { return ''; } + my $navmaps=''; my $reloadlink=''; - my $escurl=&Apache::lonnet::escape($ENV{'request.noversionuri'}); - my $escsymb=&Apache::lonnet::escape($ENV{'request.symb'}); + my $escurl=&Apache::lonnet::escape(&check_encrypt($ENV{'request.noversionuri'})); + my $escsymb=&Apache::lonnet::escape(&check_encrypt($ENV{'request.symb'})); if ($ENV{'browser.interface'} eq 'textual') { # Textual display only my %lt=&initlittle(); @@ -91,9 +95,11 @@ ENDNAV ENDRELOAD } } + my $utility=&utilityfunctions(); my $output=(<<ENDMAINMENU); <script> // BEGIN LON-CAPA Internal +$utility </script> <a href="/adm/menu" target="_top">$lt{'main'}</a> $reloadlink $navmaps<br /> @@ -128,11 +134,11 @@ ENDMAINMENU my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain); # Do we have a NAV link? if ($ENV{'request.course.id'}) { - $navmaps=(<<ENDNAVREM); + $navmaps=(<<ENDNAV); <td bgcolor="$tabbg"> -<a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top"><font color="$font">$lt{'nav'}</font></a></td> -ENDNAVREM - if (($ENV{'request.noversionuri'}=~/^\/adm\//) && +<a href="javascript:gonav('/adm/navmaps?postdata=$escurl&postsymb=$escsymb')"><font color="$font">$lt{'nav'}</font></a></td> +ENDNAV + if (($ENV{'request.noversionuri'}=~/^\/adm\//) && ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) && ($ENV{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) { my $escreload=&Apache::lonnet::escape('return:'); @@ -146,9 +152,11 @@ ENDRELOAD if ($registration) { $reg=&innerregister($forcereg,$target); } + my $utility=&utilityfunctions(); return (<<ENDINLINEMENU); <script> // BEGIN LON-CAPA Internal +$utility </script> <font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1"> <tr> @@ -217,6 +225,14 @@ sub innerregister { my $forcereg=shift; my $target = shift; my $result = ''; + my ($uname,$thisdisfn); + my $const_space = 0; + if ($ENV{'request.filename'} =~ /^\/home\/([^\/]+)\/public_html\/(.*)/) { + $const_space = 1; + $uname = $1; + $thisdisfn = $2; + } + if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } $Apache::lonxml::registered=1; @@ -235,6 +251,38 @@ sub innerregister { if ($noremote) { $newmail='<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'">'; } + if ($textual && $const_space) { + my $formaction='/priv/'.$uname.'/'.$thisdisfn; + $formaction=~s/\/+/\//g; + my $titleinfo = '<form name="dirs" method="post" action="'.$formaction + .'" target="_top">'. + &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn,'_top','/priv','','-1'). + &Apache::lonhtmlcommon::select_recent('construct','recent', + 'this.form.action=this.form.recent.value;this.form.submit()'). + '</form>'; + &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction); + $newmail .= &constspaceform(); +# role and realm + my ($role,$realm) = &Apache::lonnet::plaintext((split(/\./,$ENV{'request.role'}))[0]); + unless ($realm) { $realm=' '; } + $newmail .= <<END; +<table width="100%" cellspacing="0" border="0" cellpadding="0"> +<tr> +<td> +$titleinfo +</td> +<td align="right"> +<font size="2" face="Arial, Helvetica, sans-serif"> + $ENV{'environment.firstname'} + $ENV{'environment.middlename'} + $ENV{'environment.lastname'} + $ENV{'environment.generation'} + </font> <br /> + <font size="2" face="Arial, Helvetica, sans-serif">$role</font> +</td></tr> +</table> +END + } 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'}; @@ -310,9 +358,11 @@ sub innerregister { } # 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); } } ## @@ -324,17 +374,20 @@ sub innerregister { 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[_1]','resource[_2]', "go('".$cfile."');","Edit this resource"); @@ -345,7 +398,19 @@ sub innerregister { ### ### # Prepare the rest of the buttons - my $menuitems=(<<ENDMENUITEMS); + my $menuitems; + if ($const_space) { + my $currdir = '/priv/'.$uname.'/'.$thisdisfn; + $currdir =~ s#[^/]+$##; + $menuitems=(<<ENDMENUITEMS); +s&6&1&list.gif&list[_1]&dir[_1]&go('$currdir')&List current directory +s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$thisdisfn')&Retreive old version +s&6&3&pub.gif&publish[_1]&resource[_1]&gocstr('/adm/publish','/~$uname/$thisdisfn')&Publish this resource +s&7&1&del.gif&delete[_1]&resource[_2]&gocstr('/adm/cfile?action=delete','/~$uname/$thisdisfn')&Delete this resource +s&7&2&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout','/~$uname/$thisdisfn')&Prepare a printable document +ENDMENUITEMS + } else { + $menuitems=(<<ENDMENUITEMS); c&3&1 s&2&1&back.gif&backward[_1]&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1 s&2&3&forw.gif&forward[_1]&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&3 @@ -356,13 +421,14 @@ s&8&3&prt.gif&prepare[_1]&printout[_1]&g s&9&1&sbkm.gif&set[_1]&bookmark[_2]&set_bookmark()&Set a bookmark for this resource&2 s&9&3&anot.gif&anno-[_1]&tations[_1]&annotate()&Make notes and annotations about this resource&2 ENDMENUITEMS - unless ($ENV{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) { - $menuitems.=(<<ENDREALRES); + unless ($ENV{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) { + $menuitems.=(<<ENDREALRES); s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show catalog information s&8&1&eval.gif&evaluate[_1]&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource s&8&2&fdbk.gif&feedback[_1]&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource ENDREALRES - } + } + } my $buttons=''; foreach (split(/\n/,$menuitems)) { my ($command,@rest)=split(/\&/,$_); @@ -374,7 +440,6 @@ ENDREALRES } if ($textual) { # Registered, textual output - my $utility=&utilityfunctions(); my $form=&serverform(); my $inlinebuttons=''; @@ -393,7 +458,6 @@ ENDINLINE $result =(<<ENDREGTEXT); <script> // BEGIN LON-CAPA Internal -$utility </script> $timesync $newmail @@ -409,7 +473,9 @@ ENDREGTEXT # Registered, graphical output } else { my $requri=(split(/\?/,$ENV{'request.noversionuri'}))[0]; - $requri=&Apache::lonnet::unescape($requri); + $requri=&check_encrypt(&Apache::lonnet::unescape($requri)); + my $cursymb=&check_encrypt($ENV{'request.symb'}); + my $navstatus=&get_nav_status(); $result = (<<ENDREGTHIS); <script language="JavaScript"> @@ -424,9 +490,10 @@ var swmenu=null; $buttons swmenu.currentURL="$requri"; swmenu.reloadURL=swmenu.currentURL+window.location.search; - swmenu.currentSymb="$ENV{'request.symb'}"; - swmenu.reloadSymb="$ENV{'request.symb'}"; + swmenu.currentSymb="$cursymb"; + swmenu.reloadSymb="$cursymb"; swmenu.currentStale=0; + $navstatus $hwkadd $editbutton } @@ -443,7 +510,7 @@ var swmenu=null; 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,2);clearbut(9,3);clearbut(6,3);clearbut(6,1)', + 'clearbut(9,1);clearbut(9,3);clearbut(6,3);clearbut(6,1)', 2000); } @@ -518,11 +585,18 @@ sub startupremote { # my $configmenu=&rawconfig(); my $esclowerurl=&Apache::lonnet::escape($lowerurl); - + my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited'); return(<<ENDREMOTESTARTUP); <script> - +var timestart; function wheelswitch() { + if (typeof(document.wheel) != 'undefined') { + if (typeof(document.wheel.spin) != 'undefined') { + var date=new Date(); + var waited=Math.round(30-((date.getTime()-timestart)/1000)); + document.wheel.spin.value=$message; + } + } if (window.status=='|') { window.status='/'; } else { @@ -559,6 +633,8 @@ function wait() { function main() { canceltim=setTimeout('tim=1;',30000); window.status='-'; + var date=new Date(); + timestart=date.getTime(); wait(); } @@ -584,6 +660,25 @@ sub maincall() { </script> 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('<a href="[_1]">Continue</a> on in Inline Menu mode', + "/adm/remote?action=collapse?url=$esclowerurl"); + return(<<ENDREMOTEFORM); +<p> +<form name="wheel"> +<input name="spin" type="text" size="60" /> +</form> +</p> +<p>$link</p> +ENDREMOTEFORM +} # ================================================================= Reopen menu sub reopenmenu { @@ -599,7 +694,9 @@ sub reopenmenu { sub open { my $returnval=''; if (($ENV{'browser.interface'} eq 'textual') || - ($ENV{'environment.remote'} eq 'off')) { return ''; } + ($ENV{'environment.remote'} eq 'off')) { + return '<script type="text/javascript">self.name="loncapaclient";</script>'; + } my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'}; unless (shift eq 'unix') { # resizing does not work on linux because of virtual desktop sizes @@ -789,6 +886,11 @@ sub rawconfig { 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'}) && @@ -810,7 +912,10 @@ sub rawconfig { } $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); } @@ -821,7 +926,11 @@ sub rawconfig { 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; } @@ -852,17 +961,44 @@ sub footer { } +sub nav_control_js { + my $nav=($ENV{'environment.remotenavmap'} eq 'on'); + return (<<NAVCONTROL); + var w_loncapanav_flag="$nav"; + + +function gonav(url) { + if (w_loncapanav_flag != 1) { + gopost(url,''); + } else { + navwindow=window.open(url, + "loncapanav","height=600,width=400,scrollbars=1"); + } +} +NAVCONTROL +} + +sub check_encrypt { + my $str=shift; + if ($ENV{'request.enc'}) { return &Apache::lonenc::encrypted($str); } + return $str; +} + sub utilityfunctions { unless (($ENV{'browser.interface'} eq 'textual') || ($ENV{'environment.remote'} eq 'off')) { return ''; } - my $currenturl=$ENV{'request.noversionuri'}; - my $currentsymb=$ENV{'request.symb'}; + my $currenturl=&check_encrypt($ENV{'request.noversionuri'}); + + my $currentsymb=&check_encrypt($ENV{'request.symb'}); + my $nav_control=&nav_control_js(); return (<<ENDUTILITY) var currentURL="$currenturl"; var reloadURL="$currenturl"; var currentSymb="$currentsymb"; +$nav_control + function go(url) { if (url!='' && url!= null) { currentURL = null; @@ -893,6 +1029,20 @@ function gocmd(url,cmd) { } } +function gocstr(url,filename) { + if (url == '/adm/cfile?action=delete') { + this.document.cstrdelete.filename.value = filename + this.document.cstrdelete.submit(); + return; + } + if (url !='') { + this.document.constspace.filename.value = filename; + this.document.constspace.action = url; + this.document.constspace.submit(); + } +} + + function catalog_info() { loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no'); } @@ -914,6 +1064,30 @@ sub serverform { </form> ENDSERVERFORM } + +sub constspaceform { + return(<<ENDCONSTSPACEFORM); +<form name="constspace" action="/adm/logout" method="post" target="_top"> +<input type="hidden" name="filename" value="" /> +</form> +<form name="cstrdelete" action="/adm/cfile" method="post" target="_top"> +<input type="hidden" name="action" value="delete" /> +<input type="hidden" name="filename" value="" /> +</form> +ENDCONSTSPACEFORM +} + + +sub get_nav_status { + my $navstatus="swmenu.w_loncapanav_flag="; + if ($ENV{'environment.remotenavmap'} eq 'on') { + $navstatus.="1"; + } else { + $navstatus.="-1"; + } + return $navstatus; +} + # ================================================ Handler when called directly @@ -945,13 +1119,9 @@ sub handler { $ENV{'browser.interface'}='faketextual'; $ENV{'environment.remote'}='off'; } - my $utility=&utilityfunctions(); $r->print(<<ENDHEADER); <html><head> <title>LON-CAPA Main Menu</title> -<script> -$utility -</script> </head> $bodytag ENDHEADER