Diff for /loncom/interface/lonnavdisplay.pm between versions 1.35 and 1.38

version 1.35, 2017/11/16 13:41:56 version 1.38, 2021/02/18 14:48:02
Line 39  use Apache::lonnet; Line 39  use Apache::lonnet;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::londocs();  use Apache::londocs();
 use Apache::lonuserstate;  use Apache::lonuserstate;
   use LONCAPA::ltiutils;
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
Line 87  sub real_handler { Line 88  sub real_handler {
         my $preamble = '<div id="LC_update_'.$cid.'" class="LC_info">'.          my $preamble = '<div id="LC_update_'.$cid.'" class="LC_info">'.
                        '<br />'.                         '<br />'.
                        &mt('Your course session is being updated because of recent changes by course personnel.').                         &mt('Your course session is being updated because of recent changes by course personnel.').
                        ' '.&mt('Please be patient.').'<br /></div>'.                         ' '.&mt('Please be patient').'.<br /></div>'.
                        '<div style="padding:0;clear:both;margin:0;border:0"></div>';                         '<div style="padding:0;clear:both;margin:0;border:0"></div>';
         $closure = <<ENDCLOSE;          $closure = <<ENDCLOSE;
 <script type="text/javascript">  <script type="text/javascript">
Line 100  ENDCLOSE Line 101  ENDCLOSE
         &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course'));          &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course'));
         $r->rflush();          $r->rflush();
         my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum",\%prog_state,$r);          my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum",\%prog_state,$r);
         &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished'));          &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished!'));
         if ($ferr) {          if ($ferr) {
             &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);              &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
             $r->print($closure.&Apache::loncommon::end_page());              $r->print($closure.&Apache::loncommon::end_page());
Line 125  ENDCLOSE Line 126  ENDCLOSE
         }          }
     }      }
   
       if ($env{'request.lti.login'}) {
           if ($env{'request.lti.uri'} ne '') {
               my $cid = $env{'request.course.id'};
               my $cnum = $env{'course.'.$cid.'.num'};
               my $cdom = $env{'course.'.$cid.'.domain'};
               my ($scope,$url) = &LONCAPA::ltiutils::lti_provider_scope($env{'request.lti.uri'},$cdom,$cnum);
               if (($scope eq 'map') || ($scope eq 'resource')) {
                   &Apache::loncommon::content_type($r,'text/html');
                   $r->header_out(Location => $url);
                   return REDIRECT;
               }
           }
       }
   
     # Create the nav map      # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new();      my $navmap = Apache::lonnavmaps::navmap->new();
   
Line 242  ENDCLOSE Line 257  ENDCLOSE
                      ."</span>");                       ."</span>");
         }          }
     } else {      } else {
         my $link = 'navmaps?jumpToFirstHomework';          my $link = '/adm/navmaps?jumpToFirstHomework';
         if ($env{'form.register'}) {          if ($env{'form.register'}) {
             $link .= '&amp;register='.$env{'form.register'};               $link .= '&amp;register='.$env{'form.register'}; 
         }          }
Line 265  ENDCLOSE Line 280  ENDCLOSE
         $filterFunc = sub { my $res = shift;           $filterFunc = sub { my $res = shift; 
                             return $res->completable() || $res->is_map();                              return $res->completable() || $res->is_map();
                         };                          };
         my $link = 'navmaps?sort='.$env{'form.sort'};          my $link = '/adm/navmaps?sort='.$env{'form.sort'};
         if ($env{'form.register'}) {          if ($env{'form.register'}) {
             $link .= '&amp;register='.$env{'form.register'};              $link .= '&amp;register='.$env{'form.register'};
         }          }
Line 277  ENDCLOSE Line 292  ENDCLOSE
         $env{'form.condition'} = 1;          $env{'form.condition'} = 1;
  $resource_no_folder_link = 1;   $resource_no_folder_link = 1;
     } else {      } else {
         my $link = 'navmaps?sort='.$env{'form.sort'}.'&amp;showOnlyHomework=1';          my $link = '/adm/navmaps?sort='.$env{'form.sort'}.'&amp;showOnlyHomework=1';
         if ($env{'form.register'}) {          if ($env{'form.register'}) {
             $link .= '&amp;register='.$env{'form.register'};              $link .= '&amp;register='.$env{'form.register'};
         }          }

Removed from v.1.35  
changed lines
  Added in v.1.38


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.