Author: sevein
Date: Sat Oct  8 12:35:10 2011
New Revision: 9987

Log:
Check credentials using QubitUser::checkCredentials.

Modified:
   trunk/plugins/qtSwordPlugin/lib/qtSwordPluginHttpAuthFilter.class.php

Modified: trunk/plugins/qtSwordPlugin/lib/qtSwordPluginHttpAuthFilter.class.php
==============================================================================
--- trunk/plugins/qtSwordPlugin/lib/qtSwordPluginHttpAuthFilter.class.php       
Sat Oct  8 03:22:15 2011        (r9986)
+++ trunk/plugins/qtSwordPlugin/lib/qtSwordPluginHttpAuthFilter.class.php       
Sat Oct  8 12:35:10 2011        (r9987)
@@ -25,19 +25,27 @@
     {
       if (!isset($_SERVER['PHP_AUTH_USER']))
       {
-        $this->sendHeadersAndExit();
+        $this->sendHeaders();
+
+        exit;
       }
 
-      // TODO: check user and password
+      $user = QubitUser::checkCredentials($_SERVER['PHP_AUTH_USER'], 
$_SERVER['PHP_AUTH_PW'], $error);
+
+      if (null === $user)
+      {
+        $this->sendHeaders();
+
+        return;
+      }
     }
 
     $filterChain->execute();
   }
 
-  private function sendHeadersAndExit()
+  private function sendHeaders()
   {
-    header('WWW-Authenticate: Basic realm="' . sfConfig::get('app_auth_realm') 
. '"');
+    header('WWW-Authenticate: Basic realm="Secure area"');
     header('HTTP/1.0 401 Unauthorized');
-    exit;
   }
 }

-- 
You received this message because you are subscribed to the Google Groups 
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/qubit-commits?hl=en.

Reply via email to