Diff for /loncom/interface/lonparmset.pm between versions 1.328 and 1.334

version 1.328, 2006/08/09 20:40:16 version 1.334, 2006/09/07 21:57:52
Line 2432  sub storedata { Line 2432  sub storedata {
     }      }
     &Apache::lonnet::devalidateuserresdata($tuname,$tudom);      &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
  } else {   } else {
     push (@deldata,$thiskey);      push (@deldata,$thiskey,$thiskey.'.type');
  }   }
     } elsif ($cmd eq 'datepointer') {      } elsif ($cmd eq 'datepointer') {
  my $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});   my $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});
Line 2832  ENDOVER Line 2832  ENDOVER
       &Apache::loncommon::end_page());        &Apache::loncommon::end_page());
 }  }
   
   sub clean_parameters {
       my ($r) = @_;
       my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
       my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
   
       my $start_page=&Apache::loncommon::start_page('Clean Parameters');
       my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Clean');
       $r->print(<<ENDOVER);
   $start_page
   $breadcrumbs
   <form method="post" action="/adm/parmset?action=cleanparameters" name="parmform">
   ENDOVER
   # Store modified
   
       &storedata($r,$crs,$dom);
   
   # Read modified data
   
       my $resourcedata=&readdata($crs,$dom);
   
   # List data
   
       $r->print('<h3>'.
         &mt('These parameters refer to resources that do not exist.').
         '</h3>'.
         '<input type="submit" value="'.&mt('Delete Checked Parameters').'" />'.'<br />'.
         '<br />');
       $r->print(&Apache::loncommon::start_data_table().
         '<tr>'.
         '<th>'.&mt('Delete').'</th>'.
         '<th>'.&mt('Parameter').'</th>'.
         '</tr>');
       foreach my $thiskey (sort(keys(%{$resourcedata}))) {
    next if (!exists($resourcedata->{$thiskey.'.type'})
    && $thiskey=~/\.type$/);
    my %data = &parse_key($thiskey);
    if (exists($data{'realm_exists'})
       && !$data{'realm_exists'}) {
       $r->print(&Apache::loncommon::start_data_table_row().
         '<tr>'.
         '<td><input type="checkbox" name="del_'.$thiskey.'" /></td>'      );
       
       $r->print('<td>');
       $r->print(&mt('Parameter: "[_1]" with value: "[_2]"',
     &standard_parameter_names($data{'parameter_name'}),
     $resourcedata->{$thiskey}));
       $r->print('<br />');
       if ($data{'scope_type'} eq 'all') {
    $r->print(&mt('All users'));
       } elsif ($data{'scope_type'} eq 'user') {
    $r->print(&mt('User: [_1]',join(':',@{$data{'scope'}})));
       } elsif ($data{'scope_type'} eq 'section') {
    $r->print(&mt('Section: [_1]',$data{'scope'}));
       } elsif ($data{'scope_type'} eq 'group') {
    $r->print(&mt('Group: [_1]',$data{'scope'}));
       }
       $r->print('<br />');
       if ($data{'realm_type'} eq 'all') {
    $r->print(&mt('All Resources'));
       } elsif ($data{'realm_type'} eq 'folder') {
    $r->print(&mt('Folder: [_1]'),$data{'realm'});
       } elsif ($data{'realm_type'} eq 'symb') {
    my ($map,$resid,$url) =
       &Apache::lonnet::decode_symb($data{'realm'});
    $r->print(&mt('Resource: [_1] <br />&nbsp;&nbsp;&nbsp;with ID: [_2] <br />&nbsp;&nbsp;&nbsp;in folder [_3]',
         $url,$resid,$map));
       }
       $r->print(&mt('Part: [_1]',$data{'parameter_part'}));
       $r->print('</td></tr>');
   
    }
       }
       $r->print(&Apache::loncommon::end_data_table().'<p>'.
         '<input type="submit" value="'.&mt('Delete Checked Parameters').'" />'.
         '</p></form>'.
         &Apache::loncommon::end_page());
   }
   
   sub parse_key {
       my ($key) = @_;
       my %data;
       my ($middle,$part,$name)=
    ($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
       $data{'scope_type'} = 'all';
       if ($middle=~/^\[(.*)\]/) {
           $data{'scope'} = $1;
    if ($data{'scope'}=~/^useropt\:(\w+)\:(\w+)/) {
       $data{'scope_type'} = 'user';
       $data{'scope'} = [$1,$2];
    } else {
       #FIXME check for group scope
       $data{'scope_type'} = 'section';
    }
    $middle=~s/^\[(.*)\]//;
       }
       $middle=~s/\.+$//;
       $middle=~s/^\.+//;
       $data{'realm_type'}='all';
       if ($middle=~/^(.+)\_\_\_\(all\)$/) {
    $data{'realm'} = $1;
    $data{'realm_type'} = 'folder';
    $data{'realm_title'} = &Apache::lonnet::gettitle($data{'realm'});
    ($data{'realm_exists'}) = &Apache::lonnet::is_on_map($data{'realm'});
    &Apache::lonnet::logthis($1." siad ". $data{'realm_exists'} );
       } elsif ($middle) {
    $data{'realm'} = $middle;
    $data{'realm_type'} = 'symb';
    $data{'realm_title'} = &Apache::lonnet::gettitle($data{'realm'});
    my ($map,$resid,$url) = &Apache::lonnet::decode_symb($data{'realm'});
    $data{'realm_exists'} = &Apache::lonnet::symbverify($data{'realm'},$url);
       }
       
       $data{'parameter_part'} = $part;
       $data{'parameter_name'} = $name;
   
       return %data;
   }
   
 ##################################################  ##################################################
 ##################################################  ##################################################
                                                                                               
 =pod  =pod
   
 =item check_cloners  =item check_cloners
Line 3092  sub output_row { Line 3210  sub output_row {
     }      }
     return ($output);      return ($output);
 }  }
   sub addmetafield {
       my ($r)=@_;
       $r->print(&Apache::loncommon::start_page('Add Metadata Field'));
       $r->print(&Apache::lonhtmlcommon::breadcrumbs('Add Metadata Field'));
       if (exists($env{'form.fieldname'})) {
           $r->print('Here is a field');
       }
       $r->print('<form method="post" action="/adm/parmset?action=addmetadata"');
       $r->print('<input type="text" name="fieldname" /><br />');
       $r->print('<input type="submit" value="Add Metadata Field" />');
       $r->print('</form>');
   }
 sub setrestrictmeta {  sub setrestrictmeta {
     my ($r)=@_;      my ($r)=@_;
     my $next_meta;      my $next_meta;
     my $output;      my $output;
     my $item_num;      my $item_num;
     my $put_result;      my $put_result;
           &Apache::lonnet::logthis("restricting metadata");    
     $r->print(&Apache::loncommon::start_page('Restrict Metadata'));      $r->print(&Apache::loncommon::start_page('Restrict Metadata'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Restrict Metadata'));      $r->print(&Apache::lonhtmlcommon::breadcrumbs('Restrict Metadata'));
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
Line 3146  sub setrestrictmeta { Line 3275  sub setrestrictmeta {
         <p>          <p>
         $output          $output
         <input type="submit" name="restrictmeta" value="Update Metadata Restrictions">          <input type="submit" name="restrictmeta" value="Update Metadata Restrictions">
           </form><br />
           <form method="post" action="/adm/parmset?action=addmetadata" name="form">
           <input type="submit" name="restrictmeta" value="Add a Metadata Field">
         </form>          </form>
 ENDenv  ENDenv
     $r->print(&Apache::loncommon::end_page());      $r->print(&Apache::loncommon::end_page());
Line 3314  ENDYESNO Line 3446  ENDYESNO
 }  }
   
 sub components {  sub components {
     my ($key,$uname,$udom,$exeuser,$exedomain)=@_;      my ($key,$uname,$udom,$exeuser,$exedomain,$typeflag)=@_;
     my $typeflag=0;  
     if ($key=~/\.type$/) {      if ($typeflag) {
  $key=~s/\.type$//;   $key=~s/\.type$//;
         $typeflag=1;  
     }      }
   
       my ($middle,$part,$name)=
    ($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
     my $issection;      my $issection;
     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=~/^\[(.*)\]/) {
  $issection=$1;   $issection=$1;
Line 3345  sub components { Line 3479  sub components {
  $realmdescription=&mt('resource').' '.&Apache::lonnet::gettitle($middle);   $realmdescription=&mt('resource').' '.&Apache::lonnet::gettitle($middle);
     }      }
     my $what=$part.'.'.$name;      my $what=$part.'.'.$name;
     return ($realm,$section,$name,$part,$typeflag,      return ($realm,$section,$name,$part,
     $what,$middle,$uname,$udom,$issection,$realmdescription);      $what,$middle,$uname,$udom,$issection,$realmdescription);
 }  }
   
Line 3423  sub parm_change_log { Line 3557  sub parm_change_log {
     my $shown=0;      my $shown=0;
     foreach my $id (sort { $parmlog{$b}{'exe_time'}<=>$parmlog{$a}{'exe_time'} } (keys(%parmlog))) {      foreach my $id (sort { $parmlog{$b}{'exe_time'}<=>$parmlog{$a}{'exe_time'} } (keys(%parmlog))) {
         my @changes=keys(%{$parmlog{$id}{'logentry'}});          my @changes=keys(%{$parmlog{$id}{'logentry'}});
  my $count=$#changes+1;   my $count = 0;
  if (!$env{'form.includetypes'}) { $count=$count/2; }  
  my $time =   my $time =
     &Apache::lonlocal::locallocaltime($parmlog{$id}{'exe_time'});      &Apache::lonlocal::locallocaltime($parmlog{$id}{'exe_time'});
  my $plainname =    my $plainname = 
Line 3443  sub parm_change_log { Line 3576  sub parm_change_log {
    $parmlog{$id}{'exe_udom'});     $parmlog{$id}{'exe_udom'});
  }   }
  my $row_start=&Apache::loncommon::start_data_table_row();   my $row_start=&Apache::loncommon::start_data_table_row();
  $r->print($row_start.'<td rowspan="'.$count.'">'.$time.'</td>   $r->print($row_start);
                        <td rowspan="'.$count.'">'.$about_me_link.  
   '<br /><tt>'.$parmlog{$id}{'exe_uname'}.  
           ':'.$parmlog{$id}{'exe_udom'}.'</tt>'.  
   $send_msg_link.'</td>');  
  my $makenewrow=0;   my $makenewrow=0;
  my %istype=();   my %istype=();
    my $output;
  foreach my $changed (reverse(sort(@changes))) {   foreach my $changed (reverse(sort(@changes))) {
             my $value=$parmlog{$id}{'logentry'}->{$changed};              my $value=$parmlog{$id}{'logentry'}{$changed};
             my ($realm,$section,$parmname,$part,$typeflag,$what,$middle,$uname,$udom,$issection,$realmdescription)=      my $typeflag = ($changed =~/\.type$/ &&
  &components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'});      !exists($parmlog{$id}{'logentry'}{$changed.'.type'}));
               my ($realm,$section,$parmname,$part,$what,$middle,$uname,$udom,$issection,$realmdescription)=
    &components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},undef,undef,$typeflag);
     if ($typeflag) {      if ($typeflag) {
  if (!$env{'form.includetypes'}) { next; }   
  $istype{$parmname}=$value;    $istype{$parmname}=$value; 
    if (!$env{'form.includetypes'}) { next; } 
     }      }
     if ($makenewrow) { $r->print($row_start); } else { $makenewrow=1; }      $count++;
     $r->print('<td>'.$realm.'</td><td>'.$section.'</td><td>'.      if ($makenewrow) {
    $output .= $row_start;
       } else {
    $makenewrow=1;
       }
       $output .='<td>'.$realm.'</td><td>'.$section.'</td><td>'.
       &standard_parameter_names($parmname).'</td><td>'.        &standard_parameter_names($parmname).'</td><td>'.
       ($part?&mt('Part: [_1]',$part):&mt('All Parts')).'</td><td>');        ($part?&mt('Part: [_1]',$part):&mt('All Parts')).'</td><td>';
     my $stillactive=0;      my $stillactive=0;
     if ($parmlog{$id}{'deleteflag'}) {      if ($parmlog{$id}{'delflag'}) {
  $r->print(&mt('Deleted'));   $output .= &mt('Deleted');
     } else {      } else {
  if ($typeflag) {   if ($typeflag) {
     $r->print(&mt('Type: [_1]',&standard_parameter_names($value)));      $output .= &mt('Type: [_1]',&standard_parameter_names($value));
  } else {   } else {
     my ($level,@all)=&parmval_by_symb($what,$middle,&Apache::lonnet::metadata($middle,$what),      my ($level,@all)=&parmval_by_symb($what,$middle,&Apache::lonnet::metadata($middle,$what),
       $uname,$udom,$issection,$issection,$courseopt);        $uname,$udom,$issection,$issection,$courseopt);
     if (&isdateparm($istype{$parmname})) {      if (&isdateparm($istype{$parmname})) {
  $r->print(&Apache::lonlocal::locallocaltime($value));   $output .= &Apache::lonlocal::locallocaltime($value);
     } else {      } else {
  $r->print($value);   $output .= $value;
     }      }
     if ($value ne $all[$level]) {      if ($value ne $all[$level]) {
  $r->print('<br /><span class="LC_warning">'.&mt('Not active anymore').'</span>');   $output .= '<br /><span class="LC_warning">'.&mt('Not active anymore').'</span>';
     } else {      } else {
  $stillactive=1;   $stillactive=1;
     }      }
  }   }
     }      }
     $r->print('</td>');      $output .= '</td><td>';
     if ($stillactive) {      if ($stillactive) {
  my $title=&mt('Changed [_1]',&standard_parameter_names($parmname));   my $title=&mt('Changed [_1]',&standard_parameter_names($parmname));
                 my $description=&mt('Changed [_1] for [_2] to [_3]',&standard_parameter_names($parmname),$realmdescription,                  my $description=&mt('Changed [_1] for [_2] to [_3]',&standard_parameter_names($parmname),$realmdescription,
     (&isdateparm($istype{$parmname})?&Apache::lonlocal::locallocaltime($value):$value));      (&isdateparm($istype{$parmname})?&Apache::lonlocal::locallocaltime($value):$value));
  if (($uname) && ($udom)) {   if (($uname) && ($udom)) {
     $r->print('<td>'.      $output .= 
       &Apache::loncommon::messagewrapper('Notify User',$uname,$udom,$title,$description).   &Apache::loncommon::messagewrapper('Notify User',
       '</td>');     $uname,$udom,$title,
      $description);
  } else {   } else {
     $r->print('<td>'.      $output .= 
       &Apache::lonrss::course_blog_link($id,$title,$description).   &Apache::lonrss::course_blog_link($id,$title,
       '</td>');    $description);
  }   }
     } else {  
  $r->print('<td>&nbsp;</td>');  
     }      }
     $r->print(&Apache::loncommon::end_data_table_row());      $output .= '</td>'.&Apache::loncommon::end_data_table_row();
  }   }
    $r->print('<td rowspan="'.$count.'">'.$time.'</td>
                          <td rowspan="'.$count.'">'.$about_me_link.
     '<br /><tt>'.$parmlog{$id}{'exe_uname'}.
             ':'.$parmlog{$id}{'exe_udom'}.'</tt>'.
     $send_msg_link.'</td>'.$output);
   
  $shown++;   $shown++;
  if (!($env{'form.show'} eq &mt('all')    if (!($env{'form.show'} eq &mt('all') 
       || $shown<=$env{'form.show'})) { last; }        || $shown<=$env{'form.show'})) { last; }
Line 3587  sub handler { Line 3729  sub handler {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',              &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
     text=>"Overview Mode"});      text=>"Overview Mode"});
     &overview($r);      &overview($r);
    } elsif ($env{'form.action'} eq 'addmetadata' && $parm_permission) {
               &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
       text=>"Add Metadata Field"});
       &addmetafield($r);
         } elsif ($env{'form.action'} eq 'setrestrictmeta' && $parm_permission) {          } elsif ($env{'form.action'} eq 'setrestrictmeta' && $parm_permission) {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setrestrictmeta',              &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setrestrictmeta',
     text=>"Restrict Metadata"});      text=>"Restrict Metadata"});
Line 3608  sub handler { Line 3754  sub handler {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',              &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
     text=>"Parameter Change Log"});      text=>"Parameter Change Log"});
     &parm_change_log($r);      &parm_change_log($r);
           } elsif ($env{'form.action'} eq 'cleanparameters' && $parm_permission) {
               &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=cleanparameters',
       text=>"Clean Parameters"});
       &clean_parameters($r);
  }          }       
     } else {      } else {
 # ----------------------------- Not in a course, or not allowed to modify parms  # ----------------------------- Not in a course, or not allowed to modify parms

Removed from v.1.328  
changed lines
  Added in v.1.334


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