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

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

version 1.23, 2003/02/04 22:01:38 version 1.25, 2003/02/10 23:19:45
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 495  sub Rename1 { Line 494  sub Rename1 {
     if(-e $conspace) {      if(-e $conspace) {
  if($ENV{'form.newfilename'}) {   if($ENV{'form.newfilename'}) {
     my $newfilename = $ENV{'form.newfilename'};      my $newfilename = $ENV{'form.newfilename'};
       if ($newfilename =~ m|^[^\.]+$|) {
    #no extension add on orignal extension
    if ($filename =~ m|/[^\.]*\.([^\.]+)$|) {
       $newfilename.='.'.$1;
    }
       }
     $request->print(&checksuffix($filename, $newfilename));      $request->print(&checksuffix($filename, $newfilename));
     my $return=&exists($user, $domain, $dir, $newfilename);      my $return=&exists($user, $domain, $dir, $newfilename);
     $request->print($return);      $request->print($return);
Line 771  sub NewFile1 { Line 776  sub NewFile1 {
  $request->print('<p>File exists.</p></form>');   $request->print('<p>File exists.</p></form>');
     }      }
     else {      else {
  $request->print('<p>Make new file <tt>'.$newfilename.'</tt>?</p>');   $request->print('<p>Make new file <tt>'.$dir.'/'.$newfilename.'</tt>?</p>');
  my $dest=&MakeFinalUrl($request,$fullpath);   my $dest=&MakeFinalUrl($request,$fullpath);
  &Debug($request, "Cancel url is: ".$cancelurl);   &Debug($request, "Cancel url is: ".$cancelurl);
  &Debug($request, "Dest url is: ".$dest);   &Debug($request, "Dest url is: ".$dest);
Line 847  sub phaseone { Line 852  sub phaseone {
   }  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') {
     if($ENV{'form.newfilename'}) {        if($ENV{'form.newfilename'}) {
       my $newfilename = $ENV{'form.newfilename'};    my $newfilename = $ENV{'form.newfilename'};
       if (!defined($dir)) {    if (!defined($dir)) {
   $fn=~m:(.*)/:;        $fn=~m:(.*)/:;
   $dir=$1;        $dir=$1;
     }
     &NewFile1($r, $uname, $udom, $dir, $newfilename);
         } else {
     $r->print('<p>No new filename specified.</p></form>');
       }        }
       &NewFile1($r, $uname, $udom, $dir, $fn, $newfilename);  
     }else {  
       $r->print('<p>No new filename specified.</p></form>');  
     }  
   }    }
 }  }
   
Removed from v.1.23  
changed lines
  Added in v.1.25

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