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

Diff for /loncom/publisher/lonupload.pm between versions 1.33 and 1.35

version 1.33, 2006/07/05 22:23:09 version 1.35, 2007/05/02 01:34:23
Line 41  use Apache::lonnet; Line 41  use Apache::lonnet;
 use HTML::Entities();  use HTML::Entities();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   use LONCAPA();
   
 my $DEBUG=0;  my $DEBUG=0;
   
Line 98  sub phaseone { Line 99  sub phaseone {
       '<input type="hidden" name="datatoken" value="'.        '<input type="hidden" name="datatoken" value="'.
       &upfile_store.'" />'.        &upfile_store.'" />'.
       '<input type="hidden" name="uploaduname" value="'.$uname.        '<input type="hidden" name="uploaduname" value="'.$uname.
       '" />'.&mt('Store uploaded file as ').        '" />'.&mt('Save uploaded file as ').
                       "<span class='LC_filename'>/priv/$uname/</span>".                        "<span class='LC_filename'>/priv/$uname/</span>".
                       '<input type="text" size="50" name="filename" value="'.$fn.                        '<input type="text" size="50" name="filename" value="'.$fn.
                       '" /><br />'.                        '" /><br />'.
Line 111  sub phaseone { Line 112  sub phaseone {
 <br />  <br />
 <br />  <br />
 ');  ');
             $r->print('<input type="button" value="'.&mt('Store').'" onClick="javascript:verifyForm()"/></form>');              $r->print('<input type="button" value="'.&mt('Save').'" onClick="javascript:verifyForm()"/></form>');
     # Check for bad extension and warn user      # Check for bad extension and warn user
     if ($fn=~/\.(\w+)$/ &&       if ($fn=~/\.(\w+)$/ && 
  (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {   (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
Line 289  function verifyForm() { Line 290  function verifyForm() {
  $fn=$env{'form.filename'};   $fn=$env{'form.filename'};
  $fn=~s/^http\:\/\/[^\/]+\///;   $fn=~s/^http\:\/\/[^\/]+\///;
  $fn=~s/^\///;   $fn=~s/^\///;
  $fn=~s/(\~|priv\/)(\w+)//;   $fn=~s{(~|priv/)($LONCAPA::username_re)}{};
  $fn=~s/\/+/\//g;   $fn=~s/\/+/\//g;
     } else {      } else {
  $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.   $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
Removed from v.1.33  
changed lines
  Added in v.1.35

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