From 2ec83d39192a3d5f6a650c88b290237128c8dc10 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Wed, 7 Jan 2015 12:01:45 -0500
Subject: [PATCH] Don't show the learning paths' progress and exercises by
 invited users - refs BT#9070

---
 main/inc/lib/tracking.lib.php | 11 +++++++++--
 main/mySpace/myStudents.php   |  4 ++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php
index 6602f0bf9b..f28f25daf1 100755
--- a/main/inc/lib/tracking.lib.php
+++ b/main/inc/lib/tracking.lib.php
@@ -5711,9 +5711,10 @@ class TrackingCourseLog
      * @param $number_of_items
      * @param $column
      * @param $direction
+     * @param $includeInvitedUsers boolean Whether include the invited users
      * @return array
      */
-    public static function get_user_data($from, $number_of_items, $column, $direction)
+    public static function get_user_data($from, $number_of_items, $column, $direction, $includeInvitedUsers = false)
     {
         global $user_ids, $course_code, $additional_user_profile_info, $export_csv, $is_western_name_order, $csv_content, $session_id;
 
@@ -5749,13 +5750,19 @@ class TrackingCourseLog
     		$url_condition = " AND user.user_id = url_users.user_id AND access_url_id='$access_url_id'";
     	}
 
+        $invitedUsersCondition = '';
+
+        if (!$includeInvitedUsers) {
+            $invitedUsersCondition = " AND user.status != " . ROLE_INVITED;
+        }
+
     	$sql = "SELECT  user.user_id as user_id,
                     user.official_code  as col0,
                     user.lastname       as col1,
                     user.firstname      as col2,
                     user.username       as col3
                 FROM $tbl_user as user $url_table
-    	        $condition_user $url_condition";
+    	        $condition_user $url_condition $invitedUsersCondition";
 
     	if (!in_array($direction, array('ASC','DESC'))) {
     		$direction = 'ASC';
diff --git a/main/mySpace/myStudents.php b/main/mySpace/myStudents.php
index ac4e35eb5e..214fce1440 100755
--- a/main/mySpace/myStudents.php
+++ b/main/mySpace/myStudents.php
@@ -754,6 +754,7 @@ if (!empty($student_id)) {
             echo '</table>';
         }
     } else {
+        if ($user_info['status'] != ROLE_INVITED) {
         $csv_content[] = array();
         $csv_content[] = array(str_replace('&nbsp;', '', $table_title));
         $t_lp = Database :: get_course_table(TABLE_LP_MAIN);
@@ -935,7 +936,9 @@ if (!empty($student_id)) {
         }
         ?>
         </table>
+        <?php } ?>
         <!-- line about exercises -->
+        <?php if ($user_info['status'] != ROLE_INVITED) { ?>
         <table class="data_table">
         <tr>
             <th><?php echo get_lang('Exercices'); ?></th>
@@ -1047,6 +1050,7 @@ if (!empty($student_id)) {
             echo '<tr><td colspan="6">'.get_lang('NoExercise').'</td></tr>';
         }
         echo '</table>';
+        }
 
         //@when using sessions we do not show the survey list
         if (empty($session_id)) {