',
'#type' => 'textfield',
@@ -310,13 +330,13 @@ function masquerade_block_1($record) {
);
if (isset($quick_switch_link) && count($quick_switch_link)) {
- $markup_value .= '
'. t('Quick switches:') . theme('item_list', $quick_switch_link) .'
';
+ $markup_value .= '
' . t('Quick switches:') . theme('item_list', $quick_switch_link) . '
';
}
}
$form['masquerade_desc'] = array(
'#prefix' => '
',
);
return $form;
@@ -351,8 +371,9 @@ function masquerade_block_1_validate($fo
*/
function masquerade_block_1_submit($form, &$form_state) {
unset($form);
- $masq_user = user_load(array('name' => $form_state['values']['masquerade_user_field']));
- masquerade_switch_user($masq_user->uid);
+ $uid = db_query('SELECT uid FROM {users} WHERE name=:name', array(':name' => $form_state['values']['masquerade_user_field']))->fetchField();
+
+ masquerade_switch_user($uid);
}
/**
@@ -360,11 +381,11 @@ function masquerade_block_1_submit($form
*/
function masquerade_autocomplete($string) {
$matches = array();
- $result = db_query_range("SELECT u.name FROM {users} u WHERE LOWER(u.name) LIKE LOWER(:name)", array(':name' => $string . "%"), 0, 10);
+ $result = db_query_range("SELECT u.name FROM {users} u WHERE LOWER(u.name) LIKE LOWER(:name)", 0, 10, array(':name' => $string . "%"));
while ($user = $result->fetchObject()) {
$matches[$user->name] = check_plain($user->name);
}
- exit(drupal_to_js($matches));
+ exit(drupal_json_encode($matches));
}
/**
@@ -380,7 +401,7 @@ function masquerade_autocomplete_multipl
$matches = array();
$result = db_query_range("SELECT u.name FROM {users} u WHERE LOWER(u.name) LIKE LOWER(':name')", array(':name' => $last_string . '%'), 0, 10);
- $prefix = count($array) ? implode(', ', $array) .', ' : '';
+ $prefix = count($array) ? implode(', ', $array) . ', ' : '';
while ($user = $result->fetchObject()) {
$matches[$prefix . $user->name] = check_plain($user->name);
@@ -398,9 +419,7 @@ function masquerade_switch_user($uid) {
watchdog('masquerade', 'The user id provided to switch users was not numeric.', NULL, WATCHDOG_ERROR);
return drupal_goto($_SERVER['HTTP_REFERER']);
}
-
- $new_user = user_load(array('uid' => $uid));
-
+ $new_user = user_load($uid);
$roles = array_keys(array_filter(variable_get('masquerade_admin_roles', array())));
$perm = $uid == 1 || array_intersect(array_keys($new_user->roles), $roles) ?
'masquerade as admin' :
@@ -434,17 +453,18 @@ function masquerade_switch_user($uid) {
drupal_set_message(t('Now masquerading as %masq_as.', array('%masq_as' => $new_user->name)));
$user->masquerading = $new_user->uid;
$user = $new_user;
- drupal_goto(referer_uri());
+ drupal_save_session(TRUE);
+ drupal_goto($_SERVER['HTTP_REFERER']);
}
/**
- * Page callback that allows a user who is currently masquerading to become
- * a new user.
+ * Page callback that allows a user who is currently masquerading to revert to their
+ * original user session.
*/
function masquerade_switch_back() {
// switch user
global $user;
- cache_clear_all($user->uid, 'cache_menu', true);
+ cache_clear_all($user->uid, 'cache_menu', TRUE);
$query = db_select('masquerade', 'm');
$query->addField('m', 'uid_from');
$query->condition(db_and()->condition('sid', session_id(), '=')->condition('uid_as', $user->uid, '='));
@@ -456,7 +476,8 @@ function masquerade_switch_back() {
->condition(db_and()->condition('sid', session_id())->condition('uid_as', $user->uid))
->execute();
$oldname = $user->name;
- $user = user_load(array('uid' => $uid));
+ $user = user_load($uid);
+ drupal_save_session(TRUE);
watchdog('masquerade', 'User %user no longer masquerading as %masq_as.', array('%user' => $user->name, '%masq_as' => $oldname), WATCHDOG_INFO);
drupal_set_message(t('No longer masquerading as %masq_as.', array('%masq_as' => $oldname)));
drupal_goto($_SERVER['HTTP_REFERER']);
Index: masquerade.test
===================================================================
RCS file: masquerade.test
diff -N masquerade.test
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ masquerade.test 6 May 2010 19:46:15 -0000
@@ -0,0 +1,47 @@
+ 'Masquerade tests',
+ 'description' => 'Tests user switching with the Masquerade module.',
+ 'group' => 'Masquerade',
+ );
+ }
+
+ public function setUp() {
+ parent::setUp('masquerade');
+ }
+
+ public function testAdminForm() {
+ $admin_perms = array(
+ 'administer site configuration',
+ 'administer permissions',
+ 'masquerade as user',
+ );
+ $admin = $this->drupalCreateUser($admin_perms);
+ $user = $this->drupalCreateUser();
+
+ $this->drupalLogin($admin);
+ $this->drupalGet('admin/config/development/masquerade');
+
+ //test switch
+
+ $this->drupalGet('masquerade/switch/' . $user->uid);
+ $this->assertText('Now masquerading as ' . $user->name);
+
+ //test unswitch
+ $this->drupalGet('masquerade/unswitch');
+ $this->assertText('No longer masquerading as ' . $user->name);
+ }
+
+}
+