Diff for /loncom/auth/lonroles.pm between versions 1.56 and 1.60

version 1.56, 2003/04/07 18:24:05 version 1.60, 2003/06/18 13:13:10
Line 50  use Apache::Constants qw(:common); Line 50  use Apache::Constants qw(:common);
 use Apache::File();  use Apache::File();
 use Apache::lonmenu;  use Apache::lonmenu;
 use Apache::loncommon;  use Apache::loncommon;
   use Apache::lonannounce;
   
 sub handler {  sub handler {
   
Line 151  ENDENTERKEY Line 152  ENDENTERKEY
     unless ($ENV{'request.course.id'}) {      unless ($ENV{'request.course.id'}) {
  &Apache::lonnet::appenv(   &Apache::lonnet::appenv(
       "request.course.id"  => $cdom.'_'.$cnum);        "request.course.id"  => $cdom.'_'.$cnum);
  $furl='/adm/notfound.html';   $furl='/adm/roles';
  $msg=   $msg=
  '<h1><font color=red>Could not initialize top-level map.</font></h1>';   '<h1><font color=red>Could not initialize course at this time.</font></h1><h3>Please try again.</h3>';
     }      }
   
       # Check to see if the user is a CC entering a course 
       # for the first time
       my (undef, undef, $role, $courseid) = split(/\./, $envkey);
       if (substr($courseid, 0, 1) eq '/') {
    $courseid = substr($courseid, 1);
       }
       $courseid =~ s/\//_/;
       if ($role eq 'cc' && $ENV{'course.' . $courseid . 
     '.course.helper.not.run'}) {
    $furl = "/adm/helper/course.initialization.helper";
       }
   
     $r->content_type('text/html');      $r->content_type('text/html');
     &Apache::loncommon::no_cache($r);      &Apache::loncommon::no_cache($r);
     $r->send_http_header;      $r->send_http_header;
Line 262  ENDHEADER Line 276  ENDHEADER
     $r->print("Author and Co-Author roles may not be available on ".      $r->print("Author and Co-Author roles may not be available on ".
       "servers other than your home server.");        "servers other than your home server.");
         } else {          } else {
     $r->print("<h2>Enter a Course</h2>\n");      $r->print("<h2>Select a Course to Enter</h2>\n");
         }          }
         if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {          if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
        $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};         $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
Line 437  ENDHEADER Line 451  ENDHEADER
                         $r->print('<td>&nbsp;</td>');                          $r->print('<td>&nbsp;</td>');
                     }                      }
                 }                  }
                   $tremark.=&Apache::lonannounce::showday(time,1,
                            &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
                   
  $r->print('<td><font color="'.$tfont.'">'.$trole.   $r->print('<td><font color="'.$tfont.'">'.$trole.
                       '</font></td><td><font color="'.$tfont.'">'.$ttype.                        '</font></td><td><font color="'.$tfont.'">'.$ttype.
                       '</font></td><td><font color="'.$tfont.'">'.$twhere.                        '</font></td><td><font color="'.$tfont.'">'.$twhere.

Removed from v.1.56  
changed lines
  Added in v.1.60


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