cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make it work with alt_login

Browse Source
This commit is contained in:
espie 2009-07-27 13:00:26 +00:00
parent 2c280a6d53
commit 98d00d9f61
2 changed files with 63 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/drupal6/masquerade/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2009/07/26 12:20:08 espie Exp $
# $OpenBSD: Makefile,v 1.3 2009/07/27 13:00:26 espie Exp $
COMMENT = test site as another user
CATEGORIES = devel
DISTNAME = masquerade-6.x-1.1
PKGNAME = drupal6-masquerade-1.1p0
PKGNAME = drupal6-masquerade-1.1p1
.include <bsd.port.mk>

61
www/drupal6/masquerade/patches/patch-masquerade_module Normal file
View File

@ -0,0 +1,61 @@
$OpenBSD: patch-masquerade_module,v 1.1 2009/07/27 13:00:26 espie Exp $
--- masquerade.module.orig Mon Jul 27 14:43:25 2009
+++ masquerade.module Mon Jul 27 14:56:07 2009
@@ -284,14 +284,21 @@ function masquerade_block_1($record) {
*/
function masquerade_block_1_validate($form, &$form_state) {
unset($form);
- if ($form_state['values']['masquerade_user_field'] == '') {
+ $name = $form_state['values']['masquerade_user_field'];
+ if ($name == '') {
form_set_error('masquerade_user_field', t('You cannot masquerade as %anonymous!', array('%anonymous' => variable_get('anonymous', 'Anonymous'))));
}
if ($GLOBALS['masquerading']) {
form_set_error('masquerade_user_field', t('You are already masquerading!'));
}
global $user;
- $masq_user = user_load(array('name' => $form_state['values']['masquerade_user_field']));
+ if (module_exists('alt_login')) {
+ $alt_login = db_fetch_object(db_query("SELECT u.name FROM {users} u INNER JOIN {alt_login} al ON u.uid = al.uid WHERE al.alt_login = '%s'", $name));
+ if ($alt_login->name) {
+ $name = $alt_login->name;
+ }
+ }
+ $masq_user = user_load(array('name' => $name));
if (!$masq_user) {
form_set_error('masquerade_user_field', t('User %masq_as does not exist. Please enter a valid username.', array('%masq_as' => $form_state['values']['masquerade_user_field'])));
}
@@ -308,15 +315,16 @@ function masquerade_block_1_validate($form, &$form_sta
*/
function masquerade_block_1_submit($form, &$form_state) {
unset($form);
- $masq_user = user_load(array('name' => $form_state['values']['masquerade_user_field']));
-
- if (module_exists('alt_login')) { // alt_login.module integration patch by espie.
+ $name = $form_state['values']['masquerade_user_field'];
+ if (module_exists('alt_login')) {
$alt_login = db_fetch_object(db_query("SELECT u.name FROM {users} u INNER JOIN {alt_login} al ON u.uid = al.uid WHERE al.alt_login = '%s'", $name));
if ($alt_login->name) {
- $masq_user = user_load(array('name' => $alt_login->name));
+ $name = $alt_login->name;
}
}
+ $masq_user = user_load(array('name' => $name));
+
masquerade_switch_user($masq_user->uid);
}
@@ -328,6 +336,12 @@ function masquerade_autocomplete($string) {
$result = db_query_range("SELECT u.name FROM {users} u WHERE LOWER(u.name) LIKE LOWER('%s%%')", $string, 0, 10);
while ($user = db_fetch_object($result)) {
$matches[$user->name] = check_plain($user->name);
+ }
+ if (module_exists('alt_login')) {
+ $result = db_query_range("SELECT alt_login FROM {alt_login} u WHERE LOWER(alt_login) LIKE LOWER('%s%%')", $string, 0, 10);
+ while ($user = db_fetch_object($result)) {
+ $matches[$user->alt_login] = check_plain($user->alt_login);
+ }
}
print drupal_to_js($matches);
exit();