/[drupal]/contributions/modules/user_import/supported/user.inc

Diff of /contributions/modules/user_import/supported/user.inc

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-revision 1.1.2.6,
Sat Mar 21 23:11:50 2009 UTC
+revision 1.1.2.7,
Sun Sep 20 02:02:13 2009 UTC
 Line 13 
 function user_user_import_form_field_mat
    $options = array();
    $options['user']['email'] = t('Email Address*');
    $options['user']['password'] = t('Password');
+   $options['user']['roles'] = t('Roles');
    return $options;
  }
 Line 56 
 function user_user_import_data($settings
      $value = trim($data[$column_id]);
    }
+   if ($field_id == 'roles') {
+     $value = user_user_import_roles_data($data[$column_id], $settings['roles_new']);
+   }
    return $value;
  }
-Line 78 
 function user_user_import_pre_save($sett
+Line 82 
 function user_user_import_pre_save($sett
        case UPDATE_REPLACE:
          // update roles
-         $account_add['roles'] = array();
+                                 if (!isset($account_add['roles'])) {
+                                         $account_add['roles'] = array();
+                                 }
          foreach ($settings['roles'] as $rid => $role_set) {
            if (!empty($role_set)) {
-Line 145 
 function user_user_import_edit_roles_fie
+Line 151 
 function user_user_import_edit_roles_fie
    $form['role_selection'] = array(
        '#type' => 'fieldset',
        '#title' => t('Role Assign'),
-       '#description' => t("Select which role(s) imported users should be assigned. The role 'authenticated user' is assigned automatically."),
        '#weight' => -80,
        '#collapsible' => TRUE,
        '#collapsed' => $collapsed,
    );
    $form['role_selection']['roles'] = array(
+         '#title' => t('Assign Role(s) To All Users'),
        '#type' => 'checkboxes',
        '#options' => $roles,
        '#default_value' => $roles_selected,
+       '#description' => t("Select which role(s) all imported users should be assigned. The role 'authenticated user' is assigned automatically."),
+   );
+   $form['role_selection']['roles_new'] = array(
+       '#type' => 'checkbox',
+       '#title' => t('Add New Roles'),
+       '#default_value' => $import['options']['roles_new'],
+       '#description' => t('Create imported role(s) that are not found and assign it to the user, in addition to any role(s) selected above. Warning: incorrect roles will be created if the incoming data includes typos.'),
    );
    return;
-Line 225 
 function _user_import_existing_uid($emai
+Line 240 
 function _user_import_existing_uid($emai
          $uid = db_result(db_query("SELECT uid FROM {users} WHERE mail= '%s' LIMIT 1", $email));
    return $uid;
  }
+ /**
+  * Implementation of hook_user_import_after_save().
+  */
+ function user_user_import_after_save($settings, $account, $password, $fields, $updated, $update_setting_per_module) {
+   /**
+    * @todo change hook_user_import_after_save() so that all changes to data are returned and saved in one hit
+    */
+   user_save($account, array('contact' => $settings['contact']));
+         user_user_import_after_save_role($account, $settings['roles_new'], $account->roles, $fields['user']['roles']);
+   return;
+ }
+ function user_user_import_roles_data($data, $new_roles_allowed) {
+   if (empty($data)) return;
+   $values = explode( ',', $data);
+ //var_dump($values);
+   // check if any roles are specified that don't already exist
+   $existing_roles = user_roles();
+   foreach($values as $piece) {
+     $role = trim($piece);
+     $unrecognised = array();
+                 if (!empty($role)) {
+             // only add if role is recognized or adding new roles is allowed
+             if (empty($new_roles_allowed) && !array_search($role, $existing_roles)) {
+                         $unrecognised[] = $role;
+             }
+             else {
+                         $roles[] = $role;
+             }
+                 }
+   }
+   if (!empty($unrecognised)) {
+                 user_import_errors(t('The following unrecognised roles were specified: ') . implode(',', $unrecognised));
+   }
+   return $roles;
+ }
+ function user_user_import_after_save_role($account, $new_roles_allowed, $account_roles, $roles) {
+   $existing_roles = user_roles();
+   // if roles were specified, add to existing roles
+   $assign_roles = array();
+   if (is_array($roles) && !empty($roles)) {
+                 foreach ($roles as $role) {
+             if (!empty($role)) {
+                           $key = array_search($role, $existing_roles);
+                           if (!empty($new_roles_allowed) && empty($key)) {
+                                   db_query("INSERT INTO {role} (name) VALUES ('%s')", $role);
+                       $key = db_result(db_query("SELECT rid FROM {role} WHERE name = '%s' LIMIT 1", $role));
+                                         $existing_roles[$key] = $role;
+                           }
+                           $assign_roles[$key] = $role;
+                         }
+                 }
+                 $need_update = FALSE;
+           foreach ($assign_roles as $key => $role) {
+                   if (!isset($account_roles[$key])) {
+                     $need_update = TRUE;
+                     $account_roles[$key] = $role;
+                   }
+           }
+                 if ($need_update) {
+                         user_save($account, array('roles' => $account_roles));
+           }
+   }
+   return;
+ }

 Legend:



Removed from v.1.1.2.6
 


changed lines


 
Added in v.1.1.2.7
 Legend:



Removed from v.1.1.2.6
 


changed lines


 
Added in v.1.1.2.7
-Removed from v.1.1.2.6
+Added in v.1.1.2.7

	ViewVC Help
Powered by ViewVC 1.1.2