/[drupal]/contributions/modules/ldap_integration/ldapauth.module

Diff of /contributions/modules/ldap_integration/ldapauth.module

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

-revision 1.45,
Tue Jul 28 14:03:05 2009 UTC
+revision 1.46,
Tue Oct 27 14:29:16 2009 UTC
 Line 1
  <?php
- // $Id: ldapauth.module,v 1.44 2009/05/04 00:26:17 miglius Exp $
+ // $Id: ldapauth.module,v 1.45 2009/07/28 14:03:05 miglius Exp $
  /**
   * @file
 Line 115 
 function ldapauth_menu() {
      ),
      'admin/settings/ldap/ldapauth/activate' => array(
        'title' => 'Activate LDAP Source',
-       'page callback' => 'ldapauth_admin_activate',
+       'page callback' => 'drupal_get_form',
-       'page arguments' => array(5),
+       'page arguments' => array('ldapauth_admin_activate'),
        'access arguments' => array('administer ldap modules'),
        'type' => MENU_CALLBACK,
        'file' => 'ldapauth.admin.inc',
      ),
      'admin/settings/ldap/ldapauth/deactivate' => array(
-       'title' => 'De-Activate LDAP Source',
+       'title' => 'De-activate LDAP Source',
-       'page callback' => 'ldapauth_admin_deactivate',
+       'page callback' => 'drupal_get_form',
-       'page arguments' => array(5),
+       'page arguments' => array('ldapauth_admin_deactivate'),
        'access arguments' => array('administer ldap modules'),
        'type' => MENU_CALLBACK,
        'file' => 'ldapauth.admin.inc',
 Line 201 
 function ldapauth_form_alter(&$form, $fo
    // Replace the drupal authenticate function is it's used as validation.
    if (isset($form['#validate']) && is_array($form['#validate']) && ($key = array_search('user_login_authenticate_validate', $form['#validate'])))
-     $form['#validate'][$key] = 'ldapauth_login_validate';
+     $form['#validate'][$key] = 'ldapauth_login_authenticate_validate';
    switch ($form_id) {
      case 'user_login_block':
 Line 260 
 function ldapauth_exit() {
   *
   * If successful, sets the global $user object.
   */
- function ldapauth_login_validate($form, &$form_state) {
+ function ldapauth_login_authenticate_validate($form, &$form_state) {
    ldapauth_authenticate($form_state['values']);
  }
 Line 275 
 function ldapauth_authenticate($form_val
    $name = $form_values['name'];
    $pass = trim($form_values['pass']);
+   // The user_login_name_validate() is not called if the user is being authenticated
+   // from the httpauth or services modules, therefore call it here.
+   $form_state['values'] = $form_values;
+   user_login_name_validate(NULL, $form_state);
    // (Design decision) uid=1 (admin user) must always authenticate to local database
    // this user is critical for all drupal admin and upgrade operations so it is best
    // left with drupal's native authentication.
-Line 300 
 function ldapauth_authenticate($form_val
+Line 305 
 function ldapauth_authenticate($form_val
      }
    }
+   $account = user_load(array('name' => $name, 'status' => 1));
+   if ($account && drupal_is_denied('mail', $account->mail)) {
+     form_set_error('name', t('The name %name is registered using a reserved e-mail address and therefore could not be logged in.', array('%name' => $account->name)));
+   }
+   // If there is any validations errors, we do not query LDAP.
+   if (form_get_errors())
+     return;
    // Authenticate LDAP user.
    if (!($dn = _ldapauth_auth($name, $pass)))
      return;
-   $account = user_load(array('name' => $name));
+   if (!$account) {
-   if (!isset($account->uid)) {
-     // Check if the username is allowed.
-     if (drupal_is_denied('user', $name)) {
-       drupal_set_message(t('The name %name has been denied access.', array('%name' => $name)), 'error');
-       return;
-     }
      // Register this new user.
      if ($ldap_user = _ldapauth_user_lookup($name)) {
-       // Generate a random drupal password. LDAP password will be used anyways.
-       $pass_new = (LDAPAUTH_LOGIN_PROCESS == LDAPAUTH_AUTH_EXCLUSIVED || !LDAPAUTH_SYNC_PASSWORDS) ? user_password(20) : $pass;
        // If mail attribute is missing, set the name as mail.
        $init = $mail = key_exists(($_ldapauth_ldap->getOption('mail_attr') ? $_ldapauth_ldap->getOption('mail_attr') : LDAPAUTH_DEFAULT_MAIL_ATTR), $ldap_user) ? $ldap_user[$_ldapauth_ldap->getOption('mail_attr')][0] : $name;
+       // Check if the e-mail is not denied.
+       if (drupal_is_denied('mail', $mail)) {
+         form_set_error('name', t('The name %name is registered using a reserved e-mail address and therefore could not be logged in.', array('%name' => $name)));
+         return;
+       }
+       // Generate a random drupal password. LDAP password will be used anyways.
+       $pass_new = (LDAPAUTH_LOGIN_PROCESS == LDAPAUTH_AUTH_EXCLUSIVED || !LDAPAUTH_SYNC_PASSWORDS) ? user_password(20) : $pass;
        $userinfo = array('name' => $name, 'pass' => $pass_new, 'mail' => $mail, 'init' => $init, 'status' => 1, 'authname_ldapauth' => $name, 'ldap_authentified' => TRUE, 'ldap_dn' => $ldap_user['dn'], 'ldap_config' => $_ldapauth_ldap->getOption('sid'));
        $user = user_save('', $userinfo);
        watchdog('ldapauth', 'New external user %name created from the LDAP server %server.', array('%name' => $name, '%server' => $_ldapauth_ldap->getOption('name')), WATCHDOG_NOTICE, l(t('edit'), 'user/'. $user->uid .'/edit'));
      }
    }
-   else if ($account->status == 0) {
-     // User is blocked.
-     return;
-   }
    else {
      // Login existing user.
      $data = array(

 Legend:



Removed from v.1.45
 


changed lines


 
Added in v.1.46
 Legend:



Removed from v.1.45
 


changed lines


 
Added in v.1.46
-Removed from v.1.45
+Added in v.1.46

	ViewVC Help
Powered by ViewVC 1.1.2