Diff for /loncom/interface/lonparmset.pm between versions 1.290 and 1.291

version 1.290, 2006/04/15 21:12:56 version 1.291, 2006/04/17 21:28:50
Line 3324  ENDYESNO Line 3324  ENDYESNO
 }  }
   
 sub components {  sub components {
     my ($key,$uname,$udom)=@_;      my ($key,$uname,$udom,$exeuser,$exedomain)=@_;
     my $typeflag=0;      my $typeflag=0;
     if ($key=~/\.type$/) {      if ($key=~/\.type$/) {
  $key=~s/\.type$//;   $key=~s/\.type$//;
         $typeflag=1;          $typeflag=1;
     }      }
       my $issection;
     my ($middle,$part,$name)=($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);      my ($middle,$part,$name)=($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
     my $section=&mt('All Students');      my $section=&mt('All Students');
     if ($middle=~/^\[(.*)\]/) {      if ($middle=~/^\[(.*)\]/) {
  my $issection=$1;   $issection=$1;
  if ($uname) {   $section=&mt('Group/Section').': '.$issection;
     $section=&mt('User').": ".&Apache::loncommon::plainname($uname,$udom);  
  } else {  
     $section=&mt('Group/Section').': '.$issection;  
  }  
  $middle=~s/^\[(.*)\]//;   $middle=~s/^\[(.*)\]//;
     }      }
     $middle=~s/\.+$//;      $middle=~s/\.+$//;
     $middle=~s/^\.+//;      $middle=~s/^\.+//;
       if ($uname) {
    $section=&mt('User').": ".&Apache::loncommon::plainname($uname,$udom);
    $issection='';
       }
     my $realm='<font color="red">'.&mt('All Resources').'</font>';      my $realm='<font color="red">'.&mt('All Resources').'</font>';
     if ($middle=~/^(.+)\_\_\_\(all\)$/) {      if ($middle=~/^(.+)\_\_\_\(all\)$/) {
  $realm='<font color="green">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><font color="#aaaaaa" size="-2">('.$1.')</font></font>';   $realm='<font color="green">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><font color="#aaaaaa" size="-2">('.$1.')</font></font>';
Line 3350  sub components { Line 3351  sub components {
  my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);   my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
  $realm='<font color="orange">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><font color="#aaaaaa" size="-2">('.$url.' in '.$map.' id: '.$id.')</font></font>';   $realm='<font color="orange">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><font color="#aaaaaa" size="-2">('.$url.' in '.$map.' id: '.$id.')</font></font>';
     }      }
     return ($realm,$section,$name,$part,$typeflag);      my $what=$part.'.'.$name;
       return ($realm,$section,$name,$part,$typeflag,
       $what,$middle,$uname,$udom,$issection);
 }  }
   
 sub parm_change_log {  sub parm_change_log {
Line 3364  sub parm_change_log { Line 3367  sub parm_change_log {
  if ($key=~/^(.+)\_exe\_time$/) {   if ($key=~/^(.+)\_exe\_time$/) {
     $exetime{$1}=$parmlog{$key};      $exetime{$1}=$parmlog{$key};
  }   }
     }      }    
       my $courseopt=&Apache::lonnet::get_courseresdata($env{'course.'.$env{'request.course.id'}.'.num'},
        $env{'course.'.$env{'request.course.id'}.'.domain'});
     $r->print('<table border="2">');      $r->print('<table border="2">');
     foreach my $id (sort { $exetime{$a}<=>$exetime{$b} } (keys(%exetime))) {      foreach my $id (sort { $exetime{$b}<=>$exetime{$a} } (keys(%exetime))) {
         my @changes=split(/\,/,$parmlog{$id.'_logentry'});          my @changes=split(/\,/,$parmlog{$id.'_logentry'});
  my $count=$#changes+1;   my $count=$#changes+1;
  my $time =   my $time =
Line 3396  sub parm_change_log { Line 3401  sub parm_change_log {
  my %istype=();   my %istype=();
  foreach my $changed (sort @changes) {   foreach my $changed (sort @changes) {
             my ($key,$value)=split(/\=\>/,&Apache::lonnet::unescape($changed));              my ($key,$value)=split(/\=\>/,&Apache::lonnet::unescape($changed));
             my ($realm,$section,$parmname,$part,$typeflag)=              my ($realm,$section,$parmname,$part,$typeflag,$what,$middle,$uname,$udom,$issection)=
  &components($key,$parmlog{$id.'_uname'},$parmlog{$id.'_udom'});   &components($key,$parmlog{$id.'_uname'},$parmlog{$id.'_udom'});
     if ($typeflag) { $istype{$parmname}=$value; }      if ($typeflag) { $istype{$parmname}=$value; }
     if ($makenewrow) { $r->print('<tr>'); } else { $makenewrow=1; }      if ($makenewrow) { $r->print('<tr>'); } else { $makenewrow=1; }
     $r->print('<td>'.$realm.'</td><td>'.$section.'</td><td>'.      $r->print('<td>'.$realm.'</td><td>'.$section.'</td><td>'.
       &mt('Part: [_1]',$part).'</td><td>');        &mt('Part: [_1]',$part).'</td><td>');
       my $stillactive=0;
     if ($parmlog{$id.'_deleteflag'}) {      if ($parmlog{$id.'_deleteflag'}) {
  $r->print(&mt('Deleted'));   $r->print(&mt('Deleted'));
     } else {      } else {
  if ($typeflag) {   if ($typeflag) {
     $r->print(&mt('Type: [_1]',$value));      $r->print(&mt('Type: [_1]',$value));
  } elsif (&isdateparm($istype{$parmname})) {  
     $r->print(&Apache::lonlocal::locallocaltime($value));  
  } else {   } else {
     $r->print($value);      my ($level,@all)=&parmval_by_symb($what,$middle,&Apache::lonnet::metadata($middle,$what),
         $uname,$udom,$issection,$issection,$courseopt);
       if (&isdateparm($istype{$parmname})) {
    $r->print(&Apache::lonlocal::locallocaltime($value));
       } else {
    $r->print($value);
       }
       if ($value ne $all[$level]) {
    $r->print('<br /><font color="red">'.&mt('Not active anymore').'</font>');
       } else {
    $stillactive=1;
       }
  }   }
     }      }
     $r->print('</td></tr>');      $r->print('</td>');
       if ($stillactive) {
    $r->print('<td>Notify Link</td>');
       } else {
    $r->print('<td>&nbsp;</td>');
       }
       $r->print('</tr>');
  }   }
     }      }
     $r->print('</table>');      $r->print('</table>');

Removed from v.1.290  
changed lines
  Added in v.1.291


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