--- loncom/auth/checkauthen.pm	2006/06/02 19:29:21	1.3
+++ loncom/auth/checkauthen.pm	2007/10/02 01:09:59	1.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # checks for a cokkie to authenticate a user
 #
-# $Id: checkauthen.pm,v 1.3 2006/06/02 19:29:21 albertel Exp $
+# $Id: checkauthen.pm,v 1.12 2007/10/02 01:09:59 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,11 +36,18 @@ use Apache::lonnet;
 sub handler {
     my ($r) = @_;
 
-    if ($r->auth_type() eq 'Basic') {
+    if (&Apache::lonnet::is_domainimage($r->uri)) {
+        return OK;
+    }
+
+    if ($r->auth_type() ne 'LONCAPA') {
 	return DECLINED;
     }
     my $fail = FORBIDDEN; 
     if ($r->dir_config('lonOtherAuthen') eq 'yes') {
+	if (defined($r->dir_config('lonOtherAuthenType'))) {
+            $r->auth_type($r->dir_config('lonOtherAuthenType'));
+        }
 	#&Apache::lonnet::logthis("other authen");
 	$fail = DECLINED;
     }
@@ -54,16 +61,13 @@ sub handler {
 	}
     }
 
-    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 '')) {    
-	    return OK;
-	}
+    my $handle = &Apache::lonnet::check_for_valid_session($r);
+    if ($handle eq '') {
+        $handle = $env{'user.environment'};
+    }
+
+    if ($handle ne '') {
+        return OK;
     }
 
     return $fail;