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

Diff for /loncom/auth/lonauth.pm between versions 1.40 and 1.43

version 1.40, 2003/02/20 01:35:27 version 1.43, 2003/03/02 02:16:53
Line 110  sub success { Line 110  sub success {
   
 # -------------------------------------- Any accessibility options to remember?  # -------------------------------------- Any accessibility options to remember?
     if (($FORM{'interface'}) && ($FORM{'remember'} eq 'true')) {      if (($FORM{'interface'}) && ($FORM{'remember'} eq 'true')) {
        foreach ('imagesuppress','appletsuppress',   foreach ('imagesuppress','appletsuppress',
                 'embedsuppress','fontenhance','blackwhite') {   'embedsuppress','fontenhance','blackwhite') {
  if ($FORM{$_} eq 'true') {      if ($FORM{$_} eq 'true') {
             &Apache::lonnet::put('environment',{$_ => 'on'},$domain,$username);   &Apache::lonnet::put('environment',{$_ => 'on'},
          } else {       $domain,$username);
             &Apache::lonnet::del('environment',[$_],$domain,$username);      } else {
          }   &Apache::lonnet::del('environment',[$_],$domain,$username);
        }      }
     }    }
       }
 # ------------------------------------------------------------- Get environment  # ------------------------------------------------------------- Get environment
   
     my $userenv;      my $userenv;
Line 134  sub success { Line 135  sub success {
     }      }
 # --------------------------------------------------------- Write first profile  # --------------------------------------------------------- Write first profile
   
        {      {
     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();  
       return 'error: '.$!;  
     }  
             if ($userenv ne '') { print $idf "$userenv\n"; }  
             print $idf "user.name=$username\n";  
             print $idf "user.domain=$domain\n";  
             print $idf "user.home=$authhost\n";  
             print $idf "browser.type=$clientbrowser\n";  
             print $idf "browser.version=$clientversion\n";  
             print $idf "browser.mathml=$clientmathml\n";  
             print $idf "browser.unicode=$clientunicode\n";  
             print $idf "browser.os=$clientos\n";  
             print $idf "request.course.fn=\n";  
             print $idf "request.course.uri=\n";  
             print $idf "request.course.sec=\n";  
             print $idf "request.role=cm\n";  
             print $idf "request.host=$ENV{'HTTP_HOST'}\n";  
             if ($FORM{'interface'}) {  
        $FORM{'interface'}=~s/\W//gs;  
                print $idf "browser.interface=$FORM{'interface'}\n";  
                $ENV{'browser.interface'}=$FORM{'interface'};  
                foreach   
                  ('imagesuppress','appletsuppress',  
                   'embedsuppress','fontenhance','blackwhite') {  
                    if (($FORM{$_} eq 'true') ||  
                        ($userenv{$_} eq 'on')) {  
                       print $idf "browser.$_=on\n";  
    }  
          
                }                 
     }  
             if ($userroles ne '') { print $idf "$userroles"; }  
     $idf->close();      $idf->close();
         }      return 'error: '.$!;
          $ENV{'request.role'}='cm';   }
          $ENV{'browser.type'}=$clientbrowser;   if ($userenv ne '') { print $idf "$userenv\n"; }
    print $idf "user.name=$username\n";
    print $idf "user.domain=$domain\n";
    print $idf "user.home=$authhost\n";
    print $idf "browser.type=$clientbrowser\n";
    print $idf "browser.version=$clientversion\n";
    print $idf "browser.mathml=$clientmathml\n";
    print $idf "browser.unicode=$clientunicode\n";
    print $idf "browser.os=$clientos\n";
    print $idf "request.course.fn=\n";
    print $idf "request.course.uri=\n";
    print $idf "request.course.sec=\n";
    print $idf "request.role=cm\n";
    print $idf "request.host=$ENV{'REMOTE_ADDR'}\n";
    if ($FORM{'interface'}) {
       $FORM{'interface'}=~s/\W//gs;
       print $idf "browser.interface=$FORM{'interface'}\n";
       $ENV{'browser.interface'}=$FORM{'interface'};
       foreach ('imagesuppress','appletsuppress',
        'embedsuppress','fontenhance','blackwhite') {
    if (($FORM{$_} eq 'true') ||
       ($userenv{$_} eq 'on')) {
       print $idf "browser.$_=on\n";
    }
       }
    }
    if ($userroles ne '') { print $idf "$userroles"; }
    $idf->close();
       }
       $ENV{'request.role'}='cm';
       $ENV{'browser.type'}=$clientbrowser;
 # -------------------------------------------------------------------- Log this  # -------------------------------------------------------------------- Log this
   
     &Apache::lonnet::log($domain,$username,$authhost,      &Apache::lonnet::log($domain,$username,$authhost,
Line 197  sub success { Line 196  sub success {
     my $startupremote=&Apache::lonmenu::startupremote($lowerurl);      my $startupremote=&Apache::lonmenu::startupremote($lowerurl);
     my $setflags=&Apache::lonmenu::setflags();      my $setflags=&Apache::lonmenu::setflags();
     my $maincall=&Apache::lonmenu::maincall();      my $maincall=&Apache::lonmenu::maincall();
       my $bodytag=&Apache::loncommon::bodytag('Successful Login');
 # ------------------------------------------------- Output for successful login  # ------------------------------------------------- Output for successful login
   
     $r->send_cgi_header(<<ENDHEADER);      $r->send_cgi_header(<<ENDHEADER);
Line 210  ENDHEADER Line 210  ENDHEADER
 <title>Successful Login to the LearningOnline Network with CAPA</title>  <title>Successful Login to the LearningOnline Network with CAPA</title>
 $startupremote  $startupremote
 </head>  </head>
 <body bgcolor="#FFFFFF">  $bodytag
 $setflags  $setflags
 $windowinfo  $windowinfo
 <h1>Welcome!</h1>  <h1>Welcome!</h1>
Line 228  ENDSUCCESS Line 228  ENDSUCCESS
   
 sub failed {  sub failed {
     my ($r,$message) = @_;      my ($r,$message) = @_;
       my $bodytag=&Apache::loncommon::bodytag('Unsuccessful Login');
     $r->send_cgi_header(<<ENDFHEADER);      $r->send_cgi_header(<<ENDFHEADER);
 Content-type: text/html  Content-type: text/html
   
Line 238  ENDFHEADER Line 239  ENDFHEADER
 <title>Unsuccessful Login to the LearningOnline Network with CAPA</title>  <title>Unsuccessful Login to the LearningOnline Network with CAPA</title>
 </head>  </head>
 <html>  <html>
 <body bgcolor="#FFFFFF">  $bodytag
 <h1>Sorry ...</h1>  <h1>Sorry ...</h1>
 <h2>$message to use the Learning<i>Online</i> Network with CAPA</h2>  <p><b>$message</b></p>
   <p>Please <a href="/adm/login?username=$FORM{'uname'}&domain=$FORM{'udom'}">login</a> again.</p>
   <p>
   <a href="/adm/loginproblems.html">Problems?</a></p>
 </body>  </body>
 </html>  </html>
 ENDFAILED  ENDFAILED
Line 265  sub handler { Line 269  sub handler {
     }       } 
   
     if ((!$FORM{'uname'}) || (!$FORM{'upass'}) || (!$FORM{'udom'})) {      if ((!$FORM{'uname'}) || (!$FORM{'upass'}) || (!$FORM{'udom'})) {
  failed($r,'Username, password and domain need to be specified');   failed($r,'Username, password and domain need to be specified.');
         return OK;          return OK;
     }      }
     $FORM{'uname'} =~ s/\W//g;      $FORM{'uname'} =~ s/\W//g;
Line 281  sub handler { Line 285  sub handler {
                                       $FORM{'serverid'});                                        $FORM{'serverid'});
   
     if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) {      if (($tmpinfo=~/^error/) || ($tmpinfo eq 'con_lost')) {
  failed($r,'Login token missing, inaccessible or expired');   failed($r,'Information needed to verify your login information is missing, inaccessible or expired.');
         return OK;          return OK;
     }      }
           
Line 313  sub handler { Line 317  sub handler {
 # --------------------------------------------------------------------- Failed?  # --------------------------------------------------------------------- Failed?
   
     if ($authhost eq 'no_host') {      if ($authhost eq 'no_host') {
  failed($r,'Username and/or password could not be authenticated');   failed($r,'Username and/or password could not be authenticated.');
         return OK;          return OK;
     }      }
   
Removed from v.1.40  
changed lines
  Added in v.1.43

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