Minor - changing function names

main/admin/configure_inscription.php

@@ -275,7 +275,8 @@ if ($display_all_form) {
         }
     }
     $extra_data = UserManager::get_extra_user_data(api_get_user_id(), true);
-    ExtraField::set_extra_fields_in_form($form, $extra_data, 'registration', false, null, 'user');
+    $extraField = new ExtraField('user');
+    $extraField->set_extra_fields_in_form($form, $extra_data, 'registration', false, null);
 }
 
 // Terms and conditions

main/admin/course_edit.php

@@ -168,7 +168,7 @@ $form->addRule('disk_quota',get_lang('ThisFieldShouldBeNumeric'),'numeric');
 
 //Extra fields
 $extra_field = new ExtraField('course');
-$extra = $extra_field->add_elements($form, $course_code);
+$extra = $extra_field->addElements($form, $course_code);
 
 $htmlHeadXtra[] ='
 <script>
@@ -234,4 +234,4 @@ function valide() {
 // Display the form
 $form->display();
 /* FOOTER */
-Display :: display_footer();
+Display :: display_footer();

main/admin/user_add.php

@@ -244,8 +244,8 @@ $form->addElement('radio', 'active', get_lang('ActiveAccount'), get_lang('Active
 $form->addElement('radio', 'active', '', get_lang('Inactive'), 0);
 
 $extra_data = UserManager::get_extra_user_data(0, true);
-
-$return_params = ExtraField::set_extra_fields_in_form($form, $extra_data, 'user_add', false, null, 'user');
+$extraField = new ExtraField('user');
+$return_params = $extraField->set_extra_fields_in_form($form, $extra_data, 'user_add', false, null);
 $jquery_ready_content = $return_params['jquery_ready_content'];
 
 // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
@@ -416,4 +416,4 @@ $app['title'] = $tool_name;
 $tpl = $app['template'];
 $tpl->assign('message', $message);
 $tpl->assign('content', $content);
-$tpl->display_one_col_template();
+$tpl->display_one_col_template();

main/admin/user_edit.php

@@ -290,7 +290,8 @@ if (!$user_data['platform_admin']) {
 
 
 // EXTRA FIELDS
-$return_params = ExtraField::set_extra_fields_in_form($form, $extra_data, 'user_edit', true, $user_id, 'user');
+$extraField = new ExtraField('user');
+$return_params = $extraField->set_extra_fields_in_form($form, $extra_data, 'user_edit', true, $user_id);
 $jquery_ready_content = $return_params['jquery_ready_content'];
 
 // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
@@ -489,4 +490,4 @@ $app['title'] = $tool_name;
 $tpl = $app['template'];
 $tpl->assign('message', $message);
 $tpl->assign('content', $content);
-$tpl->display_one_col_template();
+$tpl->display_one_col_template();

main/auth/inscription.php

@@ -162,7 +162,8 @@ if ($user_already_registered_show_terms == false) {
     }
     // EXTRA FIELDS
     $extra_data = UserManager::get_extra_user_data(api_get_user_id(), true);
-    ExtraField::set_extra_fields_in_form($form, $extra_data, 'registration', false, null, 'user');
+    $extraField = new ExtraField('user');
+    $extraField->set_extra_fields_in_form($form, $extra_data, 'registration', false, null);
 }
 
 if (isset($_SESSION['user_language_choice']) && $_SESSION['user_language_choice'] != '') {

main/auth/profile.php

@@ -316,7 +316,8 @@ if (is_platform_authentication() && is_profile_editable() && api_get_setting('pr
 
 // EXTRA FIELDS
 $extra_data = UserManager::get_extra_user_data(api_get_user_id(), true);
-$return_params = ExtraField::set_extra_fields_in_form($form, $extra_data, 'profile', false, api_get_user_id(), 'user');
+$extraField = new ExtraField('user');
+$return_params = $extraField->set_extra_fields_in_form($form, $extra_data, 'profile', false, api_get_user_id());
 $jquery_ready_content = $return_params['jquery_ready_content'];
 
 // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function

main/exercice/question.class.php

@@ -1518,7 +1518,7 @@ abstract class Question
 
             // Inject question extra fields!
             $extraFields = new ExtraField('question');
-            $extraFields->add_elements($form, $this->id);
+            $extraFields->addElements($form, $this->id);
 
             if ($this->exercise->fastExerciseEdition == false) {
                 $form->addElement('html', '</div>');

main/session/session_add.php

@@ -239,12 +239,9 @@ $form->addElement('select', 'session_category_id', get_lang('SessionCategory'),
 
 //Extra fields
 $extra_field = new ExtraField('session');
-$extra = $extra_field->add_elements($form, $id);
-
-
-$htmlHeadXtra[] ='
-<script>
+$extra = $extra_field->addElements($form, $id);
 
+$htmlHeadXtra[] ='<script>
 $(function() {
     '.$extra['jquery_ready_content'].'
 });
@@ -293,4 +290,4 @@ echo '<a href="../admin/index.php">'.Display::return_icon('back.png', get_lang('
 echo '</div>';
 
 $form->display();
-Display::display_footer();
+Display::display_footer();