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

Diff for /loncom/publisher/loncleanup.pm between versions 1.11 and 1.13

version 1.11, 2009/09/09 17:58:37 version 1.13, 2011/10/24 22:39:21
Line 278  sub phaseone { Line 278  sub phaseone {
 sub phasetwo {  sub phasetwo {
     # Check original file      # Check original file
     my ($r,$fn,$uname,$udom)=@_;      my ($r,$fn,$uname,$udom)=@_;
     open(IN,'/home/'.$uname.'/public_html/'.$fn);      open(IN,'/home/httpd/html/priv/'.$udom.'/'.$uname.'/'.$fn);
     my $text='';      my $text='';
     while (my $line=<IN>) {      while (my $line=<IN>) {
  $text.=$line;   $text.=$line;
Line 310  sub phasetwo { Line 310  sub phasetwo {
                ($env{'form.symbol'} ne 'on'));                 ($env{'form.symbol'} ne 'on'));
     my ($main,$ext)=($fn=~/^(.*)\.(\w+)/);      my ($main,$ext)=($fn=~/^(.*)\.(\w+)/);
     my $newfn=$main.'_Auto_Cleaned_Up.'.$ext;      my $newfn=$main.'_Auto_Cleaned_Up.'.$ext;
     open(OUT,'>/home/'.$uname.'/public_html'.$newfn);      open(OUT,'>/home/httpd/html/priv/'.$udom.'/'.$uname.'/'.$newfn);
     print OUT $text;      print OUT $text;
     close(OUT);      close(OUT);
     my $newuri='/~'.$uname.$newfn;      my $newuri='/~'.$uname.$newfn;
Line 356  sub phasetwo { Line 356  sub phasetwo {
   
 sub phasethree {  sub phasethree {
     my ($r,$fn,$uname,$udom)=@_;      my ($r,$fn,$uname,$udom)=@_;
     my $old='/home/'.$uname.'/public_html/'.$fn;      my $old='/home/httpd/html/priv/'.$udom.'/'.$uname.'/'.$fn;
     my ($main,$ext)=($fn=~/^(.*)\.(\w+)/);      my ($main,$ext)=($fn=~/^(.*)\.(\w+)/);
     my $newfn=$main.'_Auto_Cleaned_Up.'.$ext;      my $newfn=$main.'_Auto_Cleaned_Up.'.$ext;
     my $new='/home/'.$uname.'/public_html'.$newfn;      my $new='/home/httpd/html/priv/'.$udom.'/'.$uname.'/'.$newfn;
     if ($env{'form.accept'}) {      if ($env{'form.accept'}) {
  $r->print(   $r->print(
         '<p class="LC_info">'          '<p class="LC_info">'
Line 407  sub handler { Line 407  sub handler {
     my $uname;      my $uname;
     my $udom;      my $udom;
   
     ($uname,$udom)=      ($uname,$udom)=&Apache::loncacc::constructaccess($fn);
  &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'}.
Line 451  sub handler { Line 450  sub handler {
         '</form>'          '</form>'
        .&Apache::lonhtmlcommon::start_funclist()         .&Apache::lonhtmlcommon::start_funclist()
        .&Apache::lonhtmlcommon::add_item_funclist(         .&Apache::lonhtmlcommon::add_item_funclist(
             '<a href="/priv/'.$uname.'/'.$fn.'">'.&mt('Back to Source File').'</a>')              '<a href="/priv/'.$udom.'/'.$uname.'/'.$fn.'">'.&mt('Back to Source File').'</a>')
        .&Apache::lonhtmlcommon::add_item_funclist(         .&Apache::lonhtmlcommon::add_item_funclist(
             '<a href="/priv/'.$uname.'/'.$dir.'">'.&mt('Back to Source Directory').'</a>')              '<a href="/priv/'.$udom.'/'.$uname.'/'.$dir.'">'.&mt('Back to Source Directory').'</a>')
        .&Apache::lonhtmlcommon::end_funclist()         .&Apache::lonhtmlcommon::end_funclist()
        .&Apache::loncommon::end_page()         .&Apache::loncommon::end_page()
     );      );
Removed from v.1.11  
changed lines
  Added in v.1.13

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