Completed
Pull Request — master (#112)
by
unknown
01:50
created
bbb_view.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -198,10 +198,10 @@  discard block
 block discarded – undo
198 198
  */
199 199
 function bigbluebutton_bbb_view_create_meeting_data(&$bbbsession) {
200 200
     $data = ['meetingID' => $bbbsession['meetingid'],
201
-              'name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64),
202
-              'attendeePW' => $bbbsession['viewerPW'],
203
-              'moderatorPW' => $bbbsession['modPW'],
204
-              'logoutURL' => $bbbsession['logoutURL'],
201
+                'name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64),
202
+                'attendeePW' => $bbbsession['viewerPW'],
203
+                'moderatorPW' => $bbbsession['modPW'],
204
+                'logoutURL' => $bbbsession['logoutURL'],
205 205
             ];
206 206
     $data['record'] = bigbluebutton_bbb_view_create_meeting_data_record($bbbsession['record']);
207 207
     $data['welcome'] = trim($bbbsession['welcome']);
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
             '%duration%',
215 215
             (string) $durationtime,
216 216
             get_string('bbbdurationwarning', 'bigbluebuttonbn')
217
-          );
217
+            );
218 218
     }
219 219
     $voicebridge = intval($bbbsession['voicebridge']);
220 220
     if ($voicebridge > 0 && $voicebridge < 79999) {
@@ -253,22 +253,22 @@  discard block
 block discarded – undo
253 253
 function bigbluebutton_bbb_view_create_meeting_metadata(&$bbbsession) {
254 254
     global $USER;
255 255
     $metadata = ['bbb-origin' => $bbbsession['origin'],
256
-                 'bbb-origin-version' => $bbbsession['originVersion'],
257
-                 'bbb-origin-server-name' => $bbbsession['originServerName'],
258
-                 'bbb-origin-server-common-name' => $bbbsession['originServerCommonName'],
259
-                 'bbb-origin-tag' => $bbbsession['originTag'],
260
-                 'bbb-context' => $bbbsession['course']->fullname,
261
-                 'bbb-recording-name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64),
262
-                 'bbb-recording-description' => bigbluebuttonbn_html2text($bbbsession['meetingdescription'], 64),
263
-                 'bbb-recording-tags' => bigbluebuttonbn_get_tags($bbbsession['cm']->id), // Same as $id.
256
+                    'bbb-origin-version' => $bbbsession['originVersion'],
257
+                    'bbb-origin-server-name' => $bbbsession['originServerName'],
258
+                    'bbb-origin-server-common-name' => $bbbsession['originServerCommonName'],
259
+                    'bbb-origin-tag' => $bbbsession['originTag'],
260
+                    'bbb-context' => $bbbsession['course']->fullname,
261
+                    'bbb-recording-name' => bigbluebuttonbn_html2text($bbbsession['meetingname'], 64),
262
+                    'bbb-recording-description' => bigbluebuttonbn_html2text($bbbsession['meetingdescription'], 64),
263
+                    'bbb-recording-tags' => bigbluebuttonbn_get_tags($bbbsession['cm']->id), // Same as $id.
264 264
                 ];
265 265
     if ((boolean)\mod_bigbluebuttonbn\locallib\config::get('recordingstatus_enabled')) {
266 266
         $metadata["bn-recording-status"] = json_encode(
267 267
             array(
268 268
                 'email' => array('"' . fullname($USER) . '" <' . $USER->email . '>'),
269 269
                 'context' => $bbbsession['bigbluebuttonbnURL']
270
-              )
271
-          );
270
+                )
271
+            );
272 272
     }
273 273
     if ((boolean)\mod_bigbluebuttonbn\locallib\config::get('recordingready_enabled')) {
274 274
         $metadata['bn-recording-ready-url'] = $bbbsession['recordingReadyURL'];
Please login to merge, or discard this patch.
import_view.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -77,8 +77,8 @@
 block discarded – undo
77 77
     $body .= html_writer::start_tag('br');
78 78
     $body .= html_writer::tag('input', '',
79 79
         array('type' => 'button', 'class' => 'btn btn-secondary',
80
-              'value' => get_string('view_recording_button_return', 'bigbluebuttonbn'),
81
-              'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$cm->id.'\''));
80
+                'value' => get_string('view_recording_button_return', 'bigbluebuttonbn'),
81
+                'onclick' => 'window.location=\''.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$cm->id.'\''));
82 82
     // JavaScript for locales.
83 83
     $PAGE->requires->strings_for_js(array_keys(bigbluebuttonbn_get_strings_for_js()), 'bigbluebuttonbn');
84 84
     // Require JavaScript modules.
Please login to merge, or discard this patch.
config-dist.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
  * recordings from a different activity even from a different course.
99 99
  **/
100 100
 
101
- /*
101
+    /*
102 102
  * When the value is set to 1 (checked) the bigbluebuttonbn rooms or
103 103
  * activities will have the 'import recordings' capability enabled.
104 104
  * $CFG->bigbluebuttonbn['importrecordings_enabled'] = 0;
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
  * 'Join session' button enabled
120 120
  **/
121 121
 
122
- /*
122
+    /*
123 123
  * When the value is set to 1 (checked) the bigbluebuttonbn rooms or
124 124
  * activities will have the 'wait for moderator' capability enabled by
125 125
  * default.
@@ -298,27 +298,27 @@  discard block
 block discarded – undo
298 298
  * $CFG->bigbluebuttonbn['general_warning_message'] = "Would you like to record your BigBlueButton sessions for later viewing? ";
299 299
  */
300 300
 
301
- /*
301
+    /*
302 302
  * The warning box is always shown to administrators, but it is also possible to define other roles
303 303
  * to whom the it will be shown. The roles are based on the shortnames defined by Moodle:
304 304
  *     'manager,coursecreator,editingteacher,teacher,student,guest,user,frontpage'
305 305
  * $CFG->bigbluebuttonbn['general_warning_roles'] = 'editingteacher,teacher';
306 306
  */
307 307
 
308
- /*
308
+    /*
309 309
  * As the general_warning_message is shown in a box, its type can be defined with general_warning_type
310 310
  * The default type is 'info' which is normaly rendered in blue when using a bootstrap theme.
311 311
  * All the modifiers for boxed in bootstrap can be used [info|success|warning|danger].
312 312
  * $CFG->bigbluebuttonbn['general_warning_box_type'] = 'info';
313 313
  */
314 314
 
315
- /*
315
+    /*
316 316
  * Additionally, when general_warning_button_href value is different than "", a button
317 317
  * can also be shown right after the message.
318 318
  * $CFG->bigbluebuttonbn['general_warning_button_href'] = "http://blindsidenetworks.com/";
319 319
  */
320 320
 
321
- /*
321
+    /*
322 322
  * Finally, the text and class for the button can be modified
323 323
  * $CFG->bigbluebuttonbn['general_warning_button_text'] = "Upgrade your site";
324 324
  * $CFG->bigbluebuttonbn['general_warning_button_class'] = "btn btn-primary";
Please login to merge, or discard this patch.
bbb_broker.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -437,26 +437,26 @@  discard block
 block discarded – undo
437 437
             return array(
438 438
                 'status' => false,
439 439
                 'message' => get_string('view_recording_publish_link_deleted', 'bigbluebuttonbn')
440
-              );
440
+                );
441 441
         }
442 442
         if ($realrecordings[$params['id']]['published'] !== 'true') {
443 443
             return array(
444 444
                 'status' => false,
445 445
                 'message' => get_string('view_recording_publish_link_not_published', 'bigbluebuttonbn')
446
-              );
446
+                );
447 447
         }
448 448
         return array(
449 449
             'status' => bigbluebuttonbn_publish_recording_imported(
450 450
                 $recordings[$params['id']]['imported'], true
451 451
             )
452
-          );
452
+            );
453 453
     }
454 454
     // As the recordingid was not identified as imported recording link, execute actual publish.
455 455
     return array(
456 456
         'status' => bigbluebuttonbn_publish_recordings(
457 457
             $params['id'], 'true'
458 458
         )
459
-      );
459
+        );
460 460
 }
461 461
 
462 462
 /**
@@ -477,26 +477,26 @@  discard block
 block discarded – undo
477 477
             return array(
478 478
                 'status' => false,
479 479
                 'message' => get_string('view_recording_unprotect_link_deleted', 'bigbluebuttonbn')
480
-              );
480
+                );
481 481
         }
482 482
         if ($realrecordings[$params['id']]['protected'] === 'true') {
483 483
             return array(
484 484
                 'status' => false,
485 485
                 'message' => get_string('view_recording_unprotect_link_not_unprotected', 'bigbluebuttonbn')
486
-              );
486
+                );
487 487
         }
488 488
         return array(
489 489
             'status' => bigbluebuttonbn_protect_recording_imported(
490 490
                 $recordings[$params['id']]['imported'], false
491 491
             )
492
-          );
492
+            );
493 493
     }
494 494
     // As the recordingid was not identified as imported recording link, execute actual uprotect.
495 495
     return array(
496 496
         'status' => bigbluebuttonbn_update_recordings(
497 497
             $params['id'], array('protect' => 'false')
498 498
         )
499
-      );
499
+        );
500 500
 }
501 501
 
502 502
 /**
@@ -515,7 +515,7 @@  discard block
 block discarded – undo
515 515
             'status' => bigbluebuttonbn_publish_recording_imported(
516 516
                 $recordings[$params['id']]['imported'], false
517 517
             )
518
-          );
518
+            );
519 519
     }
520 520
     // As the recordingid was not identified as imported recording link, execute unpublish on a real recording.
521 521
     // First: Unpublish imported links associated to the recording.
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
533 533
         'status' => bigbluebuttonbn_publish_recordings(
534 534
             $params['id'], 'false'
535 535
         )
536
-      );
536
+        );
537 537
 }
538 538
 
539 539
 /**
@@ -552,7 +552,7 @@  discard block
 block discarded – undo
552 552
             'status' => bigbluebuttonbn_protect_recording_imported(
553 553
                 $recordings[$params['id']]['imported'], true
554 554
             )
555
-          );
555
+            );
556 556
     }
557 557
     // As the recordingid was not identified as imported recording link, execute protect on a real recording.
558 558
     // First: Protect imported links associated to the recording.
@@ -570,7 +570,7 @@  discard block
 block discarded – undo
570 570
         'status' => bigbluebuttonbn_update_recordings(
571 571
             $params['id'], array('protect' => 'true')
572 572
         )
573
-      );
573
+        );
574 574
 }
575 575
 
576 576
 /**
@@ -589,7 +589,7 @@  discard block
 block discarded – undo
589 589
             'status' => bigbluebuttonbn_delete_recording_imported(
590 590
                 $recordings[$params['id']]['imported']
591 591
             )
592
-          );
592
+            );
593 593
     }
594 594
     // As the recordingid was not identified as imported recording link, execute delete on a real recording.
595 595
     // First: Delete imported links associated to the recording.
@@ -603,7 +603,7 @@  discard block
 block discarded – undo
603 603
     // Second: Execute the actual delete.
604 604
     return array(
605 605
         'status' => bigbluebuttonbn_delete_recordings($params['id'])
606
-      );
606
+        );
607 607
 }
608 608
 
609 609
 /**
@@ -621,7 +621,7 @@  discard block
 block discarded – undo
621 621
             'status' => bigbluebuttonbn_update_recording_imported(
622 622
                 $recordings[$params['id']]['imported'], json_decode($params['meta'], true)
623 623
             )
624
-          );
624
+            );
625 625
     }
626 626
 
627 627
     // As the recordingid was not identified as imported recording link, execute update on a real recording.
@@ -631,7 +631,7 @@  discard block
 block discarded – undo
631 631
         'status' => bigbluebuttonbn_update_recordings(
632 632
             $params['id'], json_decode($params['meta'])
633 633
         )
634
-      );
634
+        );
635 635
 }
636 636
 
637 637
 /**
@@ -802,10 +802,10 @@  discard block
 block discarded – undo
802 802
     $params['recording_import'] = ['id' => 'The recordingID must be specified.'];
803 803
     $params['recording_ready'] = [
804 804
             'signed_parameters' => 'A JWT encoded string must be included as [signed_parameters].'
805
-          ];
805
+            ];
806 806
     $params['live_session_events'] = [
807 807
             'signed_parameters' => 'A JWT encoded string must be included as [signed_parameters].'
808
-          ];
808
+            ];
809 809
     return $params;
810 810
 }
811 811
 
Please login to merge, or discard this patch.
classes/settings/validator.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -205,7 +205,7 @@
 block discarded – undo
205 205
                 !isset($CFG->bigbluebuttonbn['recordings_imported_editable']) ||
206 206
                 !isset($CFG->bigbluebuttonbn['recordings_preview_default']) ||
207 207
                 !isset($CFG->bigbluebuttonbn['recordings_preview_editable'])
208
-              );
208
+                );
209 209
     }
210 210
 
211 211
     /**
Please login to merge, or discard this patch.
classes/event/base.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@
 block discarded – undo
80 80
             'objectid' => $this->objectid,
81 81
             'contextinstanceid' => $this->contextinstanceid,
82 82
             'other' => $this->other
83
-          );
83
+            );
84 84
         $string = $this->description;
85 85
         foreach ($vars as $key => $value) {
86 86
             $string = str_replace("##" . $key, $value, $string);
Please login to merge, or discard this patch.
lib.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
  * Remove this block when restored
62 62
  */
63 63
 
64
- /** @var BIGBLUEBUTTONBN_DEFAULT_SERVER_URL string of default bigbluebutton server url */
64
+    /** @var BIGBLUEBUTTONBN_DEFAULT_SERVER_URL string of default bigbluebutton server url */
65 65
 const BIGBLUEBUTTONBN_DEFAULT_SERVER_URL = 'http://test-install.blindsidenetworks.com/bigbluebutton/';
66 66
 /** @var BIGBLUEBUTTONBN_DEFAULT_SHARED_SECRET string of default bigbluebutton server shared secret */
67 67
 const BIGBLUEBUTTONBN_DEFAULT_SHARED_SECRET = '8cd8ef52e8e101574e400365b55e11a6';
@@ -339,12 +339,12 @@  discard block
 block discarded – undo
339 339
     $str  = '<div class="bigbluebuttonbn overview">'."\n";
340 340
     $str .= '  <div class="name">'.get_string('modulename', 'bigbluebuttonbn').':&nbsp;'."\n";
341 341
     $str .= '    <a '.$classes.'href="'.$CFG->wwwroot.'/mod/bigbluebuttonbn/view.php?id='.$bigbluebuttonbn->coursemodule.
342
-      '">'.$bigbluebuttonbn->name.'</a>'."\n";
342
+        '">'.$bigbluebuttonbn->name.'</a>'."\n";
343 343
     $str .= '  </div>'."\n";
344 344
     $str .= '  <div class="info">'.get_string($start, 'bigbluebuttonbn').': '.userdate($bigbluebuttonbn->openingtime).
345 345
         '</div>'."\n";
346 346
     $str .= '  <div class="info">'.get_string('ends_at', 'bigbluebuttonbn').': '.userdate($bigbluebuttonbn->closingtime)
347
-      .'</div>'."\n";
347
+        .'</div>'."\n";
348 348
     $str .= '</div>'."\n";
349 349
     return $str;
350 350
 }
@@ -529,7 +529,7 @@  discard block
 block discarded – undo
529 529
             $bigbluebuttonbn->coursemodule,
530 530
             'bigbluebuttonbn',
531 531
             $bigbluebuttonbn->id, $bigbluebuttonbn->completionexpected
532
-          );
532
+            );
533 533
     }
534 534
 }
535 535
 /**
Please login to merge, or discard this patch.
classes/privacy/provider.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -61,11 +61,11 @@  discard block
 block discarded – undo
61 61
      */
62 62
     public static function _get_metadata(collection $collection) {
63 63
 
64
-         // The table bigbluebuttonbn stores only the room properties.
65
-         // However, there is a chance that some personal information is stored as metadata.
66
-         // This would be done in the column 'participants' where rules can be set to define BBB roles.
67
-         // It is fair to say that only the userid is stored, which is useless if user is removed.
68
-         // But if this is a concern a refactoring on the way the rules are stored will be required.
64
+            // The table bigbluebuttonbn stores only the room properties.
65
+            // However, there is a chance that some personal information is stored as metadata.
66
+            // This would be done in the column 'participants' where rules can be set to define BBB roles.
67
+            // It is fair to say that only the userid is stored, which is useless if user is removed.
68
+            // But if this is a concern a refactoring on the way the rules are stored will be required.
69 69
         $collection->add_database_table('bigbluebuttonbn', [
70 70
             'participants' => 'privacy:metadata:bigbluebuttonbn:participants',
71 71
         ], 'privacy:metadata:bigbluebuttonbn');
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
                     'meetingid' => $record->meetingid,
209 209
                     'log' => $record->log,
210 210
                     'meta' => $record->meta,
211
-                  ];
211
+                    ];
212 212
                 return $carry;
213 213
             },
214 214
             function($instanceid, $data) use ($user, $instanceidstocmids) {
Please login to merge, or discard this patch.
mod_form.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -209,8 +209,8 @@  discard block
 block discarded – undo
209 209
             $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'],
210 210
                 $field['description_key'], 0, ['maxlength' => 4, 'size' => 6],
211 211
                 ['message' => get_string('mod_form_field_voicebridge_format_error', 'bigbluebuttonbn'),
212
-                 'type' => 'numeric', 'rule' => '####', 'validator' => 'server']
213
-              );
212
+                    'type' => 'numeric', 'rule' => '####', 'validator' => 'server']
213
+                );
214 214
         } else {
215 215
             $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'],
216 216
                 $field['description_key'], 0, ['maxlength' => 4, 'size' => 6]);
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
      */
249 249
     private function bigbluebuttonbn_mform_add_block_room_recordings(&$mform, $cfg) {
250 250
         $field = ['type' => 'hidden', 'name' => 'recordings_html', 'data_type' => PARAM_INT,
251
-                  'description_key' => null];
251
+                    'description_key' => null];
252 252
         if ($cfg['recordings_html_editable']) {
253 253
             $field['type'] = 'checkbox';
254 254
             $field['description_key'] = 'mod_form_field_recordings_html';
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
         $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'],
257 257
             $field['description_key'], $cfg['recordings_html_default']);
258 258
         $field = ['type' => 'hidden', 'name' => 'recordings_deleted', 'data_type' => PARAM_INT,
259
-                  'description_key' => null];
259
+                    'description_key' => null];
260 260
         if ($cfg['recordings_deleted_editable']) {
261 261
             $field['type'] = 'checkbox';
262 262
             $field['description_key'] = 'mod_form_field_recordings_deleted';
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
         $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'],
265 265
             $field['description_key'], $cfg['recordings_deleted_default']);
266 266
         $field = ['type' => 'hidden', 'name' => 'recordings_imported', 'data_type' => PARAM_INT,
267
-                  'description_key' => null];
267
+                    'description_key' => null];
268 268
         if ($cfg['importrecordings_enabled'] && $cfg['recordings_imported_editable']) {
269 269
             $field['type'] = 'checkbox';
270 270
             $field['description_key'] = 'mod_form_field_recordings_imported';
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
         $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'],
273 273
             $field['description_key'], $cfg['recordings_imported_default']);
274 274
         $field = ['type' => 'hidden', 'name' => 'recordings_preview', 'data_type' => PARAM_INT,
275
-                  'description_key' => null];
275
+                    'description_key' => null];
276 276
         if ($cfg['recordings_preview_editable']) {
277 277
             $field['type'] = 'checkbox';
278 278
             $field['description_key'] = 'mod_form_field_recordings_preview';
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
         $htmlselectiontype = html_writer::select($participantselection['type_options'],
343 343
             'bigbluebuttonbn_participant_selection_type', $participantselection['type_selected'], array(),
344 344
             array('id' => 'bigbluebuttonbn_participant_selection_type',
345
-                  'onchange' => 'M.mod_bigbluebuttonbn.modform.participantSelectionSet(); return 0;'));
345
+                    'onchange' => 'M.mod_bigbluebuttonbn.modform.participantSelectionSet(); return 0;'));
346 346
         $htmlselectionoptions = html_writer::select($participantselection['options'], 'bigbluebuttonbn_participant_selection',
347 347
             $participantselection['selected'], array(),
348 348
             array('id' => 'bigbluebuttonbn_participant_selection', 'disabled' => 'disabled'));
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
             'type' => 'button', 'class' => 'btn btn-secondary',
351 351
             'value' => get_string('mod_form_field_participant_list_action_add', 'bigbluebuttonbn'),
352 352
             'onclick' => 'M.mod_bigbluebuttonbn.modform.participantAdd(); return 0;'
353
-          ));
353
+            ));
354 354
         $htmladdparticipant = html_writer::tag('div',
355 355
             $htmlselectiontype . '&nbsp;&nbsp;' . $htmlselectionoptions . '&nbsp;&nbsp;' . $htmlselectioninput, null);
356 356
         $mform->addElement('html', "\n\n");
@@ -392,9 +392,9 @@  discard block
 block discarded – undo
392 392
             $field['type'] = 'select';
393 393
             $field['data_type'] = PARAM_TEXT;
394 394
             $field['description_key'] = 'mod_form_field_block_clienttype';
395
-             $choices = array(BIGBLUEBUTTON_CLIENTTYPE_FLASH => get_string('mod_form_block_clienttype_flash', 'bigbluebuttonbn'),
396
-                             BIGBLUEBUTTON_CLIENTTYPE_HTML5 => get_string('mod_form_block_clienttype_html5', 'bigbluebuttonbn'));
397
-             $mform->addElement('header', 'clienttypeselection', get_string('mod_form_block_clienttype', 'bigbluebuttonbn'));
395
+                $choices = array(BIGBLUEBUTTON_CLIENTTYPE_FLASH => get_string('mod_form_block_clienttype_flash', 'bigbluebuttonbn'),
396
+                                BIGBLUEBUTTON_CLIENTTYPE_HTML5 => get_string('mod_form_block_clienttype_html5', 'bigbluebuttonbn'));
397
+                $mform->addElement('header', 'clienttypeselection', get_string('mod_form_block_clienttype', 'bigbluebuttonbn'));
398 398
             $this->bigbluebuttonbn_mform_add_element($mform, $field['type'], $field['name'], $field['data_type'],
399 399
                                     $field['description_key'], $cfg['clienttype_default'], $choices);
400 400
             return;
Please login to merge, or discard this patch.