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

integrate with alt_login

Browse Source
This commit is contained in:
espie 2008-02-17 12:37:22 +00:00
parent 300d0b7bd9
commit ace1b1fd44
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/drupal5/user_import/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.1.1.1 2008/02/16 16:46:59 espie Exp $ # $OpenBSD: Makefile,v 1.2 2008/02/17 12:37:22 espie Exp $
COMMENT = import CSV users to drupal COMMENT = import CSV users to drupal
DISTNAME = user_import-5.x-1.3 DISTNAME = user_import-5.x-1.3
PKGNAME = drupal5-user-import-1.3 PKGNAME = drupal5-user-import-1.3p0
.include <bsd.port.mk> .include <bsd.port.mk>

36
www/drupal5/user_import/patches/patch-user_import_module
View File

@ -1,7 +1,17 @@
$OpenBSD: patch-user_import_module,v 1.1.1.1 2008/02/16 16:46:59 espie Exp $ $OpenBSD: patch-user_import_module,v 1.2 2008/02/17 12:37:22 espie Exp $
--- user_import.module.orig Tue Feb 12 23:32:10 2008 --- user_import.module.orig Tue Jul 24 00:49:45 2007
+++ user_import.module Tue Feb 12 23:33:10 2008 +++ user_import.module Sun Feb 17 13:32:54 2008
@@ -1171,7 +1171,7 @@ function _user_import_sanitise_username(&$username) { @@ -1088,6 +1088,9 @@ function user_import_edit_match_fields(&$form, $import
$profile_fields[0] = '-------------';
$profile_fields['email'] = t('Email Address') . '*';
$profile_fields['password'] = t('Password');
+ if (module_exists('alt_login')) {
+ $profile_fields['alt_login'] = t('Alternate Login');
+ }
asort($profile_fields);
$row = 0;
@@ -1171,7 +1174,7 @@ function _user_import_sanitise_username(&$username) {
if ($sanitised == 0) { if ($sanitised == 0) {
// username cannot contain an illegal character // username cannot contain an illegal character
@ -10,3 +20,21 @@ $OpenBSD: patch-user_import_module,v 1.1.1.1 2008/02/16 16:46:59 espie Exp $
// username cannot contain multiple spaces in a row // username cannot contain multiple spaces in a row
$username = preg_replace('/[ ]+/', ' ', $username); $username = preg_replace('/[ ]+/', ' ', $username);
@@ -1549,6 +1552,7 @@ function _user_import_process($settings) {
$username_order[ $column_id ] = $setting['username'];
$username_abbreviate[$column_id]= $setting['abbreviate'];
}
+ if ($setting['field_match'] == 'alt_login') $alt_login = trim($data[$column_id]);
}
if ($errors == 'duplicate email' && $settings['setting'] == 'import') _user_import_group_add($settings, $email, $fields);
@@ -1572,6 +1576,9 @@ function _user_import_process($settings) {
'roles' => $roles,
'contact' => $contact
);
+ if (!empty($alt_login)) {
+ $account['alt_login'] = $alt_login;
+ }
if (!empty($settings['options']['activate'])) {
$account['access'] = time();