Merge branch '1.10.x' of github.com:chamilo/chamilo-lms into 1.10.x

main/inc/lib/tracking.lib.php

@@ -1291,12 +1291,19 @@ class Tracking
     		$condition_user = " AND user_id = $user_id ";
     	}
 
-    	$sql = "SELECT SUM(UNIX_TIMESTAMP(logout_course_date) - UNIX_TIMESTAMP(login_course_date)) as nb_seconds
-                FROM $tbl_track_course
-                WHERE
-                    UNIX_TIMESTAMP(logout_course_date) > UNIX_TIMESTAMP(login_course_date) AND
-                    c_id = '$courseId' AND
-                    session_id = '$session_id' $condition_user";
+    	$sql = "SELECT SUM(UNIX_TIMESTAMP(logout_course_date) - UNIX_TIMESTAMP(login_course_date)) as nb_seconds "
+            . "FROM $tbl_track_course "
+            . "WHERE UNIX_TIMESTAMP(logout_course_date) > UNIX_TIMESTAMP(login_course_date) ";
+
+        if ($courseId != 0) {
+            $sql .= "AND c_id = '$courseId' ";
+        }
+
+        if ($session_id != -1) {
+            $sql .= "AND session_id = '$session_id' ";
+        }
+
+        $sql .= $condition_user;
 
         $rs = Database::query($sql);
     	$row = Database::fetch_array($rs);

main/mySpace/company_reports.php

@@ -22,7 +22,7 @@ $tool_name = get_lang('Report');
 $this_section = SECTION_TRACKING;
 
 $htmlHeadXtra[] = api_get_jqgrid_js();
-$sessionId = isset($_GET['session_id']) ? intval($_GET['session_id']) : 0;
+$sessionId = isset($_GET['session_id']) ? intval($_GET['session_id']) : -1;
 
 //jqgrid will use this URL to do the selects
 $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_user_course_report&session_id='.$sessionId;

main/mySpace/company_reports_resumed.php

@@ -20,7 +20,7 @@ $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('MySpace'));
 $tool_name = get_lang('Report');
 $this_section = SECTION_TRACKING;
 $htmlHeadXtra[] = api_get_jqgrid_js();
-$sessionId = isset($_GET['session_id']) ? intval($_GET['session_id']) : 0;
+$sessionId = isset($_GET['session_id']) ? intval($_GET['session_id']) : -1;
 
 // jqgrid will use this URL to do the selects
 $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_user_course_report_resumed&session_id='.$sessionId;