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

Diff for /loncom/publisher/londiff.pm between versions 1.21 and 1.23

version 1.21, 2006/09/19 21:47:29 version 1.23, 2007/01/15 18:34:32
Line 40  use Apache::lonnet; Line 40  use Apache::lonnet;
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonretrieve();  use Apache::lonretrieve();
 use Apache::lonlocal;  use Apache::lonlocal;
   use LONCAPA();
   
 sub get_split_file {  sub get_split_file {
     my ($fn,$style)=@_;      my ($fn,$style)=@_;
Line 55  sub get_split_file { Line 55  sub get_split_file {
     }      }
  }   }
     } elsif ($style eq 'remote') {      } elsif ($style eq 'remote') {
  my $f1=&Apache::lonnet::getfile($fn);   $f1=&Apache::lonnet::getfile($fn);
     }  
     if ($f1=~/\r/) {  
  @f1=split(/\r/,&Apache::lonnet::getfile($fn));        
  foreach my $line (@f1) {  
     $line=~s/\n//g;  
  }  
     } else {  
  @f1=split(/\n/,&Apache::lonnet::getfile($fn));        
     }      }
       @f1=split(/\r\n|\r|\n/,$f1);
     return @f1;      return @f1;
 }  }
   
Line 88  sub handler { Line 81  sub handler {
   
     if ($env{'form.filename'}=~/^\/res\//) {      if ($env{'form.filename'}=~/^\/res\//) {
  ($cudom,$cuname,$env{'form.filename'})=   ($cudom,$cuname,$env{'form.filename'})=
     ($env{'form.filename'}=~/^\/res\/(\w+)\/(\w+)\/(.*)$/);      ($env{'form.filename'}=~m{^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)/(.*)$});
     } else {      } else {
  unless (($cuname,$cudom)=   unless (($cuname,$cudom)=
  &Apache::loncacc::constructaccess($env{'form.filename'},   &Apache::loncacc::constructaccess($env{'form.filename'},
   $r->dir_config('lonDefDomain'))) {    $r->dir_config('lonDefDomain'))) {
     $r->log_reason($cuname.' at '.$cudom.      $r->log_reason($cuname.':'.$cudom.
    ' trying to get diffs file '.$env{'form.filename'}.     ' trying to get diffs file '.$env{'form.filename'}.
    '  - not authorized',      '  - not authorized', 
    $r->filename);      $r->filename); 
Line 103  sub handler { Line 96  sub handler {
       
     my $efn=$env{'form.filename'};      my $efn=$env{'form.filename'};
   
     $efn=~s/\/\~(\w+)//g;      $efn=~s{/\~($LONCAPA::username_re)}{}g;
   
     my @f1=();      my @f1=();
     my @f2=();      my @f2=();
Line 152  sub handler { Line 145  sub handler {
   
  if ($env{'form.filetwo'}) {   if ($env{'form.filetwo'}) {
     my $efn2=$env{'form.filetwo'};      my $efn2=$env{'form.filetwo'};
     $efn2=~s/\/\~(\w+)//g;      $efn2=~s{/\~($LONCAPA::username_re)}{}g;
     my $fn='/home/'.$cuname.'/public_html/'.$efn2;      my $fn='/home/'.$cuname.'/public_html/'.$efn2;
     @f2=&get_split_file($fn,'local');      @f2=&get_split_file($fn,'local');
     $r->print('<tt>'.$efn2.'</tt>');      $r->print('<tt>'.$efn2.'</tt>');
Removed from v.1.21  
changed lines
  Added in v.1.23

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