Diff for /loncom/auth/lonauth.pm between versions 1.18 and 1.19

version 1.18, 2001/01/09 22:10:40 version 1.19, 2001/06/02 16:10:04
Line 3 Line 3
 # 5/21/99,5/22,5/25,5/26,5/27,5/29,6/2,6/11,6/14,6/15  # 5/21/99,5/22,5/25,5/26,5/27,5/29,6/2,6/11,6/14,6/15
 # 16/11,12/16,  # 16/11,12/16,
 # 1/14,2/24,2/28,2/29,3/7,5/29,5/30,5/31,6/1,6/5,6/29,  # 1/14,2/24,2/28,2/29,3/7,5/29,5/30,5/31,6/1,6/5,6/29,
 # 7/1,7/10,10/2,10/5,10/9,10/26,10/30,11/10 Gerd Kortemeyer  # 7/1,7/10,10/2,10/5,10/9,10/26,10/30,11/10,
   # 05/28,05/29 Gerd Kortemeyer
   
 package Apache::lonauth;  package Apache::lonauth;
   
Line 91  sub success { Line 92  sub success {
     my $idf=Apache::File->new(">$lonids/$cookie.id");      my $idf=Apache::File->new(">$lonids/$cookie.id");
     unless (flock($idf,LOCK_EX)) {      unless (flock($idf,LOCK_EX)) {
       &Apache::lonnet::logthis("<font color=blue>WARNING: ".        &Apache::lonnet::logthis("<font color=blue>WARNING: ".
        'Could not obtain exclusive lock in lonauth: '.$!);      'Could not obtain exclusive lock in lonauth: '.$!);
       $idf->close();        $idf->close();
       return 'error: '.$!;        return 'error: '.$!;
     }      }
Line 111  sub success { Line 112  sub success {
             if ($userroles ne '') { print $idf "$userroles"; }              if ($userroles ne '') { print $idf "$userroles"; }
     $idf->close();      $idf->close();
         }          }
            $ENV{'request.role'}='cm';
 # -------------------------------------------------------------------- Log this  # -------------------------------------------------------------------- Log this
   
     &Apache::lonnet::log($domain,$username,$authhost,      &Apache::lonnet::log($domain,$username,$authhost,
Line 130  sub success { Line 131  sub success {
   
     $cookie="lonID=$cookie; path=/";      $cookie="lonID=$cookie; path=/";
 # -------------------------------------------------------- Menu script and info  # -------------------------------------------------------- Menu script and info
   
     my $windowinfo=&Apache::lonmenu::open();      my $windowinfo=&Apache::lonmenu::open();
   # ------------------------------------------------------------- Info for Remote
       my $configmenu=&Apache::lonmenu::rawconfig();
 # ------------------------------------------------- Output for successful login  # ------------------------------------------------- Output for successful login
   
     $r->send_cgi_header(<<ENDHEADER);      $r->send_cgi_header(<<ENDHEADER);
Line 143  ENDHEADER Line 145  ENDHEADER
 <html>  <html>
 <head>  <head>
 <title>Successful Login to the LearningOnline Network with CAPA</title>  <title>Successful Login to the LearningOnline Network with CAPA</title>
 <meta HTTP-EQUIV="Refresh" CONTENT="1; url=$lowerurl">  <script>
   
   // --------------------------------------------- Checks if server frame defined
   
   function checkdef() {
      if ((menuloaded==0) && (tim==0)) { setTimeout('checkdef()',100); }
   }
   
   // ---------------------------------------------------------- The wait function
   
   function wait() {
      if ((menuloaded==1) || (tim==1)) {
         if (tim==0) {
            clearTimeout(canceltim);
            $configmenu
            window.location='$lowerurl';  
         } else {
            alert("Remote Control Timed Out.");
         }
      } else {
         setTimeout('wait();',100);
      }
   }
   
   function main() {
      canceltim=setTimeout('tim=1;',20000);
      checkdef();
      wait();
   }
   
   </script>
 </head>  </head>
 <body bgcolor="#FFFFFF">  <body bgcolor="#FFFFFF" onLoad="main();">
     $windowinfo  <script>
       menuloaded=0;
       tim=0;
   </script>
   $windowinfo
 <h1>Welcome!</h1>  <h1>Welcome!</h1>
 </body>  </body>
 </html>  </html>

Removed from v.1.18  
changed lines
  Added in v.1.19


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