Diff for /loncom/publisher/loncfile.pm between versions 1.31 and 1.33

version 1.31, 2003/06/19 20:49:13 version 1.33, 2003/06/20 15:30:13
Line 92  use Apache::Constants qw(:common :http : Line 92  use Apache::Constants qw(:common :http :
 use Apache::loncacc;  use Apache::loncacc;
 use Apache::Log ();  use Apache::Log ();
 use Apache::lonnet;  use Apache::lonnet;
   use Apache::loncommon();
   
 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 387  sub checksuffix { Line 388  sub checksuffix {
     }      }
     return $result;      return $result;
 }  }
   
   sub cleanDest {
       my ($request,$dest)=@_;
       #remove bad characters
       if  ($dest=~/[\#\?&]/) {
    $request->print("<p><font color=\"red\">Invalid characters in requested name have been removed.</font></p>");
    $dest=~s/[\#\?&]//g;
       }
       return $dest;
   }
   
 =pod  =pod
   
 =item CloseForm1($request, $user, $file)  =item CloseForm1($request, $user, $file)
Line 778  sub NewFile1 { Line 790  sub NewFile1 {
  }   }
     }      }
   
     #remove bad characters  
     if  ($newfilename=~/[\#\?&]/) {  
  $request->print("<p><font color=\"red\">Invalid characters in requested filename have been removed.</font></p>");  
  $newfilename=~s/[\#\?&]//g;  
     }  
   
     my $fullpath = $dir.'/'.$newfilename;      my $fullpath = $dir.'/'.$newfilename;
   
     &Debug($request, "Full path is : ".$fullpath);      &Debug($request, "Full path is : ".$fullpath);
Line 842  sub phaseone { Line 848  sub phaseone {
       
   #  my $conspace=ConstructionPathFromRelative($uname, $fn);    #  my $conspace=ConstructionPathFromRelative($uname, $fn);
       
       $ENV{'form.newfilename'}=&cleanDest($r,$ENV{'form.newfilename'});
   
   $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" />'.
Line 1276  sub handler { Line 1283  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(&Apache::loncommon::bodytag('File Operation'));
    '<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>');

Removed from v.1.31  
changed lines
  Added in v.1.33


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