[BACK]Return to lonsource.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonsource.pm between versions 1.19 and 1.20

version 1.19, 2007/08/28 22:23:22 version 1.20, 2007/08/28 22:46:32
Line 51  sub make_link { Line 51  sub make_link {
   
 sub stage_2 {  sub stage_2 {
     my ($r, $filename, $author, $listname) = @_;      my ($r, $filename, $author, $listname) = @_;
     $filename = $filename;  
     &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->print(&Apache::loncommon::start_page('Problem source code moving operation'));      $r->print(&Apache::loncommon::start_page('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 />");
Line 71  sub stage_2 { Line 68  sub stage_2 {
   
 sub copy_stage {  sub copy_stage {
     my ($r, $filename, $listname, $newpath) = @_;      my ($r, $filename, $listname, $newpath) = @_;
   
   #Figure out if we are author or co-author
     my $role;      my $role;
     my $domain;      my $domain;
     my $author_name;      my $author_name;
 #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 {
Line 88  sub copy_stage { Line 85  sub copy_stage {
 #Just checking again for access as we want to make sure that it is really ok now that we have the real path  #Just checking again for access as we want to make sure that it is really ok now that we have the real path
   
     my ($uname,$udom)= &Apache::loncacc::constructaccess($path_to_new_file,$domain);      my ($uname,$udom)= &Apache::loncacc::constructaccess($path_to_new_file,$domain);
     unless (($uname) && ($udom)) {  
         return HTTP_NOT_ACCEPTABLE;      if (!$uname || !$udom) {
    $r->print(&Apache::loncommon::start_page('Not Allowed'));
    $r->print(&mt('Not allowed to create file [_1]', $path_to_new_file));
    $r->print(&Apache::loncommon::end_page());
    return;
     }      }
     &Apache::loncommon::content_type($r,'text/html');  
     $r->send_http_header;  
       #allowed
     $r->print(&Apache::loncommon::start_page('Copying Source'));      $r->print(&Apache::loncommon::start_page('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_copy_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 {
         &copy_file($r, $author_name, $newpath, $filename, $path_to_new_file);   &copy_file($r, $author_name, $newpath, $filename, $path_to_new_file);
     }      }
       
     return OK;      $r->print(&Apache::loncommon::end_page());
   
 }  }
   
 sub confirm {  sub confirm {
Line 230  sub handler { Line 231  sub handler {
         $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;
     }       } 
   
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
   
     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   #strip the domain of the author name
    if ($author =~ /:/) {
       ($author) = split(/:/,$author);
    } else {
       ($author) = split(/@/,$author);
    }
         &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');  
         $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');   $r->print('<form name="copy" action="/adm/source" target="_parent" method="post">
         $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="filename" value="'.$filename.'" />
                   <input type="hidden" name="listname" value="'.$listname.'" />                    <input type="hidden" name="listname" value="'.$listname.'" />
Removed from v.1.19  
changed lines
  Added in v.1.20

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