summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/simpletest/tests/session.test28
-rw-r--r--modules/simpletest/tests/session_test.module2
-rw-r--r--modules/user/user.module14
3 files changed, 22 insertions, 22 deletions
diff --git a/modules/simpletest/tests/session.test b/modules/simpletest/tests/session.test
index 2e564e0bf..5e2533988 100644
--- a/modules/simpletest/tests/session.test
+++ b/modules/simpletest/tests/session.test
@@ -26,19 +26,19 @@ class SessionTestCase extends DrupalWebTestCase {
}
/**
- * Tests for session_save_session().
+ * Tests for drupal_save_session().
*/
function testSessionSaveSession() {
- $this->assertTrue(session_save_session(), t('session_save_session() correctly returns TRUE when initially called with no arguments.'), t('Session'));
- $this->assertFalse(session_save_session(FALSE), t('session_save_session() correctly returns FALSE when called with FALSE.'), t('Session'));
- $this->assertFalse(session_save_session(), t('session_save_session() correctly returns FALSE when saving has been disabled.'), t('Session'));
- $this->assertTrue(session_save_session(TRUE), t('session_save_session() correctly returns TRUE when called with TRUE.'), t('Session'));
- $this->assertTrue(session_save_session(), t('session_save_session() correctly returns TRUE when saving has been enabled.'), t('Session'));
+ $this->assertTrue(drupal_save_session(), t('drupal_save_session() correctly returns TRUE when initially called with no arguments.'), t('Session'));
+ $this->assertFalse(drupal_save_session(FALSE), t('drupal_save_session() correctly returns FALSE when called with FALSE.'), t('Session'));
+ $this->assertFalse(drupal_save_session(), t('drupal_save_session() correctly returns FALSE when saving has been disabled.'), t('Session'));
+ $this->assertTrue(drupal_save_session(TRUE), t('drupal_save_session() correctly returns TRUE when called with TRUE.'), t('Session'));
+ $this->assertTrue(drupal_save_session(), t('drupal_save_session() correctly returns TRUE when saving has been enabled.'), t('Session'));
}
/**
* Test data persistence via the session_test module callbacks. Also tests
- * sess_count() since session data is already generated here.
+ * drupal_session_count() since session data is already generated here.
*/
function testDataPersistence() {
$user = $this->drupalCreateUser(array('access content'));
@@ -54,13 +54,13 @@ class SessionTestCase extends DrupalWebTestCase {
$this->drupalGet('session-test/get');
$this->assertText($value_1, t('Session correctly returned the stored data for an authenticated user.'), t('Session'));
- // Attempt to write over val_1. If session_save_session(FALSE) is working.
+ // Attempt to write over val_1. If drupal_save_session(FALSE) is working.
// properly, val_1 will still be set.
$value_2 = $this->randomName();
$this->drupalGet('session-test/no-set/' . $value_2);
$this->assertText($value_2, t('The session value was correctly passed to session-test/no-set.'), t('Session'));
$this->drupalGet('session-test/get');
- $this->assertText($value_1, t('Session data is not saved for session_save_session(FALSE).'), t('Session'));
+ $this->assertText($value_1, t('Session data is not saved for drupal_save_session(FALSE).'), t('Session'));
// Switch browser cookie to anonymous user, then back to user 1.
$this->sessionReset();
@@ -85,7 +85,7 @@ class SessionTestCase extends DrupalWebTestCase {
$this->drupalGet('session-test/no-set/' . $value_4);
$this->assertText($value_4, t('The session value was correctly passed to session-test/no-set.'), t('Session'));
$this->drupalGet('session-test/get');
- $this->assertText($value_3, t('Session data is not saved for session_save_session(FALSE).'), t('Session'));
+ $this->assertText($value_3, t('Session data is not saved for drupal_save_session(FALSE).'), t('Session'));
// Logout and get first user back in. Sessions shouldn't persist through
// logout, so the data won't be on the page.
@@ -100,10 +100,10 @@ class SessionTestCase extends DrupalWebTestCase {
$this->drupalLogin($user2);
$this->session_count_authenticated = $this->session_count++;
- // Perform sess_count tests here in order to use the session data already generated.
+ // Perform drupal_session_count tests here in order to use the session data already generated.
// Test absolute count.
- $anonymous = sess_count(0, TRUE);
- $authenticated = sess_count(0, FALSE);
+ $anonymous = drupal_session_count(0, TRUE);
+ $authenticated = drupal_session_count(0, FALSE);
$this->assertEqual($anonymous + $authenticated, $this->session_count, t('Correctly counted @count total sessions.', array('@count' => $this->session_count)), t('Session'));
// Test anonymous count.
@@ -113,7 +113,7 @@ class SessionTestCase extends DrupalWebTestCase {
$this->assertEqual($authenticated, $this->session_count_authenticated, t('Correctly counted @count authenticated sessions.', array('@count' => $authenticated)), t('Session'));
// Should return 0 sessions from 1 second from now.
- $this->assertEqual(sess_count(time() + 1), 0, t('Correctly returned 0 sessions newer than the current time.'), t('Session'));
+ $this->assertEqual(drupal_session_count(time() + 1), 0, t('Correctly returned 0 sessions newer than the current time.'), t('Session'));
}
diff --git a/modules/simpletest/tests/session_test.module b/modules/simpletest/tests/session_test.module
index a2f32422b..42c47a08c 100644
--- a/modules/simpletest/tests/session_test.module
+++ b/modules/simpletest/tests/session_test.module
@@ -49,7 +49,7 @@ function _session_test_set($value) {
* anyway.
*/
function _session_test_no_set($value) {
- session_save_session(FALSE);
+ drupal_save_session(FALSE);
_session_test_set($value);
return t('session saving was disabled, and then %val was set', array('%val' => $value));
}
diff --git a/modules/user/user.module b/modules/user/user.module
index 50cd6695d..905dcc3bd 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -277,14 +277,14 @@ function user_save($account, $edit = array(), $category = 'account') {
// Delete a blocked user's sessions to kick them if they are online.
if (isset($edit['status']) && $edit['status'] == 0) {
- sess_destroy_uid($account->uid);
+ drupal_session_destroy_uid($account->uid);
}
// If the password changed, delete all open sessions and recreate
// the current one.
if (!empty($edit['pass'])) {
- sess_destroy_uid($account->uid);
- sess_regenerate();
+ drupal_session_destroy_uid($account->uid);
+ drupal_session_regenerate();
}
// Refresh user object.
@@ -792,7 +792,7 @@ function user_block($op = 'list', $delta = '', $edit = array()) {
// Perform database queries to gather online user lists. We use s.timestamp
// rather than u.access because it is much faster.
- $anonymous_count = sess_count($interval);
+ $anonymous_count = drupal_session_count($interval);
$authenticated_users = db_query('SELECT DISTINCT u.uid, u.name, s.timestamp FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.timestamp >= %d AND s.uid > 0 ORDER BY s.timestamp DESC', $interval);
$authenticated_count = 0;
$max_users = variable_get('user_block_max_list_count', 10);
@@ -1344,7 +1344,7 @@ function user_authenticate_finalize(&$edit) {
$user->login = $_SERVER['REQUEST_TIME'];
db_query("UPDATE {users} SET login = %d WHERE uid = %d", $user->login, $user->uid);
user_module_invoke('login', $edit, $user);
- sess_regenerate();
+ drupal_session_regenerate();
}
/**
@@ -1555,7 +1555,7 @@ function _user_edit_submit($uid, &$edit) {
*/
function user_delete($edit, $uid) {
$account = user_load(array('uid' => $uid));
- sess_destroy_uid($uid);
+ drupal_session_destroy_uid($uid);
_user_mail_notify('status_deleted', $account);
module_invoke_all('user', 'delete', $edit, $account);
db_query('DELETE FROM {users} WHERE uid = %d', $uid);
@@ -2210,7 +2210,7 @@ function user_block_user_action(&$object, $context = array()) {
$uid = $user->uid;
}
db_query("UPDATE {users} SET status = 0 WHERE uid = %d", $uid);
- sess_destroy_uid($uid);
+ drupal_session_destroy_uid($uid);
watchdog('action', 'Blocked user %name.', array('%name' => check_plain($user->name)));
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-22 18:23:10 +0000