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

Diff for /loncom/publisher/loncfile.pm between versions 1.14 and 1.20

version 1.14, 2002/08/05 02:09:05 version 1.20, 2002/11/27 17:05:50
Line 7 Line 7
 #  presents a page that describes the proposed action to the user  #  presents a page that describes the proposed action to the user
 #  and requests confirmation.  The second phase commits the action  #  and requests confirmation.  The second phase commits the action
 #  and displays a page showing the results of the action.  #  and displays a page showing the results of the action.
 #  # 
   
 #  #
 # $Id$  # $Id$
Line 69  directory. Line 69  directory.
 =head1 INTRODUCTION  =head1 INTRODUCTION
   
   loncfile is invoked when buttons in the top frame of the construction     loncfile is invoked when buttons in the top frame of the construction 
 space directory listing are clicked.   All operations procede in two phases.  space directory listing are clicked.   All operations proceed in two phases.
 The first phase describes to the user exactly what will be done.  If the user  The first phase describes to the user exactly what will be done.  If the user
 confirms the operation, the second phase commits the operation and indicates  confirms the operation, the second phase commits the operation and indicates
 completion.  When the user dismisses the output of phase2, they are returned to  completion.  When the user dismisses the output of phase2, they are returned to
Line 86  package Apache::loncfile; Line 86  package Apache::loncfile;
   
 use strict;  use strict;
 use Apache::File;  use Apache::File;
   use File::Basename;
 use File::Copy;  use File::Copy;
   use HTML::Entities();
 use Apache::Constants qw(:common :http :methods);  use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;  use Apache::loncacc;
 use Apache::Log ();  use Apache::Log ();
   use Apache::lonnet;
   
 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 98  my $r;    # Needs to be global for some Line 101  my $r;    # Needs to be global for some
   
 =item Debug($request, $message)  =item Debug($request, $message)
   
   If debugging is enabled puts out a debuggin message determined by the    If debugging is enabled puts out a debugging message determined by the
   caller.  The debug message goes to the Apache error log file. Debugging    caller.  The debug message goes to the Apache error log file. Debugging
   is enabled by ssetting the module global DEBUG variable to nonzero (TRUE).    is enabled by setting the module global DEBUG variable to nonzero (TRUE).
   
  Parameters:   Parameters:
   
 =over 4  =over 4
     
 =item $request - The curretn request operation.  =item $request - The current request operation.
   
 =item $message - The message to put inthe log file.  =item $message - The message to put in the log file.
   
 =back  =back
       
Line 153  sub Debug { Line 156  sub Debug {
   
 =over 4  =over 4
   
 =item  The corresponing file system path.   =item  The corresponding file system path. 
   
 =back  =back
   
Line 180  sub URLToPath { Line 183  sub URLToPath {
   
 =item PublicationPath($domain, $user, $dir, $file)  =item PublicationPath($domain, $user, $dir, $file)
   
    Determines the filesystem path corersponding to a published resource     Determines the filesystem path corresponding to a published resource
    specification.  The returned value is the path.     specification.  The returned value is the path.
 Parameters:  Parameters:
   
Line 191  Parameters: Line 194  Parameters:
   
 =item   $user   - string [in] Name of the user asking about the resource.  =item   $user   - string [in] Name of the user asking about the resource.
   
 =item   $dir    - Directory pathr elatvie to the top of the resource space0  =item   $dir    - Directory path relative to the top of the resource space.
   
 =item   $file   - name of the resource file itself without path info.  =item   $file   - name of the resource file itself without path info.
   
Line 219  sub PublicationPath Line 222  sub PublicationPath
   
 =item ConstructionPath($domain, $user, $dir, $file)  =item ConstructionPath($domain, $user, $dir, $file)
   
    Determines the filesystem path corersponding to a construction space     Determines the filesystem path corresponding to a construction space
    resource specification.  The returned value is the path     resource specification.  The returned value is the path
 Parameters:  Parameters:
   
Line 227  Parameters: Line 230  Parameters:
   
 =item   $user   - string [in] Name of the user asking about the resource.  =item   $user   - string [in] Name of the user asking about the resource.
   
 =item   $dir    - Directory path relatvie to the top of the resource space  =item   $dir    - Directory path relative to the top of the resource space.
   
 =item   $file   - name of the resource file itself without path info.  =item   $file   - name of the resource file itself without path info.
   
Line 285  sub ConstructionPathFromRelative { Line 288  sub ConstructionPathFromRelative {
   
 =item exists($user, $domain, $directory, $file)  =item exists($user, $domain, $directory, $file)
   
    Determine if a resource file name has been publisehd or exists     Determine if a resource file name has been published or exists
    in the construction space.     in the construction space.
   
  Parameters:   Parameters:
Line 360  as a result of this operation. Line 363  as a result of this operation.
   
 =over 4  =over 4
   
 =item    Empty string if everythikng worked.  =item    Empty string if everything worked.
   
 =item    String containing an error message if there was a problem.  =item    String containing an error message if there was a problem.
   
Line 490  sub Rename1 { Line 493  sub Rename1 {
     my $newfilename = $ENV{'form.newfilename'};      my $newfilename = $ENV{'form.newfilename'};
     $request->print(&checksuffix($filename, $newfilename));      $request->print(&checksuffix($filename, $newfilename));
     $request->print(&exists($user, $domain, $dir, $newfilename));      $request->print(&exists($user, $domain, $dir, $newfilename));
       my $dest=&SimplifyDir($dir,$newfilename);
     $request->print('<input type=hidden name=newfilename value="'.      $request->print('<input type=hidden name=newfilename value="'.
     $newfilename.      $newfilename.
     '"><p>Rename <tt>'.$filename.'</tt> to <tt>'.      '"><p>Rename <tt>'.$filename.'</tt><br /> to <tt>'.
     $dir.'/'.$newfilename.'</tt>?</p>');      $dest.'</tt>?</p>');
     &CloseForm1($request, $cancelurl);      &CloseForm1($request, $cancelurl);
  } else {   } else {
     $request->print('<p>No new filename specified</p></form>');      $request->print('<p>No new filename specified</p></form>');
Line 552  sub Delete1 { Line 556  sub Delete1 {
 =item Copy1($request, $user, $domain, $filename, $newfilename)  =item Copy1($request, $user, $domain, $filename, $newfilename)
   
    Performs phase 1 processing of the construction space copy command.     Performs phase 1 processing of the construction space copy command.
    Ensure that the source fil eexists.  Ensure that a destination exists,     Ensure that the source file exists.  Ensure that a destination exists,
    also warn if the detination already exists.     also warn if the destination already exists.
   
 Parameters:  Parameters:
   
Line 584  sub Copy1 { Line 588  sub Copy1 {
   $cancelurl    =~ s/\/public_html//;    $cancelurl    =~ s/\/public_html//;
           
   
   
   if(-e $filename) {    if(-e $filename) {
     $request->print(&checksuffix($filename,$newfilename));      $request->print(&checksuffix($filename,$newfilename));
     $request->print(&exists($user, $domain, $dir, $newfilename));      $request->print(&exists($user, $domain, $dir, $newfilename));
       my $dest=&SimplifyDir($dir,$newfilename);
     $request->print('<input type = hidden name = newfilename value = "'.      $request->print('<input type = hidden name = newfilename value = "'.
     $dir.'/'.$newfilename.      $dir.'/'.$newfilename.
     '"><p>Copy <tt>'.$filename.'</tt> to'.      '"><p>Copy <tt>'.$filename.'</tt><br />  to '.
     '<tt>'.$dir.'/'.$newfilename.'</tt>/?</p>');      '<tt>'.$dest.'</tt>?</p>');
     &CloseForm1($request, $cancelurl);      &CloseForm1($request, $cancelurl);
   } else {    } else {
     $request->print('<p>No such file <tt>'.$filename.'</p></form>');      $request->print('<p>No such file <tt>'.$filename.'</p></form>');
Line 600  sub Copy1 { Line 604  sub Copy1 {
   
 =pod  =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
   
 =item NewDir1  =item NewDir1
     
   Does all phase 1 processing of directory creation:    Does all phase 1 processing of directory creation:
Line 611  Parameters: Line 643  Parameters:
 =over 4  =over 4
   
 =item   $request  - Apache Request Object [in] - Server request object for the  =item   $request  - Apache Request Object [in] - Server request object for the
                current url..                 current url.
   
 =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 spacee.  =item   $path     - current directory relative to construction space.
   
 =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 680  performed and reported to the user. Line 712  performed and reported to the user.
   
 =item $uname - string [in] Name of user logged in and doing this action.  =item $uname - string [in] Name of user logged in and doing this action.
   
 =item $udom  - string [in] Domain nmae under which the user logged in.   =item $udom  - string [in] Domain name under which the user logged in. 
   
 =back  =back
   
Line 727  sub phaseone { Line 759  sub phaseone {
   
 =item Rename2($request, $user, $directory, $oldfile, $newfile)  =item Rename2($request, $user, $directory, $oldfile, $newfile)
   
 Performs phase 2 procesing of a rename reequest.   This is where the  Performs phase 2 processing of a rename reequest.   This is where the
 actual rename is performed.  actual rename is performed.
   
 Parameters  Parameters
Line 797  Parameters: Line 829  Parameters:
 =item $user    - string [in]  The name of the user initiating the delete  =item $user    - string [in]  The name of the user initiating the delete
                  request.                   request.
   
 =item $filename - string [in] The name of the file, relative to construction space,  =item $filename - string [in] The name of the file, relative to construction
                   to delete.                    space, to delete.
   
 =back  =back
   
Line 985  sub phasetwo { Line 1017  sub phasetwo {
  # Once a resource is deleted, we just list the directory that   # Once a resource is deleted, we just list the directory that
  # previously held it.   # previously held it.
  #   #
  $dest = $dir."/"; # Parent dir.   $dest = $dir."/."; # Parent dir.
     } 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'})) {
Line 1014  sub phasetwo { Line 1046  sub phasetwo {
     # construction space path.      # construction space path.
     #      #
     &Debug($r, "Final url is: $dest");      &Debug($r, "Final url is: $dest");
     $dest =~ s/\/home\//\/priv\//;      $dest =~ s|/home/|/priv/|;
     $dest =~ s/\/public_html//;      $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");      &Debug($r, "Final url after rewrite: $dest");
   
     $r->print('<h3><a href="'.$dest.'">Done</a></h3>');      $r->print('<h3><a href="'.$dest.'">Done</a></h3>');
Removed from v.1.14  
changed lines
  Added in v.1.20

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