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

Diff for /loncom/publisher/loncfile.pm between versions 1.24 and 1.26

version 1.24, 2003/02/10 23:13:17 version 1.26, 2003/02/10 23:26:15
Line 764  sub NewFile1 { Line 764  sub NewFile1 {
     if ($ENV{'form.action'} =~ /new(.+)file/) {      if ($ENV{'form.action'} =~ /new(.+)file/) {
  my $extension=$1;   my $extension=$1;
  if ($newfilename !~ /\Q.$extension\E$/) {   if ($newfilename !~ /\Q.$extension\E$/) {
       if ($newfilename =~ m|^[^\.]*\.([^\.]+)$|) {
    #already has an extension strip it and add in expected one
    $newfilename =~ s|.([^\.]+)$||;
       }
     $newfilename.=".$extension";      $newfilename.=".$extension";
  }   }
     }      }
Line 776  sub NewFile1 { Line 780  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 852  sub phaseone { Line 856  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.24  
changed lines
  Added in v.1.26

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