Index: securesite.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/securesite/Attic/securesite.module,v
retrieving revision 1.24.2.55
retrieving revision 1.24.2.56
diff -u -F^f -r1.24.2.55 -r1.24.2.56
--- securesite.module	10 Jul 2008 01:58:25 -0000	1.24.2.55
+++ securesite.module	10 Jul 2008 17:57:32 -0000	1.24.2.56
@@ -274,6 +274,9 @@ function securesite_init() {
   if ((isset($account->uid) ? $account->uid : FALSE) && user_access('access site', $account)) {
     // Login successful
     $user = $account;
+    
+    // Mark the session so on logout, Secure Site will be triggered
+    $_SESSION['securesite_login'] = TRUE;
 
     watchdog('user', t('Session opened for %name.', array('%name' => $user->name)));
     db_query("UPDATE {users} SET login = '%d' WHERE uid = '%s'", time(), $user->uid);
@@ -311,7 +314,13 @@ function securesite_user($op, &$edit, &$
     unset($GLOBALS['user']);
 
     if (variable_get('securesite_enabled', SECURESITE_DISABLED) == SECURESITE_AUTH) {
-      _securesite_user_auth();
+      // Only show HTTP Auth if login was done using Secure Site
+      if ($_SESSION['securesite_login']) {
+        _securesite_user_auth();
+      }
+      else {
+        _securesite_goto();
+      }
     }
     else {
       // Redirect first to prevent browser caching problems