Projet

Général

Profil

Révision dd54aff9

Ajouté par Assos Assos il y a plus de 10 ans

Weekly update of contrib modules

Voir les différences:

htmltest/sites/all/modules/ldap/ldap_servers/ldap_servers.module
26 26
define('LDAP_SERVERS_ENC_TYPE_SALTED_CRYPT', 3);
27 27
define('LDAP_SERVERS_ENC_TYPE_EXTENDED_DES', 4);
28 28
define('LDAP_SERVERS_ENC_TYPE_MD5C', 5);
29
define('LDAP_SERVERS_ENC_TYPE_BLOWFISH', 6);
29 30
define('LDAP_SERVERS_ENC_TYPE_SALTED_MD5', 7);
30 31
define('LDAP_SERVERS_ENC_TYPE_SHA', 8);
31 32
define('LDAP_SERVERS_ENC_TYPE_SALTED_SHA', 9);
32 33
define('LDAP_SERVERS_ENC_TYPE_CLEARTEXT', 10);
34

  
33 35
define('LDAP_SERVERS_CYPHER_MODE', 'cfb', 12);
34 36

  
35 37
define('LDAP_SERVERS_BIND_METHOD_SERVICE_ACCT', 1);
......
682 684
  else {
683 685
    $drupal_username = (is_object($drupal_user)) ? $drupal_user->name : $drupal_user;
684 686
  }
687
  //Sometimes we have username instead of a drupal user object
688
  //For example, when using LDAP user test form (admin/config/people/ldap/user/test)
689
  //But we can still load the user by using $drupal_username  if $drupal_user is not an object
690
  if ( !(is_object($drupal_user)) ) {
691
    $user_object = user_load_by_name($drupal_username);
692
    if (is_object($user_object) && property_exists($user_object, 'uid')) {
693
      $drupal_user = $user_object;
694
    }
695
  }
685 696
  // if no explicit $sid, find most appropriate one
686 697
  if (module_exists('ldap_user') && (!$sid || $sid == LDAP_USER_AUTH_SERVER_SID)) {
687 698
    if (property_exists($drupal_user, 'ldap_user_puid_sid') &&

Formats disponibles : Unified diff