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

Diff for /loncom/publisher/loncfile.pm between versions 1.39 and 1.60

version 1.39, 2003/08/04 20:34:19 version 1.60, 2004/08/20 16:29:15
Line 72  use Apache::loncacc; Line 72  use Apache::loncacc;
 use Apache::Log ();  use Apache::Log ();
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::loncommon();  use Apache::loncommon();
   use Apache::lonlocal;
   
 my $DEBUG=0;  my $DEBUG=0;
 my $r; # Needs to be global for some stuff RF.  my $r; # Needs to be global for some stuff RF.
Line 101  my $r;    # Needs to be global for some Line 102  my $r;    # Needs to be global for some
   
 sub Debug {  sub Debug {
       
   # Marshall the parameters.      # Marshall the parameters.
       
   my $r       = shift;      my $r       = shift;
   my $log     = $r->log;      my $log     = $r->log;
   my $message = shift;      my $message = shift;
       
   # Put out the indicated message butonly if DEBUG is true.      # Put out the indicated message butonly if DEBUG is true.
       
   if ($DEBUG) {      if ($DEBUG) {
     $log->debug($message);   $r->log_reason($message);
   }      }
 }  }
   
 =pod  =pod
Line 150  Global References Line 151  Global References
 =cut  =cut
   
 sub URLToPath {  sub URLToPath {
   my $Url = shift;      my $Url = shift;
   &Debug($r, "UrlToPath got: $Url");      &Debug($r, "UrlToPath got: $Url");
   $Url=~ s/\/+/\//g;      $Url=~ s/\/+/\//g;
   $Url=~ s/^http\:\/\/[^\/]+//;      $Url=~ s/^http\:\/\/[^\/]+//;
   $Url=~ s/^\///;      $Url=~ s/^\///;
   $Url=~ s/(\~|priv\/)(\w+)\//\/home\/$2\/public_html\//;      $Url=~ s/(\~|priv\/)(\w+)\//\/home\/$2\/public_html\//;
   &Debug($r, "Returning $Url \n");      &Debug($r, "Returning $Url \n");
   return $Url;      return $Url;
 }  }
   
 sub url {  sub url {
     my $fn=shift;      my $fn=shift;
     $fn=~s/^\/home\/(\w+)\/public\_html/\/priv\/$1/;      $fn=~s/^\/home\/(\w+)\/public\_html/\/priv\/$1/;
       $fn=&HTML::Entities::encode($fn,'<>"&');
     return $fn;      return $fn;
 }  }
   
 sub display {  sub display {
     my $fn=shift;      my $fn=shift;
     $fn=~s/^\/home\/(\w+)\/public\_html//;      $fn=~s-^/home/(\w+)/public_html-/priv/$1-;
     return '<tt>'.$fn.'</tt>';      return '<tt>'.$fn.'</tt>';
 }  }
   
   
   # see if the file is
   # a) published (return 0 if not)
   # b) if, so obsolete (return 0 if not)
   
   sub obsolete_unpub {
       my ($user,$domain,$construct)=@_;
       my $published=$construct;
       $published=~
    s/^\/home\/$user\/public\_html\//\/home\/httpd\/html\/res\/$domain\/$user\//;
       if (-e $published) {
    if (&Apache::lonnet::metadata($published,'obsolete')) {
       return 1;
    }
    return 0;
       } else {
    return 1;
       }
   }
   
   
   
 =pod  =pod
   
 =item exists($user, $domain, $file)  =item exists($user, $domain, $file)
Line 205  Returns: Line 229  Returns:
 =cut  =cut
   
 sub exists {  sub exists {
   my ($user, $domain, $construct) = @_;      my ($user, $domain, $construct) = @_;
   my $published=$construct;      my $published=$construct;
   $published=~      $published=~
 s/^\/home\/$user\/public\_html\//\/home\/httpd\/html\/res\/$domain\/$user\//;   s/^\/home\/$user\/public\_html\//\/home\/httpd\/html\/res\/$domain\/$user\//;
   my $result='';          my $result='';    
   if ( -d $construct ) {      if ( -d $construct ) {
       return 'Error: destination for operation is an existing directory.';   return &mt('Error: destination for operation is an existing directory.');
   }      }
   if ( -e $published) {      if ( -e $published) {
       $result.='<p><font color="red">Warning: target file exists, and has been published!</font></p>';   $result.='<p><font color="red">'.&mt('Warning: target file exists, and has been published!').'</font></p>';
   } elsif ( -e $construct) {      } elsif ( -e $construct) {
       $result.='<p><font color="red">Warning: target file exists!</font></p>';   $result.='<p><font color="red">'.&mt('Warning: target file exists!').'</font></p>';
   }      }
   return $result;      return $result;
   
 }  }
   
 =pod  =pod
Line 260  sub checksuffix { Line 283  sub checksuffix {
     if ($old=~m:(.*)/+([^/]+)\.(\w+)$:) { $oldsuffix=$3; }      if ($old=~m:(.*)/+([^/]+)\.(\w+)$:) { $oldsuffix=$3; }
     if ($oldsuffix ne $newsuffix) {      if ($oldsuffix ne $newsuffix) {
  $result.=   $result.=
             '<p><font color="red">Warning: change of MIME type!</font></p>';              '<p><font color="red">'.&mt('Warning: change of MIME type!').'</font></p>';
     }      }
     return $result;      return $result;
 }  }
   
 sub cleanDest {  sub cleanDest {
     my ($request,$dest)=@_;      my ($request,$dest,$subdir)=@_;
     #remove bad characters      #remove bad characters
     if  ($dest=~/[\#\?&]/) {      my $foundbad=0;
  $request->print("<p><font color=\"red\">Invalid characters in requested name have been removed.</font></p>");      if ($subdir && $dest =~/\./) {
  $dest=~s/[\#\?&]//g;   $foundbad=1;
    $dest=~s/\.//g;
       }
       if  ($dest=~/[\#\?&%\"]/) {
    $foundbad=1;
    $dest=~s/[\#\?&%\"]//g;
       }
       if ($foundbad) {
    $request->print("<p><font color=\"red\">".&mt('Invalid characters in requested name have been removed.')."</font></p>");
     }      }
     return $dest;      return $dest;
 }  }
Line 311  Parameters: Line 342  Parameters:
 =cut  =cut
   
 sub CloseForm1 {  sub CloseForm1 {
    my ($request,  $fn) = @_;      my ($request,  $fn) = @_;
    $request->print('<p><input type="submit" value="Continue" /></p></form>');      $request->print('<p><input type="submit" value="'.&mt('Continue').'" /></p></form>');
    $request->print('<form action="'.&url($fn).      $request->print('<form action="'.&url($fn).
      '" method="POST"><p><input type="submit" value="Cancel" /></p></form>');      '" method="POST"><p><input type="submit" value="'.&mt('Cancel').'" /></p></form>');
 }  }
   
   
Line 343  Parameters: Line 374  Parameters:
 =cut  =cut
   
 sub CloseForm2 {  sub CloseForm2 {
   my ($request, $user, $fn) = @_;      my ($request, $user, $fn) = @_;
   $request->print('<h3><a href="'.&url($fn).'/">Done</a></h3>');      $request->print('<h3><a href="'.&url($fn).'/">'.&mt('Done').'</a></h3>');
 }  }
   
 =pod  =pod
Line 383  new filename relative to the current dir Line 414  new filename relative to the current dir
 =cut    =cut  
   
 sub Rename1 {  sub Rename1 {
     my ($request, $user, $domain, $fn, $newfilename) = @_;      my ($request, $user, $domain, $fn, $newfilename, $style) = @_;
   
     if(-e $fn) {      if(-e $fn) {
  if($newfilename) {   if($newfilename) {
       # is dest a dir
       if ($style eq 'move') {
    if (-d $newfilename) {
       if ($fn =~ m|/([^/]*)$|) { $newfilename .= '/'.$1; }
    }
       }
     if ($newfilename =~ m|/[^\.]+$|) {      if ($newfilename =~ m|/[^\.]+$|) {
  #no extension add on original extension   #no extension add on original extension
  if ($fn =~ m|/[^\.]*\.([^\.]+)$|) {   if ($fn =~ m|/[^\.]*\.([^\.]+)$|) {
Line 397  sub Rename1 { Line 434  sub Rename1 {
     #renaming a dir, delete the trailing /      #renaming a dir, delete the trailing /
             #remove second to last element for current dir              #remove second to last element for current dir
     if (-d $fn) {      if (-d $fn) {
    $newfilename=~/\.(\w+)$/;
    if (&Apache::loncommon::fileembstyle($1) eq 'ssi') {
       $request->print('<br /><font color="red">'.
       &mt('Cannot change MIME type of a directory').
       '</font>'.
       '<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
       return;
    }
  $newfilename=~s/\/[^\/]+\/([^\/]+)$/\/$1/;   $newfilename=~s/\/[^\/]+\/([^\/]+)$/\/$1/;
     }      }
       $newfilename=~s://+:/:g; # remove duplicate /
       while ($newfilename=~m:/\.\./:) {
    $newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/..
       }
     my $return=&exists($user, $domain, $newfilename);      my $return=&exists($user, $domain, $newfilename);
     $request->print($return);      $request->print($return);
     if ($return =~/^Error:/) {      if ($return =~/^Error:/) {
  $request->print('<br /><a href="'.&url($fn).'">Cancel</a>');   $request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
  return;   return;
     }      }
       unless (&obsolete_unpub($user,$domain,$fn)) {
    $request->print('<h3>'.&mt('Cannot rename or move non-obsolete published file').'</h3>'.
    '<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
    return;
       }
       my $action;
       if ($style eq 'rename') {
    $action=&mt('Rename');
       } else {
    $action=&mt('Move');
       }
     $request->print('<input type="hidden" name="newfilename" value="'.      $request->print('<input type="hidden" name="newfilename" value="'.
     $newfilename.      $newfilename.
     '" /><p>Rename '.&display($fn).      '" /><p>'.$action.' '.&display($fn).
     '</tt><br />to '.&display($newfilename).'?</p>');      '</tt><br />to '.&display($newfilename).'?</p>');
     &CloseForm1($request, $fn);      &CloseForm1($request, $fn);
  } else {   } else {
     $request->print('<p>No new filename specified.</p></form>');      $request->print('<p>'.&mt('No new filename specified.').'</p></form>');
     return;      return;
  }   }
     } else {      } else {
  $request->print('<p> No such file: '.&display($fn).'</p></form>');   $request->print('<p> '.&mt('No such file').': '.&display($fn).'</p></form>');
  return;   return;
     }      }
           
 }  }
   
 =pod  =pod
   
 =item Delete1  =item Delete1
Line 445  Parameters: Line 506  Parameters:
 =cut  =cut
   
 sub Delete1 {  sub Delete1 {
   my ($request, $user, $domain, $fn) = @_;      my ($request, $user, $domain, $fn) = @_;
   
   if( -e $fn) {      if( -e $fn) {
     $request->print('<input type="hidden" name="newfilename" value="'.   $request->print('<input type="hidden" name="newfilename" value="'.
     $fn.'"/>');   $fn.'"/>');
     $request->print('<p>Delete '.&display($fn).'?</p>');   unless (&obsolete_unpub($user,$domain,$fn)) {
     &CloseForm1($request, $fn);      $request->print('<h3>'.&mt('Cannot delete non-obsolete published file').'</h3>'.
   } else {      '<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
     $request->print('<p>No such file: '.&display($fn).'</p></form>');      return;
   }   }
    $request->print('<p>'.&mt('Delete').' '.&display($fn).'?</p>');
    &CloseForm1($request, $fn);
       } else {
    $request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
       }
 }  }
   
 =pod  =pod
Line 485  Parameters: Line 551  Parameters:
 =cut  =cut
   
 sub Copy1 {  sub Copy1 {
   my ($request, $user, $domain, $fn, $newfilename) = @_;      my ($request, $user, $domain, $fn, $newfilename) = @_;
   
   if(-e $fn) {      if(-e $fn) {
     $request->print(&checksuffix($fn,$newfilename));   # is dest a dir
     my $return=&exists($user, $domain, $newfilename);   if (-d $newfilename) {
     $request->print($return);      if ($fn =~ m|/([^/]*)$|) { $newfilename .= '/'.$1; }
     if ($return =~/^Error:/) {   }
  $request->print('<br /><a href="'.&url($fn).'">Cancel</a>');   if ($newfilename =~ m|/[^\.]+$|) {
  return;      #no extension add on original extension
       if ($fn =~ m|/[^\.]*\.([^\.]+)$|) { $newfilename.='.'.$1; }
    } 
    $newfilename=~s://+:/:g; # remove duplicate /
    while ($newfilename=~m:/\.\./:) {
       $newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/..
    }
    $request->print(&checksuffix($fn,$newfilename));
    my $return=&exists($user, $domain, $newfilename);
    $request->print($return);
    if ($return =~/^Error:/) {
       $request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
       return;
    }
    $request->print('<input type="hidden" name="newfilename" value="'.
    $newfilename.
    '" /><p>'.&mt('Copy').' '.&display($fn).'<br />to '.
    &display($newfilename).'?</p>');
    &CloseForm1($request, $fn);
       } else {
    $request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
     }      }
     $request->print('<input type = "hidden" name = "newfilename" value = "'.  
     $newfilename.  
     '" /><p>Copy '.&display($fn).'<br />to '.  
     &display($newfilename).'?</p>');  
     &CloseForm1($request, $fn);  
   } else {  
     $request->print('<p>No such file: '.&display($fn).'</p></form>');  
   }  
 }  }
   
 =pod  =pod
Line 544  causes the newdir operation to transitio Line 622  causes the newdir operation to transitio
 =cut  =cut
   
   
 sub NewDir1  sub NewDir1 {
 {      my ($request, $username, $domain, $fn, $newfilename, $mode) = @_;
   my ($request, $username, $domain, $fn, $newfilename) = @_;  
       my $result=&exists($username,$domain,$newfilename);
   my $result=&exists($username,$domain,$newfilename);      if ($result) {
   if ($result) {   $request->print('<font color="red">'.$result.'</font></form>');
     $request->print('<font color="red">'.$result.'</font></form>');      } else {
   } else {   if ($mode eq 'testbank') {
     $request->print('<input type="hidden" name="newfilename" value="'.      $request->print('<input type="hidden" name="callingmode" value="testbank">');
     $newfilename.'" /><p>Make new directory '.   } elsif ($mode eq 'imsimport') {
     &display($newfilename).'?</p>');      $request->print('<input type="hidden" name="callingmode" value="imsimport">');
     &CloseForm1($request, $fn);   }
   }   $request->print('<input type="hidden" name="newfilename" value="'.
    $newfilename.'" /><p>'.&mt('Make new directory').' '.
    &display($newfilename).'?</p>');
    &CloseForm1($request, $fn);
       }
   }
   
   
   sub Decompress1 {
       my ($request, $user, $domain, $fn) = @_;
       if( -e $fn) {
       $request->print('<input type="hidden" name="newfilename" value="'.$fn.'"/>');
       $request->print('<p>'.&mt('Decompress').' '.&display($fn).'?</p>');
       &CloseForm1($request, $fn);
       } else {
    $request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
       }
 }  }
   
 =pod  =pod
Line 599  button which returns you to the driector Line 693  button which returns you to the driector
   
 =cut  =cut
   
   
 sub NewFile1 {  sub NewFile1 {
     my ($request, $user, $domain, $fn, $newfilename) = @_;      my ($request, $user, $domain, $fn, $newfilename) = @_;
   
     if ($ENV{'form.action'} =~ /new(.+)file/) {      if ($ENV{'form.action'} =~ /new(.+)file/) {
  my $extension=$1;   my $extension=$1;
   
           ##Informs User (name).(number).(extension) not allowed 
    if($newfilename =~ /\.(\d+)\.(\w+)$/){
       $r->print('<font color="red">'.$newfilename.
         ' - '.&mt('Bad Filename').'<br />('.&mt('name').').('.&mt('number').').('.&mt('extension').')'.
         ' '.&mt('Not Allowed').'</font>');
       return;
    }
  if ($newfilename !~ /\Q.$extension\E$/) {   if ($newfilename !~ /\Q.$extension\E$/) {
     if ($newfilename =~ m|^[^\.]*\.([^\.]+)$|) {      if ($newfilename =~ m|^[^\.]*\.([^\.]+)$|) {
  #already has an extension strip it and add in expected one   #already has an extension strip it and add in expected one
Line 617  sub NewFile1 { Line 718  sub NewFile1 {
     if($result) {      if($result) {
  $request->print('<font color="red">'.$result.'</font></form>');   $request->print('<font color="red">'.$result.'</font></form>');
     } else {      } else {
  $request->print('<p>Make new file '.&display($newfilename).'?</p>');   $request->print('<p>'.&mt('Make new file').' '.&display($newfilename).'?</p>');
  $request->print('</form>');   $request->print('</form>');
  $request->print('<form action="'.&url($newfilename).   $request->print('<form action="'.&url($newfilename).
  '" method="POST"><p><input type="submit" value="Continue" /></p></form>');   '" method="POST"><p><input type="submit" value="'.&mt('Continue').'" /></p></form>');
  $request->print('<form action="'.&url($fn).   $request->print('<form action="'.&url($fn).
  '" method="POST"><p><input type="submit" value="Cancel" /></p></form>');   '" method="POST"><p><input type="submit" value="'.&mt('Cancel').'" /></p></form>');
     }      }
 }  }
   
Line 655  performed and reported to the user. Line 756  performed and reported to the user.
 =cut  =cut
   
 sub phaseone {  sub phaseone {
   my ($r,$fn,$uname,$udom)=@_;      my ($r,$fn,$uname,$udom)=@_;
       
   my $newfilename=&cleanDest($r,$ENV{'form.newfilename'});      my $doingdir=0;
   $newfilename=&relativeDest($fn,$newfilename,$uname);      if ($ENV{'form.action'} eq 'newdir') { $doingdir=1; }
       my $newfilename=&cleanDest($r,$ENV{'form.newfilename'},$doingdir);
   $r->print('<form action="/adm/cfile" method="post">'.      $newfilename=&relativeDest($fn,$newfilename,$uname);
       '<input type="hidden" name="qualifiedfilename" value="'.$fn.'" />'.      $r->print('<form action="/adm/cfile" method="post">'.
       '<input type="hidden" name="phase" value="two" />'.        '<input type="hidden" name="qualifiedfilename" value="'.$fn.'" />'.
       '<input type="hidden" name="action" value="'.$ENV{'form.action'}.'" />');        '<input type="hidden" name="phase" value="two" />'.
           '<input type="hidden" name="action" value="'.$ENV{'form.action'}.'" />');
   if ($ENV{'form.action'} eq 'rename') {    
       &Rename1($r, $uname, $udom, $fn, $newfilename);      if ($ENV{'form.action'} eq 'rename') {
   } elsif ($ENV{'form.action'} eq 'delete') {    &Rename1($r, $uname, $udom, $fn, $newfilename, 'rename');
       &Delete1($r, $uname, $udom, $fn);      } elsif ($ENV{'form.action'} eq 'move') {
   } elsif ($ENV{'form.action'} eq 'copy') {    &Rename1($r, $uname, $udom, $fn, $newfilename, 'move');
       if($newfilename) {      } elsif ($ENV{'form.action'} eq 'delete') { 
   &Copy1($r, $uname, $udom, $fn, $newfilename);   &Delete1($r, $uname, $udom, $fn);
       } else {      } elsif ($ENV{'form.action'} eq 'decompress') {
   $r->print('<p>No new filename specified.</p></form>');   &Decompress1($r, $uname, $udom, $fn);
       }      } elsif ($ENV{'form.action'} eq 'copy') { 
   } elsif ($ENV{'form.action'} eq 'newdir') {   if($newfilename) {
       &NewDir1($r, $uname, $udom, $fn, $newfilename);      &Copy1($r, $uname, $udom, $fn, $newfilename);
   }  elsif ($ENV{'form.action'} eq 'newfile' ||   } else {
     $ENV{'form.action'} eq 'newhtmlfile' ||      $r->print('<p>'.&mt('No new filename specified.').'</p></form>');
     $ENV{'form.action'} eq 'newproblemfile' ||   }
             $ENV{'form.action'} eq 'newpagefile' ||      } elsif ($ENV{'form.action'} eq 'newdir') {
             $ENV{'form.action'} eq 'newsequencefile' ||   my $mode = '';
             $ENV{'form.action'} eq 'newrightsfile' ||   if (exists($ENV{'form.callingmode'}) ) {
             $ENV{'form.action'} eq 'newstyfile' ||      $mode = $ENV{'form.callingmode'};
             $ENV{'form.action'} eq 'Select Action') {   }   
       if ($newfilename) {   &NewDir1($r, $uname, $udom, $fn, $newfilename, $mode);
   &NewFile1($r, $uname, $udom, $fn, $newfilename);      }  elsif ($ENV{'form.action'} eq 'newfile' ||
       } else {        $ENV{'form.action'} eq 'newhtmlfile' ||
   $r->print('<p>No new filename specified.</p></form>');        $ENV{'form.action'} eq 'newproblemfile' ||
       }        $ENV{'form.action'} eq 'newpagefile' ||
   }        $ENV{'form.action'} eq 'newsequencefile' ||
         $ENV{'form.action'} eq 'newrightsfile' ||
         $ENV{'form.action'} eq 'newstyfile' ||
         $ENV{'form.action'} eq 'Select Action') {
    if ($newfilename) {
       &NewFile1($r, $uname, $udom, $fn, $newfilename);
    } else {
       $r->print('<p>'.&mt('No new filename specified.').'</p></form>');
    }
       }
 }  }
   
 =pod  =pod
Line 729  Returns: Line 839  Returns:
   
 sub Rename2 {  sub Rename2 {
   
   my ($request, $user, $directory, $oldfile, $newfile) = @_;      my ($request, $user, $directory, $oldfile, $newfile) = @_;
   
   &Debug($request, "Rename2 directory: ".$directory." old file: ".$oldfile.      &Debug($request, "Rename2 directory: ".$directory." old file: ".$oldfile.
  " new file ".$newfile."\n");     " new file ".$newfile."\n");
   &Debug($request, "Target is: ".$directory.'/'.      &Debug($request, "Target is: ".$directory.'/'.
  $newfile);     $newfile);
   if (-e $oldfile) {      if (-e $oldfile) {
       unless (rename($oldfile,$newfile)) {  
   $request->print('<font color="red">Error: '.$!.'</font>');   my $oRN=$oldfile;
   return 0;   my $nRN=$newfile;
       }   unless (rename($oldfile,$newfile)) {
   } else {      $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
       $request->print("<p> No such file: ".&display($oldfile).'</p></form>');      return 0;
       return 0;   }
   }   ## If old name.(extension) exits, move under new name.
   return 1;   ## If it doesn't exist and a new.(extension) exists  
    ## delete it (only concern when renaming over files)
    my $tmp1=$oRN.'.meta';
    my $tmp2=$nRN.'.meta';
    if(-e $tmp1){
       unless(rename($tmp1,$tmp2)){ }
    } elsif(-e $tmp2){
       unlink $tmp2;
    }
    $tmp1=$oRN.'.save';
    $tmp2=$nRN.'.save';
    if(-e $tmp1){
       unless(rename($tmp1,$tmp2)){ }
    } elsif(-e $tmp2){
       unlink $tmp2;
    }
    $tmp1=$oRN.'.log';
    $tmp2=$nRN.'.log';
    if(-e $tmp1){
       unless(rename($tmp1,$tmp2)){ }
    } elsif(-e $tmp2){
       unlink $tmp2;
    }
    $tmp1=$oRN.'.bak';
    $tmp2=$nRN.'.bak';
    if(-e $tmp1){
       unless(rename($tmp1,$tmp2)){ }
    } elsif(-e $tmp2){
       unlink $tmp2;
    }
       } else {
    $request->print("<p> ".&mt('No such file').": ".&display($oldfile).'</p></form>');
    return 0;
       }
       return 1;
 }  }
   
 =pod  =pod
   
 =item Delete2($request, $user, $filename)  =item Delete2($request, $user, $filename)
Line 776  Returns: Line 921  Returns:
 =cut  =cut
   
 sub Delete2 {  sub Delete2 {
   my ($request, $user, $filename) = @_;      my ($request, $user, $filename) = @_;
       if(opendir DIR, $filename) { 
   if(-e $filename) {   my @files=readdir(DIR);
     unless(unlink($filename)) {   shift @files; shift @files; # takes off . and ..
       $request->print('<font color="red">Error: '.$!.'</font>');   if(@files) { 
       return 0;      $request->print('<font color="red"> '.&mt('Error: Directory Non Empty').'</font>'); 
     }      return 0;
   } else {   } else {   
     $request->print('<p> No such file. </p></form');      if(-e $filename) {
     return 0;   unless(rmdir($filename)) {
   }      $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
   return 1;      return 0;
    }
       } else {
    $request->print('<p> '.&mt('No such file').'. </p></form>');
    return 0;
       }
    }
       } else {
    if(-e $filename) {
       unless(unlink($filename)) {
    $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
    return 0;
       }
    } else {
       $request->print('<p> '.&mt('No such file').'. </p></form>');
       return 0;
    }
       }
       return 1;
 }  }
   
 =pod  =pod
Line 823  sub Copy2 { Line 986  sub Copy2 {
     &Debug($request ,"Will try to copy $oldfile to $newfile");      &Debug($request ,"Will try to copy $oldfile to $newfile");
     if(-e $oldfile) {      if(-e $oldfile) {
  unless (copy($oldfile, $newfile)) {   unless (copy($oldfile, $newfile)) {
     $request->print('<font color="red"> copy Error: '.$!.'</font>');      $request->print('<font color="red"> '.&mt('copy Error').': '.$!.'</font>');
     return 0;      return 0;
  } else {   } else {
     unless (chmod(0660, $newfile)) {      unless (chmod(0660, $newfile)) {
  $request->print('<font color="red"> chmod error: '.$!.'</font>');   $request->print('<font color="red"> '.&mt('chmod error').': '.$!.'</font>');
  return 0;   return 0;
     }      }
     return 1;      return 1;
  }   }
     } else {      } else {
  $request->print('<p> No such file </p>');   $request->print('<p> '.&mt('No such file').' </p>');
  return 0;   return 0;
     }      }
     return 1;      return 1;
 }  }
   
 =pod  =pod
   
 =item NewDir2($request, $user, $newdirectory)  =item NewDir2($request, $user, $newdirectory)
Line 861  Returns 0 - failure 1 - success. Line 1025  Returns 0 - failure 1 - success.
 =cut  =cut
   
 sub NewDir2 {  sub NewDir2 {
   my ($request, $user, $newdirectory) = @_;      my ($request, $user, $newdirectory) = @_;
       
   unless(mkdir($newdirectory, 02770)) {      unless(mkdir($newdirectory, 02770)) {
     $request->print('<font color="red">Error: '.$!.'</font>');   $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
     return 0;   return 0;
   }      }
   unless(chmod(02770, ($newdirectory))) {      unless(chmod(02770, ($newdirectory))) {
       $request->print('<font color="red"> Error: '.$!.'</font>');   $request->print('<font color="red"> '.&mt('Error').': '.$!.'</font>');
       return 0;   return 0;
   }      }
   return 1;      return 1;
   }
   
   sub decompress2 {
       my ($r, $user, $dir, $file) = @_;
       &Apache::lonnet::appenv('cgi.file' => $file);
       &Apache::lonnet::appenv('cgi.dir' => $dir);
       my $result=&Apache::lonnet::ssi_body('/cgi-bin/decompress.pl');
       $r->print($result);
       &Apache::lonnet::delenv('cgi.file');
       &Apache::lonnet::delenv('cgi.dir');
       return 1;
 }  }
   
 =pod  =pod
Line 916  sub phasetwo { Line 1091  sub phasetwo {
     my $dir; # Directory path      my $dir; # Directory path
     my $main; # Filename.      my $main; # Filename.
     my $suffix; # Extension.      my $suffix; # Extension.
       if ($fn=~m:(.*)/([^/]+):) {
     if ($fn=~m:(.*)/([^/]+)\.(\w+)$:) {  
  $dir=$1; # Directory path   $dir=$1; # Directory path
  $main=$2; # Filename.   $main=$2; # Filename.
  $suffix=$3; # Extension.  
     }      }
               if($main=~m:\.(\w+)$:){ # Fixes problems with filenames with no extensions
    $main=$`; #This is what is before the match (.) so it's just the main filename, yea it's nasty
    $suffix=$1; #This is the actually filename extension if it exists
       }
     my $dest;                   # On success this is where we'll go.      my $dest;                   # On success this is where we'll go.
           
     &Debug($r,       &Debug($r,"loncfile::phase2 dir = $dir main = $main suffix = $suffix");
    "loncfile::phase2 dir = $dir main = $main suffix = $suffix");      &Debug($r,"    newfilename = ".$ENV{'form.newfilename'});
     &Debug($r,  
    "    newfilename = ".$ENV{'form.newfilename'});  
   
     my $conspace=$fn;      my $conspace=$fn;
           
     &Debug($r,       &Debug($r,"loncfile::phase2 Full construction space name: $conspace");
    "loncfile::phase2 Full construction space name: $conspace");  
           
     &Debug($r,       &Debug($r,"loncfie::phase2 action is $ENV{'form.action'}");
    "loncfie::phase2 action is $ENV{'form.action'}");  
           
     # Select the appropriate processing sub.      # Select the appropriate processing sub.
           if ($ENV{'form.action'} eq 'decompress') { 
     if ($ENV{'form.action'} eq 'rename') { # Rename.   $main .= '.';
    $main .= $suffix;
    if(!&decompress2($r, $uname, $dir, $main)) {
       return ;
    }
    $dest = $dir."/.";
       } elsif ($ENV{'form.action'} eq 'rename') { # Rename.
  if($ENV{'form.newfilename'}) {   if($ENV{'form.newfilename'}) {
     if (!defined($dir)) {      if (!defined($dir)) {
  $fn=~m:^(.*)/:;   $fn=~m:^(.*)/:;
  $dir=$1;   $dir=$1; 
     }      }
     if(!&Rename2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {      if(!&Rename2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {
  return;   return;
     }      }
     $dest = &url($ENV{'form.newfilename'});      $dest = $ENV{'form.newfilename'};
  }   }
     } elsif ($ENV{'form.action'} eq 'delete') {       } elsif ($ENV{'form.action'} eq 'delete') { 
  if(!&Delete2($r, $uname, $ENV{'form.newfilename'})) {   if(!&Delete2($r, $uname, $ENV{'form.newfilename'})) {
Line 962  sub phasetwo { Line 1140  sub phasetwo {
     } elsif ($ENV{'form.action'} eq 'copy') {       } elsif ($ENV{'form.action'} eq 'copy') { 
  if($ENV{'form.newfilename'}) {   if($ENV{'form.newfilename'}) {
     if(!&Copy2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {      if(!&Copy2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {
  return   return ;
  }      }
     $dest = $ENV{'form.newfilename'};      $dest = $ENV{'form.newfilename'};
              } else {
  } else {      $r->print('<p>'.&mt('No New filename specified').'</p></form>');
     $r->print('<p>No New filename specified</p></form>');  
     return;      return;
  }   }
   
Line 976  sub phasetwo { Line 1153  sub phasetwo {
  if(!&NewDir2($r, $uname, $newdir)) {   if(!&NewDir2($r, $uname, $newdir)) {
     return;      return;
  }   }
  $dest = $newdir."/"   $dest = $newdir."/";
       }
       if ( ($ENV{'form.action'} eq 'newdir') && ($ENV{'form.phase'} eq 'two') && ( ($ENV{'form.callingmode'} eq 'testbank') || ($ENV{'form.callingmode'} eq 'imsimport') ) ) {
    $r->print('<h3><a href="javascript:self.close()">'.&mt('Done').'</a></h3>');
       } else {
    $r->print('<h3><a href="'.&url($dest).'">'.&mt('Done').'</a></h3>');
     }      }
     $r->print('<h3><a href="'.&url($dest).'">Done</a></h3>');  
 }  }
   
 sub handler {  sub handler {
   
   $r=shift;      $r=shift;
   
       &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress','action','filename','newfilename']);
   
   &Debug($r, "loncfile.pm - handler entered");      &Debug($r, "loncfile.pm - handler entered");
   &Debug($r, " filename: ".$ENV{'form.filename'});      &Debug($r, " filename: ".$ENV{'form.filename'});
   &Debug($r, " newfilename: ".$ENV{'form.newfilename'});      &Debug($r, " newfilename: ".$ENV{'form.newfilename'});
 #  #
 # Determine the root filename  # Determine the root filename
 # This could come in as "filename", which actually is a URL, or  # This could come in as "filename", which actually is a URL, or
 # as "qualifiedfilename", which is indeed a real filename in filesystem  # as "qualifiedfilename", which is indeed a real filename in filesystem
 #  #
   my $fn;      my $fn;
   
       if ($ENV{'form.filename'}) {
    &Debug($r, "test: $ENV{'form.filename'}");
    $fn=&Apache::lonnet::unescape($ENV{'form.filename'});
    $fn=&URLToPath($fn);
       }  elsif($ENV{'QUERY_STRING'} && $ENV{'form.phase'} ne 'two') {  
    #Just hijack the script only the first time around to inject the
    #correct information for further processing
    $fn=&Apache::lonnet::unescape($ENV{'form.decompress'});
    $fn=&URLToPath($fn);
    $ENV{'form.action'}="decompress";
       } elsif ($ENV{'form.qualifiedfilename'}) {
    $fn=$ENV{'form.qualifiedfilename'};
       } else {
    &Debug($r, "loncfile::handler - no form.filename");
    $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
          ' unspecified filename for cfile', $r->filename); 
    return HTTP_NOT_FOUND;
       }
   
   if ($ENV{'form.filename'}) {      unless ($fn) { 
       $fn=&Apache::lonnet::unescape($ENV{'form.filename'});   &Debug($r, "loncfile::handler - doctored url is empty");
       $fn=&URLToPath($fn);   $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
   } elsif ($ENV{'form.qualifiedfilename'}) {         ' trying to cfile non-existing file', $r->filename); 
       $fn=$ENV{'form.qualifiedfilename'};   return HTTP_NOT_FOUND;
   } else {      } 
       &Debug($r, "loncfile::handler - no form.filename");  
      $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.  
          ' unspecified filename for cfile', $r->filename);   
      return HTTP_NOT_FOUND;  
   }  
   
   unless ($fn) {   
       &Debug($r, "loncfile::handler - doctored url is empty");  
      $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.  
          ' trying to cfile non-existing file', $r->filename);   
      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'));
   &Debug($r,       &Debug($r, 
  "loncfile::handler constructaccess uname = $uname domain = $udom");     "loncfile::handler constructaccess uname = $uname domain = $udom");
   unless (($uname) && ($udom)) {      unless (($uname) && ($udom)) {
      $r->log_reason($uname.' at '.$udom.   $r->log_reason($uname.' at '.$udom.
          ' trying to manipulate 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;
   }      }
   
   
   $r->content_type('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>');      if ( ($ENV{'form.action'} eq 'newdir') && ($ENV{'form.phase'} eq 'two') && ( ($ENV{'form.callingmode'} eq 'testbank') || ($ENV{'form.callingmode'} eq 'imsimport') ) ) {
    my $newdirname = $ENV{'form.newfilename'};
   $r->print(&Apache::loncommon::bodytag('Construction Space File Operation'));   $r->print('<html><head><title>LON-CAPA Construction Space</title><script language="Javascript">');
    $r->print(qq|
     function writeDone() {
   $r->print('<h3>Location: '.&display($fn).'</h3>');      var winName = window.opener
         window.focus();
   if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {      winName.document.dataForm.newdir.value = "$newdirname"
           $r->print('<h3><font color="red">Co-Author: '.$uname.' at '.$udom.      setTimeout("self.close()",10000)
                '</font></h3>');  }
   }    </script>
     </head>|);
    my $loaditem = 'onLoad="writeDone()"';
   &Debug($r, "loncfile::handler Form action is $ENV{'form.action'} ");   $r->print(&Apache::loncommon::bodytag('Construction Space File Operation','',$loaditem));
   if ($ENV{'form.action'} eq 'delete') {      } else {
          $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
       $r->print('<h3>Delete</h3>');   $r->print(&Apache::loncommon::bodytag('Construction Space File Operation'));
   } elsif ($ENV{'form.action'} eq 'rename') {      }
       $r->print('<h3>Rename</h3>');  
   } elsif ($ENV{'form.action'} eq 'newdir') {    
       $r->print('<h3>New Directory</h3>');      $r->print('<h3>'.&mt('Location').': '.&display($fn).'</h3>');
   } elsif ($ENV{'form.action'} eq 'copy') {    
       $r->print('<h3>Copy</h3>');      if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
   } elsif ($ENV{'form.action'} eq 'newfile' ||   $r->print('<h3><font color="red">'.&mt('Co-Author').': '.$uname.' at '.$udom.
    $ENV{'form.action'} eq 'newhtmlfile' ||    '</font></h3>');
    $ENV{'form.action'} eq 'newproblemfile' ||      }
            $ENV{'form.action'} eq 'newpagefile' ||  
            $ENV{'form.action'} eq 'newsequencefile' ||  
    $ENV{'form.action'} eq 'newrightsfile' ||      &Debug($r, "loncfile::handler Form action is $ENV{'form.action'} ");
    $ENV{'form.action'} eq 'newstyfile' ||      if ($ENV{'form.action'} eq 'delete') {
            $ENV{'form.action'} eq 'Select Action' ) {        $r->print('<h3>'.&mt('Delete').'</h3>');
       $r->print('<h3>New Resource</h3>');      } elsif ($ENV{'form.action'} eq 'rename') {
   } else {   $r->print('<h3>'.&mt('Rename').'</h3>');
      $r->print('<p>Unknown Action '.$ENV{'form.action'}.' </p></body></html>');      } elsif ($ENV{'form.action'} eq 'move') {
      return OK;     $r->print('<h3>'.&mt('Move').'</h3>');
   }      } elsif ($ENV{'form.action'} eq 'newdir') {
   if ($ENV{'form.phase'} eq 'two') {   $r->print('<h3>'.&mt('New Directory').'</h3>');
       &Debug($r, "loncfile::handler  entering phase2");      } elsif ($ENV{'form.action'} eq 'decompress') {
       &phasetwo($r,$fn,$uname,$udom);   $r->print('<h3>'.&mt('Decompress').'</h3>');
   } else {      } elsif ($ENV{'form.action'} eq 'copy') {
       &Debug($r, "loncfile::handler  entering phase1");   $r->print('<h3>'.&mt('Copy').'</h3>');
       &phaseone($r,$fn,$uname,$udom);      } elsif ($ENV{'form.action'} eq 'newfile' ||
   }       $ENV{'form.action'} eq 'newhtmlfile' ||
        $ENV{'form.action'} eq 'newproblemfile' ||
        $ENV{'form.action'} eq 'newpagefile' ||
        $ENV{'form.action'} eq 'newsequencefile' ||
        $ENV{'form.action'} eq 'newrightsfile' ||
        $ENV{'form.action'} eq 'newstyfile' ||
        $ENV{'form.action'} eq 'Select Action' ) {
    $r->print('<h3>'.&mt('New Resource').'</h3>');
       } else {
    $r->print('<p>'.&mt('Unknown Action').' '.$ENV{'form.action'}.' </p></body></html>');
    return OK;  
       }
       if ($ENV{'form.phase'} eq 'two') {
    &Debug($r, "loncfile::handler  entering phase2");
    &phasetwo($r,$fn,$uname,$udom);
       } else {
    &Debug($r, "loncfile::handler  entering phase1");
    &phaseone($r,$fn,$uname,$udom);
       }
   
   $r->print('</body></html>');      $r->print('</body></html>');
   return OK;        return OK;  
 }  }
   
 1;  1;
Removed from v.1.39  
changed lines
  Added in v.1.60

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