Changeset 935

Timestamp:

05/19/08 16:27:06 (3 months ago)

Author:

laurentj

Message:

jAuth : added persistenceEnabled parameter at the AuthLogin? event

Files:

• trunk/lib/jelix/auth/jAuth.class.php (modified) (2 diffs)
• trunk/lib/jelix/auth/jAuth.class.php (modified) (2 diffs)
• trunk/lib/jelix/auth/jAuth.class.php (modified) (2 diffs)
• trunk/lib/jelix/auth/jAuth.class.php (modified) (2 diffs)

trunk/lib/jelix/auth/jAuth.class.php

@@ -303 +303 @@
-
-            $_SESSION[$config['session_name']] = $user;
-jEvent::notify ('AuthLogin', array('login'=>$login)
+$persistenceEnabled = ($persistant && isset($config['persistant_enable']) && $config['persistant_enable']
-
-            // Add a cookie for session persistance, if enabled
-ant && isset($config['persistant_enable']) && $config['persistant_enable']
+enceEnabled
-                if(!isset($config['persistant_crypt_key']) || !isset($config['persistant_cookie_name'])){
-                    throw new jException('jelix~auth.error.persistant.incorrectconfig','persistant_cookie_name, persistant_crypt_key');
-                }
-
+
-                if(isset($config['persistant_duration']))
-                    $cookieDuration=$config['persistant_duration']*86400;
+                else
+                    $cookieDuration=86400; // 24h
-                $cookieDuration+=time();
-                $encryptedPassword=jCrypt::encrypt($password,$config['persistant_crypt_key']);
@@ -318 +320 @@
-                setcookie($config['persistant_cookie_name'].'[passwd]', $encryptedPassword, $cookieDuration, $config['persistant_cookie_path']);
-            }
+
+            jEvent::notify ('AuthLogin', array('login'=>$login, 'persistenceEnabled'=>$persistenceEnabled));
-            return true;
-        }else

trunk/lib/jelix/auth/jAuth.class.php

@@ -303 +303 @@
-
-            $_SESSION[$config['session_name']] = $user;
-jEvent::notify ('AuthLogin', array('login'=>$login)
+$persistenceEnabled = ($persistant && isset($config['persistant_enable']) && $config['persistant_enable']
-
-            // Add a cookie for session persistance, if enabled
-ant && isset($config['persistant_enable']) && $config['persistant_enable']
+enceEnabled
-                if(!isset($config['persistant_crypt_key']) || !isset($config['persistant_cookie_name'])){
-                    throw new jException('jelix~auth.error.persistant.incorrectconfig','persistant_cookie_name, persistant_crypt_key');
-                }
-
+
-                if(isset($config['persistant_duration']))
-                    $cookieDuration=$config['persistant_duration']*86400;
+                else
+                    $cookieDuration=86400; // 24h
-                $cookieDuration+=time();
-                $encryptedPassword=jCrypt::encrypt($password,$config['persistant_crypt_key']);
@@ -318 +320 @@
-                setcookie($config['persistant_cookie_name'].'[passwd]', $encryptedPassword, $cookieDuration, $config['persistant_cookie_path']);
-            }
+
+            jEvent::notify ('AuthLogin', array('login'=>$login, 'persistenceEnabled'=>$persistenceEnabled));
-            return true;
-        }else

trunk/lib/jelix/auth/jAuth.class.php

@@ -303 +303 @@
-
-            $_SESSION[$config['session_name']] = $user;
-jEvent::notify ('AuthLogin', array('login'=>$login)
+$persistenceEnabled = ($persistant && isset($config['persistant_enable']) && $config['persistant_enable']
-
-            // Add a cookie for session persistance, if enabled
-ant && isset($config['persistant_enable']) && $config['persistant_enable']
+enceEnabled
-                if(!isset($config['persistant_crypt_key']) || !isset($config['persistant_cookie_name'])){
-                    throw new jException('jelix~auth.error.persistant.incorrectconfig','persistant_cookie_name, persistant_crypt_key');
-                }
-
+
-                if(isset($config['persistant_duration']))
-                    $cookieDuration=$config['persistant_duration']*86400;
+                else
+                    $cookieDuration=86400; // 24h
-                $cookieDuration+=time();
-                $encryptedPassword=jCrypt::encrypt($password,$config['persistant_crypt_key']);
@@ -318 +320 @@
-                setcookie($config['persistant_cookie_name'].'[passwd]', $encryptedPassword, $cookieDuration, $config['persistant_cookie_path']);
-            }
+
+            jEvent::notify ('AuthLogin', array('login'=>$login, 'persistenceEnabled'=>$persistenceEnabled));
-            return true;
-        }else

trunk/lib/jelix/auth/jAuth.class.php

@@ -303 +303 @@
-
-            $_SESSION[$config['session_name']] = $user;
-jEvent::notify ('AuthLogin', array('login'=>$login)
+$persistenceEnabled = ($persistant && isset($config['persistant_enable']) && $config['persistant_enable']
-
-            // Add a cookie for session persistance, if enabled
-ant && isset($config['persistant_enable']) && $config['persistant_enable']
+enceEnabled
-                if(!isset($config['persistant_crypt_key']) || !isset($config['persistant_cookie_name'])){
-                    throw new jException('jelix~auth.error.persistant.incorrectconfig','persistant_cookie_name, persistant_crypt_key');
-                }
-
+
-                if(isset($config['persistant_duration']))
-                    $cookieDuration=$config['persistant_duration']*86400;
+                else
+                    $cookieDuration=86400; // 24h
-                $cookieDuration+=time();
-                $encryptedPassword=jCrypt::encrypt($password,$config['persistant_crypt_key']);
@@ -318 +320 @@
-                setcookie($config['persistant_cookie_name'].'[passwd]', $encryptedPassword, $cookieDuration, $config['persistant_cookie_path']);
-            }
+
+            jEvent::notify ('AuthLogin', array('login'=>$login, 'persistenceEnabled'=>$persistenceEnabled));
-            return true;
-        }else