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.install
99 99
 */
100 100

  
101 101
function ldap_servers_update_7100() {
102
  if (!db_field_exists('ldap_servers', 'ldap_type') && db_field_exists('ldap_servers', 'type')) {
102
  if (!ldap_servers_db_field_exists('ldap_servers', 'ldap_type') && ldap_servers_db_field_exists('ldap_servers', 'type')) {
103 103
    db_change_field('ldap_servers', 'type', 'ldap_type', array(
104 104
      'type' => 'varchar',
105 105
      'length' => 20,
......
169 169
 */
170 170
function ldap_servers_update_7102() {
171 171

  
172
  if (!db_field_exists('ldap_servers', 'bind_method')) {
172
  if (!ldap_servers_db_field_exists('ldap_servers', 'bind_method')) {
173 173
    db_add_field('ldap_servers', 'bind_method', array(
174 174
      'type' => 'int',
175 175
      'size' => 'tiny',
......
187 187
 */
188 188
function ldap_servers_update_7103() {
189 189

  
190
  if (!db_field_exists('ldap_servers', 'group_object_category')) {
190
  if (!ldap_servers_db_field_exists('ldap_servers', 'group_object_category')) {
191 191
    db_add_field('ldap_servers', 'group_object_category', array(
192 192
      'type' => 'varchar',
193 193
      'length' => 64,
......
205 205
 */
206 206
function ldap_servers_update_7104() {
207 207

  
208
  if (!db_field_exists('ldap_servers', 'search_pagination')) {
208
  if (!ldap_servers_db_field_exists('ldap_servers', 'search_pagination')) {
209 209
    db_add_field('ldap_servers', 'search_pagination', array(
210 210
      'type' => 'int',
211 211
      'size' => 'tiny',
......
215 215
    $msg = t('"search_pagination" field added to ldap_servers table');
216 216
  }
217 217

  
218
  if (!db_field_exists('ldap_servers', 'search_page_size')) {
218
  if (!ldap_servers_db_field_exists('ldap_servers', 'search_page_size')) {
219 219
    db_add_field('ldap_servers', 'search_page_size', array(
220 220
      'type' => 'int',
221 221
      'size' => 'medium',
......
225 225
    $msg .= '<br/>' . t('"search_page_size" field added to ldap_servers table');
226 226
  }
227 227

  
228
  if (!db_field_exists('ldap_servers', 'unique_persistent_attr_binary')) {
228
  if (!ldap_servers_db_field_exists('ldap_servers', 'unique_persistent_attr_binary')) {
229 229
    db_add_field('ldap_servers', 'unique_persistent_attr_binary', array(
230 230
      'type' => 'int',
231 231
      'size' => 'tiny',
......
259 259
 * add account_name_attr field to ldap_servers table
260 260
 */
261 261
function ldap_servers_update_7106() {
262
  if (!db_field_exists('ldap_servers', 'account_name_attr')) {
262
  if (!ldap_servers_db_field_exists('ldap_servers', 'account_name_attr')) {
263 263
    db_add_field('ldap_servers', 'account_name_attr', array(
264 264
    'description' => 'The attribute to be used as the account name if not the user_attr',
265 265
    'type' => 'varchar',
......
277 277
 *  remove allow_conflicting_drupal_accts from ldap_servers table
278 278
 */
279 279
function ldap_servers_update_7107() {
280
  if (db_field_exists('ldap_servers', 'allow_conflicting_drupal_accts')) {
280
  if (ldap_servers_db_field_exists('ldap_servers', 'allow_conflicting_drupal_accts')) {
281 281
    db_drop_field('ldap_servers', 'allow_conflicting_drupal_accts');
282 282
    $msg = t('"allow_conflicting_drupal_accts" field removed from ldap_servers table');
283 283
  }
......
286 286

  
287 287

  
288 288

  
289

  
289
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)) ) {
291
    return false;
292
  }
293
  else {
294
    return true;
295
  }
296
}
290 297
/**
291 298
 * add group related fields to ldap_servers table
292 299
 */
293 300
function ldap_servers_update_7108() {
294 301

  
295 302
  foreach (array('groupFunctionalityUnused', 'groupNested', 'groupSearchAll', 'groupUserMembershipsAttrExists', 'groupDeriveFromDn', 'groupUserMembershipsAttrExists') as $tinyint_field_name) {
296
    if (!db_field_exists('ldap_servers', $tinyint_field_name)) {
303
    if (!ldap_servers_ldap_servers_db_field_exists('ldap_servers', $tinyint_field_name))  {
297 304
      db_add_field('ldap_servers', $tinyint_field_name, array(
298 305
        'type' => 'int',
299 306
        'size' => 'tiny',
......
304 311
    }
305 312
  }
306 313
  foreach (array('groupUserMembershipsAttr', 'groupMembershipsAttr', 'groupTestGroupDn', 'groupUserMembershipsAttr', 'groupMembershipsAttrMatchingUserAttr') as $varchar255field_name) {
307
    if (!db_field_exists('ldap_servers', $varchar255field_name)) {
314
    if (!ldap_servers_db_field_exists('ldap_servers', $varchar255field_name) && !ldap_servers_db_field_exists('ldap_servers', drupal_strtolower($varchar255field_name))) {
308 315
      db_add_field('ldap_servers', $varchar255field_name, array(
309 316
        'type' => 'varchar',
310 317
        'length' => '255',
......
321 328
 */
322 329
function ldap_servers_update_7109() {
323 330

  
324
  if (!db_field_exists('ldap_servers', 'groupNested')) {
331
  if (!ldap_servers_db_field_exists('ldap_servers', 'groupNested')) {
325 332
    db_add_field('ldap_servers', 'groupNested', array(
326 333
      'type' => 'int',
327 334
      'size' => 'tiny',
......
331 338
    $msg = t('"groupNested" field added to ldap_servers table');
332 339
  }
333 340

  
334
  if (!db_field_exists('ldap_servers', 'groupUseFirstAttr')) {
341
  if (!ldap_servers_db_field_exists('ldap_servers', 'groupUseFirstAttr')) {
335 342
    db_add_field('ldap_servers', 'groupUseFirstAttr', array(
336 343
      'type' => 'int',
337 344
      'size' => 'tiny',
......
341 348
    $msg .= '<br/>' . t('"groupUseFirstAttr" field added to ldap_servers table');
342 349
  }
343 350

  
344
  if (!db_field_exists('ldap_servers', 'groupSearchAll')) {
351
  if (!ldap_servers_db_field_exists('ldap_servers', 'groupSearchAll')) {
345 352
    db_add_field('ldap_servers', 'groupSearchAll', array(
346 353
      'type' => 'int',
347 354
      'size' => 'tiny',
......
351 358
    $msg = t('"groupSearchAll" field added to ldap_servers table');
352 359
  }
353 360

  
354
  if (!db_field_exists('ldap_servers', 'groupUserMembershipsAttrExists')) {
361
  if (!ldap_servers_db_field_exists('ldap_servers', 'groupUserMembershipsAttrExists')) {
355 362
    db_add_field('ldap_servers', 'groupUserMembershipsAttrExists', array(
356 363
      'type' => 'int',
357 364
      'size' => 'tiny',
......
361 368
    $msg = t('"groupUserMembershipsAttrExists" field added to ldap_servers table');
362 369
  }
363 370

  
364
  if (!db_field_exists('ldap_servers', 'groupUserMembershipsAttr')) {
371
  if (!ldap_servers_db_field_exists('ldap_servers', 'groupUserMembershipsAttr')) {
365 372
    db_add_field('ldap_servers', 'groupUserMembershipsAttr', array(
366 373
      'type' => 'varchar',
367 374
      'length' => '255',
......
370 377
    $msg = t('"groupUserMembershipsAttr" field added to ldap_servers table');
371 378
  }
372 379

  
373
  if (!db_field_exists('ldap_servers', 'groupMembershipsAttr')) {
380
  if (!ldap_servers_db_field_exists('ldap_servers', 'groupMembershipsAttr')) {
374 381
    db_add_field('ldap_servers', 'groupMembershipsAttr', array(
375 382
      'type' => 'varchar',
376 383
      'length' => '255',
......
379 386
    $msg = t('"groupMembershipsAttr" field added to ldap_servers table');
380 387
  }
381 388

  
382
  if (!db_field_exists('ldap_servers', 'groupMembershipsAttrMatchingUserAttr')) {
389
  if (!ldap_servers_db_field_exists('ldap_servers', 'groupMembershipsAttrMatchingUserAttr')) {
383 390
    db_add_field('ldap_servers', 'groupMembershipsAttrMatchingUserAttr', array(
384 391
      'type' => 'varchar',
385 392
      'length' => '255',
......
388 395
    $msg = t('"groupMembershipsAttrMatchingUserAttr" field added to ldap_servers table');
389 396
  }
390 397

  
391
  if (!db_field_exists('ldap_servers', 'groupUserMembershipsAttrExists')) {
398
  if (!ldap_servers_db_field_exists('ldap_servers', 'groupUserMembershipsAttrExists')) {
392 399
    db_add_field('ldap_servers', 'groupUserMembershipsAttrExists', array(
393 400
      'type' => 'int',
394 401
      'size' => 'tiny',
......
398 405
    $msg = t('"groupUserMembershipsAttrExists" field added to ldap_servers table');
399 406
  }
400 407

  
401
  if (!db_field_exists('ldap_servers', 'groupUserMembershipsAttr')) {
408
  if (!ldap_servers_db_field_exists('ldap_servers', 'groupUserMembershipsAttr')) {
402 409
    db_add_field('ldap_servers', 'groupUserMembershipsAttr', array(
403 410
      'type' => 'varchar',
404 411
      'length' => '255',
......
414 421
 */
415 422
function ldap_servers_update_7110() {
416 423

  
417
  if (!db_field_exists('ldap_servers', 'groupFunctionalityUnused')) {
424
  if (!ldap_servers_db_field_exists('ldap_servers', 'groupFunctionalityUnused')) {
418 425
    db_add_field('ldap_servers', 'groupFunctionalityUnused', array(
419 426
      'type' => 'int',
420 427
      'size' => 'tiny',
......
424 431
    $msg = t('"groupFunctionalityUnused" field added to ldap_servers table');
425 432
  }
426 433

  
427
  if (!db_field_exists('ldap_servers', 'groupTestGroupDn')) {
434
  if (!ldap_servers_db_field_exists('ldap_servers', 'groupTestGroupDn')) {
428 435
    db_add_field('ldap_servers', 'groupTestGroupDn', array(
429 436
      'type' => 'varchar',
430 437
      'length' => '255',
......
433 440
    $msg = t('"groupTestGroupDn" field added to ldap_servers table');
434 441
  }
435 442

  
436
  if (!db_field_exists('ldap_servers', 'groupTestGroupDnWriteable')) {
443
  if (!ldap_servers_db_field_exists('ldap_servers', 'groupTestGroupDnWriteable')) {
437 444
    db_add_field('ldap_servers', 'groupTestGroupDnWriteable', array(
438 445
      'type' => 'varchar',
439 446
      'length' => '255',
......
449 456
 */
450 457
function ldap_servers_update_7111() {
451 458

  
452
  if (!db_field_exists('ldap_servers', 'groupTestGroupDnWriteable')) {
459
  if (!ldap_servers_db_field_exists('ldap_servers', 'groupTestGroupDnWriteable')) {
453 460
    db_add_field('ldap_servers', 'groupTestGroupDnWriteable', array(
454 461
      'type' => 'varchar',
455 462
      'length' => '255',
......
465 472
 */
466 473
function ldap_servers_update_7112() {
467 474

  
468
  if (!db_field_exists('ldap_servers', 'testingDrupalUserDn')) {
475
  if (!ldap_servers_db_field_exists('ldap_servers', 'testingDrupalUserDn')) {
469 476
    db_add_field('ldap_servers', 'testingDrupalUserDn', array(
470 477
      'type' => 'varchar',
471 478
      'length' => '255',
......
741 748
  );
742 749
  foreach ($changes as $old_field_name => $new_field_name) {
743 750
    $field_schema = $schema['ldap_servers']['fields'][$new_field_name];
744
    if (db_field_exists('ldap_servers', $old_field_name)) {
745
      if (db_field_exists('ldap_servers', $new_field_name)) {
751
    if (ldap_servers_db_field_exists('ldap_servers', $old_field_name)) {
752
      if (ldap_servers_db_field_exists('ldap_servers', $new_field_name)) {
746 753
        db_drop_field('ldap_servers', $old_field_name);
747 754
      }
748 755
      else {
......
757 764
 * Add picture_attr field in schema
758 765
 */
759 766
function ldap_servers_update_7204() {
760
  if (!db_field_exists('ldap_servers', 'picture_attr')) {
767
  if (!ldap_servers_db_field_exists('ldap_servers', 'picture_attr')) {
761 768
    db_add_field(
762 769
      'ldap_servers',
763 770
      'picture_attr',
......
809 816
function ldap_servers_install_update_schema($schema, &$change_log) {
810 817
  foreach ($schema as $table_name => $table_schema) {
811 818
    foreach ($table_schema['fields'] as $field_name => $field_schema) {
812
      if (!db_field_exists($table_name, $field_name)) {
819
      if (!ldap_servers_db_field_exists($table_name, $field_name)) {
813 820
        db_add_field($table_name, $field_name, $field_schema);
814 821
        $change_log[] = t("!field_name field added to !table_name table", array('!field_name' => $field_name, '!table_name' => $table_name));
815 822
      }

Formats disponibles : Unified diff