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

Diff for /loncom/publisher/loncfile.pm between versions 1.18 and 1.23

version 1.18, 2002/09/10 02:31:26 version 1.23, 2003/02/04 22:01:38
Line 128  sub Debug { Line 128  sub Debug {
   my $log     = $r->log;    my $log     = $r->log;
   my $message = shift;    my $message = shift;
       
   # Put out the indicated message butonly if DEBUG is false.    # Put out the indicated message butonly if DEBUG is true.
       
   if ($DEBUG) {    if ($DEBUG) {
     $log->debug($message);      $log->debug($message);
Line 323  sub exists { Line 323  sub exists {
   my ($user, $domain, $dir, $file) = @_;    my ($user, $domain, $dir, $file) = @_;
   
   # Create complete paths in publication and construction space.    # Create complete paths in publication and construction space.
     my $relativedir=$dir;
   my $published = &PublicationPath($domain, $user, $dir, $file);    $relativedir=s|/home/\Q$user\E/public_html||;
   my $construct = &ConstructionPath($user, $dir, $file);    my $published = &PublicationPath($domain, $user, $relativedir, $file);
     my $construct = &ConstructionPath($user, $relativedir, $file);
   
   # If the resource exists in either space indicate this fact.    # If the resource exists in either space indicate this fact.
   # Note that the check for existence in resource space is stricter.    # Note that the check for existence in resource space is stricter.
   
   my $result;        my $result;    
     if ( -d $construct ) {
         return 'Error: destination for operation is a 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">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">Warning: target file exists!</font></p>';
    }    }
   
   return $result;    return $result;
   
Line 380  sub checksuffix { Line 384  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">Warning: change of MIME type!</font></p>';
     }      }
     return $result;      return $result;
 }  }
Line 407  sub CloseForm1 { Line 411  sub CloseForm1 {
   
   
    &Debug($request, "Cancel url is: ".$cancelurl);     &Debug($request, "Cancel url is: ".$cancelurl);
    $request->print('<p><input type=submit value=Continue></p></form>');     $request->print('<p><input type="submit" value="Continue" /></p></form>');
    $request->print('<form action="'.$cancelurl.     $request->print('<form action="'.$cancelurl.
    '" method=GET"><p><input type=submit value=Cancel><p></form>');     '" method="GET"><p><input type="submit" value="Cancel" /></p></form>');
   
 }  }
   
Line 441  Parameters: Line 445  Parameters:
 sub CloseForm2 {  sub CloseForm2 {
   my ($request, $user, $directory) = @_;    my ($request, $user, $directory) = @_;
   
   $request->print('<h3><a=href="/priv/'.$user.$directory.'/">Done </a> </h3>');    $request->print('<h3><a href="/priv/'.$user.$directory.'/">Done </a> </h3>');
 }  }
   
 =pod  =pod
Line 492  sub Rename1 { Line 496  sub Rename1 {
  if($ENV{'form.newfilename'}) {   if($ENV{'form.newfilename'}) {
     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));      my $return=&exists($user, $domain, $dir, $newfilename);
     $request->print('<input type=hidden name=newfilename value="'.      $request->print($return);
       if ($return =~/^Error:/) {
    $request->print('<br /><a href="'.$cancelurl.'">Cancel</a>');
    return;
       }
       my $dest=&SimplifyDir($dir,$newfilename);
       $request->print('<input type="hidden" name="newfilename" value="'.
     $newfilename.      $newfilename.
     '"><p>Rename <tt>'.$filename.'</tt> to <tt>'.      '" /><p>Rename <tt>'.$filename.
     $dir.'/'.$newfilename.'</tt>?</p>');      '</tt><br /> to <tt>'.
       $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 541  sub Delete1 { Line 552  sub Delete1 {
       
   
   if( -e $filename) {    if( -e $filename) {
     $request->print('<input type=hidden name=newfilename value="'.      $request->print('<input type="hidden" name="newfilename" value="'.
     $filename.'">');      $filename.'"/>');
     $request->print('<p> Delete <tt>'.$filename.'</tt>?</p>');      $request->print('<p> Delete <tt>'.$filename.'</tt>?</p>');
     &CloseForm1($request, $cancelurl);      &CloseForm1($request, $cancelurl);
   } else {    } else {
Line 587  sub Copy1 { Line 598  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));      my $return=&exists($user, $domain, $dir, $newfilename);
     $request->print('<input type = hidden name = newfilename value = "'.      $request->print($return);
       if ($return =~/^Error:/) {
    $request->print('<br /><a href="'.$cancelurl.'">Cancel</a>');
    return;
       }
       my $dest=&SimplifyDir($dir,$newfilename);
       $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 603  sub Copy1 { Line 619  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 653  sub NewDir1 Line 697  sub NewDir1
     $request->print('<p>Directory exists.</p></form>');      $request->print('<p>Directory exists.</p></form>');
   }    }
   else {    else {
     $request->print('<input type=hidden name=newfilename value="'.      $request->print('<input type="hidden" name="newfilename" value="'.
     $newdir.'"><p>Make new directory <tt>'.      $newdir.'" /><p>Make new directory <tt>'.
     $path."/".$newdir.'</tt>?</p>');      $path."/".$newdir.'</tt>?</p>');
     &CloseForm1($request, $cancelurl);      &CloseForm1($request, $cancelurl);
   
Line 663  sub NewDir1 Line 707  sub NewDir1
   
 =pod  =pod
   
   =item NewFile1
    
     Does all phase 1 processing of file creation:
     Ensures that the user provides a new filename, adds proper extension
     if needed and that the file does not already exist, if it is a html,
     problem, page, or sequence, it then creates a form link to hand the
     actual creation off to the proper handler.
   
   Parameters:
   
   =over 4
   
   =item   $request  - Apache Request Object [in] - Server request object for the
                  current url.
   
   =item   $username - Name of the user that is requesting the directory creation.
   
   =item   $domain   - Name of the domain of the user
   
   =item   $dir      - current absolute diretory
   
   =item   $newfilename
                     - Name of the file to be created; no path information
   =back
   
   Side Effects:
   
   =over 4
   
   =item 2 new forms are displayed.  Clicking on the confirmation button
   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
   button which returns you to the driectory listing you came from
   
   =back
   
   =cut
   
   
   sub NewFile1 {
       my ($request, $user, $domain, $dir, $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/) {
    my $extension=$1;
    if ($newfilename !~ /\Q.$extension\E$/) {
       $newfilename.=".$extension";
    }
       }
   
       my $fullpath = $dir.'/'.$newfilename;
   
       &Debug($request, "Full path is : ".$fullpath);
   
       if(-e $fullpath) {
    $request->print('<p>File exists.</p></form>');
       }
       else {
    $request->print('<p>Make new file <tt>'.$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 action="'.$dest.
    '" method="GET"><p><input type="submit" value="Continue" /></p></form>');
    $request->print('<form action="'.$cancelurl.
    '" method="GET"><p><input type="submit" value="Cancel" /></p></form>');
       }
   }
   
   =pod
   
 =item phaseone($r, $fn, $uname, $udom)  =item phaseone($r, $fn, $uname, $udom)
   
   Peforms phase one processing of the request.  In phase one, error messages    Peforms phase one processing of the request.  In phase one, error messages
Line 700  sub phaseone { Line 822  sub phaseone {
   #  my $conspace=ConstructionPathFromRelative($uname, $fn);    #  my $conspace=ConstructionPathFromRelative($uname, $fn);
       
       
   $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="filename" value="/~'.$uname.$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') {
           
Line 722  sub phaseone { Line 844  sub phaseone {
     }      }
   } elsif ($ENV{'form.action'} eq 'newdir') {    } elsif ($ENV{'form.action'} eq 'newdir') {
     &NewDir1($r, $uname, $dir, $ENV{'form.newfilename'});      &NewDir1($r, $uname, $dir, $ENV{'form.newfilename'});
     }  elsif ($ENV{'form.action'} eq 'newfile' ||
       $ENV{'form.action'} eq 'newhtmlfile' ||
       $ENV{'form.action'} eq 'newproblemfile') {
       if($ENV{'form.newfilename'}) {
         my $newfilename = $ENV{'form.newfilename'};
         if (!defined($dir)) {
     $fn=~m:(.*)/:;
     $dir=$1;
         }
         &NewFile1($r, $uname, $udom, $dir, $fn, $newfilename);
       }else {
         $r->print('<p>No new filename specified.</p></form>');
       }
   }    }
     
 }  }
   
 =pod  =pod
Line 772  sub Rename2 { Line 906  sub Rename2 {
   if(-e $oldfile) {    if(-e $oldfile) {
       unless(rename($oldfile,        unless(rename($oldfile,
     $directory.'/'.$newfile)) {      $directory.'/'.$newfile)) {
   $request->print('<font color=red>Error: '.$!.'</font>');    $request->print('<font color="red">Error: '.$!.'</font>');
   return 0;    return 0;
       } else {}        } else {}
   } else {    } else {
Line 816  sub Delete2 { Line 950  sub Delete2 {
   
   if(-e $filename) {    if(-e $filename) {
     unless(unlink($filename)) {      unless(unlink($filename)) {
       $request->print('<font color=red>Error: '.$!.'</font>');        $request->print('<font color="red">Error: '.$!.'</font>');
       return 0;        return 0;
     }      }
   } else {    } else {
     $request->print('<p> No such file. </form');      $request->print('<p> No such file. </p></form');
     return 0;      return 0;
   }    }
   return 1;    return 1;
Line 859  sub Copy2 { Line 993  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"> 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"> chmod error: '.$!.'</font>');
  return 0;   return 0;
     }      }
     return 1;      return 1;
Line 900  sub NewDir2 { Line 1034  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">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"> Error: '.$!.'</font>');
       return 0;        return 0;
   }    }
   return 1;    return 1;
Line 988  sub phasetwo { Line 1122  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 997  sub phasetwo { Line 1131  sub phasetwo {
     $dest = $ENV{'form.newfilename'};      $dest = $ENV{'form.newfilename'};
             
  } else {   } else {
     $r->print('<p>No New filename specified</form>');      $r->print('<p>No New filename specified</p></form>');
     return;      return;
  }   }
   
Line 1016  sub phasetwo { Line 1150  sub phasetwo {
     #  Substitute for priv for the first home in $dir to get our      #  Substitute for priv for the first home in $dir to get our
     # construction space path.      # construction space path.
     #      #
       $dest=&MakeFinalUrl($r,$dest);
   
       $r->print('<h3><a href="'.$dest.'">Done</a></h3>');
   }
   
   sub MakeFinalUrl {
       my($r,$dest)=@_;
     &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 $base = &File::Basename::basename($dest);
     my $dpath= &File::Basename::dirname($dest);      my $dpath= &File::Basename::dirname($dest);
       if ($base eq '.') { $base=''; }
     $dest = &HTML::Entities::encode($dpath.'/'.$base);      $dest = &HTML::Entities::encode($dpath.'/'.$base);
   
   
     &Debug($r, "Final url after rewrite: $dest");      &Debug($r, "Final url after rewrite: $dest");
       return $dest;
     $r->print('<h3><a href="'.$dest.'">Done</a></h3>');  
 }  }
   
 sub handler {  sub handler {
Line 1042  sub handler { Line 1182  sub handler {
   my $fn;    my $fn;
   
   if ($ENV{'form.filename'}) {    if ($ENV{'form.filename'}) {
       $fn=$ENV{'form.filename'};        $fn=&Apache::lonnet::unescape($ENV{'form.filename'});
       &Debug($r, "loncfile::handler - raw url: $fn");        &Debug($r, "loncfile::handler - raw url: $fn");
 #      $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;  #      $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
 #      $fn=~s/^http\:\/\/[^\/]+//;  #      $fn=~s/^http\:\/\/[^\/]+//;
Line 1088  sub handler { Line 1228  sub handler {
   $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');    $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
   
   $r->print(    $r->print(
    '<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');     '<body bgcolor="#FFFFFF"><img align="right" src="/adm/lonIcons/lonlogos.gif" />');
   
       
   $r->print('<h1>Construction Space <tt>'.$fn.'</tt></h1>');    $r->print('<h1>Construction Space <tt>'.$fn.'</tt></h1>');
       
   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">Co-Author: '.$uname.' at '.$udom.
                '</font></h3>');                 '</font></h3>');
   }    }
   
Line 1109  sub handler { Line 1249  sub handler {
       $r->print('<h3>New Directory</h3>');        $r->print('<h3>New Directory</h3>');
   } elsif ($ENV{'form.action'} eq 'copy') {    } elsif ($ENV{'form.action'} eq 'copy') {
       $r->print('<h3>Copy</h3>');        $r->print('<h3>Copy</h3>');
     } elsif ($ENV{'form.action'} eq 'newfile' ||
      $ENV{'form.action'} eq 'newhtmlfile' ||
      $ENV{'form.action'} eq 'newproblemfile') {
         $r->print('<h3>New Resource</h3>');
   } else {    } else {
      $r->print('<p>Unknown Action</body></html>');       $r->print('<p>Unknown Action</p></body></html>');
      return OK;         return OK;  
   }    }
   if ($ENV{'form.phase'} eq 'two') {    if ($ENV{'form.phase'} eq 'two') {
Removed from v.1.18  
changed lines
  Added in v.1.23

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