[LON-CAPA-cvs] cvs: loncom /interface lonsource.pm

[taceyjo1]

taceyjo1		Wed Jul  7 16:01:02 2004 EDT

  Modified files:              
    /loncom/interface	lonsource.pm 
  Log:
  A few more little formatting things.. 
  
  
Index: loncom/interface/lonsource.pm
diff -u loncom/interface/lonsource.pm:1.5 loncom/interface/lonsource.pm:1.6
--- loncom/interface/lonsource.pm:1.5	Wed Jul  7 14:14:33 2004
+++ loncom/interface/lonsource.pm	Wed Jul  7 16:01:02 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Souce Code handler
 #
-# $Id: lonsource.pm,v 1.5 2004/07/07 18:14:33 taceyjo1 Exp $
+# $Id: lonsource.pm,v 1.6 2004/07/07 20:01:02 taceyjo1 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -99,7 +99,7 @@
     my $result = &Apache::loncfile::exists($uname, $udom, $path_to_new_file);
     $r->print($result);
     if(($result) && ($result =~ m|published|) ) {
-        &delete_file($r, $author_name, $newpath, $filename, $path_to_new_file, '1');
+        &delete_copy_file($r, $author_name, $newpath, $filename, $path_to_new_file, '1');
     } elsif(($result) && ($result =~ m|exists!|)) {
         &confirm($r, $author_name, $newpath, $filename, $path_to_new_file);
     } else {
@@ -124,12 +124,12 @@
               </form>');
 }
 
-sub delete_file {
+sub delete_copy_file {
     my ($r, $author_name, $newpath, $filename, $path_to_new_file, $type) = @_;
     if($type eq '1') {
         $r->print("<b>Cannot delete non-obsolete published file</b><br />Please
               use the code view in previous window to use shared code<br /><br />");
-        $r->print('<input type="button" value="Close Window" name="close" onClick="window.close()">');
+        $r->print('<input type="button" value="Close Window" name="close" onClick="window.close()" />');
     } else {
         if(-e $path_to_new_file) {
             unless(unlink($path_to_new_file)) {
@@ -168,7 +168,7 @@
 
     }
     $r->print("<br /><b>Copying File</b>");
-    my $problem_filename = "/home/httpd/html".$filename;
+    my $problem_filename = $Apache::lonnet::perlvar{'lonDocRoot'}.$filename;
     my $file_output = &Apache::lonnet::getfile($problem_filename);
     my $fs=Apache::File->new(">$path_to_new_file");
     if (defined($fs)) {
@@ -181,7 +181,7 @@
 
 sub print_item {
     my ($r, $filename) = @_;
-    $filename = "/home/httpd/html".$filename;
+    $filename = $Apache::lonnet::perlvar{'lonDocRoot'}.$filename;
     &Apache::lonnet::logthis("print_item filename = $filename");
     my $file_output = &Apache::lonnet::getfile($filename);
     my $count=0;
@@ -212,31 +212,26 @@
     if ($source ne 'open') {
         $ENV{'user.error.msg'}="$filename:cre:1:1:Source code not available";
         return HTTP_NOT_ACCEPTABLE;
-    }
-    if ((!&Apache::lonnet::allowed('cre',$filename)) ||
+    } if ((!&Apache::lonnet::allowed('cre',$filename)) ||
             (!&Apache::lonnet::allowed('bre',$filename))) {
         $ENV{'user.error.msg'}="$filename:bre:1:1:Access to resource denied";
         return HTTP_NOT_ACCEPTABLE;
-    }
-    if ($ENV{'form.action'} eq 'stage2') {
+    } if ($ENV{'form.action'} eq 'stage2') {
         my $author = &Apache::lonnet::metadata($filename,'authorspace');
         $author =~ m|@|;
         $author = $`; #This just tells who the author name is for later processing.
         &stage_2($r, $ENV{'form.filename'}, $author, $listname);
-    }
-    elsif($ENV{'form.action'} eq 'copy_stage') {
+    } elsif($ENV{'form.action'} eq 'copy_stage') {
         &copy_stage($r, $filename,$ENV{'form.listname'},$ENV{'form.newpath'});
-    }
-    elsif($ENV{'form.action'} eq 'delete_confirm') {
+    } elsif($ENV{'form.action'} eq 'delete_confirm') {
         &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
-        &delete_file($r, $ENV{'form.author'}, $ENV{'form.newpath'}, $ENV{'form.filename'}, $ENV{'form.path'}, '0');
-    }
-    else {
+        &delete_copy_file($r, $ENV{'form.author'}, $ENV{'form.newpath'}, $ENV{'form.filename'}, $ENV{'form.path'}, '0');
+    } else {
         &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
         $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="button" value="Close Window" name="close" onClick="window.close()" />
                   <input type="hidden" name="filename" value="'.$filename.'" />
                   <input type="hidden" name="listname" value="'.$listname.'" />
                   <input type="hidden" name="action" value="stage2" />