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

Diff for /loncom/interface/londocs.pm between versions 1.590 and 1.591

version 1.590, 2014/12/20 20:32:33 version 1.591, 2014/12/21 16:26:31
Line 977  sub docs_change_log { Line 977  sub docs_change_log {
   
 sub update_paste_buffer {  sub update_paste_buffer {
     my ($coursenum,$coursedom,$folder) = @_;      my ($coursenum,$coursedom,$folder) = @_;
     my (@possibles,%removals,%cuts);      my (@possibles,%removals,%cuts,$output);
     if ($env{'form.multiremove'}) {      if ($env{'form.multiremove'}) {
         $env{'form.multiremove'} =~ s/,$//;          $env{'form.multiremove'} =~ s/,$//;
         map { $removals{$_} = 1; } split(/,/,$env{'form.multiremove'});          map { $removals{$_} = 1; } split(/,/,$env{'form.multiremove'});
Line 1045  sub update_paste_buffer { Line 1045  sub update_paste_buffer {
         next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$url}));          next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$url}));
         my ($suffix,$errortxt,$locknotfreed) =          my ($suffix,$errortxt,$locknotfreed) =
             &new_timebased_suffix($env{'user.domain'},$env{'user.name'},'paste');              &new_timebased_suffix($env{'user.domain'},$env{'user.name'},'paste');
         push(@newpaste,$suffix);          if ($suffix ne '') {
         if ($locknotfreed) {              push(@newpaste,$suffix);
             return $locknotfreed;          } else {
             last;              if ($locknotfreed) {
                   return $locknotfreed;
               }
         }          }
         if (&is_supplemental_title($title)) {          if (&is_supplemental_title($title)) {
             &Apache::lonnet::appenv({'docs.markedcopy_supplemental_'.$suffix => $title});              &Apache::lonnet::appenv({'docs.markedcopy_supplemental_'.$suffix => $title});
Line 1082  sub update_paste_buffer { Line 1084  sub update_paste_buffer {
                 }                  }
             }              }
         }          }
           if ($locknotfreed) {
               $output = $locknotfreed;
               last;
           }
     }      }
     if (@newpaste) {      if (@newpaste) {
         $addtoenv{'docs.markedcopies'} = join(',',(@currpaste,@newpaste));          $addtoenv{'docs.markedcopies'} = join(',',(@currpaste,@newpaste));
     }      }
     &Apache::lonnet::appenv(\%addtoenv);      &Apache::lonnet::appenv(\%addtoenv);
     delete($env{'form.markcopy'});      delete($env{'form.markcopy'});
     return;      return $output;
 }  }
   
 sub recurse_uploaded_maps {  sub recurse_uploaded_maps {
Line 3881  sub new_timebased_suffix { Line 3887  sub new_timebased_suffix {
             '<div class="LC_error">'.              '<div class="LC_error">'.
             &mt('There was a problem removing a lockfile.').' ';              &mt('There was a problem removing a lockfile.').' ';
         if ($type eq 'paste') {          if ($type eq 'paste') {
             &mt('This will prevent use of the paste buffer until th next log-in.');              if ($freedlock eq 'nolock') {
                   $locknotfreed =
                       '<div class="LC_error">'.
                       &mt('A lockfile was not released when you added content to the clipboard earlier in this session.').' '.
    
                       &mt('As a result addition of items to the clipboard wll be unavailable until your next log-in.');
               } else { 
                   $locknotfreed .=
                       &mt('This will prevent addition of items to the clipboard until your next log-in.');
               }
         } elsif ($type eq 'map') {          } elsif ($type eq 'map') {
             &mt('This will prevent creation of additional folders or composite pages in this course.');              $locknotfreed .=
                   &mt('This will prevent creation of additional folders or composite pages in this course.');
         } elsif ($type eq 'smppg') {          } elsif ($type eq 'smppg') {
             $locknotfreed .=              $locknotfreed .=
                 &mt('This will prevent creation of additional simple pages in this course.');                  &mt('This will prevent creation of additional simple pages in this course.');
Removed from v.1.590  
changed lines
  Added in v.1.591

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