Projet

Général

Profil

Révision 5136ce55

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

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/ldap/ldap_servers/ldap_servers.install
28 28
 */
29 29
function ldap_servers_requirements($phase) {
30 30
  $requirements = array();
31
  $t = get_t();
31 32

  
32 33
  if ($phase == 'install') {
33 34
    $requirements['ldap_extension_loaded']['title'] = t('LDAP Extension Loaded');
......
55 56
      See http://drupal.org/node/1023016. This message will go away when the ldapauth database table is removed.');
56 57
  }
57 58
  // check that ldapauth not installed.
59

  
60
  // Check enabled LDAP servers are configured and Drupal can connect to them.
61
  if ($phase == 'runtime') {
62
    $requirements['ldap_servers_enabled'] = array(
63
      'title' => $t('LDAP Server status'),
64
      'value' =>  $t('Disabled'),
65
      'severity' => REQUIREMENT_WARNING,
66
    );
67

  
68
    $servers = ldap_servers_get_servers(NULL, 'enabled');
69
    if (!empty($servers)) {
70
      unset($requirements['ldap_servers_enabled']);
71

  
72
      foreach ($servers as $server) {
73
        $server_req_key = 'ldap_servers_sid_' . $server->sid;
74
        $server_tokens = array(
75
          '@host' => $server->address,
76
          '@sid' => $server->sid,
77
        );
78
        $requirements[$server_req_key] = array(
79
          'title' => $t('LDAP Server status: @sid (@host)', $server_tokens),
80
          'value' =>  $t('Connection: Failed, check logs for details.', $server_tokens),
81
          'severity' => REQUIREMENT_ERROR,
82
        );
83

  
84
        try {
85
          $connect_result = $server->connect();
86
          if ($connect_result == LDAP_SUCCESS) {
87
            $bind_result = $server->bind();
88
            if ($bind_result == LDAP_SUCCESS) {
89
              $requirements[$server_req_key]['value'] = $t('Connection: Success, Bind: Success', $server_tokens);
90
              $requirements[$server_req_key]['severity'] = REQUIREMENT_OK;
91
            }
92
          }
93
          $server->disconnect();
94
        }
95
        catch (Exception $e) {
96
        }
97
      }
98
    }
99
  }
100

  
58 101
  return $requirements;
59 102
}
60 103

  
......
287 330

  
288 331

  
289 332
function ldap_servers_db_field_exists($table, $field_name) {
290
  if (!ldap_servers_db_field_exists($table, $field_name) && !ldap_servers_db_field_exists($table, drupal_strtolower($field_name)) ) {
333
  if (!db_field_exists($table, $field_name) && !db_field_exists($table, drupal_strtolower($field_name)) ) {
291 334
    return false;
292 335
  }
293 336
  else {
......
300 343
function ldap_servers_update_7108() {
301 344

  
302 345
  foreach (array('groupFunctionalityUnused', 'groupNested', 'groupSearchAll', 'groupUserMembershipsAttrExists', 'groupDeriveFromDn', 'groupUserMembershipsAttrExists') as $tinyint_field_name) {
303
    if (!ldap_servers_ldap_servers_db_field_exists('ldap_servers', $tinyint_field_name))  {
346
    if (!ldap_servers_db_field_exists('ldap_servers', $tinyint_field_name))  {
304 347
      db_add_field('ldap_servers', $tinyint_field_name, array(
305 348
        'type' => 'int',
306 349
        'size' => 'tiny',
......
796 839
}
797 840

  
798 841

  
799

  
800 842
/**
801 843
 * Add LDAP Referrals fields in schema
802 844
 */
803 845
function ldap_servers_update_7206() {
804
  db_add_field(
805
    'ldap_servers',
806
    'followrefs',
807
    array(
808
      'type' => 'int',
809
      'size' => 'tiny',
810
      'not null' => FALSE,
811
      'default' => 0,
812
    )
813
  );
846
  if (!ldap_servers_db_field_exists('ldap_servers', 'followrefs')) {
847
    db_add_field(
848
      'ldap_servers',
849
      'followrefs',
850
      array(
851
        'type' => 'int',
852
        'size' => 'tiny',
853
        'not null' => FALSE,
854
        'default' => 0,
855
      )
856
    );
857
  }
814 858
}
815 859

  
816 860
function ldap_servers_install_update_schema($schema, &$change_log) {

Formats disponibles : Unified diff