loncom/auth/migrateuser.pm - diff

Return to migrateuser.pm CVS log

Up to [LON-CAPA] / loncom / auth

-version 1.3, 2005/10/28 21:51:43
+version 1.5, 2006/04/05 22:39:55
  Line 37  sub goto_login {
      my ($r) = @_;
      &Apache::loncommon::content_type($r,'text/html');
      $r->send_http_header;
-     $r->print(<<TOLOGIN);
+     $r->print(&Apache::loncommon::start_page('Going to login',undef,
- <html>
+ 					     {'redirect' =>
-   <head>
+ 						  [0,'/adm/login'],}).
-     <meta http-equiv="refresh" content="0;url=/adm/login" />
+ 	      '<h1>'.&mt('One moment please...').'</h1>'.
-     <title>Going to login</title>
+ 	      '<p>'.&mt('Transferring to login page.').'</p>'.
-   </head>
+ 	      &Apache::loncommon::end_page());
-   <body>
-     <h1>One moment please...</h1>
-     <p>
-       Transferring to login page.
-       <a href="/adm/login">Continue</a>
-     </p>
-   </body>
- </html>
- TOLOGIN
      return OK;
  }
- Line 60  sub handler {
+ Line 51  sub handler {
      my ($r) = @_;
      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']);
-     my %data = &Apache::lonnet::tmpget($env{'form.token'});
+     my %data =   &Apache::lonnet::tmpget($env{'form.token'});
+     my $delete = &Apache::lonnet::tmpdel($env{'form.token'});
+     if ($delete ne 'ok') {
+ 	return &goto_login($r);
+     }
      if ($data{'ip'} ne $ENV{'REMOTE_ADDR'} || !defined($data{'username'}) ||
  	!defined($data{'domain'}) ) {