Fixing course extra fields

main/admin/course_edit.php

@@ -168,19 +168,19 @@ $form->addElement('text','disk_quota',array(get_lang('CourseQuota'), null, get_l
 $form->addRule('disk_quota', get_lang('ThisFieldIsRequired'),'required');
 $form->addRule('disk_quota',get_lang('ThisFieldShouldBeNumeric'),'numeric');
 
-$list_course_extra_field = CourseManager::get_course_extra_field_list($course_code);
-//@todo this is wrong
-foreach ($list_course_extra_field as $extra_field) {
-	switch ($extra_field['field_type']) {		
-		case CourseManager::COURSE_FIELD_TYPE_CHECKBOX:
-			$checked = (array_key_exists('extra_field_value', $extra_field) && $extra_field['extra_field_value'] == 1)? array('checked'=>'checked'): '';
-			$form->addElement('hidden', '_extra_'.$extra_field['field_variable'], 0);
-			$field_display_text=$extra_field['field_display_text'];
-			//$form->addElement('checkbox', 'extra_'.$extra_field['field_variable'], array(get_lang('SpecialCourse'), get_lang('AllUsersAreAutomaticallyRegistered')) , get_lang($extra_field['field_default_value']), $checked);
-			$form->addElement('checkbox', 'extra_'.$extra_field['field_variable'], array(null, get_lang('AllUsersAreAutomaticallyRegistered')) , get_lang('SpecialCourse'), $checked);
-			break;		
-	}
-}
+//Extra fields
+$extra_field = new ExtraField('course');
+$extra = $extra_field->add_elements($form, $course_code);
+
+$htmlHeadXtra[] ='
+<script>
+
+$(function() {
+    '.$extra['jquery_ready_content'].'
+});
+</script>';
+
+
 $form->addElement('style_submit_button', 'button', get_lang('ModifyCourseInfo'),'onclick="valide()"; class="save"');
 
 // Set some default values

main/admin/course_information.php

@@ -140,7 +140,7 @@ $extra_fields = $extra_field->get_all();
 
 if (!empty($extra_fields)) {
     echo Display::page_subheader(get_lang('ExtraFields'));
-    echo '<table class="data_table">';
+    echo '<table class="data_table">';    
     foreach ($extra_fields as $field) {
         if ($field['field_visible'] != '1') {
             continue;

main/admin/course_list.php

@@ -149,15 +149,15 @@ function get_course_visibility_icon($v) {
     }
 }
 
-if (isset ($_POST['action'])) {
-    switch ($_POST['action']) {
+if (isset ($_POST['action'])) {    
+    switch ($_POST['action']) {        
         // Delete selected courses
         case 'delete_courses' :
-            $course_codes = $_POST['course'];
+            $course_codes = $_POST['course'];            
             if (count($course_codes) > 0) {
-                foreach ($course_codes as $index => $course_code) {
+                foreach ($course_codes as $index => $course_code) {                    
                     CourseManager :: delete_course($course_code);
-                    $obj_cat=new Category();
+                    $obj_cat = new Category();
                     $obj_cat->update_category_delete($course_code);
                 }
             }