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

Diff for /loncom/interface/lonwhatsnew.pm between versions 1.43 and 1.44

version 1.43, 2006/01/06 21:04:34 version 1.44, 2006/01/06 21:52:19
Line 58  sub handler { Line 58  sub handler {
     my $command = $env{'form.command'};      my $command = $env{'form.command'};
     my $refpage = $env{'form.refpage'};      my $refpage = $env{'form.refpage'};
   
     &Apache::loncommon::content_type($r,'text/html');      my %checkallowed = ( coursenormalmail => 1,
     $r->send_http_header;   coursecritmail => 1, );
       foreach my $perm_check (['whn','whatsnew',1],
       ['pch','coursediscussion',1],
       ['mgr','handgrading',1],
       ['vgr','abovethreshold',1],
       ['opa','haserrors',1],
       ['mdc','versionchanges',0],
       ) {
    my ($perm,$key,$check_section) = @{ $perm_check };
    my $scope = $env{'request.course.id'};
    if (!($checkallowed{$key} = &Apache::lonnet::allowed($perm,$scope))) {
       $scope .= '/'.$env{'request.course.sec'};
       if ( $check_section ) {
    $checkallowed{$key} = &Apache::lonnet::allowed($perm,$scope);
       }
       if ($checkallowed{$key}) {
    $checkallowed{$key.'_section'} = $env{'request.course.sec'};
       }
    }
       }
   
     if ( ! $env{'request.course.fn'}       if ( ! $env{'request.course.fn'} || ! $checkallowed{'whatsnew'}) {
  ||  
  (!( &Apache::lonnet::allowed('whn',$env{'request.course.id'})  
      || &Apache::lonnet::allowed('whn',$env{'request.course.id'}  
  .'/'.$env{'request.course.sec'})))) {  
         # Not in a course, or no whn priv in course          # Not in a course, or no whn priv in course
         $env{'user.error.msg'}="/adm/whatsnew::whn:0:0:Cannot display what's new page";          $env{'user.error.msg'}="/adm/whatsnew::whn:0:0:Cannot display what's new page";
         return HTTP_NOT_ACCEPTABLE;          return HTTP_NOT_ACCEPTABLE;
     }      }
   
     my %checkallowed = (      &Apache::loncommon::content_type($r,'text/html');
              coursediscussion => &Apache::lonnet::allowed('pch',$env{'request.course.id'}),      $r->send_http_header;
              handgrading => &Apache::lonnet::allowed('mgr',$env{'request.course.id'}),  
              abovethreshold => &Apache::lonnet::allowed('vgr',$env{'request.course.id'}),  
              haserrors => &Apache::lonnet::allowed('opa',$env{'request.course.id'}),  
              versionchanges => &Apache::lonnet::allowed('opa',$env{'request.course.id'}),  
              coursenormalmail => 1,  
              coursecritmail => 1,  
     );  
   
     $r->print(&display_header($command,\%checkallowed));      $r->print(&display_header($command,\%checkallowed));
   
Line 87  sub handler { Line 95  sub handler {
     &Apache::lonhtmlcommon::add_breadcrumb      &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/whatsnew',              ({href=>'/adm/whatsnew',
               text=>"Display Action Items"});                text=>"Display Action Items"});
     if (($command eq 'chgthreshold') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {      if (($command eq 'chgthreshold') && $checkallowed{'abovethreshold'}) {
         &Apache::lonhtmlcommon::add_breadcrumb          &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage,              ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage,
               text=>"Change thresholds"});                text=>"Change thresholds"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs          $r->print(&Apache::lonhtmlcommon::breadcrumbs
             (undef,"What's New?",'Course_Action_Items_Thresholds'));              (undef,"What's New?",'Course_Action_Items_Thresholds'));
     } elsif (($command eq 'chginterval') && (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {      } elsif (($command eq 'chginterval') && $checkallowed{'versionchanges'} ) {
         &Apache::lonhtmlcommon::add_breadcrumb          &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage,              ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage,
               text=>"Change interval"});                text=>"Change interval"});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs          $r->print(&Apache::lonhtmlcommon::breadcrumbs
             (undef,"What's New?",'Course_Action_Items_Intervals'));              (undef,"What's New?",'Course_Action_Items_Intervals'));
     } elsif (($command eq 'chgdisc') && (&Apache::lonnet::allowed('pch',$env{'request.course.id'}))) {      } elsif (($command eq 'chgdisc') && $checkallowed{'coursediscussion'}) {
         &Apache::lonhtmlcommon::add_breadcrumb          &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage,              ({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage,
               text=>"Change discussion display"});                text=>"Change discussion display"});
Line 154  sub display_main_box { Line 162  sub display_main_box {
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};      my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};      my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
   
     if (($command eq 'chgthreshold') &&       if (($command eq 'chgthreshold') 
                (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {   && $checkallowed->{'abovethreshold'}) {
         &display_threshold_config($r,$refpage,$tabbg,\%threshold_titles,          &display_threshold_config($r,$refpage,$tabbg,\%threshold_titles,
                                                                    $cdom,$crs);                                                                     $cdom,$crs);
     } elsif (($command eq 'chginterval') &&       } elsif (($command eq 'chginterval') 
                (&Apache::lonnet::allowed('opa',$env{'request.course.id'}))) {       && $checkallowed->{'versionchanges'}) {
         &display_interval_config($r,$refpage,\%interval_titles);          &display_interval_config($r,$refpage,\%interval_titles);
     } elsif (($command eq 'chgdisc') &&       } elsif (($command eq 'chgdisc') 
                (&Apache::lonnet::allowed('pch',$env{'request.course.id'}))) {       && $checkallowed->{'coursediscussion'}) {
         &display_discussion_config($r,$refpage);          &display_discussion_config($r,$refpage);
     } elsif ($command eq 'courseinit') {      } elsif ($command eq 'courseinit') {
         &courseinit_config($r,$refpage,\%initpage);          &courseinit_config($r,$refpage,\%initpage);
Line 202  function change_display(caller,change) { Line 210  function change_display(caller,change) {
 function changeAll(change) {  function changeAll(change) {
 END  END
         foreach my $item (keys(%{$checkallowed})) {          foreach my $item (keys(%{$checkallowed})) {
       if ($item =~ /_section$/) { next; }
             if ($$checkallowed{$item}) {              if ($$checkallowed{$item}) {
                 $scripttag.='document.visible.display_'.$item.'.value=change'.                  $scripttag.='document.visible.display_'.$item.'.value=change'.
                             "\n";                              "\n";
Line 365  sub display_actions_box { Line 374  sub display_actions_box {
     my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail');      my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail');
   
     foreach my $key (keys(%{$checkallowed})) {      foreach my $key (keys(%{$checkallowed})) {
    if ($key =~ /_section$/) { next; }
         $show{$key} = 0;          $show{$key} = 0;
         if ($$checkallowed{$key}) {          if ($$checkallowed{$key}) {
             unless ($display_settings{$cid.':'.$key} eq 'hide') {              unless ($display_settings{$cid.':'.$key} eq 'hide') {
Line 396  sub display_actions_box { Line 406  sub display_actions_box {
      &nbsp;&nbsp;<a href="javascript:changeAll('show');">$lt{'shal'}</a>       &nbsp;&nbsp;<a href="javascript:changeAll('show');">$lt{'shal'}</a>
      <form method="post" name="visible" action="/adm/whatsnew">\n|);       <form method="post" name="visible" action="/adm/whatsnew">\n|);
     foreach my $item (keys(%{$checkallowed})) {      foreach my $item (keys(%{$checkallowed})) {
    if ($item =~ /_section$/) { next; }
         if ($$checkallowed{$item}) {          if ($$checkallowed{$item}) {
             $r->print('<input type="hidden" name="display_'.$item.'" />'."\n");              $r->print('<input type="hidden" name="display_'.$item.'" />'."\n");
         }          }
Line 406  sub display_actions_box { Line 417  sub display_actions_box {
     my $displayed = 0;      my $displayed = 0;
     my $totalboxes = 0;      my $totalboxes = 0;
     foreach my $key (keys(%{$checkallowed})) {      foreach my $key (keys(%{$checkallowed})) {
    if ($key =~ /_section$/) { next; }
    if ($key eq 'whatsnew' ) { next; } # whatsnew check creates no box
         if ($$checkallowed{$key}) {          if ($$checkallowed{$key}) {
             $totalboxes ++;              $totalboxes ++;
         }          }
Line 1416  sub store_display_settings { Line 1429  sub store_display_settings {
     my %whatsnew_settings;      my %whatsnew_settings;
     my $result;      my $result;
     foreach my $key (keys(%{$checkallowed})) {      foreach my $key (keys(%{$checkallowed})) {
    if ($key =~ /_section$/) { next; }
         if (exists($env{'form.display_'.$key})) {          if (exists($env{'form.display_'.$key})) {
             unless ($env{'form.display_'.$key} eq '') {              unless ($env{'form.display_'.$key} eq '') {
                 $whatsnew_settings{$cid.':'.$key} = $env{'form.display_'.$key};                  $whatsnew_settings{$cid.':'.$key} = $env{'form.display_'.$key};
Removed from v.1.43  
changed lines
  Added in v.1.44

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