--- loncom/interface/lonmenu.pm 2004/10/29 18:40:40 1.120 +++ loncom/interface/lonmenu.pm 2004/11/11 23:45:36 1.128 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.120 2004/10/29 18:40:40 raeburn Exp $ +# $Id: lonmenu.pm,v 1.128 2004/11/11 23:45:36 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -43,7 +43,7 @@ use Apache::lonnet(); use Apache::Constants qw(:common); use Apache::lonhtmlcommon(); use Apache::loncommon(); -use Apache::lonnavmaps(); +use Apache::lonenc(); use Apache::lonlocal; use vars qw(@desklines $readdesk); @@ -75,8 +75,8 @@ sub menubuttons { 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(&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'})); + my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($ENV{'request.symb'})); if ($ENV{'browser.interface'} eq 'textual') { # Textual display only my %lt=&initlittle(); @@ -227,12 +227,7 @@ sub innerregister { 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; - } + my $const_space = ($ENV{'request.state'} eq 'construct'); if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; } @@ -252,17 +247,6 @@ 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; - $newmail .= ('<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); - } 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'}; @@ -380,13 +364,16 @@ sub innerregister { # Prepare the rest of the buttons my $menuitems; if ($const_space) { - my $dir_catalog = '/priv/'.$uname.'/'.$thisdisfn.'/default.meta'; + my ($uname,$thisdisfn) = + ($ENV{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|); + my $currdir = '/priv/'.$uname.'/'.$thisdisfn; + $currdir =~ s#[^/]+$##; $menuitems=(<<ENDMENUITEMS); -s&2&1&mcrs.gif&list[_1]&dir[_1]&gopost('/adm/pubdir',currentURL)&List current directory -s&2&3&mcrs.gif&retrieve[_1]&version[_1]&gopost('/adm/retrieve',currentURL)&Retreive old version -s&6&1&mcrs.gif&publish[_1]&resource[_1]&gopost('/adm/publish',currentURL)&Publish this resource -s&6&3&mcrs.gif&delete[_1]&resource[_2]&gopost('/adm/cfile?action=delete',currentURL)&Delete this resource -s&8&3&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document +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); @@ -452,7 +439,8 @@ ENDREGTEXT # Registered, graphical output } else { my $requri=(split(/\?/,$ENV{'request.noversionuri'}))[0]; - $requri=&Apache::lonnet::unescape($requri); + $requri=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($requri)); + my $cursymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'}); my $navstatus=&get_nav_status(); $result = (<<ENDREGTHIS); @@ -468,8 +456,8 @@ 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 @@ -864,6 +852,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'}) && @@ -899,7 +892,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; } @@ -930,12 +927,30 @@ 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 utilityfunctions { unless (($ENV{'browser.interface'} eq 'textual') || ($ENV{'environment.remote'} eq 'off')) { return ''; } - my $currenturl=$ENV{'request.noversionuri'}; - my $currentsymb=$ENV{'request.symb'}; - my $nav_control=&Apache::lonnavmaps::nav_control_js(); + my $currenturl=&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'}); + + my $currentsymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'}); + my $nav_control=&nav_control_js(); return (<<ENDUTILITY) var currentURL="$currenturl"; @@ -974,6 +989,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'); } @@ -996,6 +1025,19 @@ sub serverform { 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') {