Updating libraries include references. course.lib.php and sessionmanager.lib.php added to global due the constant use in the platform

main/inc/lib/attendance.lib.php

@@ -341,8 +341,6 @@ class Attendance
 	 */
 	public function get_users_rel_course($attendance_id = 0) {
 	    
-	    require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php';
-	    
 		$current_session_id = api_get_session_id();
 		$current_course_id  = api_get_course_id();
 		if (!empty($current_session_id)) {

main/inc/lib/document.lib.php

@@ -12,9 +12,6 @@
 /**
  * Code
  */
-require_once api_get_path(LIBRARY_PATH).'course.lib.php';
-require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
-require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php';
 
 /* CONSTANTS */
 

main/inc/lib/main_api.lib.php

@@ -2098,9 +2098,10 @@ function api_display_debug_info($debug_info) {
 
 function api_is_allowed_to_edit($tutor = false, $coach = false, $session_coach = false) {
 
-    $my_session_id = api_get_session_id();
-    $is_allowed_coach_to_edit = api_is_coach();
-    $session_visibility = api_get_session_visibility($my_session_id);
+    $my_session_id 				= api_get_session_id();
+    $is_allowed_coach_to_edit 	= api_is_coach();
+    $session_visibility 		= api_get_session_visibility($my_session_id);
+    
     $is_courseAdmin = api_is_course_admin() || api_is_platform_admin();
     if (!$is_courseAdmin && $tutor) {   // If we also want to check if the user is a tutor...
         $is_courseAdmin = $is_courseAdmin || api_is_course_tutor();

main/inc/lib/promotion.lib.php

@@ -69,8 +69,7 @@ class Promotion extends Model {
 				 * 1. Copy a new session from the source
 				 * 2. Copy all courses from the session (no user data, no user list)
 				 * 3. Create the promotion
-				 */
-				require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php';
+				 */				
 				$session_list   = SessionManager::get_all_sessions_by_promotion($id);
 				
 				if (!empty($session_list)) {
@@ -123,8 +122,7 @@ class Promotion extends Model {
      * @param   int     promotion id
      * @param   int     status (1, 0)
     */
-    public function update_all_sessions_status_by_promotion_id($promotion_id, $status) { 
-        require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php';               
+    public function update_all_sessions_status_by_promotion_id($promotion_id, $status) {
         $session_list   = SessionManager::get_all_sessions_by_promotion($promotion_id);    
         if (!empty($session_list)) {
             foreach($session_list  as $item) {

main/inc/lib/sessionmanager.lib.php

@@ -9,8 +9,7 @@
  * Code
  */
 /* LIBRARIES */
-require_once 'display.lib.php';
-require_once 'course.lib.php';
+
 
 /**
 *	This class provides methods for sessions management.
@@ -1254,7 +1253,7 @@ class SessionManager {
 
 	/**
 	 * Get sessions followed by human resources manager
-	 * @param int		Human resources manager id
+	 * @param int		Human resources manager or Session admin id
 	 * @return array 	sessions
 	 */
 	public static function get_sessions_followed_by_drh($hr_manager_id) {
@@ -1283,6 +1282,8 @@ class SessionManager {
 		return $assigned_sessions_to_hrm;
 	}
 
+	
+
 	/**
 	 * Gets the list of courses by session filtered by access_url
 	 * @param int session id
@@ -1329,22 +1330,27 @@ class SessionManager {
     /**
      * Get users by session
      * @param   int sesssion id
+     * @param	int	filter by status 
      * @return  array a list with an user list
      */
-    public static function get_users_by_session($id) {
+    public static function get_users_by_session($id, $with_status = false) {
         if (empty($id)) {
             return array();
         }
         $id = intval($id);
         $tbl_user                           = Database::get_main_table(TABLE_MAIN_USER);
         $tbl_session_rel_user               = Database::get_main_table(TABLE_MAIN_SESSION_USER);
-        $order_clause ='';
+
         $sql = 'SELECT '.$tbl_user.'.user_id, lastname, firstname, username
                 FROM '.$tbl_user.'
                 INNER JOIN '.$tbl_session_rel_user.'
                     ON '.$tbl_user.'.user_id = '.$tbl_session_rel_user.'.id_user 
-                    AND '.$tbl_session_rel_user.'.id_session = '.$id.$order_clause;
-        $result=Database::query($sql);
+                    AND '.$tbl_session_rel_user.'.id_session = '.$id;
+        if ($with_status !== false) {
+        	$with_status = intval($with_status);
+        	$sql .= " WHERE relation_type = $with_status ";
+        }        
+        $result = Database::query($sql);
         while ($row = Database::fetch_array($result,'ASSOC')) {
             $return_array[] = $row;
         }
@@ -1496,8 +1502,7 @@ class SessionManager {
             
             //We will copy the current courses of the session to new courses
             if (!empty($short_courses)) {
-                if ($create_new_courses) {                    
-                    require_once api_get_path(LIBRARY_PATH).'course.lib.php';
+                if ($create_new_courses) {
                     //Just in case
                     if (function_exists('ini_set')) {
                     	ini_set('memory_limit','256M');

main/inc/lib/usergroup.lib.php

@@ -9,7 +9,6 @@
  * Code
  */
 require_once 'model.lib.php';
-require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php';
 /**
  * Class
  * @package chamilo.library
@@ -107,8 +106,7 @@ class UserGroup extends Model {
      * @param   int     usergroup id
      * @param   array   list of session ids
     */
-    function subscribe_sessions_to_usergroup($usergroup_id, $list) {
-        require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php';
+    function subscribe_sessions_to_usergroup($usergroup_id, $list) {        
         $current_list = self::get_sessions_by_usergroup($usergroup_id);
         $user_list    = self::get_users_by_usergroup($usergroup_id);
      
@@ -172,8 +170,7 @@ class UserGroup extends Model {
      * @param   array   list of course ids
      */
     function subscribe_courses_to_usergroup($usergroup_id, $list) {
-        require_once api_get_path(LIBRARY_PATH).'course.lib.php';
-  
+          
         $current_list = self::get_courses_by_usergroup($usergroup_id);
         $user_list    = self::get_users_by_usergroup($usergroup_id);