--- loncom/interface/lonmenu.pm	2006/09/05 17:36:09	1.202.2.1
+++ loncom/interface/lonmenu.pm	2006/12/06 11:34:37	1.207
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.202.2.1 2006/09/05 17:36:09 albertel Exp $
+# $Id: lonmenu.pm,v 1.207 2006/12/06 11:34:37 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,14 +44,15 @@ use Apache::lonhtmlcommon();
 use Apache::loncommon();
 use Apache::lonenc();
 use Apache::lonlocal;
-use lib '/home/httpd/lib/perl/';
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 
 use vars qw(@desklines $readdesk);
 
 
 my @inlineremote;
 
+
+
 # ================================================================ Little texts
 
 sub initlittle {
@@ -406,7 +407,7 @@ sub innerregister {
                 my $desc = "Enter my resource construction space";
                 # Set defaults for co-authors
                 if ($env{'request.role'} =~ /^ca/) { 
-                    ($cadom,$caname)=($env{'request.role'}=~/(\w+)\/(\w+)$/);
+                    ($cadom,$caname)=($env{'request.role'}=~/($match_domain)\/($match_username)$/);
                     ($top,$bottom) = ('co con-','struct');
                     $action = "go('/priv/".$caname."');";
                     $desc = "Enter construction space as co-author";
@@ -428,7 +429,7 @@ sub innerregister {
             my $cfudom='';
             if ($env{'request.filename'}) {
                 my $file=&Apache::lonnet::declutter($env{'request.filename'});
-                $file=~s/^(\w+)\/(\w+)/\/priv\/$2/;
+                $file=~s/^($match_domain)\/($match_username)/\/priv\/$2/;
                 # Check that the user has permission to edit this resource
                 ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1);
                 if (defined($cfudom)) {
@@ -471,8 +472,8 @@ s&7&1&del.gif&delete[_1]&resource[_2]&go
 s&7&2&prt.gif&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$cleandisfn')&Prepare a printable document
 ENDMENUITEMS
             }
-        } elsif (defined($env{'request.course.id'}) && 
-		 $env{'request.symb'} ne '') {
+        } elsif ( defined($env{'request.course.id'}) && 
+		 $env{'request.symb'} ne '' ) {
 	    $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
@@ -492,6 +493,11 @@ s&8&2&fdbk.gif&feedback[_1]&discuss[_1]&
 ENDREALRES
 	    }
         }
+	if ($env{'request.uri'} =~ /^\/res/) {
+	    $menuitems .= (<<ENDMENUITEMS);
+s&8&3&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
+ENDMENUITEMS
+	}
         my $buttons='';
         foreach (split(/\n/,$menuitems)) {
 	    my ($command,@rest)=split(/\&/,$_);
@@ -982,7 +988,7 @@ sub rawconfig {
                     my $caname=$env{'user.name'};
                     if ($prt eq 'rca') {
 		       ($cadom,$caname)=
-                               ($env{'request.role'}=~/(\w+)\/(\w+)$/);
+                               ($env{'request.role'}=~/($match_domain)\/($match_username)$/);
                     }                       
                     $act =~ s/\$caname/$caname/g;
                     my $home = &Apache::lonnet::homeserver($caname,$cadom);