Diff for /loncom/auth/lonauth.pm between versions 1.74 and 1.77

version 1.74, 2006/04/05 22:39:55 version 1.77, 2006/05/31 15:33:39
Line 40  use Apache::lonnet; Line 40  use Apache::lonnet;
 use Apache::lonmenu();  use Apache::lonmenu();
 use Fcntl qw(:flock);  use Fcntl qw(:flock);
 use Apache::lonlocal;  use Apache::lonlocal;
 use POSIX qw(strftime);  
   
 my %FORM;  my %FORM;
   
Line 156  sub success { Line 155  sub success {
            print $idf "browser.localres=$FORM{'localres'}\n";             print $idf "browser.localres=$FORM{'localres'}\n";
         }          }
         print $idf "server.domain=".$r->dir_config('lonDefDomain')."\n";          print $idf "server.domain=".$r->dir_config('lonDefDomain')."\n";
         my $timezone=POSIX::strftime("%Z",localtime(time));  
         print $idf "server.timezone=$timezone\n";  
  print $idf "request.course.fn=\n";   print $idf "request.course.fn=\n";
  print $idf "request.course.uri=\n";   print $idf "request.course.uri=\n";
  print $idf "request.course.sec=\n";   print $idf "request.course.sec=\n";
Line 211  sub success { Line 208  sub success {
     my $setflags=&Apache::lonmenu::setflags();      my $setflags=&Apache::lonmenu::setflags();
     my $maincall=&Apache::lonmenu::maincall();      my $maincall=&Apache::lonmenu::maincall();
     my $start_page=&Apache::loncommon::start_page('Successful Login',      my $start_page=&Apache::loncommon::start_page('Successful Login',
   $startupremote);    $startupremote,
     {'no_inline_link' => 1,});
     my $end_page  =&Apache::loncommon::end_page();      my $end_page  =&Apache::loncommon::end_page();
   
     my $continuelink;      my $continuelink;
Line 249  ENDSUCCESS Line 247  ENDSUCCESS
   
 sub failed {  sub failed {
     my ($r,$message) = @_;      my ($r,$message) = @_;
     my $start_page = &Apache::loncommon::start_page('Unsuccessful Login');      my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef,
       {'no_inline_link' => 1,});
     my $end_page   = &Apache::loncommon::end_page();      my $end_page   = &Apache::loncommon::end_page();
   
     my %lt=('sorry'  => &mt('Sorry ...'),      my %lt=('sorry'  => &mt('Sorry ...'),
Line 368  ENDFAILED Line 367  ENDFAILED
  failed($r,'Information needed to verify your login information is missing, inaccessible or expired.');   failed($r,'Information needed to verify your login information is missing, inaccessible or expired.');
         return OK;          return OK;
     } else {      } else {
         unless (&Apache::lonnet::reply('tmpdel:'.$FORM{'logtoken'},   my $reply = &Apache::lonnet::reply('tmpdel:'.$FORM{'logtoken'},
                                          $FORM{'serverid'}) eq 'ok') {     $FORM{'serverid'});
           if ( $reply ne 'ok' ) {
             &failed($r,'Session could not be opened.');              &failed($r,'Session could not be opened.');
       &Apache::lonnet::logthis("ERROR got a reply of $reply when trying to contact ". $FORM{'serverid'}." to get login token");
       return OK;
  }   }
     }      }
     my ($key,$firsturl)=split(/&/,$tmpinfo);      my ($key,$firsturl)=split(/&/,$tmpinfo);

Removed from v.1.74  
changed lines
  Added in v.1.77


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