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

Diff for /loncom/publisher/lonupload.pm between versions 1.40 and 1.47

version 1.40, 2008/11/18 19:14:40 version 1.47, 2009/07/06 10:19:22
Line 184  sub phaseone { Line 184  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="selected">'.&mt('Regular file').'
  <option value="testbank">'.&mt('Testbank file').'   <option value="testbank">'.&mt('Testbank file').'
  <option value="imsimport">'.&mt('IMS package').'   <option value="imsimport">'.&mt('IMS package').'
 </select>'.&Apache::loncommon::help_open_topic("Uploading_File_Options").'  </select>'.&Apache::loncommon::help_open_topic("Uploading_File_Options").'
 <br />  <br />
 <br />  <br />
 ');  ');
             $r->print('<input type="button" value="'.&mt('Save').'" onClick="javascript:verifyForm()"/></form>');              $r->print('<input type="button" value="'.&mt('Upload').'" 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')) {
  $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 289  sub check_extension { Line 291  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') {
Line 419  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;
Line 438  function verifyForm() { Line 440  function verifyForm() {
    $javascript = "<script type=\"text/javascript\">\n//<!--\n".     $javascript = "<script type=\"text/javascript\">\n//<!--\n".
  $javascript."\n// --></script>\n";   $javascript."\n// --></script>\n";
   
       # Breadcrumbs
       my $brcrum = [{'href' => &Apache::loncommon::authorspace(),
                      'text' => 'Construction Space'},
                     {'href' => '/adm/upload',
                      'text' => 'Upload file to Construction Space'}];
     $r->print(&Apache::loncommon::start_page('Upload file to Construction Space',      $r->print(&Apache::loncommon::start_page('Upload file to Construction Space',
      $javascript));                                               $javascript,
                                                {'bread_crumbs' => $brcrum,})
                .&Apache::loncommon::head_subbox(
                   &Apache::loncommon::CSTR_pageheader())
       );
       
     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {      if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
  $r->print('<h3><span class="LC_error">'.&mt('Co-Author').': '.$uname.          $r->print('<p class="LC_warning">'
   &mt(' at ').$udom.'</span></h3>');                   .&mt('Co-Author [_1]',$uname.':'.$udom)
                    .'</p>'
           );
     }      }
   
     if ($env{'form.phase'} eq 'three') {      if ($env{'form.phase'} eq 'three') {
Removed from v.1.40  
changed lines
  Added in v.1.47

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