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

Diff for /loncom/publisher/londiff.pm between versions 1.29 and 1.30

version 1.29, 2011/10/23 23:46:07 version 1.30, 2011/10/29 19:11:46
Line 84  sub handler { Line 84  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'}=~m{^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)/(.*)$});      ($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'},
Line 99  sub handler { Line 99  sub handler {
       
     my $efn=$env{'form.filename'};      my $efn=$env{'form.filename'};
   
     $efn=~s{/\~($LONCAPA::username_re)}{}g;      $efn=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{};
   
     my @f1=();      my @f1=();
     my @f2=();      my @f2=();
Line 127  sub handler { Line 127  sub handler {
  || $efn =~ /\.meta$/) {   || $efn =~ /\.meta$/) {
  $r->print('<p><span class="LC_diff_removed">');   $r->print('<p><span class="LC_diff_removed">');
  if ($env{'form.versionone'} eq 'priv') {   if ($env{'form.versionone'} eq 'priv') {
     my $fn='/home/httpd/html/priv/'.$cudom.'/'.$cuname.'/'.$efn;      my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn;
     @f1=&get_split_file($fn,'local');      @f1=&get_split_file($fn,'local');
     $r->print('<b>'.&mt('Construction Space Version').'</b>');      $r->print('<b>'.&mt('Construction Space Version').'</b>');
  } else {   } else {
     my $fn=      my $fn=$r->dir_config('lonDocRoot')."/res/$cudom/$cuname";
  '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';  
     if ($env{'form.versionone'}) {      if ($env{'form.versionone'}) {
  my ($main,$suffix,$is_meta)=   my ($main,$suffix,$is_meta)=
     &Apache::lonretrieve::get_file_info($efn);      &Apache::lonretrieve::get_file_info($efn);
Line 152  sub handler { Line 151  sub handler {
   
  if ($env{'form.filetwo'}) {   if ($env{'form.filetwo'}) {
     my $efn2=$env{'form.filetwo'};      my $efn2=$env{'form.filetwo'};
     $efn2=~s{/\~($LONCAPA::username_re)}{}g;      $efn2=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{};
     my $fn='/home/httpd/html/priv/'.$cudom.'/'.$cuname.'/'.$efn2;      my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn2;
     @f2=&get_split_file($fn,'local');      @f2=&get_split_file($fn,'local');
     $r->print('<tt>'.$efn2.'</tt>');      $r->print('<tt>'.$efn2.'</tt>');
  } elsif ($env{'form.versiontwo'} eq 'priv') {   } elsif ($env{'form.versiontwo'} eq 'priv') {
     my $fn='/home/httpd/html/priv/'.$cudom.'/'.$cuname.'/'.$efn;      my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn;
     @f2=&get_split_file($fn,'local');      @f2=&get_split_file($fn,'local');
     $r->print('<b>'.&mt('Construction Space Version').'</b>');      $r->print('<b>'.&mt('Construction Space Version').'</b>');
  } else {   } else {
Removed from v.1.29  
changed lines
  Added in v.1.30

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