/[drupal]/contributions/modules/og_reg_keys/og_reg_keys.module
ViewVC logotype

Diff of /contributions/modules/og_reg_keys/og_reg_keys.module

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

revision 1.2, Wed Nov 26 19:42:21 2008 UTC revision 1.2.2.1, Tue Jun 9 19:30:40 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id$  // $Id: og_reg_keys.module,v 1.2 2008/11/26 19:42:21 marcp Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 129  function og_reg_keys_user($op, &$edit, & Line 129  function og_reg_keys_user($op, &$edit, &
129          }          }
130          $rid = variable_get('og_reg_keys_role', 0);          $rid = variable_get('og_reg_keys_role', 0);
131          if ($rid) {          if ($rid) {
132            // Pass to user_save() the roles where the key is role id (value doesn't matter eg. 1)            // Let the core user_save() code deal with setting the user's role
133            $account = user_save($account, array('roles' => array($rid => $rid)));            $edit['roles'][$rid] = 1;
134          }          }
135        }        }
136        // no redirect to node as this is someone adding users through the standard interface        // no redirect to node as this is someone adding users through the standard interface
# Line 517  function og_reg_keys_register_validate($ Line 517  function og_reg_keys_register_validate($
517   * Routine to submit new user registration form. This process creates new users, and adds og subscriptions   * Routine to submit new user registration form. This process creates new users, and adds og subscriptions
518   */   */
519  function og_reg_keys_register_submit($form, &$form_state) {  function og_reg_keys_register_submit($form, &$form_state) {
520    watchdog('user', 'New user: %name %email.', array('%name' => $form_state['values']['name'], '%email' => '<'. $form_state['values']['mail'] .'>'));    watchdog('og_reg_keys', 'New user: %name %email.', array('%name' => $form_state['values']['name'], '%email' => '<'. $form_state['values']['mail'] .'>'));
521    
522    user_save('', array('name' => $form_state['values']['name'],    user_save('', array('name' => $form_state['values']['name'],
523                        'pass' => $form_state['values']['pass'],                        'pass' => $form_state['values']['pass'],
# Line 525  function og_reg_keys_register_submit($fo Line 525  function og_reg_keys_register_submit($fo
525                        'mail' => $form_state['values']['mail'],                        'mail' => $form_state['values']['mail'],
526                        'roles' => array(variable_get('og_reg_keys_role', DRUPAL_AUTHENTICATED_RID) => 1),                        'roles' => array(variable_get('og_reg_keys_role', DRUPAL_AUTHENTICATED_RID) => 1),
527                        'status' => 1));                        'status' => 1));
528    
529    $user = user_authenticate($form_state['values']);    $user = user_authenticate($form_state['values']);
530    
531    $gid = og_reg_keys_get_gid($form_state['values']['og_reg_key']);    $gid = og_reg_keys_get_gid($form_state['values']['og_reg_key']);
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.2.2.1
  ViewVC Help
Powered by ViewVC 1.1.2