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

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

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

revision 1.7, Sun Sep 20 01:59:30 2009 UTC revision 1.8, Sun Sep 20 11:58:10 2009 UTC
# Line 96  function user_user_import_pre_save($sett Line 96  function user_user_import_pre_save($sett
96          break;          break;
97      }      }
98    
99      // update password                  // update password
100      if ($update_setting_per_module['password'] == UPDATE_REPLACE) {                  if ($update_setting_per_module['password'] == UPDATE_REPLACE) {
101        $account_add['pass'] = (empty($fields['user']['password'][0])) ? user_password() : $fields['user']['password'][0];          $account_add['pass'] = (empty($fields['user']['password'][0])) ? user_password() : $fields['user']['password'][0];
102      }                  }
103                    else {
104                            $account_add['pass'] = "";
105                    }
106    
107      // update contact                  // update contact
108      if ($update_setting_per_module['contact'] == UPDATE_REPLACE) {                  if ($update_setting_per_module['contact'] == UPDATE_REPLACE) {
109        $account_add['contact'] = $settings['contact'];                          $account_add['contact'] = $settings['contact'];
110      }                  }
111                    else {
112                            $account_add['contact'] = $account['contact'];
113                    }
114    
115    }    }
116    else {    else {
# Line 135  function user_user_import_after_save($se Line 141  function user_user_import_after_save($se
141    /**    /**
142     * @todo change hook_user_import_after_save() so that all changes to data are returned and saved in one hit     * @todo change hook_user_import_after_save() so that all changes to data are returned and saved in one hit
143     */     */
144    user_save($account, array('contact' => $settings['contact']));  
145          user_user_import_after_save_role($account, $settings['roles_new'], $account->roles, $fields['user']['roles']);          user_user_import_after_save_role($account, $settings['roles_new'], $account->roles, $fields['user']['roles']);
146    return;    return;
147  }  }
Legend:
Removed from v.1.7  
changed lines
  Added in v.1.8
  ViewVC Help
Powered by ViewVC 1.1.2