Diff for /loncom/publisher/loncfile.pm between versions 1.2 and 1.8

version 1.2, 2001/06/23 18:51:32 version 1.8, 2002/01/21 17:13:49
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # Handler to rename files, etc, in construction space  # Handler to rename files, etc, in construction space
 #  #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
   #
 # (Handler to retrieve an old version of a file  # (Handler to retrieve an old version of a file
 #  #
 # (Publication Handler  # (Publication Handler
Line 13 Line 38
 # 03/23 Guy Albertelli  # 03/23 Guy Albertelli
 # 03/24,03/29 Gerd Kortemeyer)  # 03/24,03/29 Gerd Kortemeyer)
 #  #
 # 03/31,04/03,05/02,05/09,06/23 Gerd Kortemeyer)  # 03/31,04/03,05/02,05/09,06/23,06/24 Gerd Kortemeyer)
 #  #
 # 06/23 Gerd Kortemeyer  # 06/23 Gerd Kortemeyer
   
Line 25  use File::Copy; Line 50  use File::Copy;
 use Apache::Constants qw(:common :http :methods);  use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;  use Apache::loncacc;
   
   sub exists {
       my ($uname,$udom,$dir,$newfile)=@_;
       my $published='/home/httpd/html/res/'.$udom.'/'.$uname.'/'.$dir.'/'.
    $ENV{'form.newfilename'};
       my $construct='/home/'.$uname.'/public_html/'.$dir.'/'.
    $ENV{'form.newfilename'};
       my $result;
       if (-e $published) {
    $result.='<p><font color=red>Warning: target file exists, and has been published!</font></p>';
       } elsif ( -e $construct ) {
    $result.='<p><font color=red>Warning: target file exists!</font></p>';
       }
       return $result;
   }
   
   sub checksuffix {
       my ($old,$new) = @_;
       my $result;
       my $oldsuffix;
       my $newsuffix;
       if ($new=~m:(.*/*)([^/]+)\.(\w+)$:) { $newsuffix=$3; }
       if ($old=~m:(.*)/+([^/]+)\.(\w+)$:) { $oldsuffix=$3; }
       if ($oldsuffix ne $newsuffix) {
    $result.='<p><font color=red>Warning: change of MIME type!</font></p>';
       }
       return $result;
   }
   
 sub phaseone {  sub phaseone {
     my ($r,$fn,$uname,$udom)=@_;      my ($r,$fn,$uname,$udom)=@_;
     my $docroot=$r->dir_config('lonDocRoot');  
   
     my $urldir='/res/'.$udom.'/'.$uname.$fn;      $fn=~m:(.*)/([^/]+)\.(\w+)$:;
     $urldir=~s/\/[^\/]+$/\//;      my $dir=$1;
       my $main=$2;
       my $suffix=$3;
   
     my $resfn=$docroot.'/res/'.$udom.'/'.$uname.$fn;      my $conspace='/home/'.$uname.'/public_html'.$fn;
     my $resdir=$resfn;  
     $resdir=~s/\/[^\/]+$/\//;  
   
     $fn=~/\/([^\/]+)\.(\w+)$/;      $r->print('<form action=/adm/cfile method=post>'.
     my $main=$1;  
     my $suffix=$2;  
   
     if (-e $resfn) {    
     $r->print('<form action=/adm/retrieve method=post>'.  
       '<input type=hidden name=filename value="/~'.$uname.$fn.'">'.        '<input type=hidden name=filename value="/~'.$uname.$fn.'">'.
               '<input type=hidden name=phase value=two>'.                '<input type=hidden name=phase value=two>'.
               '<table border=2><tr><th>Select</th><th>Version</th>'.                '<input type=hidden name=action value='.$ENV{'form.action'}.'>');
               '<th>Became this version on ...</th>'.  
               '<th>Metadata</th></tr>');      if ($ENV{'form.action'} eq 'rename') {
     my $filename;   if (-e $conspace) {
     opendir(DIR,$resdir);      if ($ENV{'form.newfilename'}) {
     while ($filename=readdir(DIR)) {   $r->print(&checksuffix($fn,$ENV{'form.newfilename'}));
         if ($filename=~/^$main\.(\d+)\.$suffix$/) {   $r->print(&exists($uname,$udom,$dir,$ENV{'form.newfilename'}));
    my $version=$1;         $r->print('<input type=hidden name=newfilename value="'.
            my ($rdev,$rino,$rmode,$rnlink,                           $ENV{'form.newfilename'}.
                 $ruid,$rgid,$rrdev,$rsize,                           '"><p>Rename <tt>'.$fn.'</tt> to <tt>'.
                 $ratime,$rmtime,$rctime,                           $dir.'/'.$ENV{'form.newfilename'}.'</tt>?</p>');
                 $rblksize,$rblocks)=stat($resdir.'/'.$filename);      } else {
            $r->print('<tr><td><input type=radio name=version value="'.         $r->print('<p>No new filename specified.</p></form>');
                      $version.'"></td><th>'.$version.'</th><td>'.                 return;
                      localtime($rmtime).'</td><td>'.      }
                      '<a href="'.$urldir.$filename.'.meta" target=cat>'.          } else {
                      'Metadata Version '.$version.'</a>');      $r->print('<p>No such file.</p></form>');
            if (&Apache::lonnet::fileembstyle($suffix) eq 'ssi') {              return;
                $r->print(          }
                     '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename=/~'.      } elsif ($ENV{'form.action'} eq 'delete') { 
                         $uname.$fn.   if (-e $conspace) {
                         '&versionone=priv&versiontwo='.$version.              $r->print('<p>Delete <tt>'.$fn.'</tt>?</p>');
                         '">Diffs with Version '.$version.'</a>');          } else {
            }      $r->print('<p>No such file.</p></form>');
            $r->print('</a></td></tr>');              return;
           }
       } elsif ($ENV{'form.action'} eq 'copy') { 
    if (-e $conspace) {
       if ($ENV{'form.newfilename'}) {
    $r->print(&checksuffix($fn,$ENV{'form.newfilename'}));
    $r->print(&exists($uname,$udom,$dir,$ENV{'form.newfilename'}));
          $r->print('<input type=hidden name=newfilename value="'.
                            $ENV{'form.newfilename'}.
                            '"><p>Copy <tt>'.$fn.'</tt> to <tt>'.
                            $dir.'/'.$ENV{'form.newfilename'}.'</tt>?</p>');
       } else {
          $r->print('<p>No new filename specified.</p></form>');
                  return;
       }
           } else {
       $r->print('<p>No such file.</p></form>');
               return;
           }
       } elsif ($ENV{'form.action'} eq 'newdir') {
           my $newdir='/home/'.$uname.'/public_html/'.
                      $fn.$ENV{'form.newfilename'};
    if (-e $newdir) {
               $r->print('<p>Directory exists.</p></form>');
               return;
         }          }
    $r->print('<input type=hidden name=newfilename value="'.
                     $ENV{'form.newfilename'}.
                     '"><p>Make new directory <tt>'.
                     $fn.$ENV{'form.newfilename'}.'</tt>?</p>');
          
     }      }
     closedir(DIR);      $r->print('<p><input type=submit value=Continue></p></form>');
     my ($rdev,$rino,$rmode,$rnlink,      $r->print('<form action="/priv/'.$uname.$fn.
         $ruid,$rgid,$rrdev,$rsize,        '" method="GET"><p><input type=submit value=Cancel></p></form>');
         $ratime,$rmtime,$rctime,  
         $rblksize,$rblocks)=stat($resfn);  
     $r->print('<tr><td><input type=radio name=version value="new"></td>'.  
               '<th>Current</th><td>'.localtime($rmtime).  
            '</td><td><a href="'.$urldir.$main.'.'.$suffix.'.meta" target=cat>'.  
               'Metadata current version</a>');             
            if (&Apache::lonnet::fileembstyle($suffix) eq 'ssi') {  
                $r->print(  
                     '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename=/~'.  
                         $uname.$fn.  
                         '&versionone=priv'.  
                         '">Diffs with current Version</a>');  
            }  
            $r->print('</td></tr></table><p>'.  
            '<font size=+1 color=red>Retrieval of an old version will '.  
            'overwrite the file currently in construction space</font><p>'.  
            '<input type=submit value="Retrieve version"></form>');  
 } else {  
     $r->print('<h3>No previous versions published.</h3>');  
 }  
 }  }
   
 sub phasetwo {  sub phasetwo {
     my ($r,$fn,$uname,$udom)=@_;      my ($r,$fn,$uname,$udom)=@_;
     if ($ENV{'form.version'}) {  
         my $version=$ENV{'form.version'};      $fn=~/(.*)\/([^\/]+)\.(\w+)$/;
  if ($version eq 'new') {      my $dir=$1;
     $r->print('<h3>Retrieving current (most recent) version</h3>');      my $main=$2;
         } else {      my $suffix=$3;
             $r->print('<h3>Retrieving old version '.$version.'</h3>');  
         }      my $conspace='/home/'.$uname.'/public_html'.$fn;
         my $logfile;  
         my $ctarget='/home/'.$uname.'/public_html'.$fn;      if ($ENV{'form.action'} eq 'rename') {
         my $vfn=$fn;   if (-e $conspace) {
         if ($version ne 'new') {      if ($ENV{'form.newfilename'}) {
     $vfn=~s/\.(\w+)$/\.$version\.$1/;                 unless (rename('/home/'.$uname.'/public_html'.$fn,
         }            '/home/'.$uname.'/public_html'.$dir.'/'.$ENV{'form.newfilename'})) {
         my $csource=$r->dir_config('lonDocRoot').'/res/'.$udom.'/'.$uname.$vfn;      $r->print('<font color=red>Error: '.$!.'</font>');
         unless ($logfile=Apache::File->new('>>'.$ctarget.'.log')) {                 }
   $r->print(              }
          '<font color=red>No write permission to user directory, FAIL</font>');          } else {
         }      $r->print('<p>No such file.</form>');
         print $logfile               return;
 "\n\n================= Retrieve ".localtime()." ================\n".          }
 "Version: $version\nSource: $csource\nTarget: $ctarget\n";      } elsif ($ENV{'form.action'} eq 'delete') { 
         $r->print('<p>Copying file: ');   if (-e $conspace) {
         if (copy($csource,$ctarget)) {              unless (unlink('/home/'.$uname.'/public_html'.$fn)) {
     $r->print('ok<p>');         $r->print('<font color=red>Error: '.$!.'</font>');
             print $logfile "Copied sucessfully.\n\n";              }
         } else {          } else {
             my $error=$!;      $r->print('<p>No such file.</form>');
     $r->print('fail, '.$error.'<p>');              return;
             print $logfile "Copy failed: $error\n\n";          }
         }      } elsif ($ENV{'form.action'} eq 'copy') { 
         $r->print('<font size=+2><a href="/priv/'.$uname.$fn.   if (-e $conspace) {
                   '">Back to '.$fn.'</a></font>');       if ($ENV{'form.newfilename'}) {
     } else {                 unless (copy('/home/'.$uname.'/public_html'.$fn,
        $r->print(             '/home/'.$uname.'/public_html'.$dir.'/'.$ENV{'form.newfilename'})) {
    '<font size=+1 color=red>Please pick a version to retrieve</font><p>');            $r->print('<font color=red>Error: '.$!.'</font>');
        &phaseone($r,$fn,$uname,$udom);                 }
       } else {
          $r->print('<p>No new filename specified.</form>');
                  return;
       }
           } else {
       $r->print('<p>No such file.</form>');
               return;
           }
       } elsif ($ENV{'form.action'} eq 'newdir') {
           my $newdir='/home/'.$uname.'/public_html/'.
                      $fn.$ENV{'form.newfilename'};
           unless (mkdir($newdir,0770)) {
       $r->print('<font color=red>Error: '.$!.'</font>');
           }
           $r->print('<h3><a href="/priv/'.$uname.$fn.'/">Done</a></h3>');
           return;
     }      }
       $r->print('<h3><a href="/priv/'.$uname.$dir.'/">Done</a></h3>');
 }  }
   
 sub handler {  sub handler {
Line 166  sub handler { Line 240  sub handler {
     &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 publish file '.$ENV{'form.filename'}.           ' trying to manipulate file '.$ENV{'form.filename'}.
          ' ('.$fn.') - not authorized',            ' ('.$fn.') - not authorized', 
          $r->filename);            $r->filename); 
      return HTTP_NOT_ACCEPTABLE;       return HTTP_NOT_ACCEPTABLE;
Line 203  sub handler { Line 277  sub handler {
      return OK;         return OK;  
   }    }
   if ($ENV{'form.phase'} eq 'two') {    if ($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>');

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


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