Diff for /loncom/publisher/loncleanup.pm between versions 1.2 and 1.3

version 1.2, 2005/05/28 02:18:03 version 1.3, 2005/05/28 18:53:50
Line 257  sub phasethree { Line 257  sub phasethree {
 # ---------------------------------------------------------------- Main Handler  # ---------------------------------------------------------------- Main Handler
 sub handler {  sub handler {
   
   my $r=shift;      my $r=shift;
   
   
 # Get query string for limited number of parameters  # Get query string for limited number of parameters
   
   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
   ['filename']);      ['filename']);
   
   if ($env{'form.filename'}) {      if ($env{'form.filename'}) {
       $fn=$env{'form.filename'};   $fn=$env{'form.filename'};
       $fn=~s/^http\:\/\/[^\/]+//;   $fn=~s/^http\:\/\/[^\/]+//;
   } else {      } else {
      $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.   $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
          ' unspecified filename for cleanup', $r->filename);          ' unspecified filename for cleanup', $r->filename); 
      return HTTP_NOT_FOUND;   return HTTP_NOT_FOUND;
   }      }
   
   unless ($fn) {       unless ($fn) { 
      $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.   $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
          ' trying to cleanup non-existing file', $r->filename);          ' trying to cleanup non-existing file', $r->filename); 
      return HTTP_NOT_FOUND;   return HTTP_NOT_FOUND;
   }       } 
   
 # ----------------------------------------------------------- Start page output  # ----------------------------------------------------------- Start page output
   my $uname;      my $uname;
   my $udom;      my $udom;
   
   ($uname,$udom)=      ($uname,$udom)=
     &Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));   &Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
   unless (($uname) && ($udom)) {      unless (($uname) && ($udom)) {
      $r->log_reason($uname.' at '.$udom.   $r->log_reason($uname.' at '.$udom.
          ' trying to cleanup file '.$env{'form.filename'}.         ' trying to cleanup file '.$env{'form.filename'}.
          ' ('.$fn.') - not authorized',          ' ('.$fn.') - not authorized', 
          $r->filename);          $r->filename); 
      return HTTP_NOT_ACCEPTABLE;   return HTTP_NOT_ACCEPTABLE;
   }      }
   
   $fn=~s/\/\~(\w+)//;      $fn=~s/\/\~(\w+)//;
   
   &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;      $r->send_http_header;
   
   $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');      $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
   
   $r->print(&Apache::loncommon::bodytag('Cleanup XML Document'));      $r->print(&Apache::loncommon::bodytag('Cleanup XML Document'));
   
   if ($env{'form.phase'} eq 'three') {      if ($env{'form.phase'} eq 'three') {
       &phasethree($r,$fn,$uname,$udom);   &phasethree($r,$fn,$uname,$udom);
   } elsif ($env{'form.phase'} eq 'two') {      } elsif ($env{'form.phase'} eq 'two') {
       &phasetwo($r,$fn,$uname,$udom);   &phasetwo($r,$fn,$uname,$udom);
   } else {      } else {
       &phaseone($r,$fn,$uname,$udom);   &phaseone($r,$fn,$uname,$udom);
   }      }
   
   $r->print('</body></html>');      $r->print('</body></html>');
   return OK;        return OK;  
 }  }
   
 1;  1;

Removed from v.1.2  
changed lines
  Added in v.1.3


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