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

Diff for /loncom/interface/lonsimplepage.pm between versions 1.33 and 1.34

version 1.33, 2006/03/16 21:30:00 version 1.34, 2006/03/21 21:07:31
Line 38  use Apache::lonlocal; Line 38  use Apache::lonlocal;
 use Apache::lonprintout;  use Apache::lonprintout;
 use Apache::lonxml;  use Apache::lonxml;
   
 sub error {  
     my ($r,$msg) = @_;  
     $r->print(&Apache::loncommon::endheadtag().  
       &Apache::loncommon::bodytag().  
       &mt($msg).  
       &Apache::loncommon::end_page());  
     return OK;  
 }  
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
Line 54  sub handler { Line 45  sub handler {
     return OK if $r->header_only;      return OK if $r->header_only;
     my $target=$env{'form.grade_target'};      my $target=$env{'form.grade_target'};
 # ------------------------------------------------------------ Print the screen  # ------------------------------------------------------------ Print the screen
     if ($target ne 'tex') {      if ($target eq 'tex') {
  $r->print(&Apache::lonxml::xmlbegin().  
   &Apache::loncommon::headtag());  
     } else {  
  $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));   $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
     }       } 
     my (undef,undef,undef,undef,$marker,$caller)=split(/\//,$r->uri);      my (undef,undef,undef,undef,$marker,$caller)=split(/\//,$r->uri);
 # Is this even in a course?  # Is this even in a course?
     unless ($env{'request.course.id'}) {      unless ($env{'request.course.id'}) {
  if ($target ne 'tex') {   if ($target ne 'tex') {
     return &error($r,'Not in a course');      return &Apache::loncommon::simple_error_page($r,'',
    'Not in a course');
  } else {   } else {
     $r->print('\textbf{Not in a course}\end{document}');      $r->print('\textbf{Not in a course}\end{document}');
  }   }
Line 83  sub handler { Line 72  sub handler {
         $namespace = 'grppage_'.$marker;          $namespace = 'grppage_'.$marker;
         my %curr_groups;          my %curr_groups;
         if (!&Apache::loncommon::coursegroups(\%curr_groups,$dom,$crs,$marker)) {          if (!&Apache::loncommon::coursegroups(\%curr_groups,$dom,$crs,$marker)) {
     return &error($r,'Invalid group name');      return &Apache::loncommon::simple_error_page($r,'',
    'Invalid group name');
         }          }
         %groupinfo = &Apache::loncommon::get_group_settings($curr_groups{$marker});          %groupinfo = 
       &Apache::loncommon::get_group_settings($curr_groups{$marker});
     } else {        } else {  
         $marker=~s/\D//g;          $marker=~s/\D//g;
         $namespace = 'smppage_'.$marker;          $namespace = 'smppage_'.$marker;
     }      }
   
     if (!$marker) {      if (!$marker) {
  return &error($r,'Invalid call');   return &Apache::loncommon::simple_error_page($r,'','Invalid call');
     }      }
   
 # --------------------------------------------------------- The syllabus fields  # --------------------------------------------------------- The syllabus fields
Removed from v.1.33  
changed lines
  Added in v.1.34

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