--- loncom/auth/lonauth.pm	2006/10/12 18:18:01	1.86
+++ loncom/auth/lonauth.pm	2007/10/01 23:56:14	1.89
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.86 2006/10/12 18:18:01 albertel Exp $
+# $Id: lonauth.pm,v 1.89 2007/10/01 23:56:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,7 +32,6 @@ use strict;
 use LONCAPA;
 use Apache::Constants qw(:common);
 use CGI qw(:standard);
-use CGI::Cookie();
 use DynaLoader; # for Crypt::DES version
 use Crypt::DES;
 use Apache::loncommon();
@@ -122,6 +121,7 @@ sub failed {
 						    {'no_inline_link' => 1,});
     my $end_page   = &Apache::loncommon::end_page();
 
+    $message = &mt($message);
     my %lt=('sorry'  => &mt('Sorry ...'),
 	    'please' => 
 	    &mt('Please [_1]log in again[_2].',
@@ -169,22 +169,16 @@ sub handler {
     &Apache::lonlocal::get_language_handle($r);
 
 # -------------------------------- Prevent users from attempting to login twice
-    my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
-    my $lonid=$cookies{'lonID'};
-    my $cookie;
-    if ($lonid) {
-	my $handle=$lonid->value;
-        $handle=~s/\W//g;
-        my $lonidsdir=$r->dir_config('lonIDsDir');
-        if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
+    my $handle = &Apache::lonnet::check_for_valid_session($r);
+    if ($handle ne '') {
 # Indeed, a valid token is found
-	    &Apache::loncommon::content_type($r,'text/html');
-	    $r->send_http_header;
-	    my $start_page = 
-		&Apache::loncommon::start_page('Already logged in');
-	    my $end_page = 
-		&Apache::loncommon::end_page();
-	    $r->print(<<ENDFAILED);
+	&Apache::loncommon::content_type($r,'text/html');
+	$r->send_http_header;
+	my $start_page = 
+	    &Apache::loncommon::start_page('Already logged in');
+	my $end_page = 
+	    &Apache::loncommon::end_page();
+	$r->print(<<ENDFAILED);
 $start_page
 <h1>You are already logged in</h1>
 <p>Please either <a href="/adm/roles">continue the current session</a> or
@@ -193,8 +187,7 @@ $start_page
 <a href="/adm/loginproblems.html">Problems?</a></p>
 $end_page
 ENDFAILED
-           return OK;
-	}
+       return OK;
     }
 
 # ---------------------------------------------------- No valid token, continue
@@ -221,9 +214,9 @@ ENDFAILED
 # split user logging in and "su"-user
 
     ($form{'uname'},$form{'suname'})=split(/\:/,$form{'uname'});
-    $form{'uname'} =~ s/\W//g;
-    $form{'suname'} =~ s/\W//g;
-    $form{'udom'}  =~ s/\W//g;
+    $form{'uname'} = &LONCAPA::clean_username($form{'uname'});
+    $form{'suname'}= &LONCAPA::clean_username($form{'suname'});
+    $form{'udom'}  = &LONCAPA::clean_domain(  $form{'udom'});
 
     my $role   = $r->dir_config('lonRole');
     my $domain = $r->dir_config('lonDefDomain');