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

Diff for /loncom/interface/londocs.pm between versions 1.272 and 1.277

version 1.272, 2007/05/02 01:33:48 version 1.277, 2007/06/15 19:12:56
Line 904  sub store_template { Line 904  sub store_template {
 # Imports the given (name, url) resources into the course  # Imports the given (name, url) resources into the course
 # coursenum, coursedom, and folder must precede the list  # coursenum, coursedom, and folder must precede the list
 sub group_import {  sub group_import {
     my $coursenum = shift;      my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
     my $coursedom = shift;  
     my $folder = shift;      while (@files) {
     my $container = shift;   my $name = shift(@files);
     my $caller = shift;   my $url  = shift(@files);
     while (@_) {   #FIXME check if file exists before overwriting, might be restoring it
  my $name = shift;          if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) 
  my $url = shift;       && ($caller eq 'londocs')
         if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) && ($caller eq 'londocs')) {       && (!&Apache::lonnet::stat_file($url))) {
       
             my $errtext = '';              my $errtext = '';
             my $fatal = 0;              my $fatal = 0;
             my $newmapstr = '<map>'."\n".              my $newmapstr = '<map>'."\n".
Line 936  sub group_import { Line 937  sub group_import {
     $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;      $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
     my $ext = 'false';      my $ext = 'false';
     if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; }      if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; }
     $url  =~ &LONCAPA::map::qtunescape($url);      $url  = &LONCAPA::map::qtunescape($url);
     $name =~ &LONCAPA::map::qtunescape($name);      $name = &LONCAPA::map::qtunescape($name);
     $LONCAPA::map::resources[$idx] =       $LONCAPA::map::resources[$idx] = 
  join ':', ($name, $url, $ext, 'normal', 'res');   join ':', ($name, $url, $ext, 'normal', 'res');
  }   }
Line 1583  sub ask_for_embedded_content { Line 1584  sub ask_for_embedded_content {
  &Apache::loncommon::start_data_table();   &Apache::loncommon::start_data_table();
   
     my $num = 0;      my $num = 0;
     foreach my $embed_file (keys(%{$allfiles})) {      foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%{$allfiles})) {
  $upload_output .= &Apache::loncommon::start_data_table_row().   $upload_output .= &Apache::loncommon::start_data_table_row().
     '<td>'.$embed_file.'</td><td>';      '<td>'.$embed_file.'</td><td>';
  if ($args->{'error_on_invalid_names'}   if ($args->{'ignore_remote_references'}
       && $embed_file =~ m{^\w+://}) {
       $upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</span>';
    } elsif ($args->{'error_on_invalid_names'}
     && $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {      && $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {
           
     $upload_output.='<span class="LC_warning">'.&mt("Invalid characters").'</span>';      $upload_output.='<span class="LC_warning">'.&mt("Invalid characters").'</span>';
       
  } else {   } else {
   
     $upload_output .='      $upload_output .='
            <input name="embedded_item_'.$num.'" type="file" value="bob" />             <input name="embedded_item_'.$num.'" type="file" value="bob" />
            <input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />';             <input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />';
Line 1611  sub ask_for_embedded_content { Line 1617  sub ask_for_embedded_content {
     }      }
     $upload_output .= &Apache::loncommon::end_data_table().'<br />      $upload_output .= &Apache::loncommon::end_data_table().'<br />
    <input type ="hidden" name="number_embedded_items" value="'.$num.'" />     <input type ="hidden" name="number_embedded_items" value="'.$num.'" />
    <input type ="submit" value="Complete upload" />     <input type ="submit" value="'.&mt('Upload Listed Files').'" />
      '.&mt('(only files for which a location has been provided will be uploaded)').'
    </form>';     </form>';
     return $upload_output;      return $upload_output;
 }  }
Removed from v.1.272  
changed lines
  Added in v.1.277

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