--- loncom/interface/lonsource.pm	2005/04/07 06:56:23	1.11
+++ loncom/interface/lonsource.pm	2005/07/08 10:39:49	1.15
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Souce Code handler
 #
-# $Id: lonsource.pm,v 1.11 2005/04/07 06:56:23 albertel Exp $
+# $Id: lonsource.pm,v 1.15 2005/07/08 10:39:49 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,8 +43,7 @@ use HTML::Entities;
 
 sub make_link {
     my ($filename, $listname) = @_;
-    my $sourcelink = "http://".$ENV{'SERVER_NAME'}.
-                     "/adm/source/?filename=".$filename."&listname=".$listname;
+    my $sourcelink = "/adm/source?filename=".$filename."&listname=".$listname;
 
     return $sourcelink;
 }
@@ -60,11 +59,11 @@ sub stage_2 {
     $r->print(&Apache::loncommon::bodytag('Problem source code moving operation'));
     $r->print("Please enter the directory that you would like the source code to go into, a default has also been 			provided <br />");
     $r->print("Also note, the path is in reference to the root of your construction space, and new directories will be 			automatically created. <br /><br />");
-    $r->print('<form name="copy" action="/adm/source/" target="_parent" method="post">
+    $r->print('<form name="copy" action="/adm/source" target="_parent" method="post">
               <input type="hidden" name="filename" value="'.$filename.'" />
               <input type="hidden" name="listname" value="'.$listname.'" />
               <input type="hidden" name="action" value="copy_stage" />
-              <input type="text" name="newpath" value="/shared_source/'.$author.'" />&nbsp;
+              <input type="text" size="50" name="newpath" value="/shared_source/'.$author.'" />&nbsp;
               <input type="submit" value="Copy" />
               </form>');
     return OK;
@@ -115,7 +114,7 @@ sub copy_stage {
 sub confirm {
     my ($r, $author_name, $newpath, $filename, $path_to_new_file) = @_;
     $r->print("<b>Press delete to remove file and replace it with a copy of the source you are viewing</b><br /><br /	>");
-    $r->print('<form name="delete_confirm" action="/adm/source/" target="_parent" method="post">
+    $r->print('<form name="delete_confirm" action="/adm/source" target="_parent" method="post">
               <input type="hidden" name="filename" value="'.$filename.'" />
               <input type="hidden" name="path" value="'.$path_to_new_file.'" />
               <input type="hidden" name="author" value="'.$author_name.'" />
@@ -215,8 +214,8 @@ sub handler {
         $env{'user.error.msg'}="$filename:cre:1:1:Source code not available";
         return HTTP_NOT_ACCEPTABLE;
     } 
-    if ((!&Apache::lonnet::allowed('cre',$filename)) ||
-            (!&Apache::lonnet::allowed('bre',$filename))) {
+    unless ((&Apache::lonnet::allowed('bre',$filename)) &&
+	    (&Apache::lonnet::allowed('cre','/'))) {
         $env{'user.error.msg'}="$filename:bre:1:1:Access to resource denied";
         return HTTP_NOT_ACCEPTABLE;
     } 
@@ -233,7 +232,7 @@ sub handler {
     } else {
         &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
-        $r->print('<form name="copy" action="/adm/source/" target="_parent" method="post">
+        $r->print('<form name="copy" action="/adm/source" target="_parent" method="post">
                   <input type="button" value="Close Window" name="close" onClick="window.close()" />
                   <input type="hidden" name="filename" value="'.$filename.'" />
                   <input type="hidden" name="listname" value="'.$listname.'" />