Changeset 368 for devel/lib

Timestamp:

05/27/06 14:21:20 (2 years ago)

Author:

ben

Message:

Persistent logins are reinstated; login functions are slightly rejigged to allow for several different login methods

Files:

• devel/lib/elgglib.php (modified) (4 diffs)

devel/lib/elgglib.php

@@ -3344 +3344 @@
-}
-
+// Fills user information
+function init_user_var($user) {
+    
+    global $CFG;
+    
+    $user->loggedin = true;
+    $user->site     = $CFG->wwwroot; // for added security, store the site in the session
+    $user->sesskey  = random_string(10);
+    $user->sessionIP = md5(getremoteaddr());   // Store the current IP in the session
+    // backwards compatibility (TODO this will have to go eventually)
+    fill_legacy_user_session($user);
+    return $user;
+    
+}
+
-
-// Authentication Function
@@ -3375 +3390 @@
-    
-    // Set Persistent Cookie
-,PARAM_INT
+
-    if (!empty($rememberme)) {
-        remember_login($user->ident);
-    }
-    
-
-
-
-
-
-
-
+
+
-    return $ok;
-}
-
-
-
-
-
-
-
+
+
+
-    if($ticket = md5($_COOKIE[AUTH_COOKIE])) {
-        if ($user = get_record('users','code',$ticket)) {
@@ -3401 +3408 @@
-            
-            /*** TODO: Create Proper Abstraction Interface - don't use file binding -- ugh ***/
-row
-$user
+user
+init_user_var($user)
-                return true;
-            } else {
-                global $messages;
-                $messages[] = gettext("You have been banned from the system!");
+                return false;
-            }
-        }
-    }
+}
+
+/**
+ * elgg doesn't have a 'login' page yet, but it will so this can stay here for now
+ */
+function require_login() {
+    global $USER, $SESSION,$FULLME;
+    
+    // Check to see if there's a persistent cookie
+    cookied_login();
-    
-    // First check that the user is logged in to the site.
@@ -3450 +3468 @@
-    
-    setcookie(AUTH_COOKIE, $ticket, time()+AUTH_COOKIE_LENGTH, '/');
+    global $messages;
+    $messages[] = gettext("The system will remember you and automatically log you in next time.");
-    
-    return 1;
-}
-
+// Returns whether the user is logged in or not;
+// if not logged in, checks for persistent cookie
-function isloggedin() { 
-    global $USER;
+    if (empty($USER->ident) && empty($USER->loggedin)) {
+        cookied_login();
+    }
-    return (!empty($USER->ident) && !empty($USER->loggedin));
-}