Projet

Général

Profil

Révision 91af538d

Ajouté par Assos Assos il y a environ 3 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/ldap/ldap_authentication/ldap_authentication.info
18 18

  
19 19
test_dependencies[] = ldap_sso:ldap_sso
20 20

  
21
; Information added by Drupal.org packaging script on 2019-04-20
22
version = "7.x-2.5"
21
; Information added by Drupal.org packaging script on 2021-03-29
22
version = "7.x-2.6"
23 23
core = "7.x"
24 24
project = "ldap"
25
datestamp = "1555751588"
25
datestamp = "1617049660"
drupal7/sites/all/modules/ldap/ldap_authentication/tests/ldap_authentication.test
767 767
      'excludeIfNoAuthorizations' => [
768 768
        'property' => 'excludeIfNoAuthorizations',
769 769
        'values' => [
770
          [TRUE],
771
          [TRUE],
770
          1,
771
          1,
772 772
        ],
773 773
      ],
774 774
      'emailOption' => [
......
811 811
        $property = isset($conf['property']) ? $conf['property'] : $field_name;
812 812
        $desired = isset($conf['desired_result']) ? isset($conf['desired_result'][$i]) : $conf['values'][$i];
813 813

  
814
        if (is_array($desired)) {
814
        if (is_array($desired) && is_array($ldap_authentication_conf_post->{$property})) {
815 815
          $success = count($desired) == count($ldap_authentication_conf_post->{$property});
816 816
        }
817 817
        else {
drupal7/sites/all/modules/ldap/ldap_authorization/ldap_authorization.info
20 20

  
21 21
test_dependencies[] = ldap_sso:ldap_sso
22 22

  
23
; Information added by Drupal.org packaging script on 2019-04-20
24
version = "7.x-2.5"
23
; Information added by Drupal.org packaging script on 2021-03-29
24
version = "7.x-2.6"
25 25
core = "7.x"
26 26
project = "ldap"
27
datestamp = "1555751588"
27
datestamp = "1617049660"
drupal7/sites/all/modules/ldap/ldap_authorization/ldap_authorization_drupal_role/ldap_authorization_drupal_role.info
9 9
files[] = ldap_authorization_drupal_role.module
10 10
files[] = ldap_authorization_drupal_role.inc
11 11

  
12
; Information added by Drupal.org packaging script on 2019-04-20
13
version = "7.x-2.5"
12
; Information added by Drupal.org packaging script on 2021-03-29
13
version = "7.x-2.6"
14 14
core = "7.x"
15 15
project = "ldap"
16
datestamp = "1555751588"
16
datestamp = "1617049660"
drupal7/sites/all/modules/ldap/ldap_authorization/ldap_authorization_og/LdapAuthorizationConsumerOG.class.php
190 190
    }
191 191

  
192 192
    foreach ($gids as $entity_type => $gid_x_entity) {
193
      $og_group_entities[$entity_type] = @entity_load($entity_type, $gid_x_entity);
193
      if ($entity_type !== NULL) {
194
        $og_group_entities[$entity_type] = @entity_load($entity_type, $gid_x_entity);
195
      }
196
      else {
197
        watchdog("ldap_authorization_og", "Entity type of 'NULL' found while populating consumers.", WATCHDOG_ERROR);
198
      }
194 199
    }
195 200

  
196 201
    foreach ($consumers as $consumer_id => $consumer) {
drupal7/sites/all/modules/ldap/ldap_authorization/ldap_authorization_og/ldap_authorization_og.info
13 13

  
14 14
core = "7.x"
15 15

  
16
; Information added by Drupal.org packaging script on 2019-04-20
17
version = "7.x-2.5"
16
; Information added by Drupal.org packaging script on 2021-03-29
17
version = "7.x-2.6"
18 18
core = "7.x"
19 19
project = "ldap"
20
datestamp = "1555751588"
20
datestamp = "1617049660"
drupal7/sites/all/modules/ldap/ldap_feeds/ldap_feeds.info
12 12
core = 7.x
13 13
php = 5.4
14 14

  
15
; Information added by Drupal.org packaging script on 2019-04-20
16
version = "7.x-2.5"
15
; Information added by Drupal.org packaging script on 2021-03-29
16
version = "7.x-2.6"
17 17
core = "7.x"
18 18
project = "ldap"
19
datestamp = "1555751588"
19
datestamp = "1617049660"
drupal7/sites/all/modules/ldap/ldap_help/ldap_help.info
7 7
dependencies[] = ldap_servers
8 8
dependencies[] = ldap_test
9 9

  
10
; Information added by Drupal.org packaging script on 2019-04-20
11
version = "7.x-2.5"
10
; Information added by Drupal.org packaging script on 2021-03-29
11
version = "7.x-2.6"
12 12
core = "7.x"
13 13
project = "ldap"
14
datestamp = "1555751588"
14
datestamp = "1617049660"
drupal7/sites/all/modules/ldap/ldap_help/ldap_test_script/functions.inc
199 199
  $password = "\"" . $password . "\"";
200 200
  $encoded = "";
201 201
  for ($i = 0; $i < strlen($password); $i++) {
202
    $encoded .= "{$password{$i}}\000";
202
    $encoded .= "{$password[$i]}\000";
203 203
  }
204 204
  return $encoded;
205 205
}
drupal7/sites/all/modules/ldap/ldap_query/ldap_query.info
18 18

  
19 19
configure = admin/config/people/ldap/query
20 20

  
21
; Information added by Drupal.org packaging script on 2019-04-20
22
version = "7.x-2.5"
21
; Information added by Drupal.org packaging script on 2021-03-29
22
version = "7.x-2.6"
23 23
core = "7.x"
24 24
project = "ldap"
25
datestamp = "1555751588"
25
datestamp = "1617049660"
drupal7/sites/all/modules/ldap/ldap_servers/ldap_servers.functions.inc
8 8
/**
9 9
 * Modify an LDAP Entry.
10 10
 *
11
 * This has been depracated in favor or $ldap_server->modifyLdapEntry($dn, $attributes)
12
 * which handles empty attributes better.
11
 * @deprecated This has been deprecated in favor of
12
 * `$ldap_server->modifyLdapEntry($dn, $attributes)` which handles empty
13
 * attributes better.
13 14
 */
14 15
function ldap_user_modify($dn, $attributes, $ldap_server) {
15 16
  $result = ldap_modify($ldap_server->connection, $dn, $attributes);
16 17
  if (!$result) {
17
    $error = "LDAP Server ldap_modify(%dn) in ldap_user_modify() Error Server ID = %sid, LDAP Err No: %ldap_errno LDAP Err Message: %ldap_err2str ";
18
    $tokens = ['%dn' => $dn, '%sid' => $this->sid, '%ldap_errno' => ldap_errno($this->connection), '%ldap_err2str' => ldap_err2str(ldap_errno($this->connection))];
18
    $error = "LDAP Server ldap_modify(%dn) in ldap_user_modify(), LDAP Err No: %ldap_errno LDAP Err Message: %ldap_err2str ";
19
    $tokens = ['%dn' => $dn, '%ldap_errno' => ldap_errno($ldap_server->connection), '%ldap_err2str' => ldap_err2str(ldap_errno($ldap_server->connection))];
19 20
    watchdog('ldap_servers', $error, $tokens, WATCHDOG_ERROR);
20 21
  }
21 22
  return $result;
......
30 31
  $len = drupal_strlen($new_password);
31 32
  $new_pass = NULL;
32 33
  for ($i = 0; $i < $len; $i++) {
33
    $new_pass .= "{$new_password{$i}}\000";
34
    $new_pass .= "{$new_password[$i]}\000";
34 35
  }
35 36

  
36 37
  $status = ldap_mod_replace($ldap_server->connection, $userdn, ['unicodePwd' => $new_pass]);
......
416 417
 * @return string
417 418
 */
418 419
function ldap_pear_hex2asc($string) {
419

  
420
  if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
421
    $string = preg_replace_callback(
420
  $string = preg_replace_callback(
422 421
    "/\\\([0-9A-Fa-f]{2})/",
423 422
    function ($m) {
424 423
      return chr(hexdec($m[1]));
425 424
    },
426
        $string);
427
  }
428
  else {
429
    $string = preg_replace("/\\\([0-9A-Fa-f]{2})/e", "''.chr(hexdec('\\1')).''", $string);
430
  }
431

  
425
    $string
426
  );
432 427
  return $string;
433 428
}
434 429

  
drupal7/sites/all/modules/ldap/ldap_servers/ldap_servers.info
18 18
files[] = tests/ldap_servers.test
19 19
configure = admin/config/people/ldap/servers
20 20

  
21
; Information added by Drupal.org packaging script on 2019-04-20
22
version = "7.x-2.5"
21
; Information added by Drupal.org packaging script on 2021-03-29
22
version = "7.x-2.6"
23 23
core = "7.x"
24 24
project = "ldap"
25
datestamp = "1555751588"
25
datestamp = "1617049660"
drupal7/sites/all/modules/ldap/ldap_test/ldap_test.info
19 19
files[] = LdapTestFunctions.class.php
20 20
files[] = LdapUserTestCase.class.php
21 21

  
22
; Information added by Drupal.org packaging script on 2019-04-20
23
version = "7.x-2.5"
22
; Information added by Drupal.org packaging script on 2021-03-29
23
version = "7.x-2.6"
24 24
core = "7.x"
25 25
project = "ldap"
26
datestamp = "1555751588"
26
datestamp = "1617049660"
drupal7/sites/all/modules/ldap/ldap_user/ldap_user.cron.inc
52 52
   *  signifying if corresponding LDAP Entry exists.
53 53
   */
54 54
  if (!(isset($result['user']) && count($result['user']) > 0)) {
55
    variable_set('ldap_user_cron_last_uid_checked', 1);
55 56
    return TRUE;
56 57
  }
57 58

  
drupal7/sites/all/modules/ldap/ldap_user/ldap_user.info
25 25

  
26 26
test_dependencies[] = ldap_sso:ldap_sso
27 27

  
28
; Information added by Drupal.org packaging script on 2019-04-20
29
version = "7.x-2.5"
28
; Information added by Drupal.org packaging script on 2021-03-29
29
version = "7.x-2.6"
30 30
core = "7.x"
31 31
project = "ldap"
32
datestamp = "1555751588"
32
datestamp = "1617049660"
drupal7/sites/all/modules/ldap/ldap_user/tests/ldap_user.test
918 918
      $email_body = $emails[count($emails) - 1]['body'];
919 919
      $result = [];
920 920
      preg_match_all('/(user\/reset\/.*)This link can only be/s', $email_body, $result, PREG_PATTERN_ORDER);
921
      if (count($result == 2)) {
921
      if (is_array($result) && count($result) === 2) {
922 922
        $login_path = trim($result[1][0]);
923 923
        // User login form.
924 924
        $this->drupalGet($login_path);
drupal7/sites/all/modules/ldap/ldap_views/ldap_views.info
23 23
files[] = handlers/ldap_views_handler_sort.inc
24 24
files[] = handlers/ldap_views_handler_sort_attribute.inc
25 25

  
26
; Information added by Drupal.org packaging script on 2019-04-20
27
version = "7.x-2.5"
26
; Information added by Drupal.org packaging script on 2021-03-29
27
version = "7.x-2.6"
28 28
core = "7.x"
29 29
project = "ldap"
30
datestamp = "1555751588"
30
datestamp = "1617049660"
drupal7/sites/all/modules/ldap/ldap_views/plugins/ldap_views_plugin_query_ldap.inc
196 196
    $condition     = $this->build_condition();
197 197
    $contextual    = $this->build_contextual_filter();
198 198
    $search_filter = !empty($contextual) && !empty($condition) ? '(&' . $condition . $contextual . ')' : $condition . $contextual;
199
    return !empty($search_filter) ? $search_filter : $filter;
199
    //if both ldap views filters & ldap views query filter exist, combine them
200
    //if the ldap views filter exist, use that
201
    //else, use ldap query filter
202
    if (!empty($search_filter) && !empty($filter)) {
203
       return '(&' . $search_filter . $filter . ')';
204
    } elseif (!empty($search_filter)) {
205
       return $search_filter;
206
    } else {
207
       return $filter;
208
    }
200 209
  }
201 210

  
202 211
  /**

Formats disponibles : Unified diff