Diff for /loncom/interface/lonsource.pm between versions 1.5 and 1.16

version 1.5, 2004/07/07 18:14:33 version 1.16, 2006/03/15 19:41:26
Line 31 Line 31
 package Apache::lonsource;  package Apache::lonsource;
   
 use strict;  use strict;
 use Apache::lonnet();  use Apache::lonnet;
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
 use Apache::lonsequence();  use Apache::lonsequence();
Line 43  use HTML::Entities; Line 43  use HTML::Entities;
   
 sub make_link {  sub make_link {
     my ($filename, $listname) = @_;      my ($filename, $listname) = @_;
     my $sourcelink = "http://".$ENV{'SERVER_NAME'}.      my $sourcelink = "/adm/source?filename=".$filename."&listname=".$listname;
                      "/adm/source/?filename=".$filename."&listname=".$listname;  
   
     return $sourcelink;      return $sourcelink;
 }  }
Line 55  sub stage_2 { Line 54  sub stage_2 {
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     my ($uname, $udom) = &Apache::loncacc::constructaccess('/~'.$author.'/',$r->dir_config('lonDefDomain'));      my ($uname, $udom) = &Apache::loncacc::constructaccess('/~'.$author.'/',$r->dir_config('lonDefDomain'));
     $r->send_http_header;      $r->send_http_header;
     $r->print('<html><head><title>LON-CAPA Move source to construction space</title>');      $r->print(&Apache::loncommon::start_page('Problem source code moving operation'));
     $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("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("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="filename" value="'.$filename.'" />
               <input type="hidden" name="listname" value="'.$listname.'" />                <input type="hidden" name="listname" value="'.$listname.'" />
               <input type="hidden" name="action" value="copy_stage" />                <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" />                <input type="submit" value="Copy" />
               </form>');                </form>');
     return OK;      return OK;
Line 77  sub copy_stage { Line 75  sub copy_stage {
     my $author_name;      my $author_name;
 #Figure out if we are author or co-author  #Figure out if we are author or co-author
   
     if($ENV{'request.role'} =~ m|ca.|) {      if($env{'request.role'} =~ m|ca.|) {
         ($role, $domain, $author_name) = split(/\//,$ENV{'request.role'});          ($role, $domain, $author_name) = split(/\//,$env{'request.role'});
     } else {      } else {
         $role = "au.";          $role = "au.";
         $domain = $ENV{'user.domain'};          $domain = $env{'user.domain'};
         $author_name = $ENV{'user.name'};          $author_name = $env{'user.name'};
     }      }
   
     my $path_to_new_file = '/home/'.$author_name.'/public_html/'.$newpath.'/'.$listname;      my $path_to_new_file = '/home/'.$author_name.'/public_html/'.$newpath.'/'.$listname;
Line 94  sub copy_stage { Line 92  sub copy_stage {
     }      }
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
     $r->print('<html><head><title>LON-CAPA Move source to construction space</title>');      $r->print(&Apache::loncommon::start_page('Copying Source'));
     $r->print(&Apache::loncommon::bodytag('Copying Source'));  
     my $result = &Apache::loncfile::exists($uname, $udom, $path_to_new_file);      my $result = &Apache::loncfile::exists($uname, $udom, $path_to_new_file);
     $r->print($result);      $r->print($result);
     if(($result) && ($result =~ m|published|) ) {      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!|)) {      } elsif(($result) && ($result =~ m|exists!|)) {
         &confirm($r, $author_name, $newpath, $filename, $path_to_new_file);          &confirm($r, $author_name, $newpath, $filename, $path_to_new_file);
     } else {      } else {
Line 113  sub copy_stage { Line 110  sub copy_stage {
 sub confirm {  sub confirm {
     my ($r, $author_name, $newpath, $filename, $path_to_new_file) = @_;      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("<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="filename" value="'.$filename.'" />
               <input type="hidden" name="path" value="'.$path_to_new_file.'" />                <input type="hidden" name="path" value="'.$path_to_new_file.'" />
               <input type="hidden" name="author" value="'.$author_name.'" />                <input type="hidden" name="author" value="'.$author_name.'" />
Line 124  sub confirm { Line 121  sub confirm {
               </form>');                </form>');
 }  }
   
 sub delete_file {  sub delete_copy_file {
     my ($r, $author_name, $newpath, $filename, $path_to_new_file, $type) = @_;      my ($r, $author_name, $newpath, $filename, $path_to_new_file, $type) = @_;
     if($type eq '1') {      if($type eq '1') {
         $r->print("<b>Cannot delete non-obsolete published file</b><br />Please          $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 />");                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 {      } else {
         if(-e $path_to_new_file) {          if(-e $path_to_new_file) {
             unless(unlink($path_to_new_file)) {              unless(unlink($path_to_new_file)) {
Line 168  sub copy_file { Line 165  sub copy_file {
   
     }      }
     $r->print("<br /><b>Copying File</b>");      $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 $file_output = &Apache::lonnet::getfile($problem_filename);
     my $fs=Apache::File->new(">$path_to_new_file");      my $fs=Apache::File->new(">$path_to_new_file");
     if (defined($fs)) {      if (defined($fs)) {
Line 181  sub copy_file { Line 178  sub copy_file {
   
 sub print_item {  sub print_item {
     my ($r, $filename) = @_;      my ($r, $filename) = @_;
     $filename = "/home/httpd/html".$filename;      $filename = $Apache::lonnet::perlvar{'lonDocRoot'}.$filename;
     &Apache::lonnet::logthis("print_item filename = $filename");      &Apache::lonnet::logthis("print_item filename = $filename");
     my $file_output = &Apache::lonnet::getfile($filename);      my $file_output = &Apache::lonnet::getfile($filename);
     my $count=0;      my $count=0;
Line 206  sub handler { Line 203  sub handler {
     my $r=shift;      my $r=shift;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['filename','listname']);                                              ['filename','listname']);
     my $filename = $ENV{'form.filename'};      my $filename = $env{'form.filename'};
     my $listname = $ENV{'form.listname'};      my $listname = $env{'form.listname'};
     my $source = &Apache::lonnet::metadata($filename,'sourceavail');      my $source = &Apache::lonnet::metadata($filename,'sourceavail');
     if ($source ne 'open') {      if ($source ne 'open') {
         $ENV{'user.error.msg'}="$filename:cre:1:1:Source code not available";          $env{'user.error.msg'}="$filename:cre:1:1:Source code not available";
         return HTTP_NOT_ACCEPTABLE;          return HTTP_NOT_ACCEPTABLE;
     }      } 
     if ((!&Apache::lonnet::allowed('cre',$filename)) ||      unless ((&Apache::lonnet::allowed('bre',$filename)) &&
             (!&Apache::lonnet::allowed('bre',$filename))) {      (&Apache::lonnet::allowed('cre','/'))) {
         $ENV{'user.error.msg'}="$filename:bre:1:1:Access to resource denied";          $env{'user.error.msg'}="$filename:bre:1:1:Access to resource denied";
         return HTTP_NOT_ACCEPTABLE;          return HTTP_NOT_ACCEPTABLE;
     }      } 
     if ($ENV{'form.action'} eq 'stage2') {      if ($env{'form.action'} eq 'stage2') {
         my $author = &Apache::lonnet::metadata($filename,'authorspace');          my $author = &Apache::lonnet::metadata($filename,'authorspace');
         $author =~ m|@|;          ($author) = split('@',$author); #strip the domain of the author name
         $author = $`; #This just tells who the author name is for later processing.          &stage_2($r, $env{'form.filename'}, $author, $listname);
         &stage_2($r, $ENV{'form.filename'}, $author, $listname);      } elsif($env{'form.action'} eq 'copy_stage') {
     }          &copy_stage($r, $filename,$env{'form.listname'},$env{'form.newpath'});
     elsif($ENV{'form.action'} eq 'copy_stage') {      } elsif($env{'form.action'} eq 'delete_confirm') {
         &copy_stage($r, $filename,$ENV{'form.listname'},$ENV{'form.newpath'});  
     }  
     elsif($ENV{'form.action'} eq 'delete_confirm') {  
         &Apache::loncommon::content_type($r,'text/html');          &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;          $r->send_http_header;
         &delete_file($r, $ENV{'form.author'}, $ENV{'form.newpath'}, $ENV{'form.filename'}, $ENV{'form.path'}, '0');          &delete_copy_file($r, $env{'form.author'}, $env{'form.newpath'}, $env{'form.filename'}, $env{'form.path'}, '0');
     }      } else {
     else {  
         &Apache::loncommon::content_type($r,'text/html');          &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;          $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="button" value="Close Window" name="close" onClick="window.close()" />
                   <input type="hidden" name="filename" value="'.$filename.'" />                    <input type="hidden" name="filename" value="'.$filename.'" />
                   <input type="hidden" name="listname" value="'.$listname.'" />                    <input type="hidden" name="listname" value="'.$listname.'" />
                   <input type="hidden" name="action" value="stage2" />                    <input type="hidden" name="action" value="stage2" />
                   <input type="submit" value="Copy to CSTR" />                    <input type="submit" value="Copy to CSTR" />
                   </form>');                    </form>');
         $r->print('<hr />');          $r->print('<hr />');
         &print_item($r, $ENV{'form.filename'});          &print_item($r, $env{'form.filename'});
     }      }
     return OK;      return OK;
 }  }

Removed from v.1.5  
changed lines
  Added in v.1.16


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>