Projet

Général

Profil

Révision be58a50c

Ajouté par Assos Assos il y a environ 7 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/ldap/ldap_user/ldap_user.module
228 228
      case 'all':
229 229
        $attributes[$ldap_server->user_attr] = ldap_servers_set_attribute_map(@$attributes[$ldap_server->user_attr]); // array($ldap_server->user_attr, 0, NULL);
230 230
        $attributes[$ldap_server->mail_attr] = ldap_servers_set_attribute_map(@$attributes[$ldap_server->mail_attr]);
231
        $attributes[$ldap_server->picture_attr] = ldap_servers_set_attribute_map(@$attributes[$ldap_server->picture_attr]);
232
        $attributes[$ldap_server->unique_persistent_attr] = ldap_servers_set_attribute_map(@$attributes[$ldap_server->unique_persistent_attr]);
231
        if ($ldap_server->picture_attr) {
232
          $attributes[$ldap_server->picture_attr] = ldap_servers_set_attribute_map(@$attributes[$ldap_server->picture_attr]);
233
        }
234
        if ($ldap_server->unique_persistent_attr) {
235
          $attributes[$ldap_server->unique_persistent_attr] = ldap_servers_set_attribute_map(@$attributes[$ldap_server->unique_persistent_attr]);
236
        }
233 237
        if ($ldap_server->mail_template) {
234 238
          ldap_servers_token_extract_attributes($attributes,  $ldap_server->mail_template);
235 239
        }
......
491 495
  array_unshift($form['#validate'], 'ldap_user_grab_password_validate');
492 496
}
493 497

  
498
/**
499
* Implements hook_form_FORM_ID_alter(). for user-pass-reset form. Useful for
500
* sites where this is the form ID for a user to intially set their password
501
* (user clicks an emailed registration link, is prompted to set their password).
502
*/
503
function ldap_user_form_user_pass_reset_alter(&$form, &$form_state) {
504
  array_unshift($form['#validate'], 'ldap_user_grab_password_validate');
505
}
506

  
494 507
/**
495 508
 * store password from logon forms in ldap_user_ldap_provision_pwd static variable
496 509
 * for use in provisioning to ldap
......
763 776
 *   and protect unencrypted user password from other modules
764 777
 *
765 778
 *   @param enum string $action 'get' | 'set'
766
 *   @param string | FALE $value as user entered password
779
 *   @param string | FALSE $value as user entered password
767 780
 */
768

  
769

  
770 781
function ldap_user_ldap_provision_pwd($action, $value = NULL, $reset = FALSE) {
771 782

  
772 783
  //$calling_function = FALSE;

Formats disponibles : Unified diff