Diff for /loncom/publisher/lonupload.pm between versions 1.41 and 1.43

version 1.41, 2008/11/20 16:32:34 version 1.43, 2008/12/19 03:57:24
Line 290  sub check_extension { Line 290  sub check_extension {
     if ($fn=~/\.(\w+)$/ &&      if ($fn=~/\.(\w+)$/ &&
         (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {          (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
         $result .= &mt('File [_1] could not be copied.',          $result .= &mt('File [_1] could not be copied.',
                       '<p class="LC_filename">'.$fn.'</span> ').                        '<span class="LC_filename">'.$fn.'</span> ').
                   '<span class="LC_error">'.                    '<p class="LC_error">'.
                   &mt('The extension on this file is reserved internally by LON-CAPA.').                    &mt('The extension on this file is reserved internally by LON-CAPA.').
                   '</p>';                    '</p>';
     } elsif ($fn=~/\.(\w+)$/ &&      } elsif ($fn=~/\.(\w+)$/ &&
Line 421  function verifyForm() { Line 421  function verifyForm() {
     my $fn;      my $fn;
     if ($env{'form.filename'}) {      if ($env{'form.filename'}) {
  $fn=$env{'form.filename'};   $fn=$env{'form.filename'};
  $fn=~s/^http\:\/\/[^\/]+\///;   $fn=~s/^https?\:\/\/[^\/]+\///;
  $fn=~s/^\///;   $fn=~s/^\///;
  $fn=~s{(~|priv/)($LONCAPA::username_re)}{};   $fn=~s{(~|priv/)($LONCAPA::username_re)}{};
  $fn=~s/\/+/\//g;   $fn=~s/\/+/\//g;

Removed from v.1.41  
changed lines
  Added in v.1.43


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