Projet

Général

Profil

Révision 32700c57

Ajouté par Assos Assos il y a environ 5 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/ldap/ldap_servers/ldap_servers.test_form.inc
23 23
 * @return
24 24
 *   The form structure.
25 25
 */
26

  
27 26
function ldap_servers_test_form($form, &$form_state, $op = NULL, $sid = NULL) {
28 27

  
29 28
  $ldap_server = ldap_servers_get_servers($sid, 'all', TRUE);
30 29

  
31
  drupal_set_title(t('Test LDAP Server Configuration: !server', array('!server' => $ldap_server->name)));
30
  drupal_set_title(t('Test LDAP Server Configuration: !server', ['!server' => $ldap_server->name]));
32 31

  
33 32
  $form['#prefix'] = t('This form tests an LDAP configuration to see if
34 33
    it can bind and basic user and group functions.  It also shows token examples
35 34
    and a sample user.  The only data this function will modify is the test LDAP group, which will be deleted and added');
36 35

  
37
  $variables = array(
38
    'ldap_server' => $ldap_server, 'actions' => FALSE, 'type' => 'detail'
39
  );
36
  $variables = [
37
    'ldap_server' => $ldap_server,
38
    'actions' => FALSE,
39
    'type' => 'detail',
40
  ];
40 41

  
41
  $form['server_variables'] = array(
42
  $form['server_variables'] = [
42 43
    '#markup' => theme('ldap_servers_server', $variables),
43
  );
44
  ];
44 45

  
45
  $form['sid'] = array(
46
  $form['sid'] = [
46 47
    '#type' => 'hidden',
47 48
    '#default_value' => $sid,
48
  );
49
  ];
49 50

  
50
  $form['binding']['bindpw'] = array(
51
  $form['binding']['bindpw'] = [
51 52
    '#type' => 'password',
52 53
    '#title' => t('Password for non-anonymous search'),
53 54
    '#size' => 20,
54 55
    '#maxlength' => 255,
55 56
    '#description' => t('Leave empty to test with currently stored password.'),
56
  );
57
  ];
57 58

  
58
  $form['testing_drupal_username'] = array(
59
  $form['testing_drupal_username'] = [
59 60
    '#type' => 'textfield',
60 61
    '#title' => t('Testing Drupal Username'),
61 62
    '#default_value' => $ldap_server->testingDrupalUsername,
62 63
    '#size' => 30,
63 64
    '#maxlength' => 255,
64 65
    '#description' => t('This is optional and used for testing this server\'s configuration against an actual username.  The user need not exist in Drupal and testing will not affect the user\'s LDAP or Drupal Account.'),
65
  );
66
  ];
66 67

  
67
  $form['testingDrupalUserDn'] = array(
68
  $form['testingDrupalUserDn'] = [
68 69
    '#type' => 'textfield',
69 70
    '#title' => t('Testing Drupal DN'),
70 71
    '#default_value' => $ldap_server->testingDrupalUserDn,
71 72
    '#size' => 120,
72 73
    '#maxlength' => 255,
73 74
    '#description' => t('This is optional and used for testing this server\'s configuration against an actual username.  The user need not exist in Drupal and testing will not affect the user\'s LDAP or Drupal Account.'),
74
  );
75
  ];
75 76

  
76
  $form['grp_test_grp_dn'] = array(
77
  $form['grp_test_grp_dn'] = [
77 78
    '#type' => 'textfield',
78 79
    '#title' => t('Testing Group DN'),
79 80
    '#default_value' => $ldap_server->groupTestGroupDn,
80 81
    '#size' => 120,
81 82
    '#maxlength' => 255,
82 83
    '#description' => t('This is optional and used for testing this server\'s group configuration.'),
83
  );
84
  ];
84 85

  
85
  $form['grp_test_grp_dn_writeable'] = array(
86
  $form['grp_test_grp_dn_writeable'] = [
86 87
    '#type' => 'textfield',
87 88
    '#title' => t('Testing Group DN that is writeable. Warning!  In test, this group will be deleted, created, have members added to it!'),
88 89
    '#default_value' => $ldap_server->groupTestGroupDnWriteable,
89 90
    '#size' => 120,
90 91
    '#maxlength' => 255,
91 92
    '#description' => t('This is optional and used for testing this server\'s group configuration.'),
92
  );
93
  ];
93 94

  
94 95
  if ($ldap_server->bind_method == LDAP_SERVERS_BIND_METHOD_ANON_USER) {
95
    $form['testing_drupal_userpw'] = array(
96
    $form['testing_drupal_userpw'] = [
96 97
      '#type' => 'password',
97 98
      '#title' => t('Testing Drupal User Password'),
98 99
      '#size' => 30,
99 100
      '#maxlength' => 255,
100 101
      '#description' => t('This is optional and used for testing this server\'s configuration against the username above.'),
101
    );
102
    ];
102 103
  }
103 104

  
104
  $form['submit'] = array(
105
  $form['submit'] = [
105 106
    '#type' => 'submit',
106 107
    '#value' => 'Test',
107 108
    '#weight' => 100,
108
  );
109
  ];
109 110

  
110 111
  if (!empty($form_state['ldap_server_test_data'])) {
111 112
    $test_data = $form_state['ldap_server_test_data'];
112 113

  
113 114
    if (isset($test_data['username']) && isset($test_data['ldap_user'])) {
114 115
      $form['#prefix'] = theme('ldap_server_ldap_entry_table',
115
        array(
116
        [
116 117
          'entry' => $test_data['ldap_user']['attr'],
117 118
          'username' => $test_data['username'],
118 119
          'dn' => $test_data['ldap_user']['dn'],
119
        ));
120
        ]);
120 121
    }
121 122

  
122
    $titles = array(
123
    $titles = [
123 124
      'basic' => 'Test Results',
124 125
      'group1' => 'Group Create, Delete, Add Member, Remove Member Tests',
125 126
      'group2' => 'User Group Membership Functions Test',
126 127
      'tokens' => 'User Token Samples',
127 128
      'groupfromDN' => 'Groups Derived From User DN',
128
    );
129
    ];
129 130
    foreach ($test_data['results_tables'] as $table_name => $table_data) {
130
      $form['#prefix'] .= '<h2>' . $titles[$table_name] . '</h2>' . theme('table', array('header' => array('Test', 'Result'), 'rows' => $table_data));
131
      $form['#prefix'] .= '<h2>' . $titles[$table_name] . '</h2>' . theme('table', ['header' => ['Test', 'Result'], 'rows' => $table_data]);
131 132
    }
132 133

  
133 134
    if (function_exists('dpm') && !empty($test_data['username'])) {
......
150 151
  return $form;
151 152
}
152 153

  
154
/**
155
 *
156
 */
153 157
function ldap_servers_string_binary_check($input) {
154 158
  if (preg_match('~[^\x20-\x7E\t\r\n]~', $input) > 0) {
155 159
    $truncatedString = truncate_utf8($input, 200);
......
169 173
    form_set_error(NULL, t('No server id found in form'));
170 174
  }
171 175
  elseif (!$ldap_server = ldap_servers_get_servers($values['sid'], 'all', TRUE)) {
172
    form_set_error(NULL, t('Failed to create server object for server with server id=%sid', array('%sid' => $values['sid'])));
176
    form_set_error(NULL, t('Failed to create server object for server with server id=%sid', ['%sid' => $values['sid']]));
173 177
  }
174 178
}
175 179

  
......
178 182
 */
179 183
function ldap_servers_test_form_submit($form, &$form_state) {
180 184

  
181
  //Pass data back to form builder
185
  // Pass data back to form builder.
182 186
  $form_state['rebuild'] = TRUE;
183 187

  
184 188
  ldap_servers_module_load_include('inc', 'ldap_servers', 'ldap_servers.functions');
......
188 192
  $sid = $values['sid'];
189 193
  $ldap_server = ldap_servers_get_servers($sid, 'all', TRUE);
190 194

  
191
  //$result = t('<h1>Test of name </h2>',$server_conf);
192
  $results = array();
193
  $results_tables = array();
195
  $results = [];
196
  $results_tables = [];
194 197
  if ($values['bindpw']) {
195 198
    $bindpw = $values['bindpw'];
196 199
    $bindpw_type = t('entered in form.');
......
201 204
  }
202 205

  
203 206
  if ($ldap_server->bind_method == LDAP_SERVERS_BIND_METHOD_SERVICE_ACCT) {
204
    $results_tables['basic'][] = array(t('Binding with DN for non-anonymous search (%bind_dn).  Using password ',
205
      array('%bind_dn' => $ldap_server->binddn)) . ' ' . $bindpw_type);
207
    $results_tables['basic'][] = [
208
      t('Binding with DN for non-anonymous search (%bind_dn).  Using password ',
209
      ['%bind_dn' => $ldap_server->binddn]) . ' ' . $bindpw_type,
210
    ];
206 211
  }
207 212
  else {
208
    $results_tables['basic'][] = array(t('Binding with null DN for anonymous search.'));
213
    $results_tables['basic'][] = [t('Binding with null DN for anonymous search.')];
209 214
  }
210 215

  
211 216
  if (@$values['grp_test_grp_dn_writeable'] && @$values['grp_test_grp_dn']) {
212 217
    $user_test_dn = @$values['grp_test_grp_dn'];
213 218
    $group_create_test_dn = $values['grp_test_grp_dn_writeable'];
214
    $group_create_test_attr = array(
215
      'objectClass' => array($ldap_server->groupObjectClass, 'top'),
216
    );
219
    $group_create_test_attr = [
220
      'objectClass' => [$ldap_server->groupObjectClass, 'top'],
221
    ];
217 222

  
218
    // 1. delete test group if it exists
219
    if ($ldap_server->dnExists($group_create_test_dn, 'ldap_entry', array('cn', 'member'))) {
223
    // 1. delete test group if it exists.
224
    if ($ldap_server->dnExists($group_create_test_dn, 'ldap_entry', ['cn', 'member'])) {
220 225
      $result = $ldap_server->groupRemoveGroup($group_create_test_dn, FALSE);
221 226
    }
222 227

  
223
    $group_exists = $ldap_server->dnExists($group_create_test_dn, 'ldap_entry', array('cn', 'member'));
228
    $group_exists = $ldap_server->dnExists($group_create_test_dn, 'ldap_entry', ['cn', 'member']);
224 229
    $result = ($group_exists === FALSE) ? "PASS" : "FAIL";
225
    $results_tables['group1'][] = array("Starting test without group: $group_create_test_dn ", $result);
230
    $results_tables['group1'][] = ["Starting test without group: $group_create_test_dn ", $result];
226 231

  
227
    // 2. make sure call to members in empty group returns false
232
    // 2. make sure call to members in empty group returns false.
228 233
    $result = $ldap_server->groupAllMembers($group_create_test_dn);
229 234
    $result = ($result === FALSE) ? "PASS" : 'FAIL';
230
    $results_tables['group1'][] = array("LdapServer::groupAllMembers($group_create_test_dn) call on nonexistent group returns FALSE", $result);
235
    $results_tables['group1'][] = ["LdapServer::groupAllMembers($group_create_test_dn) call on nonexistent group returns FALSE", $result];
231 236

  
232
    // 3. add group
237
    // 3. add group.
233 238
    $result = $ldap_server->groupAddGroup($group_create_test_dn, $group_create_test_attr);
234 239
    $result = ($result) ? "PASS" : 'FAIL';
235 240
    $attr = serialize($group_create_test_attr);
236
    $results_tables['group1'][] = array("LdapServer::groupAddGroup($group_create_test_dn, $attr)", $result);
241
    $results_tables['group1'][] = ["LdapServer::groupAddGroup($group_create_test_dn, $attr)", $result];
237 242

  
238
    // 4. call to all members in an empty group returns emtpy array, not FALSE
243
    // 4. call to all members in an empty group returns emtpy array, not FALSE.
239 244
    $result = $ldap_server->groupAllMembers($group_create_test_dn);
240 245
    $result = (is_array($result) && count($result) == 0) ? 'PASS' : 'FAIL';
241
    $results_tables['group1'][] = array("LdapServer::groupAllMembers($group_create_test_dn) returns empty array for empty group ", $result);
246
    $results_tables['group1'][] = ["LdapServer::groupAllMembers($group_create_test_dn) returns empty array for empty group ", $result];
242 247

  
243
    // 5. add member to group
248
    // 5. add member to group.
244 249
    $result = $ldap_server->groupAddMember($group_create_test_dn, $user_test_dn);
245 250
    $result = is_array($ldap_server->groupAllMembers($group_create_test_dn)) ? 'PASS' : 'FAIL';
246
    $results_tables['group1'][] = array("LdapServer::groupAddMember($group_create_test_dn, $user_test_dn)", $result);
251
    $results_tables['group1'][] = ["LdapServer::groupAddMember($group_create_test_dn, $user_test_dn)", $result];
247 252

  
248
   // 6. try to remove group with member in it
253
    // 6. try to remove group with member in it.
249 254
    $only_if_group_empty = TRUE;
250 255
    $result = $ldap_server->groupRemoveGroup($group_create_test_dn, $only_if_group_empty);
251 256
    $result = ($result) ? 'FAIL' : 'PASS';
252
    $results_tables['group1'][] = array("LdapServer::groupRemoveGroup($group_create_test_dn, $only_if_group_empty)", $result);
257
    $results_tables['group1'][] = ["LdapServer::groupRemoveGroup($group_create_test_dn, $only_if_group_empty)", $result];
253 258

  
254
   // 7. remove group member
259
    // 7. remove group member.
255 260
    $result = $ldap_server->groupRemoveMember($group_create_test_dn, $user_test_dn);
256 261
    $result = $ldap_server->groupAllMembers($group_create_test_dn);
257 262
    $result = (is_array($result) && count($result) == 0) ? 'PASS' : 'FAIL';
258
    $results_tables['group1'][] = array("LdapServer::groupRemoveMember($group_create_test_dn, $user_test_dn)", $result);
263
    $results_tables['group1'][] = ["LdapServer::groupRemoveMember($group_create_test_dn, $user_test_dn)", $result];
259 264

  
260 265
    $only_if_group_empty = TRUE;
261 266
    $result = $ldap_server->groupRemoveGroup($group_create_test_dn, $only_if_group_empty);
262
    $result = ($ldap_server->dnExists($group_create_test_dn, 'ldap_entry', array('cn', 'member'))) ? "FAIL" : 'PASS';
263
    $results_tables['group1'][] = array("LdapServer::groupRemoveGroup($group_create_test_dn, $only_if_group_empty)", $result);
267
    $result = ($ldap_server->dnExists($group_create_test_dn, 'ldap_entry', ['cn', 'member'])) ? "FAIL" : 'PASS';
268
    $results_tables['group1'][] = ["LdapServer::groupRemoveGroup($group_create_test_dn, $only_if_group_empty)", $result];
264 269
  }
265 270

  
266
  // connect to ldap
271
  // Connect to ldap.
267 272
  list($has_errors, $more_results) = ldap_servers_test_binding_credentials($ldap_server, $bindpw, $results_tables);
268 273
  $results = array_merge($results, $more_results);
269 274
  if ($ldap_server->bind_method == LDAP_SERVERS_BIND_METHOD_ANON_USER) {
......
276 281
          $mapping[] = "$key = " . $value[0];
277 282
        }
278 283
      }
279
      $results_tables['basic'][] = array(theme_item_list(array('items' => $mapping, 'title' => t('Attributes available to anonymous search', array('%bind_dn' => $ldap_server->binddn)) , 'type' => 'ul', 'attributes' => array())));
284
      $results_tables['basic'][] = [theme_item_list(['items' => $mapping, 'title' => t('Attributes available to anonymous search', ['%bind_dn' => $ldap_server->binddn]), 'type' => 'ul', 'attributes' => []])];
280 285
    }
281
    $results_tables['basic'][] = array(t('Binding with DN (%bind_dn).  Using supplied password ',
282
      array('%bind_dn' => $ldap_user['dn'])));
286
    $results_tables['basic'][] = [
287
      t('Binding with DN (%bind_dn).  Using supplied password ',
288
      ['%bind_dn' => $ldap_user['dn']]),
289
    ];
283 290
    $result = $ldap_server->bind($ldap_user['dn'], $values['testing_drupal_userpw'], FALSE);
284 291
    if ($result == LDAP_SUCCESS) {
285
      $results_tables['basic'][] = array(t('Successfully bound to server'), 'PASS');
292
      $results_tables['basic'][] = [t('Successfully bound to server'), 'PASS'];
286 293
    }
287 294
    else {
288
      $results_tables['basic'][] = array(t('Failed to bind to server. ldap error #') . $result . ' ' . $ldap_server->errorMsg('ldap'), 'FAIL') ;
295
      $results_tables['basic'][] = [t('Failed to bind to server. ldap error #') . $result . ' ' . $ldap_server->errorMsg('ldap'), 'FAIL'];
289 296
    }
290 297
  }
291 298

  
......
298 305
    }
299 306
    $user = isset($values['testing_drupal_username']) ? $values['testing_drupal_username'] : NULL;
300 307

  
301
    foreach (array(FALSE, TRUE) as $nested) { //FALSE
308
    // FALSE.
309
    foreach ([FALSE, TRUE] as $nested) {
302 310
      $nested_display = ($nested) ? 'Yes' : 'No';
303 311
      if ($user) {
304
        // this is the parent function that will call FromUserAttr or FromEntry
312
        // This is the parent function that will call FromUserAttr or FromEntry.
305 313
        $memberships = $ldap_server->groupMembershipsFromUser($user, 'group_dns', $nested);
306
        $result = theme('item_list', array('items' => $memberships, 'type' => 'ul'));
307
        $results_tables['group2'][] = array("ldap_server->groupMembershipsFromUser($user, 'group_dns', nested=$nested_display)<br/>count=" . count($memberships), $result);
314
        $result = theme('item_list', ['items' => $memberships, 'type' => 'ul']);
315
        $results_tables['group2'][] = ["ldap_server->groupMembershipsFromUser($user, 'group_dns', nested=$nested_display)<br/>count=" . count($memberships), $result];
308 316

  
309 317
        $result = ($ldap_server->groupIsMember($group_dn, $user, $nested)) ? 'Yes' : 'No';
310
        $group_results[] = array("ldap_server->groupIsMember($group_dn, $user, nested=$nested_display)", $result);
318
        $group_results[] = ["ldap_server->groupIsMember($group_dn, $user, nested=$nested_display)", $result];
311 319

  
312 320
        if ($ldap_server->groupUserMembershipsConfigured) {
313 321
          $groupusermembershipsfromuserattr = $ldap_server->groupUserMembershipsFromUserAttr($user, $nested);
314 322
          $count = count($groupusermembershipsfromuserattr);
315
          $result = theme('item_list', array('items' => $groupusermembershipsfromuserattr, 'type' => 'ul'));
323
          $result = theme('item_list', ['items' => $groupusermembershipsfromuserattr, 'type' => 'ul']);
316 324
        }
317 325
        else {
318
          $groupusermembershipsfromuserattr = array();
326
          $groupusermembershipsfromuserattr = [];
319 327
          $result = "'A user LDAP attribute such as memberOf exists that contains a list of their group' is not configured.";
320 328
        }
321
        $results_tables['group2'][] = array("ldap_server->groupUserMembershipsFromUserAttr($user, nested=$nested_display)<br/> count=" .
322
            count($groupusermembershipsfromuserattr) , $result);
329
        $results_tables['group2'][] = [
330
          "ldap_server->groupUserMembershipsFromUserAttr($user, nested=$nested_display)<br/> count=" .
331
          count($groupusermembershipsfromuserattr), $result,
332
        ];
323 333

  
324 334
        if ($ldap_server->groupGroupEntryMembershipsConfigured) {
325 335
          $groupusermembershipsfromentry = $ldap_server->groupUserMembershipsFromEntry($user, $nested);
326
          $result = theme('item_list', array('items' => $groupusermembershipsfromentry, 'type' => 'ul'));
336
          $result = theme('item_list', ['items' => $groupusermembershipsfromentry, 'type' => 'ul']);
327 337
        }
328 338
        else {
329
          $groupusermembershipsfromentry = array();
339
          $groupusermembershipsfromentry = [];
330 340
          $result = "Groups by entry not configured.";
331 341
        }
332
        $results_tables['group2'][] = array("ldap_server->groupUserMembershipsFromEntry($user, nested=$nested_display)<br/>count=" .
333
          count($groupusermembershipsfromentry) , $result);
342
        $results_tables['group2'][] = [
343
          "ldap_server->groupUserMembershipsFromEntry($user, nested=$nested_display)<br/>count=" .
344
          count($groupusermembershipsfromentry), $result,
345
        ];
334 346

  
335 347
        if (count($groupusermembershipsfromentry) && count($groupusermembershipsfromuserattr)) {
336 348
          $diff1 = array_diff($groupusermembershipsfromuserattr, $groupusermembershipsfromentry);
337 349
          $diff2 = array_diff($groupusermembershipsfromentry, $groupusermembershipsfromuserattr);
338
          $result1 = theme('item_list', array('items' => $diff1, 'type' => 'ul'));
339
          $result2 = theme('item_list', array('items' => $diff2, 'type' => 'ul'));
340
          $results_tables['group2'][] = array("groupUserMembershipsFromEntry and FromUserAttr Diff)", $result1);
341
          $results_tables['group2'][] = array("FromUserAttr and groupUserMembershipsFromEntry Diff)", $result2);
350
          $result1 = theme('item_list', ['items' => $diff1, 'type' => 'ul']);
351
          $result2 = theme('item_list', ['items' => $diff2, 'type' => 'ul']);
352
          $results_tables['group2'][] = ["groupUserMembershipsFromEntry and FromUserAttr Diff)", $result1];
353
          $results_tables['group2'][] = ["FromUserAttr and groupUserMembershipsFromEntry Diff)", $result2];
342 354
        }
343 355
      }
344 356
    }
345 357

  
346

  
347 358
    if ($groups_from_dn = $ldap_server->groupUserMembershipsFromDn($user)) {
348
      $results_tables['groupfromDN'][] = array("Groups from DN", theme('item_list', array('items' => $groups_from_dn, 'type' => 'ul')));
359
      $results_tables['groupfromDN'][] = ["Groups from DN", theme('item_list', ['items' => $groups_from_dn, 'type' => 'ul'])];
349 360
    }
350 361

  
351 362
  }
352 363

  
353 364
  list($has_errors, $more_results, $ldap_user) = ldap_servers_test_user_mapping($values['testing_drupal_username'], $ldap_server);
354 365

  
355
  $tokens = ($ldap_user && isset($ldap_user['attr'])) ? ldap_servers_token_tokenize_entry($ldap_user['attr'], 'all') : array();
366
  $tokens = ($ldap_user && isset($ldap_user['attr'])) ? ldap_servers_token_tokenize_entry($ldap_user['attr'], 'all') : [];
356 367
  foreach ($tokens as $key => $value) {
357
    $results_tables['tokens'][] = array($key, ldap_servers_string_binary_check($value));
368
    $results_tables['tokens'][] = [$key, ldap_servers_string_binary_check($value)];
358 369
  }
359
  $form_state['ldap_server_test_data'] = array(
370
  $form_state['ldap_server_test_data'] = [
360 371
    'username' => $values['testing_drupal_username'],
361 372
    'results_tables' => $results_tables,
362
  );
373
  ];
363 374

  
364 375
  if (isset($ldap_user)) {
365 376
    $form_state['ldap_server_test_data']['ldap_user'] = $ldap_user;
366 377
  }
367 378

  
368
  if (isset($group_entry) ) {
379
  if (isset($group_entry)) {
369 380
    $form_state['ldap_server_test_data']['group_entry'] = $group_entry;
370 381
  }
371 382

  
......
374 385
/**
375 386
 * Submit hook for the LDAP server form.
376 387
 */
377

  
378

  
379 388
function ldap_servers_test_binding_credentials(&$ldap_server, $bindpw, &$results_tables) {
380 389

  
381 390
  $errors = FALSE;
382
  $results = array();
391
  $results = [];
383 392

  
384 393
  $ldap_result = $ldap_server->connect();
385 394
  if ($ldap_result != LDAP_SUCCESS) {
386
    $results_tables['basic'][] = array(t('Failed to connect to LDAP server.  See watchdog error logs for details.') .
387
                                    $ldap_server->errorMsg('ldap'));
395
    $results_tables['basic'][] = [
396
      t('Failed to connect to LDAP server.  See watchdog error logs for details.') .
397
      $ldap_server->errorMsg('ldap'),
398
    ];
388 399
    $errors = TRUE;
389 400
  }
390 401

  
391 402
  if (!$errors) {
392 403
    $bind_result = $ldap_server->bind($ldap_server->binddn, $bindpw, FALSE);
393 404
    if ($bind_result == LDAP_SUCCESS) {
394
      $results_tables['basic'][] = array(t('Successfully bound to server'));
405
      $results_tables['basic'][] = [t('Successfully bound to server')];
395 406
    }
396 407
    else {
397
      $results_tables['basic'][] = array(t('Failed to bind to server. ldap error #') . $bind_result . ' ' . $ldap_server->errorMsg('ldap')) ;
408
      $results_tables['basic'][] = [t('Failed to bind to server. ldap error #') . $bind_result . ' ' . $ldap_server->errorMsg('ldap')];
398 409
      $errors = TRUE;
399 410
    }
400 411
  }
401
  return array($errors, $results);
412
  return [$errors, $results];
402 413
}
403 414

  
415
/**
416
 *
417
 */
404 418
function ldap_servers_test_user_mapping($drupal_username, &$ldap_server, $ldap_context = NULL) {
405 419

  
406 420
  $ldap_user = $ldap_server->userUserNameToExistingLdapEntry($drupal_username, $ldap_context);
407 421
  $errors = FALSE;
408
  if (!$ldap_user ) {
422
  if (!$ldap_user) {
409 423
    $results[] = t('Failed to find test user %username by searching on  %user_attr = %username.',
410
      array(
424
      [
411 425
        '%username' => $drupal_username,
412
        '%user_attr' => $ldap_server->user_attr )
426
        '%user_attr' => $ldap_server->user_attr,
427
      ]
413 428
      )
414 429
      . ' ' . t('Error Message:') . ' ' . $ldap_server->errorMsg('ldap');
415 430
    $errors = TRUE;
416 431
  }
417 432
  else {
418 433
    $results[] = t('Found test user %username by searching on  %user_attr = %username.',
419
      array('%username' => $drupal_username, '%user_attr' => $ldap_server->user_attr ));
434
      ['%username' => $drupal_username, '%user_attr' => $ldap_server->user_attr]);
420 435
  }
421
  return array($errors, $results, $ldap_user);
436
  return [$errors, $results, $ldap_user];
422 437
}

Formats disponibles : Unified diff