Diff for /loncom/publisher/loncfile.pm between versions 1.35 and 1.52

version 1.35, 2003/08/01 20:32:05 version 1.52, 2004/03/02 16:48:27
Line 33 Line 33
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 #  
 # (Handler to retrieve an old version of a file  
 #  
 # (Publication Handler  
 #   
 # (TeX Content Handler  
 #  
 # 05/29/00,05/30,10/11 Gerd Kortemeyer)  
 #  
 # 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer  
 # 03/23 Guy Albertelli  
 # 03/24,03/29 Gerd Kortemeyer)  
 #  
 # 03/31,04/03,05/02,05/09,06/23,06/24 Gerd Kortemeyer)  
 #  
 # 06/23 Gerd Kortemeyer  
 # 05/07/02 Ron Fox:  
 #           - Added Debug log output so that I can trace what the heck this  
 #             undocumented thingy does.  
 # 05/28/02  Ron Fox:  
 #           - Started putting in pod in standard format.  
 =pod  =pod
   
 =head1 NAME  =head1 NAME
Line 93  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 131  sub Debug { Line 111  sub Debug {
   # 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);
   }    }
 }  }
   
Line 173  Global References Line 153  Global References
 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/^http\:\/\/[^\/]+//;    $Url=~ s/^http\:\/\/[^\/]+//;
   $Url=~ s/^\///;    $Url=~ s/^\///;
   $Url=~ s/(\~|priv\/)(\w+)\//\/home\/$2\/public_html\//;    $Url=~ s/(\~|priv\/)(\w+)\//\/home\/$2\/public_html\//;
Line 180  sub URLToPath { Line 161  sub URLToPath {
   return $Url;    return $Url;
 }  }
   
 =pod  sub url {
       my $fn=shift;
 =item PublicationPath($domain, $user, $dir, $file)      $fn=~s/^\/home\/(\w+)\/public\_html/\/priv\/$1/;
       return $fn;
    Determines the filesystem path corresponding to a published resource  }
    specification.  The returned value is the path.  
 Parameters:  sub display {
       my $fn=shift;
 =over 4      $fn=~s-^/home/(\w+)/public_html-/priv/$1-;
       return '<tt>'.$fn.'</tt>';
 =item   $domain - string [in] Name of the domain within which the resource is   
              stored.  
   
 =item   $user   - string [in] Name of the user asking about the resource.  
   
 =item   $dir    - Directory path relative to the top of the resource space.  
   
 =item   $file   - name of the resource file itself without path info.  
   
 =back  
   
 =over 4  
   
 Returns:  
   
 =item  string - full path to the file if it exists in publication space.  
   
 =back  
        
 =cut  
   
 sub PublicationPath  
 {  
   my ($domain, $user, $dir, $file)=@_;  
   
   return '/home/httpd/html/res/'.$domain.'/'.$user.'/'.$dir.'/'.  
  $file;  
 }  }
   
 =pod  
   
 =item ConstructionPath($domain, $user, $dir, $file)  
   
    Determines the filesystem path corresponding to a construction space  
    resource specification.  The returned value is the path  
 Parameters:  
   
 =over 4  
   
 =item   $user   - string [in] Name of the user asking about the resource.  
   
 =item   $dir    - Directory path relative to the top of the resource space.  
   
 =item   $file   - name of the resource file itself without path info.  
   
 Returns:  
   
 =item  string - full path to the file if it exists in Construction space.  
   
 =back  
        
 =cut  
   
 sub ConstructionPath {  
   my ($user, $dir, $file) = @_;  
   
   return '/home/'.$user.'/public_html/'.$dir.'/'.$file;  
   
   # 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  
   
 =item  ConstructionPathFromRelative($user, $relname)  
   
    Determines the path to a construction space file given  
 the username and the path relative to the root of construction space.  
   
 Parameters:  
   
 =over 4  
   
 =item  $user  - string [in] Name of the user in whose construction space the  
            file [will] live.  
   
 =item  $relname - string[in] Path to the file relative to the root of the  
             construction space.  
   
 =back  
   
 Returns:  
   
 =over 4     
   
 =item  string - Full path to the file.  
   
 =back  
   
 =cut  
   
 sub ConstructionPathFromRelative {  
   
   my ($user, $relname) = @_;  
   return '/home/'.$user.'/public_html'.$relname;  
   
 }  
   
 =pod  =pod
   
 =item exists($user, $domain, $directory, $file)  =item exists($user, $domain, $file)
   
    Determine if a resource file name has been published or exists     Determine if a resource file name has been published or exists
    in the construction space.     in the construction space.
Line 301  sub ConstructionPathFromRelative { Line 211  sub ConstructionPathFromRelative {
 =item  $domain - string [in] - Name of the domain in which the resource  =item  $domain - string [in] - Name of the domain in which the resource
                           might have been published.                            might have been published.
   
 =item  $dir    - string [in] - Path relative to construction or resource space  
                           in which the resource might live.  
   
 =item  $file   - string [in] - Name of the file.  =item  $file   - string [in] - Name of the file.
   
 =back  =back
Line 321  Returns: Line 228  Returns:
 =cut  =cut
   
 sub exists {  sub exists {
   my ($user, $domain, $dir, $file) = @_;    my ($user, $domain, $construct) = @_;
     my $published=$construct;
   # Create complete paths in publication and construction space.    $published=~
   my $relativedir=$dir;  s/^\/home\/$user\/public\_html\//\/home\/httpd\/html\/res\/$domain\/$user\//;
   $relativedir=s|/home/\Q$user\E/public_html||;    my $result='';    
   my $published = &PublicationPath($domain, $user, $relativedir, $file);  
   my $construct = &ConstructionPath($user, $relativedir, $file);  
   
   # If the resource exists in either space indicate this fact.  
   # Note that the check for existence in resource space is stricter.  
   
   my $result;      
   if ( -d $construct ) {    if ( -d $construct ) {
       return 'Error: destination for operation is a 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">'.&mt('Warning: target file exists!').'</font></p>';
       $result.='<p><font color="red">Warning: target file exists!</font></p>';  
   }    }
   
   return $result;    return $result;
   
 }  }
Line 385  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;
 }  }
Line 394  sub cleanDest { Line 292  sub cleanDest {
     my ($request,$dest)=@_;      my ($request,$dest)=@_;
     #remove bad characters      #remove bad characters
     if  ($dest=~/[\#\?&]/) {      if  ($dest=~/[\#\?&]/) {
  $request->print("<p><font color=\"red\">Invalid characters in requested name have been removed.</font></p>");   $request->print("<p><font color=\"red\">".&mt('Invalid characters in requested name have been removed.')."</font></p>");
  $dest=~s/[\#\?&]//g;   $dest=~s/[\#\?&]//g;
     }      }
     return $dest;      return $dest;
 }  }
   
   sub relativeDest {
       my ($fn,$newfilename,$uname)=@_;
       if ($newfilename=~/^\//) {
   # absolute, simply add path
    $newfilename='/home/'.$uname.'/public_html/';
       } else {
    my $dir=$fn;
    $dir=~s/\/[^\/]+$//;
    $newfilename=$dir.'/'.$newfilename;
       }
       $newfilename=~s://+:/:g; # remove duplicate /
       while ($newfilename=~m:/\.\./:) {
    $newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/..
       }
       return $newfilename;
   }
   
 =pod  =pod
   
 =item CloseForm1($request, $user, $file)  =item CloseForm1($request, $user, $file)
Line 419  Parameters: Line 334  Parameters:
 =cut  =cut
   
 sub CloseForm1 {  sub CloseForm1 {
    my ($request,  $cancelurl) = @_;     my ($request,  $fn) = @_;
      $request->print('<p><input type="submit" value="'.&mt('Continue').'" /></p></form>');
      $request->print('<form action="'.&url($fn).
    &Debug($request, "Cancel url is: ".$cancelurl);       '" method="POST"><p><input type="submit" value="'.&mt('Cancel').'" /></p></form>');
    $request->print('<p><input type="submit" value="Continue" /></p></form>');  
    $request->print('<form action="'.$cancelurl.  
    '" method="POST"><p><input type="submit" value="Cancel" /></p></form>');  
   
 }  }
   
   
Line 455  Parameters: Line 366  Parameters:
 =cut  =cut
   
 sub CloseForm2 {  sub CloseForm2 {
   my ($request, $user, $directory) = @_;    my ($request, $user, $fn) = @_;
     $request->print('<h3><a href="'.&url($fn).'/">'.&mt('Done').'</a></h3>');
   $request->print('<h3><a href="/priv/'.$user.$directory.'/">Done </a> </h3>');  
 }  }
   
 =pod  =pod
Line 496  new filename relative to the current dir Line 406  new filename relative to the current dir
 =cut    =cut  
   
 sub Rename1 {  sub Rename1 {
     my ($request, $filename, $user, $domain, $dir) = @_;      my ($request, $user, $domain, $fn, $newfilename, $style) = @_;
     &Debug($request, "Username - ".$user." filename: ".$filename."\n");  
     my $conspace = $filename;      if(-e $fn) {
    if($newfilename) {
     my $cancelurl = "/priv/".$filename;      # is dest a dir
     $cancelurl    =~ s/\/home\///;      if ($style eq 'move') {
     $cancelurl    =~ s/\/public_html//;   if (-d $newfilename) {
           if ($fn =~ m|/([^/]*)$|) { $newfilename .= '/'.$1; }
     if(-e $conspace) {   }
  if($ENV{'form.newfilename'}) {      }
     my $newfilename = $ENV{'form.newfilename'};  
     if ($newfilename =~ m|/[^\.]+$|) {      if ($newfilename =~ m|/[^\.]+$|) {
  #no extension add on orignal extension   #no extension add on original extension
  if ($filename =~ m|/[^\.]*\.([^\.]+)$|) {   if ($fn =~ m|/[^\.]*\.([^\.]+)$|) {
     $newfilename.='.'.$1;      $newfilename.='.'.$1;
  }   }
     }      }
     $request->print(&checksuffix($filename, $newfilename));      $request->print(&checksuffix($fn, $newfilename));
     #renaming a dir, delete the trailing /      #renaming a dir, delete the trailing /
             #remove last element for current dir              #remove second to last element for current dir
     if ($filename =~ m|/$|) {      if (-d $fn) {
  $filename =~ s|/$||;   $newfilename=~s/\/[^\/]+\/([^\/]+)$/\/$1/;
  $dir =~ s|/[^/]*$||;  
     }      }
     my $return=&exists($user, $domain, $dir, $newfilename);      $newfilename=~s://+:/:g; # remove duplicate /
       while ($newfilename=~m:/\.\./:) {
    $newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/..
       }
       my $return=&exists($user, $domain, $newfilename);
     $request->print($return);      $request->print($return);
     if ($return =~/^Error:/) {      if ($return =~/^Error:/) {
  $request->print('<br /><a href="'.$cancelurl.'">Cancel</a>');   $request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
  return;   return;
     }      }
     my $dest=&SimplifyDir($dir,$newfilename);      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 <tt>'.$filename.      '" /><p>'.$action.' '.&display($fn).
     '</tt><br /> to <tt>'.      '</tt><br />to '.&display($newfilename).'?</p>');
     $dest.'</tt>?</p>');      &CloseForm1($request, $fn);
     &CloseForm1($request, $cancelurl);  
  } 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 </p> </form>');   $request->print('<p> '.&mt('No such file').': '.&display($fn).'</p></form>');
  return;   return;
     }      }
           
Line 554  Parameters: Line 475  Parameters:
   
 =over 4  =over 4
   
 =item   $request   - Apache Request Object [in] request object for the current  =item   $request   - Apache Request Object [in] request object for the current 
                 request.                  request.
   
 =item   $user      - string [in] Name of session user.  =item   $user      - string [in]  Name of the user initiating the request.
   
   =item   $domain    - string [in]  Domain the initiating user is logged in as
   
 =item   $filename  - string [in] Name fo the file to be deleted:  =item   $filename  - string [in]  Source filename.
                 Filename is the full filesystem path to the file.  
   
 =back  =back
   
 =cut  =cut
   
 sub Delete1 {  sub Delete1 {
   my ($request, $user,  $filename) = @_;    my ($request, $user, $domain, $fn) = @_;
   
   my $cancelurl = '/priv/'.$filename;    if( -e $fn) {
   $cancelurl    =~ s/\/home\///;  
   $cancelurl    =~ s/\/public_html//;  
     
   
   if( -e $filename) {  
     $request->print('<input type="hidden" name="newfilename" value="'.      $request->print('<input type="hidden" name="newfilename" value="'.
     $filename.'"/>');      $fn.'"/>');
     $request->print('<p> Delete <tt>'.$filename.'</tt>?</p>');      unless (&obsolete_unpub($user,$domain,$fn)) {
     &CloseForm1($request, $cancelurl);   $request->print('<h3>'.&mt('Cannot delete non-obsolete published file').'</h3>'.
    '<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
    return;
       }
       $request->print('<p>'.&mt('Delete').' '.&display($fn).'?</p>');
       &CloseForm1($request, $fn);
   } else {    } else {
     $request->print('<p> No Such file: <tt>'.$filename.'</tt></p></form>');      $request->print('<p>'.&mt('No such file').': '.&display($fn).'</p></form>');
   }    }
 }  }
   
Line 604  Parameters: Line 525  Parameters:
   
 =item   $domain    - string [in]  Domain the initiating user is logged in as  =item   $domain    - string [in]  Domain the initiating user is logged in as
   
 =item   $dir       - string [in]  Directory path.  =item   $fn  - string [in]  Source filename.
   
 =item   $filename  - string [in]  Source filename.  
   
 =item   $newfilename-string [in]  Destination filename.  =item   $newfilename-string [in]  Destination filename.
   
Line 615  Parameters: Line 534  Parameters:
 =cut  =cut
   
 sub Copy1 {  sub Copy1 {
   my ($request, $user, $domain, $dir, $filename, $newfilename) = @_;      my ($request, $user, $domain, $fn, $newfilename) = @_;
   
   my $cancelurl = "/priv/".$filename;      if(-e $fn) {
   $cancelurl    =~ s/\/home\///;   # is dest a dir
   $cancelurl    =~ s/\/public_html//;   if (-d $newfilename) {
           if ($fn =~ m|/([^/]*)$|) { $newfilename .= '/'.$1; }
    }
   if(-e $filename) {   if ($newfilename =~ m|/[^\.]+$|) {
     $request->print(&checksuffix($filename,$newfilename));      #no extension add on original extension
     my $return=&exists($user, $domain, $dir, $newfilename);      if ($fn =~ m|/[^\.]*\.([^\.]+)$|) { $newfilename.='.'.$1; }
     $request->print($return);   } 
     if ($return =~/^Error:/) {   $newfilename=~s://+:/:g; # remove duplicate /
  $request->print('<br /><a href="'.$cancelurl.'">Cancel</a>');   while ($newfilename=~m:/\.\./:) {
  return;      $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>');
     }      }
     my $dest=&SimplifyDir($dir,$newfilename);  
     $request->print('<input type = "hidden" name = "newfilename" value = "'.  
     $dir.'/'.$newfilename.  
     '" /><p>Copy <tt>'.$filename.'</tt><br />  to '.  
     '<tt>'.$dest.'</tt>?</p>');  
     &CloseForm1($request, $cancelurl);  
   } else {  
     $request->print('<p>No such file <tt>'.$filename.'</p></form>');  
   }  
 }  
   
 =pod  
   
 =item SimplifyDir  
   
   Removes all extra / and all .. references  
   
 Parameters:  
   
 =over 4  
   
 =item $dir - string [in] a directory name  
   
 =item $file - string [in] a file reference relative to $dir  
   
 =back  
   
 Results: the concatenated path.  
   
 =cut  
   
 sub SimplifyDir {  
     my ($dir,$file) = @_;  
     my $location = $dir. '/'.$file;  
     $location=~s://+:/:g; # remove duplicate /  
     while ($location=~m:/\.\./:) {$location=~s:/[^/]+/\.\./:/:g;}#remove dir/..  
     return $location;  
 }  }
   
 =pod  =pod
Line 686  Parameters: Line 583  Parameters:
   
 =item   $username - Name of the user that is requesting the directory creation.  =item   $username - Name of the user that is requesting the directory creation.
   
 =item   $path     - current directory relative to construction space.  =item $domain - Domain user is in
   
   =item   $fn     - source file.
   
 =item   $newdir   - Name of the directory to be created; path relative to the   =item   $newdir   - Name of the directory to be created; path relative to the 
                top level of construction space.                 top level of construction space.
Line 708  causes the newdir operation to transitio Line 607  causes the newdir operation to transitio
   
 sub NewDir1  sub NewDir1
 {  {
   my ($request, $username, $path, $newdir) = @_;    my ($request, $username, $domain, $fn, $newfilename, $mode) = @_;
   
   my $fullpath = '/home/'.$username.'/public_html/'.  
     $path.'/'.$newdir;  
   
   my $cancelurl = '/priv/'.$username.'/'.$path;  
   
   &Debug($request, "Full path is : ".$fullpath);    my $result=&exists($username,$domain,$newfilename);
     if ($result) {
   if(-e $fullpath) {      $request->print('<font color="red">'.$result.'</font></form>');
     $request->print('<p>Directory exists.</p></form>');    } else {
   }      if ($mode eq 'testbank') {
   else {          $request->print('<input type="hidden" name="callingmode" value="testbank">');
       } elsif ($mode eq 'imsimport') {
           $request->print('<input type="hidden" name="callingmode" value="imsimport">');
       }
     $request->print('<input type="hidden" name="newfilename" value="'.      $request->print('<input type="hidden" name="newfilename" value="'.
     $newdir.'" /><p>Make new directory <tt>'.      $newfilename.'" /><p>'.&mt('Make new directory').' '.
     $path."/".$newdir.'</tt>?</p>');      &display($newfilename).'?</p>');
     &CloseForm1($request, $cancelurl);      &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
   
 =item NewFile1  =item NewFile1
Line 750  Parameters: Line 657  Parameters:
   
 =item   $domain   - Name of the domain of the user  =item   $domain   - Name of the domain of the user
   
 =item   $dir      - current absolute diretory  =item   $fn      - Source file name
   
 =item   $newfilename  =item   $newfilename
                   - Name of the file to be created; no path information                    - Name of the file to be created; no path information
Line 762  Side Effects: Line 669  Side Effects:
   
 =item 2 new forms are displayed.  Clicking on the confirmation button  =item 2 new forms are displayed.  Clicking on the confirmation button
 causes the browser to attempt to load the specfied URL, allowing the  causes the browser to attempt to load the specfied URL, allowing the
 proper handler to take care of file creation. There is also a Cancle  proper handler to take care of file creation. There is also a Cancel
 button which returns you to the driectory listing you came from  button which returns you to the driectory listing you came from
   
 =back  =back
Line 771  button which returns you to the driector Line 678  button which returns you to the driector
   
   
 sub NewFile1 {  sub NewFile1 {
     my ($request, $user, $domain, $dir, $newfilename) = @_;      my ($request, $user, $domain, $fn, $newfilename) = @_;
   
     &Debug($request, "Dir is : ".$dir);  
     &Debug($request, "Newfile is : ".$newfilename);  
   
     my $cancelurl = "/priv/".$dir;  
     $cancelurl    =~ s/\/home\///;  
     $cancelurl    =~ s/\/public_html//;  
   
     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 790  sub NewFile1 { Line 698  sub NewFile1 {
     $newfilename.=".$extension";      $newfilename.=".$extension";
  }   }
     }      }
       my $result=&exists($user,$domain,$newfilename);
     my $fullpath = $dir.'/'.$newfilename;      if($result) {
    $request->print('<font color="red">'.$result.'</font></form>');
     &Debug($request, "Full path is : ".$fullpath);      } else {
    $request->print('<p>'.&mt('Make new file').' '.&display($newfilename).'?</p>');
     if(-e $fullpath) {  
  $request->print('<p>File exists.</p></form>');  
     }  
     else {  
  $request->print('<p>Make new file <tt>'.$dir.'/'.$newfilename.'</tt>?</p>');  
  my $dest=&MakeFinalUrl($request,$fullpath);  
  &Debug($request, "Cancel url is: ".$cancelurl);  
  &Debug($request, "Dest url is: ".$dest);  
  $request->print('</form>');   $request->print('</form>');
  $request->print('<form action="'.$dest.   $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="'.$cancelurl.   $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 842  performed and reported to the user. Line 742  performed and reported to the user.
 sub phaseone {  sub phaseone {
   my ($r,$fn,$uname,$udom)=@_;    my ($r,$fn,$uname,$udom)=@_;
       
   $fn=~m:(.*)/([^/]+)\.(\w+)$:;    my $newfilename=&cleanDest($r,$ENV{'form.newfilename'});
   my $dir=$1;    $newfilename=&relativeDest($fn,$newfilename,$uname);
   my $main=$2;  
   my $suffix=$3;  
     
   #  my $conspace=ConstructionPathFromRelative($uname, $fn);  
     
   $ENV{'form.newfilename'}=&cleanDest($r,$ENV{'form.newfilename'});  
   
   $r->print('<form action="/adm/cfile" method="post">'.    $r->print('<form action="/adm/cfile" method="post">'.
     '<input type="hidden" name="filename" value="/~'.$uname.$fn.'" />'.        '<input type="hidden" name="qualifiedfilename" value="'.$fn.'" />'.
     '<input type="hidden" name="phase" value="two" />'.        '<input type="hidden" name="phase" value="two" />'.
     '<input type="hidden" name="action" value="'.$ENV{'form.action'}.'" />');        '<input type="hidden" name="action" value="'.$ENV{'form.action'}.'" />');
       
   if ($ENV{'form.action'} eq 'rename') {    if ($ENV{'form.action'} eq 'rename') {
       if (!defined($dir)) {        &Rename1($r, $uname, $udom, $fn, $newfilename, 'rename');
   $fn=~m:(.*)/:;    } elsif ($ENV{'form.action'} eq 'move') {
   $dir=$1;        &Rename1($r, $uname, $udom, $fn, $newfilename, 'move');
       }  
       &Rename1($r, $fn, $uname, $udom, $dir);  
   } elsif ($ENV{'form.action'} eq 'delete') {     } elsif ($ENV{'form.action'} eq 'delete') { 
             &Delete1($r, $uname, $udom, $fn);
     &Delete1($r, $uname, $fn);    } elsif ($ENV{'form.action'} eq 'decompress') {
             &Decompress1($r, $uname, $udom, $fn);
   } elsif ($ENV{'form.action'} eq 'copy') {     } elsif ($ENV{'form.action'} eq 'copy') { 
     if($ENV{'form.newfilename'}) {        if($newfilename) {
       my $newfilename = $ENV{'form.newfilename'};    &Copy1($r, $uname, $udom, $fn, $newfilename);
       &Copy1($r, $uname, $udom, $dir, $fn, $newfilename);        } else {
     }else {    $r->print('<p>'.&mt('No new filename specified.').'</p></form>');
       $r->print('<p>No new filename specified.</p></form>');        }
     }  
   } elsif ($ENV{'form.action'} eq 'newdir') {    } elsif ($ENV{'form.action'} eq 'newdir') {
     &NewDir1($r, $uname, $dir, $ENV{'form.newfilename'});        my $mode = '';
         if (exists($ENV{'form.callingmode'}) ) {
             $mode = $ENV{'form.callingmode'};
         }   
         &NewDir1($r, $uname, $udom, $fn, $newfilename, $mode);
   }  elsif ($ENV{'form.action'} eq 'newfile' ||    }  elsif ($ENV{'form.action'} eq 'newfile' ||
     $ENV{'form.action'} eq 'newhtmlfile' ||      $ENV{'form.action'} eq 'newhtmlfile' ||
     $ENV{'form.action'} eq 'newproblemfile' ||      $ENV{'form.action'} eq 'newproblemfile' ||
Line 883  sub phaseone { Line 777  sub phaseone {
             $ENV{'form.action'} eq 'newrightsfile' ||              $ENV{'form.action'} eq 'newrightsfile' ||
             $ENV{'form.action'} eq 'newstyfile' ||              $ENV{'form.action'} eq 'newstyfile' ||
             $ENV{'form.action'} eq 'Select Action') {              $ENV{'form.action'} eq 'Select Action') {
       if($ENV{'form.newfilename'}) {        if ($newfilename) {
   my $newfilename = $ENV{'form.newfilename'};    &NewFile1($r, $uname, $udom, $fn, $newfilename);
   if (!defined($dir)) {  
       $fn=~m:(.*)/:;  
       $dir=$1;  
   }  
   &NewFile1($r, $uname, $udom, $dir, $newfilename);  
       } else {        } else {
   $r->print('<p>No new filename specified.</p></form>');    $r->print('<p>'.&mt('No new filename specified.').'</p></form>');
       }        }
   }    }
 }  }
Line 938  sub Rename2 { Line 827  sub Rename2 {
  " 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) {        my $oRN=$oldfile;
       my $dest;        my $nRN=$newfile;
         unless (rename($oldfile,$newfile)) {
       if ($oldfile =~ m|/$|) {    $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
   #renaming a dir  
   $oldfile =~ s|/$||;  
   $dest=$directory;  
   $dest=~s|(/)([^/]*)$|$1|;  
   $dest.='/'.$newfile;  
       } else {  
   $dest=$directory.'/'.$newfile;  
       }  
   
       unless(rename($oldfile,$dest)) {  
   $request->print('<font color="red">Error: '.$!.'</font>');  
   return 0;    return 0;
       } else {}        }
         ## If old name.(extension) exits, move under new name.
         ## 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 {    } else {
       $request->print("<p> No such file: /home".$user.'/public_html'.        $request->print("<p> ".&mt('No such file').": ".&display($oldfile).'</p></form>');
       $oldfile.' </p></form>');  
       return 0;        return 0;
   }    }
   return 1;    return 1;
Line 994  Returns: Line 903  Returns:
   
 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) { 
         $request->print('<font color="red"> '.&mt('Error: Directory Non Empty').'</font>'); 
         return 0;
       } else {   
         if(-e $filename) {
           unless(rmdir($filename)) {
             $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
             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 0;
     }  
   } else {  
     $request->print('<p> No such file. </p></form');  
     return 0;  
   }    }
    }
   return 1;    return 1;
 }  }
   
Line 1040  sub Copy2 { Line 967  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;
Line 1081  sub NewDir2 { Line 1008  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
   
 =item phasetwo($r, $fn, $uname, $udom)  =item phasetwo($r, $fn, $uname, $udom)
Line 1133  sub phasetwo { Line 1069  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, 
Line 1156  sub phasetwo { Line 1093  sub phasetwo {
    "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:^(.*)/:;
Line 1166  sub phasetwo { Line 1111  sub phasetwo {
     if(!&Rename2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {      if(!&Rename2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {
  return;   return;
     }      }
     # Prepend the directory to the new name to form the basis of the      $dest = &url($ENV{'form.newfilename'});
     # url of the new resource.  
     #  
     #renaming a dir  
             #remove last element for current dir  
     if ($fn =~ m|/$|) { $dir =~ s|/[^/]*$||; }  
     $dest = $dir."/".$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 1185  sub phasetwo { Line 1124  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>No New filename specified</p></form>');      $r->print('<p>'.&mt('No New filename specified').'</p></form>');
     return;      return;
  }   }
   
     } elsif ($ENV{'form.action'} eq 'newdir') {      } elsif ($ENV{'form.action'} eq 'newdir') {
  #          my $newdir= $ENV{'form.newfilename'};
  # Since the newfilename form field is construction space  
  # relative, ew need to prepend the current path; now in $fn.  
  #  
         my $newdir= $fn.$ENV{'form.newfilename'};  
  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') ) ) {
     #  Substitute for priv for the first home in $dir to get our           $r->print('<h3><a href="javascript:self.close()">'.&mt('Done').'</a></h3>');
     # construction space path.      } else {
     #           $r->print('<h3><a href="'.&url($dest).'">'.&mt('Done').'</a></h3>');
     $dest=&MakeFinalUrl($r,$dest);      }
   
     $r->print('<h3><a href="'.$dest.'">Done</a></h3>');  
 }  
   
 sub MakeFinalUrl {  
     my($r,$dest)=@_;  
     &Debug($r, "Final url is: $dest");  
     $dest =~ s|/home/|/priv/|;  
     $dest =~ s|/public_html||;  
   
     my $base = &File::Basename::basename($dest);  
     my $dpath= &File::Basename::dirname($dest);  
     if ($base eq '.') { $base=''; }  
     $dest = &HTML::Entities::encode($dpath.'/'.$base);  
   
     &Debug($r, "Final url after rewrite: $dest");  
     return $dest;  
 }  }
   
 sub handler {  sub handler {
Line 1237  sub handler { Line 1155  sub handler {
   &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
   # This could come in as "filename", which actually is a URL, or
   # as "qualifiedfilename", which is indeed a real filename in filesystem
   #
   my $fn;    my $fn;
   
   if ($ENV{'form.filename'}) {    if ($ENV{'form.filename'}) {
   
    &Debug($r, "test: $ENV{'form.filename'}");
       $fn=&Apache::lonnet::unescape($ENV{'form.filename'});        $fn=&Apache::lonnet::unescape($ENV{'form.filename'});
       $fn=&URLToPath($fn);        $fn=&URLToPath($fn);
     }  
    #Just hijack the script only the first time around to inject the correct information for further processing
       elsif($ENV{'QUERY_STRING'} && $ENV{'form.phase'} ne 'two') {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress']);
    $fn=&Apache::lonnet::unescape($ENV{'form.decompress'});
    $fn=&URLToPath($fn);
    $ENV{'form.action'}="decompress";
     }
   
       elsif ($ENV{'form.qualifiedfilename'}) {
         $fn=$ENV{'form.qualifiedfilename'};
   } else {    } else {
       &Debug($r, "loncfile::handler - no form.filename");        &Debug($r, "loncfile::handler - no form.filename");
      $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.       $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
Line 1273  sub handler { Line 1208  sub handler {
      return HTTP_NOT_ACCEPTABLE;       return HTTP_NOT_ACCEPTABLE;
   }    }
   
   $fn=~s/\/\~(\w+)//;  
   &Debug($r, "loncfile::handler ~ removed filename: $fn");  
   
   $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('File Operation'));        $r->print('<html><head><title>LON-CAPA Construction Space</title><script language="Javascript">');
         $r->print(qq|
   function writeDone() {
       var winName = window.opener
       window.focus();
       winName.document.dataForm.newdir.value = "$newdirname"
       setTimeout("self.close()",10000)
   }
     </script>
     </head>|);
         my $loaditem = 'onLoad="writeDone()"';
         $r->print(&Apache::loncommon::bodytag('Construction Space File Operation','',$loaditem));
     } else {
         $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
         $r->print(&Apache::loncommon::bodytag('Construction Space File Operation'));
     }
   
       
   $r->print('<h1>Construction Space <tt>'.$fn.'</tt></h1>');    $r->print('<h3>'.&mt('Location').': '.&display($fn).'</h3>');
       
   if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {    if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
           $r->print('<h3><font color="red">Co-Author: '.$uname.' at '.$udom.            $r->print('<h3><font color="red">'.&mt('Co-Author').': '.$uname.' at '.$udom.
                '</font></h3>');                 '</font></h3>');
   }    }
   
Line 1295  sub handler { Line 1243  sub handler {
   &Debug($r, "loncfile::handler Form action is $ENV{'form.action'} ");    &Debug($r, "loncfile::handler Form action is $ENV{'form.action'} ");
   if ($ENV{'form.action'} eq 'delete') {    if ($ENV{'form.action'} eq 'delete') {
               
       $r->print('<h3>Delete</h3>');        $r->print('<h3>'.&mt('Delete').'</h3>');
   } elsif ($ENV{'form.action'} eq 'rename') {    } elsif ($ENV{'form.action'} eq 'rename') {
       $r->print('<h3>Rename</h3>');        $r->print('<h3>'.&mt('Rename').'</h3>');
     } elsif ($ENV{'form.action'} eq 'move') {
         $r->print('<h3>'.&mt('Move').'</h3>');
   } elsif ($ENV{'form.action'} eq 'newdir') {    } elsif ($ENV{'form.action'} eq 'newdir') {
       $r->print('<h3>New Directory</h3>');        $r->print('<h3>'.&mt('New Directory').'</h3>');
     } elsif ($ENV{'form.action'} eq 'decompress') {
         $r->print('<h3>'.&mt('Decompress').'</h3>');
   } elsif ($ENV{'form.action'} eq 'copy') {    } elsif ($ENV{'form.action'} eq 'copy') {
       $r->print('<h3>Copy</h3>');        $r->print('<h3>'.&mt('Copy').'</h3>');
   } elsif ($ENV{'form.action'} eq 'newfile' ||    } elsif ($ENV{'form.action'} eq 'newfile' ||
    $ENV{'form.action'} eq 'newhtmlfile' ||     $ENV{'form.action'} eq 'newhtmlfile' ||
    $ENV{'form.action'} eq 'newproblemfile' ||     $ENV{'form.action'} eq 'newproblemfile' ||
Line 1310  sub handler { Line 1262  sub handler {
    $ENV{'form.action'} eq 'newrightsfile' ||     $ENV{'form.action'} eq 'newrightsfile' ||
    $ENV{'form.action'} eq 'newstyfile' ||     $ENV{'form.action'} eq 'newstyfile' ||
            $ENV{'form.action'} eq 'Select Action' ) {             $ENV{'form.action'} eq 'Select Action' ) {
       $r->print('<h3>New Resource</h3>');        $r->print('<h3>'.&mt('New Resource').'</h3>');
   } else {    } else {
      $r->print('<p>Unknown Action '.$ENV{'form.action'}.' </p></body></html>');       $r->print('<p>'.&mt('Unknown Action').' '.$ENV{'form.action'}.' </p></body></html>');
      return OK;         return OK;  
   }    }
   if ($ENV{'form.phase'} eq 'two') {    if ($ENV{'form.phase'} eq 'two') {

Removed from v.1.35  
changed lines
  Added in v.1.52


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