Fixes class name LearnpathList

chamilo · Feb 13, 2015 · 1ede08e · 1ede08e
1 parent 57eeea7
commit 1ede08e
Show file tree

Hide file tree

Showing 15 changed files with 73 additions and 88 deletions.
diff --git a/main/admin/user_move_stats.php b/main/admin/user_move_stats.php
@@ -12,7 +12,6 @@
 $this_section=SECTION_PLATFORM_ADMIN;
 
 api_protect_admin_script();
-require_once '../newscorm/learnpathList.class.php';
 
 $interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
 $debug = 0;

diff --git a/main/exercice/exercise.lib.php b/main/exercice/exercise.lib.php
@@ -1404,7 +1404,7 @@ function get_exam_results_data(
             }
         }
 
-        $lp_list_obj = new learnpathList(api_get_user_id());
+        $lp_list_obj = new LearnpathList(api_get_user_id());
         $lp_list = $lp_list_obj->get_flat_list();
 
         if (is_array($results)) {

diff --git a/main/exercice/exercise_submit_modal.php b/main/exercice/exercise_submit_modal.php
@@ -487,7 +487,6 @@
 // the link to theory (a learning path)
 if (!empty($lp)) {
 	$lp_url= api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?'.api_get_cidreq().'&action=view&lp_id='.$lp;
-	require_once('../newscorm/learnpathList.class.php');
 	$list = new LearnpathList(api_get_user_id());
 	$flat_list = $list->get_flat_list();
 	$links.= Display :: return_icon('theory.gif', '', array ('style' => 'padding-left:0px;padding-right:5px;')).'<a target="_blank" href="'.$lp_url.'">'.get_lang('SeeTheory').'</a><br />';

diff --git a/main/exercice/hotspot_admin.inc.php b/main/exercice/hotspot_admin.inc.php
@@ -566,7 +566,7 @@
 
                         </tr>
                         <?php
-                        require_once '../newscorm/learnpathList.class.php';
+
                         $list = new LearnpathList(api_get_user_id());
                         $flat_list = $list->get_flat_list(); //loading list of LPs
 
@@ -874,7 +874,6 @@
                             </tr>
                             <?php
                         }
-                        require_once '../newscorm/learnpathList.class.php';
                         $list = new LearnpathList(api_get_user_id());
                         $flat_list = $list->get_flat_list();
                         $select_lp_id = array();

diff --git a/main/exercice/unique_answer.class.php b/main/exercice/unique_answer.class.php
@@ -106,8 +106,6 @@ public function createAnswersForm($form)
         $question_list = $obj_ex->selectQuestionList();
         $select_question = array();
         $select_question[0] = get_lang('SelectTargetQuestion');
-
-        require_once '../newscorm/learnpathList.class.php';
         if (is_array($question_list)) {
             foreach ($question_list as $key => $questionid) {
                 //To avoid warning messages

diff --git a/main/inc/ajax/course_home.ajax.php b/main/inc/ajax/course_home.ajax.php
@@ -106,7 +106,6 @@
          */
 
         require_once '../global.inc.php';
-        require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
         $now = time();
         $page  = intval($_REQUEST['page']);     //page
         $limit = intval($_REQUEST['rows']);     // quantity of rows
@@ -231,7 +230,6 @@
         break;
     case 'session_courses_lp_by_week':
         require_once '../global.inc.php';
-        require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
         $now = time();
 
         $page  = intval($_REQUEST['page']);     //page
@@ -357,7 +355,6 @@
         break;
     case 'session_courses_lp_by_course':
         require_once '../global.inc.php';
-        require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
         $now = time();
         $page  = intval($_REQUEST['page']);     //page
         $limit = intval($_REQUEST['rows']);     // quantity of rows

diff --git a/main/inc/ajax/model.ajax.php b/main/inc/ajax/model.ajax.php
@@ -852,7 +852,6 @@ function getWhereClause($col, $oper, $val)
             'firstname',
             'lastname',
         );
-        require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
         $lessons = LearnpathList::get_course_lessons($course['code'], $sessionId);
         foreach ($lessons as $lesson_id => $lesson) {
             $columns[] = $lesson_id;

diff --git a/main/inc/lib/myspace.lib.php b/main/inc/lib/myspace.lib.php
@@ -514,7 +514,6 @@ public static function display_tracking_lp_progress_overview($sessionId = '', $c
             get_lang('LastName'),
         );
         //add lessons of course
-        require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
         $lessons = LearnpathList::get_course_lessons($course['code'], $sessionId);
 
         //create columns array

diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php
@@ -626,7 +626,6 @@ public static function get_session_lp_progress($sessionId = 0, $courseId = 0, $d
         }
 
         //Get lessons
-        require_once api_get_path(SYS_CODE_PATH) . 'newscorm/learnpathList.class.php';
         $lessons = LearnpathList::get_course_lessons($course['code'], $sessionId);
 
         $table = array();
@@ -3443,7 +3442,6 @@ public static function copy_session($id, $copy_courses = true, $copy_users = tru
                         if ($course_info) {
                             //By default new elements are invisible
                             if ($set_exercises_lp_invisible) {
-                                require_once api_get_path(SYS_CODE_PATH) . 'newscorm/learnpathList.class.php';
                                 $list = new LearnpathList('', $course_info['code'], $sid);
                                 $flat_list = $list->get_flat_list();
                                 if (!empty($flat_list)) {
@@ -5379,7 +5377,7 @@ public static function getAllCourseCoaches()
     }
 
     /**
-     * Calculate the total user time in the platform 
+     * Calculate the total user time in the platform
      * @param int $userId The user id
      * @param string $from Optional. From date
      * @param string $until Optional. Until date

diff --git a/main/newscorm/learnpathList.class.php b/main/newscorm/learnpathList.class.php
@@ -2,15 +2,15 @@
 /* For licensing terms, see /license.txt */
 
 /**
- * Class learnpathList
+ * Class LearnpathList
  * This class is only a learning path list container with several practical methods for sorting the list and
  * provide links to specific paths
  * @uses	Database.lib.php to use the database
  * @uses	learnpath.class.php to generate learnpath objects to get in the list
  * @author	Yannick Warnier <ywarnier@beeznest.org>
  *
  */
-class learnpathList
+class LearnpathList
 {
     // Holds a flat list of learnpaths data from the database.
     public $list = array();

diff --git a/main/tracking/course_session_report.php b/main/tracking/course_session_report.php
@@ -94,7 +94,7 @@
 	$attempt_result = array();
 
 	//Getting LP list
-	$list = new learnpathList('', $current_course['code'], $session_id);
+	$list = new LearnpathList('', $current_course['code'], $session_id);
 	$lp_list = $list->get_flat_list();
 
 	// Looping LPs