--- loncom/interface/lonmenu.pm	2004/10/28 16:25:21	1.118
+++ loncom/interface/lonmenu.pm	2004/12/04 18:53:24	1.138
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.118 2004/10/28 16:25:21 albertel Exp $
+# $Id: lonmenu.pm,v 1.138 2004/12/04 18:53:24 raeburn 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);
@@ -69,14 +69,22 @@ 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') { 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(&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();
@@ -96,17 +104,19 @@ ENDNAV
 ENDRELOAD
             }
         }
+        my $form=&serverform();
         my $utility=&utilityfunctions();
 	my $output=(<<ENDMAINMENU);
-<script>
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
 $utility
 </script>
 <a href="/adm/menu" target="_top">$lt{'main'}</a>
 $reloadlink $navmaps<br />
-<script>
+<script type="text/javascript">
 // END LON-CAPA Internal
 </script>
+$form
 ENDMAINMENU
         if ($registration) { $output.=&innerregister($forcereg,$target); }
 	return $output."<hr />";
@@ -137,7 +147,7 @@ ENDMAINMENU
         if ($ENV{'request.course.id'}) {
         	    $navmaps=(<<ENDNAV);
 <td bgcolor="$tabbg">
-<a href="javascript:gonav('/adm/navmaps?postdata=$escurl&postsymb=$escsymb')"><font color="$font">$lt{'nav'}</font></a></td>
+<a href="javascript:gonav('/adm/navmaps?postdata=$escurl&amp;postsymb=$escsymb')"><font color="$font">$lt{'nav'}</font></a></td>
 ENDNAV
 	    if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&
                 ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
@@ -151,11 +161,12 @@ ENDRELOAD
         }
         my $reg='';
         if ($registration) {
-           $reg=&innerregister($forcereg,$target);
+           $reg=&innerregister($forcereg,$target,$titletable);
         }
+        my $form=&serverform();
 	my $utility=&utilityfunctions();
 	return (<<ENDINLINEMENU);
-<script>
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
 $utility
 </script>
@@ -167,15 +178,16 @@ $utility
 $reloadlink
 $navmaps
 <td bgcolor="$tabbg">
-<a href="/adm/remote?action=launch&url=$escurl" target="_top">
+<a href="/adm/remote?action=launch&amp;url=$escurl" target="_top">
 <font color="$font">$lt{'launch'}</font></a></td>
 <td bgcolor="$tabbg">
 <img align="right" src="/adm/lonIcons/minilogo.gif" />
 <b>LON-CAPA</b></td>
+$form
 </tr>
 </table>
 </font>
-<script>
+<script type="text/javascript">
 // END LON-CAPA Internal
 </script>
 $reg
@@ -225,7 +237,12 @@ sub registerurl {
 sub innerregister {
     my $forcereg=shift;
     my $target = shift;
+    my $titletable = shift;
     my $result = '';
+    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;
@@ -249,7 +266,7 @@ sub innerregister {
         $newmail.=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
         my $maptitle=&Apache::lonnet::gettitle($mapurl);
 	my $restitle=&Apache::lonnet::gettitle($resurl);
-        if ($maptitle) {
+        if ($maptitle && $maptitle ne 'default.sequence') {
 	    $newmail.=', '.$maptitle;
         }
         if ($restitle) {
@@ -262,6 +279,9 @@ sub innerregister {
  '<b><a href="/adm/communicate" target="_top">You have new messages</a></b><br />':
                           'swmenu.setstatus("you have","messages");');
     }
+    if ($ENV{'request.state'} eq 'construct') {
+        $newmail = $titletable;
+    }
     if ($noremote) {
 	$newmail.='</td></tr></table></font>';
     }
@@ -348,7 +368,7 @@ sub innerregister {
                 }
             }        
             # 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");
@@ -359,7 +379,25 @@ sub innerregister {
         ###
         ###
 # Prepare the rest of the buttons
-	my $menuitems=(<<ENDMENUITEMS);
+        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#[^/]+$##;
+                $menuitems=(<<ENDMENUITEMS);
+s&6&1&list.gif&list[_1]&dir[_1]&golist('$currdir')&List current directory
+s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$thisdisfn')&Retrieve 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]&gocstr('/adm/printout','/~$uname/$thisdisfn')&Prepare a printable document
+ENDMENUITEMS
+            }
+        } elsif (defined($ENV{'request.course.id'})) {
+	    $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
@@ -370,13 +408,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(/\&/,$_);
@@ -388,7 +427,6 @@ ENDREALRES
         }
         if ($textual) {
 # Registered, textual output
-            my $form=&serverform();
 	    my $inlinebuttons='';
 
 	    if ($ENV{'browser.interface'} eq 'textual') {
@@ -396,15 +434,18 @@ ENDREALRES
                         join('',map { (defined($_)?$_:'') } @inlineremote);
 	    } else {
 		$inlinebuttons=(<<ENDINLINE);
-<tr><td>$inlineremote[21]</td><td>&nbsp</td><td>$inlineremote[23]</td></tr>
+<tr><td>$inlineremote[21]</td><td>&nbsp;</td><td>$inlineremote[23]</td></tr>
 <tr><td>$inlineremote[61]</td><td>$inlineremote[62]</td><td>$inlineremote[63]</td></tr>
 <tr><td>$inlineremote[71]</td><td>$inlineremote[72]</td><td>$inlineremote[73]</td></tr>
 <tr><td>$inlineremote[81]</td><td>$inlineremote[82]</td><td>$inlineremote[83]</td></tr>
 <tr><td>$inlineremote[91]</td><td>$inlineremote[92]</td><td>$inlineremote[93]</td></tr>
 ENDINLINE
 	    }
+            if ($const_space && $is_const_dir) {
+                $inlinebuttons = '';
+            }
 	    $result =(<<ENDREGTEXT);
-<script>
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
 </script>
 $timesync
@@ -412,8 +453,7 @@ $newmail
 $tablestart
 $inlinebuttons
 $tableend
-$form
-<script>
+<script type="text/javascript">
 // END LON-CAPA Internal
 </script>
 
@@ -421,11 +461,12 @@ 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);
      
-<script language="JavaScript">
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
 var swmenu=null;
 
@@ -437,8 +478,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
@@ -476,7 +517,7 @@ ENDDONOTREGTEXT
 # Not registered, graphical
            $result = (<<ENDDONOTREGTHIS);
 
-<script language="JavaScript">
+<script type="text/javascript">
 // BEGIN LON-CAPA Internal
 var swmenu=null;
 
@@ -510,12 +551,14 @@ ENDDONOTREGTHIS
 }
 
 sub loadevents() {
-    if ($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.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();';
 }
 
@@ -532,9 +575,9 @@ sub startupremote {
 #
     my $configmenu=&rawconfig();
     my $esclowerurl=&Apache::lonnet::escape($lowerurl);
-    my $message=&mt('"Waiting for remote to load "+[_1]','waited');
+    my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited');
     return(<<ENDREMOTESTARTUP);
-<script>
+<script type="text/javascript">
 var timestart;
 function wheelswitch() {
     if (typeof(document.wheel) != 'undefined') {
@@ -591,7 +634,7 @@ ENDREMOTESTARTUP
 
 sub setflags() {
     return(<<ENDSETFLAGS);
-<script>
+<script type="text/javascript">
     menuloaded=0;
     tim=0;
 </script>
@@ -602,7 +645,7 @@ sub maincall() {
     if (($ENV{'browser.interface'} eq 'textual') ||
         ($ENV{'environment.remote'} eq 'off')) { return ''; }
     return(<<ENDMAINCALL);
-<script>
+<script type="text/javascript">
     main();
 </script>
 ENDMAINCALL
@@ -615,12 +658,12 @@ sub load_remote_msg {
         ($ENV{'environment.remote'} eq 'off')) { return ''; }
 
     my $esclowerurl=&Apache::lonnet::escape($lowerurl);
-    my $link=&mt('<a href="[_1]">Continue</a> on in inline remote mode',
+    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="40"/>
+<input name="spin" type="text" size="60" />
 </form>
 </p>
 <p>$link</p>
@@ -660,7 +703,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 '<script>'.$returnval.'</script>';
+    return '<script type="text/javascript">'.$returnval.'</script>';
 }
 
 
@@ -833,6 +876,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'}) &&
@@ -868,7 +916,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;
 }
 
@@ -879,7 +931,7 @@ sub close {
         ($ENV{'environment.remote'} eq 'off')) { return ''; }
     my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
     return(<<ENDCLOSE);
-<script>
+<script type="text/javascript">
 window.status='Accessing Remote Control';
 menu=window.open("/adm/rat/empty.html","$menuname",
                  "height=350,width=150,scrollbars=no,menubar=no");
@@ -899,12 +951,31 @@ 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 {
+    my $caller = shift;
     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();
+        ($ENV{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; }
+    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";
@@ -943,6 +1014,50 @@ 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 == '/adm/printout') {
+        this.document.cstrprint.postdata.value = filename
+        this.document.cstrprint.curseed.value = 0;
+        this.document.cstrprint.problemtype.value = 0;
+        if (this.document.lonhomework) {
+            if ((this.document.lonhomework.rndseed) && (this.document.lonhomework.rndseed.value != null) && (this.document.lonhomework.rndseed.value != '')) {
+                this.document.cstrprint.curseed.value = this.document.lonhomework.rndseed.value
+            }
+            if (this.document.lonhomework.problemtype) {
+                for (var i=0; i<this.document.lonhomework.problemtype.options.length; i++) {
+                    if (this.document.lonhomework.problemtype.options[i].selected) {
+                        if (this.document.lonhomework.problemtype.options[i].value != null && this.document.lonhomework.problemtype.options[i].value != '') { 
+                            this.document.cstrprint.problemtype.value = this.document.lonhomework.problemtype.options[i].value
+                        }
+                    }
+                }
+            }
+        }
+        this.document.cstrprint.submit();
+        return;
+    }
+    if (url !='') {
+        this.document.constspace.filename.value = filename;
+        this.document.constspace.action = url;
+        this.document.constspace.submit();
+    }
+}
+
+function golist(url) {
+   if (url!='' && url!= null) {
+       currentURL = null;
+       currentSymb= null;
+       top.location.href=url;
+   }
+}
+
+
+
 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');
 }
@@ -965,6 +1080,25 @@ 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>
+<form name="cstrprint" action="/adm/printout" target="_parent" method="post">
+<input type="hidden" name="postdata" value="" />
+<input type="hidden" name="curseed" value="" />
+<input type="hidden" name="problemtype" value="" />
+</form>
+
+ENDCONSTSPACEFORM
+}
+
+
 sub get_nav_status {
     my $navstatus="swmenu.w_loncapanav_flag=";
     if ($ENV{'environment.remotenavmap'} eq 'on') {
@@ -984,7 +1118,11 @@ sub handler {
     $r->send_http_header;
     return OK if $r->header_only;
 
-    my $form=&serverform();
+    my $form;
+    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)/) {
@@ -1001,7 +1139,16 @@ sub handler {
     $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain);
     $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
     $font=&Apache::loncommon::designparm($function.'.font',$domain);
-# ---- Print the screen, pretent to be in text mode to generate text-based menu
+    my $script_tag;
+    if ($ENV{'environment.remote'} eq 'on') {
+        my $utility=&utilityfunctions('/adm/menu');
+        $script_tag=(<<ENDSCRIPT);
+<script type="text/javascript">
+$utility
+</script>
+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';
@@ -1009,6 +1156,7 @@ sub handler {
     $r->print(<<ENDHEADER);
 <html><head>
 <title>LON-CAPA Main Menu</title>
+$script_tag
 </head>
 $bodytag
 ENDHEADER