Changeset 136

Timestamp:

06/27/07 13:46:19 (2 years ago)

Author:

shupp

Message:

move logout funtions to Login module, adding messaging. Add new inactivtyTimeout configuration option - 300 seconds by default

Files:

• trunk/Framework/Auth/Vpopmail.php (modified) (1 diff)
• trunk/Framework/Module/Login.php (modified) (2 diffs)
• trunk/Framework/Module/Logout (deleted)
• trunk/Framework/Module/Logout.php (deleted)
• trunk/Framework/Site/Default/config.xml (modified) (1 diff)

trunk/Framework/Auth/Vpopmail.php

@@ -7 +7 @@
-    public function authenticate()
-    {
+        // Check timeout
+        $time = time();
+        $lastActionTime = $this->session->__get('lastActionTime');
+        $timeLimit = (int)Framework::$site->config->inactiveTimeout;
+        if($this->user->debug == 1);
+            $this->log->log("timeout info: time: $time, lastActionTime: $lastActionTime, timeLimit: $timeLimit");
+        if(($time - $lastActionTime) > $timeLimit) {
+            header('Location: ./?module=Login&event=logoutInactive');
+            return false;
+        }
+
+        // Authenticate
-        $encryptedPass = $this->session->__get('password');
-        $plainPass =  Framework_User_passEncryption::decryptPass($encryptedPass, (string)Framework::$site->config->mcryptKey);
-        if(!PEAR::isError($this->user->authenticate($this->session->__get('email'), $plainPass))) {
+            $this->session->__set('lastActionTime', $time);
-            $this->setData('logged_in_as', $this->session->__get('email'));
-            $this->setData('LANG_logged_in_as', _('logged in as'));

trunk/Framework/Module/Login.php

@@ -41 +41 @@
-            if(!PEAR::isError($result)) {
-                $emailArray = explode('@', $_POST['email']);
-
-
-
-
-
+
+
+
+
+
+
-                header("Location: ./index.php?module=Domains");
-            } else {
-                $this->setData('loginError', $result->getMessage());
-                $this->setData('QF_Form', $form->toHtml());
-email = null
-password = null
+__set('email', null)
+__set('password',  null)
-                return;
-            }
@@ -76 +77 @@
-    }
-
+    function logoutNow() {
+        $this->session->destroy();
+        $this->setData('message', _('Logged out successfully'));
+        return $this->__default();
+    }
+
+    function logoutInactive() {
+        $this->session->destroy();
+        $this->setData('message', _('You have been logged out automatically for inactivity'));
+        return $this->__default();
+    }
+
-}
-

trunk/Framework/Site/Default/config.xml

@@ -1 +1 @@
-<?xml version="1.0" ?>
-<framework>
+    <!-- set to 1 to send debug info to logFile -->
+    <debug>0</debug>
-    <vpopmaildHost>home.shupp.org</vpopmaildHost>
-    <vpopmaildPort>89</vpopmaildPort>
-
+
+
-    <mcryptKey>My Secret Key</mcryptKey>
-    <maxPerPage>10</maxPerPage>