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

Diff for /loncom/publisher/loncleanup.pm between versions 1.7 and 1.10

version 1.7, 2006/04/06 22:15:18 version 1.10, 2008/12/24 07:58:34
Line 38  use Apache::loncacc; Line 38  use Apache::loncacc;
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
    
   
 sub latextrans {  sub latextrans {
     my $symbolfont=shift;      my $symbolfont=shift;
Line 294  sub phasetwo { Line 297  sub phasetwo {
       $warningcount.' '.&mt('warning(s)').        $warningcount.' '.&mt('warning(s)').
               '<br /><a href="'.$newuri.'" target="prev">'.                '<br /><a href="'.$newuri.'" target="prev">'.
       &mt('Open (and edit) cleaned up file in new window').'</a>'.        &mt('Open (and edit) cleaned up file in new window').'</a>'.
               '<br /><a href="/adm/diff?filename='.&Apache::lonnet::escape($uri).                '<br /><a href="/adm/diff?filename='.&escape($uri).
       '&versionone=priv&filetwo='.        '&versionone=priv&filetwo='.
       &Apache::lonnet::escape($newuri).'" target="prev">'.        &escape($newuri).'" target="prev">'.
       &mt('Show diffs in new window').'</a><br />'.        &mt('Show diffs in new window').'</a><br />'.
       '<input type="hidden" name="phase" value="three" />'.        '<input type="hidden" name="phase" value="three" />'.
       '<input type="submit" name="accept" value="'.&mt('Accept Result').'" />'.        '<input type="submit" name="accept" value="'.&mt('Accept Result').'" />'.
Line 332  sub handler { Line 335  sub handler {
   
     if ($env{'form.filename'}) {      if ($env{'form.filename'}) {
  $fn=$env{'form.filename'};   $fn=$env{'form.filename'};
  $fn=~s/^http\:\/\/[^\/]+//;   $fn=~s/^https?\:\/\/[^\/]+//;
     } 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); 
Line 359  sub handler { Line 362  sub handler {
  return HTTP_NOT_ACCEPTABLE;   return HTTP_NOT_ACCEPTABLE;
     }      }
   
     $fn=~s/\/\~(\w+)//;      $fn=~s{/~($LONCAPA::username_re)}{};
   
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
Removed from v.1.7  
changed lines
  Added in v.1.10

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