Fixing exercise.lib.php calls

main/admin/skills_gradebook.php

@@ -69,7 +69,7 @@ switch($action) {
         $id = isset($_REQUEST['id']) ? $_REQUEST['id'] : null;
         $gradebook_info = $gradebook->get($id);
         $url  = api_get_self().'?action='.$action.'&id='.$id;
-        $form =  $gradebook->show_skill_form($id, $url);
+        $form =  $gradebook->show_skill_form($id, $url, $gradebook_info['name']);
         if ($form->validate()) {
             $values = $form->exportValues();
             $res    = $gradebook->update_skills_to_gradebook($values['id'], $values['skill']);            
@@ -77,8 +77,8 @@ switch($action) {
                 Display::display_confirmation_message(get_lang('ItemAdded'));
             }
         }        
-        echo Display::tag('h1',$gradebook_info['name']);
         $form->display();
+        //echo Display::tag('h2',$gradebook_info['name']);
         break;
 }
 Display::display_footer();

main/exercice/adminhp.php

@@ -9,14 +9,15 @@
 /**
  * Code
  */
-include 'exercise.class.php';
+require_once 'exercise.class.php';
-include 'question.class.php';
+require_once 'question.class.php';
-include 'answer.class.php';
+require_once 'answer.class.php';
-include 'exercise.lib.php';
 // name of the language file that needs to be included
 $language_file='exercice';
 
-include('../inc/global.inc.php');
+require_once '../inc/global.inc.php';
+require_once 'exercise.lib.php';
+
 $this_section=SECTION_COURSES;
 
 if (isset($_REQUEST["cancel"])) {

main/exercice/exercise_result.php

@@ -17,7 +17,6 @@
  * Code
  */
 require_once 'exercise.class.php';
-require_once 'exercise.lib.php';
 require_once 'question.class.php';
 require_once 'answer.class.php';
 
@@ -25,6 +24,7 @@ require_once 'answer.class.php';
 $language_file='exercice';
 
 require_once '../inc/global.inc.php';
+require_once 'exercise.lib.php';
 
 if ($_GET['origin']=='learnpath') {
 	require_once '../newscorm/learnpath.class.php';

main/exercice/exercise_show.php

@@ -18,11 +18,11 @@ $language_file = array('exercice');
 
 // including additional libraries
 require_once 'exercise.class.php';
-require_once 'exercise.lib.php';
 require_once 'question.class.php'; //also defines answer type constants
 require_once 'answer.class.php';
 
 require_once '../inc/global.inc.php';
+require_once 'exercise.lib.php';
 
 require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
 require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';

main/exercice/exercise_submit.php

@@ -30,7 +30,7 @@
 require_once 'exercise.class.php';
 require_once 'question.class.php';
 require_once 'answer.class.php';
-require_once 'exercise.lib.php';
+
 
 $debug = 1; //debug value is set in the exercise.class.php file
 
@@ -38,6 +38,7 @@ $debug = 1; //debug value is set in the exercise.class.php file
 $language_file = 'exercice';
 
 require_once '../inc/global.inc.php';
+require_once 'exercise.lib.php';
 
 $this_section = SECTION_COURSES;
 

main/exercice/overview.php

@@ -9,12 +9,11 @@
 /**
  * Code
  */
-require_once 'exercise.class.php';
-require_once 'exercise.lib.php';
 $language_file = 'exercice';
-
+require_once 'exercise.class.php';
 require_once '../inc/global.inc.php';
 
+require_once 'exercise.lib.php';
 $this_section = SECTION_COURSES;
 
 // Notice for unauthorized people.

main/exercice/result.php

@@ -15,11 +15,11 @@ $language_file = array('exercice');
 
 // including additional libraries
 require_once 'exercise.class.php';
-require_once 'exercise.lib.php';
 require_once 'question.class.php'; //also defines answer type constants
 require_once 'answer.class.php';
 
 require_once '../inc/global.inc.php';
+require_once 'exercise.lib.php';
 
 if (empty($origin) ) {
     $origin = $_REQUEST['origin'];

main/inc/ajax/exercise.ajax.php

@@ -7,8 +7,8 @@
 require_once '../../exercice/exercise.class.php';
 require_once '../../exercice/question.class.php';
 require_once '../../exercice/answer.class.php';
-require_once '../../exercice/exercise.lib.php';
 require_once '../global.inc.php';
+require_once '../../exercice/exercise.lib.php';
 api_protect_course_script(true);
 $action = $_REQUEST['a'];
 

main/inc/lib/gradebook.lib.php

@@ -69,11 +69,13 @@ class Gradebook extends Model {
      * @param   string  action add, edit
      * @return  obj     form validator obj 
      */
-    public function show_skill_form($gradebook_id, $url) {
+    public function show_skill_form($gradebook_id, $url, $header = null) {
                 
         $form = new FormValidator('gradebook_add_skill', 'POST', $url);
         // Settting the form elements
+        if (!isset($header)) {
             $header = get_lang('Add');
+        }        
         $form->addElement('header', '', $header);
         $id = isset($_GET['id']) ? intval($_GET['id']) : '';
         $form->addElement('hidden', 'id', $id);