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

Diff for /loncom/interface/londocs.pm between versions 1.493 and 1.498

version 1.493, 2012/08/23 14:17:13 version 1.498, 2012/10/02 18:08:12
Line 369  sub breadcrumbs { Line 369  sub breadcrumbs {
 }  }
   
 sub log_docs {  sub log_docs {
     return &Apache::lonnet::write_log('docslog',@_);      return &Apache::lonnet::write_log('course','docslog',@_);
 }  }
   
 {  {
Line 2184  sub entryline { Line 2184  sub entryline {
  'cp' => 'Copy');   'cp' => 'Copy');
  my $nocopy=0;   my $nocopy=0;
         my $nocut=0;          my $nocut=0;
           my $noremove=0;
         if ($url=~ m{^/res/.+\.(page|sequence)$}) {          if ($url=~ m{^/res/.+\.(page|sequence)$}) {
     # no copy for published maps      # no copy for published maps
     $nocopy=1;      $nocopy=1;
Line 2192  sub entryline { Line 2193  sub entryline {
            $nocopy=1;             $nocopy=1;
            $nocut=1;             $nocut=1;
         }          }
           my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
           my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
           if ($url eq "/uploaded/$cdom/$cnum/group_allfolders.sequence") {
               if ($env{'form.folderpath'} =~ /^default&[^\&]+$/) {
                   my %curr_groups = &Apache::longroup::coursegroups();
                   if (keys(%curr_groups) > 0) {
                       $noremove=1;
                   }
                   $nocut=1;
                   $nocopy=1;
               }
           } elsif ($url =~ m{^\Q/uploaded/$cdom/$cnum/group_folder_\E(\w+)\.sequence$}) {
               my $group = $1;
               if ($env{'form.folderpath'} =~ /^default&[^\&]+\&group_allfolders\&[^\&]+$/) {
                   my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group);
                   if (keys(%curr_group) > 0) {
                       $noremove=1;
                   }
               }
               $nocut=1;
               $nocopy=1;
           } elsif ($url =~ m{^\Q/adm/$cdom/$cnum/\E(\w+)/smppg$}) {
               my $group = $1;
               if ($env{'form.folderpath'} =~ /^default&[^\&]+\&group_allfolders\&[^\&]+\&\Qgroup_folder_$group\E\&[^\&]+$/) {
                   my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group);
                   my %groupsettings = &Apache::longroup::get_group_settings($curr_group{$group});
                   if (keys(%groupsettings) > 0) {
                       $noremove=1;
                   }
                   $nocut=1;
                   $nocopy=1;
               }
           } elsif ($env{'form.folderpath'} =~ /^default&[^\&]+\&group_allfolders\&[^\&]+\&group_folder_(\w+)\&/) {
               my $group = $1;
               my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group);
               if ($url =~ /group_boards_\Q$group\E/) {
                   my %curr_group = &Apache::longroup::coursegroups($cdom,$cnum,$group);
                   my %groupsettings = &Apache::longroup::get_group_settings($curr_group{$group});
                   if (keys(%groupsettings) > 0) {
                       if (ref($groupsettings{'functions'}) eq 'HASH') {
                           if ($groupsettings{'functions'}{'discussion'} eq 'on') {
                               $noremove=1;
                           }
                       }
                   }
                   $nocut=1;
                   $nocopy=1;
               }
           }
         my $copylink=' ';          my $copylink=' ';
         my $cutlink=' ';          my $cutlink=' ';
           my $removelink=' ';
   
  my $skip_confirm = 0;   my $skip_confirm = 0;
  if ( $folder =~ /^supplemental/   if ( $folder =~ /^supplemental/
Line 2217  ENDCOPY Line 2268  ENDCOPY
 <a href="javascript:cutres('$esc_path','$index','$renametitle','$container','$symb','$folder',$skip_confirm);" class="LC_docs_cut">$lt{'ct'}</a>  <a href="javascript:cutres('$esc_path','$index','$renametitle','$container','$symb','$folder',$skip_confirm);" class="LC_docs_cut">$lt{'ct'}</a>
 ENDCUT  ENDCUT
         }          }
           if (!$noremove) {
               $removelink=(<<ENDREM);
   <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>
   ENDREM
           }
  $form_start = '   $form_start = '
    <form action="/adm/coursedocs" method="post">     <form action="/adm/coursedocs" method="post">
 ';  ';
Line 2247  END Line 2303  END
    $form_end     $form_end
 </td>  </td>
 <td class="LC_docs_entry_commands">  <td class="LC_docs_entry_commands">
    <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>  $removelink
 $cutlink  $cutlink
    <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>     <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
 $copylink  $copylink
Line 2808  ENDHEADERS Line 2864  ENDHEADERS
     '<th colspan="'.$num_ver_col.'">'.&mt('History').'</th>'.      '<th colspan="'.$num_ver_col.'">'.&mt('History').'</th>'.
     '</b>');      '</b>');
     foreach my $key (sort(keys(%changes))) {      foreach my $key (sort(keys(%changes))) {
  if ($changes{$key}>$starttime) {          #excludes not versionable problems from resource version history:
           if ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/) {
     my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);      my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
     my $currentversion=&Apache::lonnet::getversion($key);      my $currentversion=&Apache::lonnet::getversion($key);
     if ($currentversion<0) {      if ($currentversion<0) {
Line 3926  my %suporderhash = ( Line 3983  my %suporderhash = (
   } elsif ($showdoc) {    } elsif ($showdoc) {
 # -------------------------------------------------------- This is showdoc mode  # -------------------------------------------------------- This is showdoc mode
       $r->print("<h1>".&mt('Uploaded Document').' - '.        $r->print("<h1>".&mt('Uploaded Document').' - '.
  &Apache::lonnet::gettitle($r->uri).'</h1><p>'.   &Apache::lonnet::gettitle($r->uri).'</h1><p class="LC_warning">'.
 &mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><table>".  &mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><table>".
                 &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>');                  &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>');
   }    }
Removed from v.1.493  
changed lines
  Added in v.1.498

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