--- loncom/interface/lonmenu.pm	2004/10/28 16:25:21	1.118
+++ loncom/interface/lonmenu.pm	2004/11/11 20:05:56	1.126
@@ -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.126 2004/11/11 20:05:56 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,7 +43,6 @@ use Apache::lonnet();
 use Apache::Constants qw(:common);
 use Apache::lonhtmlcommon();
 use Apache::loncommon();
-use Apache::lonnavmaps();
 use Apache::lonlocal;
 
 use vars qw(@desklines $readdesk);
@@ -75,8 +74,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();
@@ -226,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;
@@ -244,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='&nbsp;'; }
+        $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>&nbsp;<br />
+    <font size="2" face="Arial, Helvetica, sans-serif">$role</font>&nbsp;
+</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'};
@@ -348,7 +387,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 +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
@@ -370,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(/\&/,$_);
@@ -421,7 +473,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);
      
@@ -437,8 +490,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
@@ -532,7 +585,7 @@ 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>
 var timestart;
@@ -615,12 +668,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>
@@ -833,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'}) &&
@@ -868,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;
 }
 
@@ -899,12 +961,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";
@@ -943,6 +1023,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');
 }
@@ -965,6 +1059,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') {