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

Diff for /loncom/interface/lonsource.pm between versions 1.26 and 1.32

version 1.26, 2011/10/25 19:11:52 version 1.32, 2014/02/11 15:49:15
Line 40  use Apache::lonmeta; Line 40  use Apache::lonmeta;
 use Apache::File;  use Apache::File;
 use Apache::lonlocal;  use Apache::lonlocal;
 use HTML::Entities;  use HTML::Entities;
 use LONCAPA;  use LONCAPA qw(:DEFAULT :match);
   
 sub make_link {  sub make_link {
     my ($filename, $listname) = @_;      my ($filename, $listname) = @_;
Line 52  sub make_link { Line 52  sub make_link {
 sub stage_2 {  sub stage_2 {
     my ($r, $filename, $listname) = @_;      my ($r, $filename, $listname) = @_;
     my ($author)=($filename=~/\/res\/[^\/]+\/([^\/]+)\//);      my ($author)=($filename=~/\/res\/[^\/]+\/([^\/]+)\//);
     $r->print(&Apache::loncommon::start_page('Copy Problem Source Code to Construction Space')      $r->print(&Apache::loncommon::start_page('Copy Problem Source Code to Authoring Space')
              .&mt('Please enter the directory that you would like the source code to go into.')               .&mt('Please enter the directory that you would like the source code to go into.')
              .'<p>'               .'<p>'
              .&mt('Note: the path is in reference to the root of your construction space,'               .&mt('Note: the path is in reference to the root of your Authoring Space,'
                  .' and new directories will be automatically created.')                   .' and new directories will be automatically created.')
              .'</p>');               .'</p>');
     $r->print('<form name="copy" action="/adm/source" target="_parent" method="post">      $r->print('<form name="copy" action="/adm/source" target="_parent" method="post">
Line 90  sub copy_stage { Line 90  sub copy_stage {
     my ($role,$author_name,$domain)=&copy_author();      my ($role,$author_name,$domain)=&copy_author();
   
 # Construct path to copy and filter out any possibly nasty stuff  # Construct path to copy and filter out any possibly nasty stuff
     my $path_to_new_file = '/home/httpd/html/priv/'.$domain.'/'.$author_name.'/'.$newpath.'/'.$listname;      my $path_to_new_file = $r->dir_config('lonDocRoot').
                              "/priv/$domain/$author_name/$newpath/$listname";
     $path_to_new_file=~s/\.\.//g;      $path_to_new_file=~s/\.\.//g;
     $path_to_new_file=~s/\~//g;      $path_to_new_file=~s/\~//g;
     $path_to_new_file=~s/\/+/\//g;      $path_to_new_file=~s/\/+/\//g;
   
 #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);      my ($uname,$udom)= &Apache::lonnet::constructaccess($path_to_new_file);
   
     if (!$uname || !$udom) {      if (!$uname || !$udom) {
  $r->print(&Apache::loncommon::start_page('Not Allowed'));   $r->print(&Apache::loncommon::start_page('Not Allowed'));
Line 123  sub copy_stage { Line 124  sub copy_stage {
   
 sub confirm {  sub confirm {
     my ($r, $newpath, $filename, $path_to_new_file) = @_;      my ($r, $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>'.&mt('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.'" />
Line 142  sub delete_copy_file { Line 143  sub delete_copy_file {
                  .'</span><br />'                   .'</span><br />'
                  .&mt('Please use the code view in previous window to use shared code.')                   .&mt('Please use the code view in previous window to use shared code.')
                  .'<br /><br />');                   .'<br /><br />');
         $r->print('<input type="button" value="Close Window" name="close"'          $r->print('<input type="button" value="'.&mt('Close Window').'" name="close"'
                  .' onclick="window.close()" />'                   .' onclick="window.close()" />'
                  .'</p>');                   .'</p>');
     } else {      } else {
Line 161  sub delete_copy_file { Line 162  sub delete_copy_file {
   
 sub copy_file {  sub copy_file {
     my ($r, $newpath, $filename, $path_to_new_file) = @_;      my ($r, $newpath, $filename, $path_to_new_file) = @_;
     $r->print("<b>Creating directories</b>");      $r->print('<b>'.&mt('Creating directories').'</b>');
   
 #Figure out if we are author or co-author  #Figure out if we are author or co-author
     my ($role,$author_name,$domain)=&copy_author();      my ($role,$author_name,$domain)=&copy_author();
   
     my $path = '/home/httpd/html/priv/'.$domain.'/'.$author_name.'/';      my $path = $r->dir_config('lonDocRoot')."/priv/$domain/$author_name/";
     my @directories = split(/\//,$newpath);      my @directories = split(/\//,$newpath);
   
     foreach my $now_checking (@directories) {      foreach my $now_checking (@directories) {
Line 187  sub copy_file { Line 188  sub copy_file {
         } else { } #Just move along          } else { } #Just move along
   
     }      }
     $r->print("<br /><b>Copying File</b>");      $r->print('<br /><b>'.&mt('Copying File').'</b>');
     my $problem_filename = $Apache::lonnet::perlvar{'lonDocRoot'}.$filename;      my $problem_filename = $Apache::lonnet::perlvar{'lonDocRoot'}.$filename;
     my $file_output = &includemeta(&Apache::lonnet::getfile($problem_filename),$filename);      my $file_output = &includemeta(&Apache::lonnet::getfile($problem_filename),$filename);
     my $fs=Apache::File->new(">$path_to_new_file");      my $fs=Apache::File->new(">$path_to_new_file");
Line 195  sub copy_file { Line 196  sub copy_file {
         print $fs $file_output;          print $fs $file_output;
     }      }
     $r->print("<br /><br />");      $r->print("<br /><br />");
     $r->print('<input type="button" value="Close Window" name="close" onclick="window.close()" />');      $r->print('<input type="button" value="'.&mt('Close Window').'" name="close" onclick="window.close()" />');
     #Some 1.3'ish feature is to include the derivative feature, will go here..'      #Some 1.3'ish feature is to include the derivative feature, will go here..'
 }  }
   
 sub print_item {  sub print_item {
     my ($r, $filename) = @_;      my ($r,$filename,$listname) = @_;
     my $file_output = &includemeta(&Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.$filename),$filename);      my $file_output = 
     my $count=0;          &includemeta(&Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.$filename),
     my $maxlength=-1;                                                $filename);
     foreach (split ("\n", $file_output)) {      $r->print(&Apache::loncommon::start_page('View Source Code',undef,
         $count+=int(length($_)/79);                                               {'only_body' => 1}));
         $count++;      if ($file_output ne '') {
         if (length($_) > $maxlength) {          my $access_to_cstr;
             $maxlength = length($_);          my $lonhost = $r->dir_config('lonHostID');
           if (&Apache::lonnet::is_library($lonhost)) {
               my @possdoms = &Apache::lonnet::current_machine_domains();
               foreach my $dom (@possdoms) {
                   if ($env{"user.role.au./$dom/"}) {
                       $access_to_cstr = 1;
                       last;  
                   }
               }
               unless ($access_to_cstr) {
                   foreach my $key (keys(%env)) {
                       if ($key =~ m{^\Quser.role.ca./\E($match_domain)/}) {
                           my $adom = $1;
                           if (grep(/^\Q$adom\E$/,@possdoms)) {
                               $access_to_cstr = 1;
                               last;
                           }
                       }
                   }
               }
               if ($access_to_cstr) {
                   $r->print('
                <form name="copy" action="/adm/source" target="_parent" method="post">
                 <input type="button" value="'.&mt('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" />
                 <input type="submit" value="'.&mt('Copy to Authoring Space').'" />
                </form><hr />
                   ');
               } else {
                   $r->print('<p><span class="LC_info">'.
                             &mt('Source code is displayed, but you can not copy to Authoring Space, as you do not have an author or co-author role on this server.').
                             '</span></p><a href="javascript:window.close();">'.&mt('Close Window').
                             '</a><br /><hr />'
                            );
               }
           } else {
               $r->print('<p><span class="LC_info">'.
                         &mt('Source code is displayed, but you can not copy to Authoring Space on this server.').
                             '</span></p><a href="javascript:window.close();">'.&mt('Close Window').
                             '</a><br /><hr />'
                        );
   
           }
           my $count=0;
           my $maxlength=-1;
           foreach (split ("\n", $file_output)) {
               $count+=int(length($_)/79);
               $count++;
               if (length($_) > $maxlength) {
                   $maxlength = length($_);
               }
         }          }
           my $rows = $count;
           my $cols = $maxlength;
           $r->print('<form name="showsrc" action="" method="post" onsubmit="return false">'."\n".
                     '<textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
                     &HTML::Entities::encode($file_output,'<>&"').'</textarea></form>');
       } else {
           $r->print('<p class="LC_warning">'.
                     &mt('Unable to retrieve file contents.').
                     '</p><a href="javascript:window.close();">'.&mt('Close Window').'</a>'
                    );
     }      }
     my $rows = $count;      $r->print(&Apache::loncommon::end_page());
     my $cols = $maxlength;      return;
     $r->print('<textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.  
               &HTML::Entities::encode($file_output,'<>&"').'</textarea>');  
     return OK;  
   
 }  }
   
 sub includemeta {  sub includemeta {
Line 233  sub includemeta { Line 292  sub includemeta {
     } else {      } else {
  $file_output=~s/(\<(?:html|problem)[^\>]*\>)/$1\n\<meta name=\"isbasedontime\" content=\"\Q$copytime\E\" \/\>/i;   $file_output=~s/(\<(?:html|problem)[^\>]*\>)/$1\n\<meta name=\"isbasedontime\" content=\"\Q$copytime\E\" \/\>/i;
     }      }
     return $file_output;      if ($file_output eq '-1') {
           return;
       } else {
           return $file_output;
       }
 }  }
   
 sub handler {  sub handler {
Line 246  sub handler { Line 309  sub handler {
     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;
     }       }
     unless ((&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";          $env{'user.error.msg'}="$filename:bre:1:1:Access to resource denied";
         return HTTP_NOT_ACCEPTABLE;          return HTTP_NOT_ACCEPTABLE;
     }       }
       unless (&Apache::lonnet::allowed('cre','/')) {
           $env{'user.error.msg'}="$filename:cre:1:1:Access to source code denied";
           return HTTP_NOT_ACCEPTABLE;
       }
   
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
   
     if ($env{'form.action'} eq 'stage2') {      if ($env{'form.action'} eq 'stage2') {
         &stage_2($r, $filename,$listname);          &stage_2($r,$filename,$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,$listname,$env{'form.newpath'});
     } elsif($env{'form.action'} eq 'delete_confirm') {      } elsif($env{'form.action'} eq 'delete_confirm') {
         &delete_copy_file($r, $env{'form.newpath'}, $env{'form.filename'}, $env{'form.path'}, '0');          &delete_copy_file($r,$env{'form.newpath'},$filename, $env{'form.path'}, '0');
     } else {      } else {
  $r->print('<form name="copy" action="/adm/source" target="_parent" method="post">          &print_item($r,$filename,$listname);
                   <input type="button" value="'.&mt('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" />  
                   <input type="submit" value="'.&mt('Copy to Construction Space').'" />  
                   </form>');  
         $r->print('<hr />');  
         &print_item($r, $env{'form.filename'});  
     }      }
     return OK;      return OK;
 }  }
Removed from v.1.26  
changed lines
  Added in v.1.32

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