From ccb6d8a5135ec97776f926a5f483d9f1f88d061b Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Fri, 13 May 2011 18:10:25 +0200
Subject: fix ssl client cert login process

---
 src/SemanticScuttle/Service/User.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/SemanticScuttle/Service')

diff --git a/src/SemanticScuttle/Service/User.php b/src/SemanticScuttle/Service/User.php
index 09a2cb1..0e437c2 100644
--- a/src/SemanticScuttle/Service/User.php
+++ b/src/SemanticScuttle/Service/User.php
@@ -426,8 +426,8 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
         if ($ssls->hasValidCert()) {
             $id = $ssls->getUserIdFromCert();
             if ($id !== false) {
-                $this->setCurrentUserId($id);
-                return (int)$_SESSION[$this->getSessionKey()];
+                $this->setCurrentUserId($id, true);
+                return $this->currentuserId;
             }
         }
         return false;
-- 
cgit v1.2.3


From 62afb014825e85c40df225358d608bef430a8949 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Fri, 13 May 2011 18:11:14 +0200
Subject: allow ssl client login with other authentication sources

---
 src/SemanticScuttle/Service/AuthUser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/SemanticScuttle/Service')

diff --git a/src/SemanticScuttle/Service/AuthUser.php b/src/SemanticScuttle/Service/AuthUser.php
index 479b68a..9447ee4 100644
--- a/src/SemanticScuttle/Service/AuthUser.php
+++ b/src/SemanticScuttle/Service/AuthUser.php
@@ -130,7 +130,7 @@ class SemanticScuttle_Service_AuthUser extends SemanticScuttle_Service_User
         //FIXME: caching?
         $name = $this->auth->getUsername();
         if (!$name) {
-            return false;
+            return parent::getCurrentUserId();
         }
         return $this->getIdFromUser($name);
     }
-- 
cgit v1.2.3