Diff for /loncom/interface/lonsource.pm between versions 1.10 and 1.11

version 1.10, 2005/04/07 04:46:36 version 1.11, 2005/04/07 06:56:23
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 78  sub copy_stage { Line 78  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 208  sub handler { Line 208  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)) ||      if ((!&Apache::lonnet::allowed('cre',$filename)) ||
             (!&Apache::lonnet::allowed('bre',$filename))) {              (!&Apache::lonnet::allowed('bre',$filename))) {
         $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) = split('@',$author); #strip the domain of the author name          ($author) = split('@',$author); #strip the domain of the author name
         &stage_2($r, $ENV{'form.filename'}, $author, $listname);          &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'});          &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');          &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;          $r->send_http_header;
         &delete_copy_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;
Line 241  sub handler { Line 241  sub handler {
                   <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.10  
changed lines
  Added in v.1.11


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