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

Diff for /loncom/publisher/loncfile.pm between versions 1.12 and 1.13

version 1.12, 2002/07/28 02:16:59 version 1.13, 2002/07/29 01:55:51
Line 393  Parameters: Line 393  Parameters:
   
 =item  $request - Apache Request Object [in] - Apache server request object.  =item  $request - Apache Request Object [in] - Apache server request object.
   
 =item  $user    - string [in] - Name of the user initiating the request.  =item  $cancelurl - the url to go to on cancel.
   
 =item  $file    - A filename.  
   
 =back  =back
   
 =cut  =cut
   
 sub CloseForm1 {  sub CloseForm1 {
    my ($request, $user, $file) = @_;     my ($request,  $cancelurl) = @_;
    my $url = "/priv/".$file;  
      
      
    $url =~ s/public_html\///;  
    $url =~ s/\/home//;  
    $url =~ s/\/\//\//;  
   
      &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="'.$url.     $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 487  sub Rename1 { Line 481  sub Rename1 {
     &Debug($request, "Username - ".$user." filename: ".$filename."\n");      &Debug($request, "Username - ".$user." filename: ".$filename."\n");
     my $conspace = $filename;      my $conspace = $filename;
   
       my $cancelurl = "/priv/".$filename;
       $cancelurl    =~ s/\/home\///;
       $cancelurl    =~ s/\/public_html//;
           
     if(-e $conspace) {      if(-e $conspace) {
  if($ENV{'form.newfilename'}) {   if($ENV{'form.newfilename'}) {
Line 497  sub Rename1 { Line 494  sub Rename1 {
     $newfilename.      $newfilename.
     '"><p>Rename <tt>'.$filename.'</tt> to <tt>'.      '"><p>Rename <tt>'.$filename.'</tt> to <tt>'.
     $dir.'/'.$newfilename.'</tt>?</p>');      $dir.'/'.$newfilename.'</tt>?</p>');
     &CloseForm1($request, $user, $filename);      &CloseForm1($request, $cancelurl);
  } else {   } else {
     $request->print('<p>No new filename specified</p></form>');      $request->print('<p>No new filename specified</p></form>');
     return;      return;
Line 524  Parameters: Line 521  Parameters:
   
 =item   $user      - string [in] Name of session user.  =item   $user      - string [in] Name of session user.
   
   
 =item   $filename  - string [in] Name fo the file to be deleted:  =item   $filename  - string [in] Name fo the file to be deleted:
                 Filename is the full filesystem path to the file.                  Filename is the full filesystem path to the file.
   
Line 532  Parameters: Line 530  Parameters:
 =cut  =cut
   
 sub Delete1 {  sub Delete1 {
   my ($request, $user, $filename) = @_;    my ($request, $user,  $filename) = @_;
   
     my $cancelurl = '/priv/'.$filename;
     $cancelurl    =~ s/\/home\///;
     $cancelurl    =~ s/\/public_html//;
     
   
   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, $user, $filename);      &CloseForm1($request, $cancelurl);
   } else {    } else {
     $request->print('<p> No Such file: <tt>'.$filename.'</tt></p></form>');      $request->print('<p> No Such file: <tt>'.$filename.'</tt></p></form>');
   }    }
Line 576  Parameters: Line 579  Parameters:
 sub Copy1 {  sub Copy1 {
   my ($request, $user, $domain, $dir, $filename, $newfilename) = @_;    my ($request, $user, $domain, $dir, $filename, $newfilename) = @_;
   
     my $cancelurl = "/priv/".$filename;
     $cancelurl    =~ s/\/home\///;
     $cancelurl    =~ s/\/public_html//;
       
   
   
   if(-e $filename) {    if(-e $filename) {
     $request->print(&checksuffix($filename,$newfilename));      $request->print(&checksuffix($filename,$newfilename));
Line 584  sub Copy1 { Line 592  sub Copy1 {
     $dir.'/'.$newfilename.      $dir.'/'.$newfilename.
     '"><p>Copy <tt>'.$filename.'</tt> to'.      '"><p>Copy <tt>'.$filename.'</tt> to'.
     '<tt>'.$dir.'/'.$newfilename.'</tt>/?</p>');      '<tt>'.$dir.'/'.$newfilename.'</tt>/?</p>');
     &CloseForm1($request, $user, $filename);      &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 633  sub NewDir1 Line 641  sub NewDir1
   
   my $fullpath = '/home/'.$username.'/public_html/'.    my $fullpath = '/home/'.$username.'/public_html/'.
     $path.'/'.$newdir;      $path.'/'.$newdir;
   Debug($request, "Full path is : ".$fullpath);  
     my $cancelurl = '/priv/'.$username.'/'.$path;
   
     &Debug($request, "Full path is : ".$fullpath);
   
   if(-e $fullpath) {    if(-e $fullpath) {
     $request->print('<p>Directory exists.</p></form>');      $request->print('<p>Directory exists.</p></form>');
Line 642  sub NewDir1 Line 653  sub NewDir1
     $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, $username, $newdir);      &CloseForm1($request, $cancelurl);
   
   }    }
 }  }
Removed from v.1.12  
changed lines
  Added in v.1.13

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