make external auth login work. one thing left is when the user changes his password

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@628 b3834d28-1941-0410-a4f8-b48e95affb8f

2 files changed, 16 insertions, 4 deletions

diff --git a/data/config.default.php b/data/config.default.php
index a6b0e68..1b040c0 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -705,4 +705,13 @@ $authOptions = null;
  * @var boolean
  */
 $authDebug = false;
+
+/**
+ * Optional prefix to create email addresses from user names.
+ * i.e. "@example.org" to create "user@example.org" email address
+ * from "user" username.
+ *
+ * @var string
+ */
+$authEmailSuffix = null;
 ?>
diff --git a/src/SemanticScuttle/Service/AuthUser.php b/src/SemanticScuttle/Service/AuthUser.php
index 79cac9c..a293af5 100644
--- a/src/SemanticScuttle/Service/AuthUser.php
+++ b/src/SemanticScuttle/Service/AuthUser.php
@@ -155,9 +155,12 @@ class SemanticScuttle_Service_AuthUser extends SemanticScuttle_Service_User
         }
 
         $ok = $this->loginAuth($username, $password);
-        $password = $this->sanitisePassword($password);
-        $id       = $this->getIdFromUser($username);
-        //FIXME: check against auth
+        if (!$ok) {
+            return false;
+        }
+
+        //utilize real login method to get longtime cookie support etc.
+        return parent::login($username, $password, $remember);
     }
 
 
@@ -187,7 +190,7 @@ class SemanticScuttle_Service_AuthUser extends SemanticScuttle_Service_User
         if (!$this->getUserByUsername($username)) {
             $this->addUser(
                 $username, $password,
-                $username . '@' . $GLOBALS['authemaildomain']
+                $username . $GLOBALS['authEmailSuffix']
             );
         }
         //FIXME: what if the user changed his password?