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

Diff for /loncom/publisher/lonupload.pm between versions 1.38 and 1.38.2.1

version 1.38, 2008/07/18 03:27:48 version 1.38.2.1, 2008/12/12 02:42:49
Line 98  sub phaseone { Line 98  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('Save uploaded file as ').        '" />'.&mt('Save uploaded file as [_1]',
                       "<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 />'.
       '<br />'.&mt('Choose file type:').'        '<br />'.&mt('Choose file type:').'
 <select name="filetype">  <select name="filetype">
  <option value="standard" selected>'.&mt('Regular file').'   <option value="standard" selected>'.&mt('Regular file').'
Line 115  sub phaseone { Line 116  sub phaseone {
     # 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')) {
  $r->print('<span class="LC_error">'.&mt('The extension on this file,').   $r->print('<p class="LC_error">'
   ' "'.$1.'"'.&mt(', is reserved internally by LON-CAPA.').                            .&mt('The extension on this file, [_1], is reserved internally by LON-CAPA.','"'.$1.'"' ).
   ' <br />'.&mt('Please change the extension.').'</span>');    .' <br />'.&mt('Please change the extension.')
                             .'</p>');
     } elsif($fn=~/\.(\w+)$/ &&       } elsif($fn=~/\.(\w+)$/ && 
     !defined(&Apache::loncommon::fileembstyle($1))) {      !defined(&Apache::loncommon::fileembstyle($1))) {
  $r->print('<span class="LC_error">'.&mt('The extension on this file,').   $r->print('<p class="LC_error">'
   ' "'.$1.'"'.&mt(', is not recognized by LON-CAPA.').                            .&mt('The extension on this file, [_1], is not recognized by LON-CAPA.','"'.$1.'"')
   ' <br />'.&mt('Please change the extension.').    .' <br />'.&mt('Please change the extension.')
   '</span>');    .'</p>');
     }      }
  } else {   } else {
     $r->print('<span class="LC_error">'.&mt('Illegal filename.').'</span>');      $r->print('<span class="LC_error">'.&mt('Illegal filename.').'</span>');
Line 203  sub check_extension { Line 205  sub check_extension {
         (&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.',
                       '<span class="LC_filename">'.$fn.'</span> ').                        '<span class="LC_filename">'.$fn.'</span> ').
                   '<br /><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.').
                   '</span>';                    '</p>';
     } elsif ($fn=~/\.(\w+)$/ &&      } elsif ($fn=~/\.(\w+)$/ &&
              !defined(&Apache::loncommon::fileembstyle($1))) {               !defined(&Apache::loncommon::fileembstyle($1))) {
         $result .= &mt('File [_1] could not be copied.',          $result .= &mt('File [_1] could not be copied.',
                       '<span class="LC_filename">'.$fn.'</span> ').                        '<span class="LC_filename">'.$fn.'</span> ').
                   '<br /><span class="LC_error">'.                    '<p class="LC_error">'.
                   &mt('The extension on this file is not recognized by LON-CAPA.').                    &mt('The extension on this file is not recognized by LON-CAPA.').
                   '</span>';                    '</p>';
     } elsif (-d $target) {      } elsif (-d $target) {
         $result .= &mt('File [_1] could not be copied.',          $result .= &mt('File [_1] could not be copied.',
                       '<span class="LC_filename">'.$fn.'</span>').                        '<span class="LC_filename">'.$fn.'</span>').
                   '<br /><span class="LC_error">'.                    '<p class="LC_error">'.
                   &mt('The target is an existing directory.').                    &mt('The target is an existing directory.').
                   '</span>';                    '</p>';
     } elsif (copy($source,$target)) {      } elsif (copy($source,$target)) {
         chmod(0660, $target); # Set permissions to rw-rw---.          chmod(0660, $target); # Set permissions to rw-rw---.
         if ($mode eq 'testbank' || $mode eq 'imsimport') {          if ($mode eq 'testbank' || $mode eq 'imsimport') {
Removed from v.1.38  
changed lines
  Added in v.1.38.2.1

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