diff options
author | Dries Buytaert <dries@buytaert.net> | 2006-08-16 13:13:34 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2006-08-16 13:13:34 +0000 |
commit | 3ace12caf8f4d46fda44b79b4a3cbe91b0bca5c0 (patch) | |
tree | 6ae616ee6f3eefb9ee16628595a5ad4534df091b /includes/session.inc | |
parent | 9f8abbcc59813f80ac6942783b33e0292ac98a38 (diff) | |
download | brdo-3ace12caf8f4d46fda44b79b4a3cbe91b0bca5c0.tar.gz brdo-3ace12caf8f4d46fda44b79b4a3cbe91b0bca5c0.tar.bz2 |
- Patch #node/76931 by Robert: improved performance of Drupal's session handling.
Diffstat (limited to 'includes/session.inc')
-rw-r--r-- | includes/session.inc | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/includes/session.inc b/includes/session.inc index 160376d84..42f5e826b 100644 --- a/includes/session.inc +++ b/includes/session.inc @@ -17,39 +17,44 @@ function sess_close() { function sess_read($key) { global $user; - // retrieve data for a $user object - $result = db_query("SELECT sid FROM {sessions} WHERE sid = '%s'", $key); - if (!db_num_rows($result)) { - $result = db_query("SELECT u.* FROM {users} u WHERE u.uid = 0"); - } - else { - $result = db_query("SELECT u.*, s.* FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.sid = '%s'", $key); + // Handle the case of first time visitors and clients that don't store cookies (eg. web crawlers). + if (!isset($_COOKIE[session_name()])) { + $user = drupal_anonymous_user(); + return ''; } - // Build $user object: - $user = db_fetch_object($result); - $user = drupal_unpack($user); + // Otherwise, if the session is still active, we have a record of the client's session in the database. + $user = db_fetch_object(db_query("SELECT u.*, s.* FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.sid = '%s'", $key)); - // Add roles element to $user: - $user->roles = array(); - if ($user->uid) { - $user->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user'; + // We found the client's session record and they are an authenticated user + if ($user->uid > 0) { + // This is done to unserialize the data member of $user + $user = drupal_unpack($user); + // Add roles element to $user + $user->roles = array(); + $user->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user'; $result = db_query("SELECT r.rid, r.name FROM {role} r INNER JOIN {users_roles} ur ON ur.rid = r.rid WHERE ur.uid = %d", $user->uid); while ($role = db_fetch_object($result)) { $user->roles[$role->rid] = $role->name; } } - else { - $user->roles[DRUPAL_ANONYMOUS_RID] = 'anonymous user'; + // We didn't find the client's record (session has expired), or they are an anonymous user. + else { + $user = drupal_anonymous_user(); } - return !empty($user->session) ? $user->session : ''; + return $user->session; } function sess_write($key, $value) { global $user; + // If the client doesn't have a session, and one isn't being created ($value), do nothing. + if (empty($_COOKIE[session_name()]) && empty($value)) { + return TRUE; + } + $result = db_query("SELECT sid FROM {sessions} WHERE sid = '%s'", $key); if (!db_num_rows($result)) { @@ -87,5 +92,4 @@ function sess_gc($lifetime) { db_query("DELETE FROM {sessions} WHERE timestamp < %d", time() - $lifetime); return TRUE; -} - +}
\ No newline at end of file |