Adding status col in the resume session page BT#4871

main/admin/resume_session.php

@@ -229,6 +229,9 @@ echo Display::page_subheader(get_lang('StudentList').$url);
         <th>
             <?php echo get_lang('User'); ?>
         </th>
+        <th>
+            <?php echo get_lang('Status'); ?>
+        </th>
         <th>
             <?php echo get_lang('Information'); ?>
         </th>
@@ -251,13 +254,24 @@ if ($session['nbr_users'] == 0) {
 	$orig_param = '&origin=resume_session&id_session='.$id_session; // change breadcrumb in destination page
     
     $users = SessionManager::get_users_by_session($id_session, 0);        
-    $reasons = SessionManager::get_session_change_user_reasons();
+    //$reasons = SessionManager::get_session_change_user_reasons();
     
     if (!empty($users)) {
         foreach ($users as $user) {
+            $user_info = api_get_user_info($user['user_id']);
+            //$link_class = 'class="item_disabled"';
+            $link_class = null;
+            $user_status_in_platform = Display::return_icon('error.png', get_lang('Inactive'));
+            if ($user_info['active'] == 1 ) {
+                $user_status_in_platform = Display::return_icon('accept.png', get_lang('Active'));                
+                //$link_class = null;
+            } else {
+                $user_info['complete_name_with_username'] = Display::tag('del', $user_info['complete_name_with_username']);
+            }
+            
             $user_link = '';            
             if (!empty($user['user_id'])) {
-                $user_link = '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_information.php?user_id='.intval($user['user_id']).'">'.api_htmlentities(api_get_person_name($user['firstname'], $user['lastname']),ENT_QUOTES,$charset).' ('.$user['username'].')</a>';
+                $user_link = '<a '.$link_class.' href="'.api_get_path(WEB_CODE_PATH).'admin/user_information.php?user_id='.intval($user['user_id']).'">'.$user_info['complete_name_with_username'].'</a>';
             }
             $information = null;
             $origin = null;
@@ -265,6 +279,10 @@ if ($session['nbr_users'] == 0) {
             $row_style = null;
             $moved_date = '-';   
             
+            
+          
+
+            $course_link = '<a href="session_course_user.php?id_user='.$user['user_id'].'&id_session='.$id_session.'">'.Display::return_icon('course.gif', get_lang('BlockCoursesForThisUser')).'&nbsp;</a>';
             $moved_link =  '<a href="change_user_session.php?user_id='.$user['user_id'].'&id_session='.$id_session.'">'.Display::return_icon('move.png', get_lang('ChangeUserSession')).'</a>&nbsp;';
 
             //User in this session is subscribed but was moved to another session
@@ -288,6 +306,7 @@ if ($session['nbr_users'] == 0) {
                     }            
                 }
                 $row_style = 'style = " background-color: #ddd;"';
+                $course_link=  Display::return_icon('course_na.gif', get_lang('BlockCoursesForThisUser')).'&nbsp;';
                 $moved_link =  Display::return_icon('move_na.png', get_lang('ChangeUserSession')).'&nbsp;';
                 $delete_link = Display::return_icon('delete_na.png', get_lang('Delete')).'&nbsp;';
             } else {          
@@ -330,13 +349,15 @@ if ($session['nbr_users'] == 0) {
                     <td width="30%">
                         '.$user_link.'
                     </td>
+                    <td>'.$user_status_in_platform.'</td>
                     <td>'.$information.'</td>
                     <td>'.$origin.' '.$destination.'</td>
                     <td>'.$moved_date.'</td>
                         
+
                     <td>
                         <a href="../mySpace/myStudents.php?student='.$user['user_id'].''.$orig_param.'">'.Display::return_icon('statistics.gif', get_lang('Reporting')).'</a>&nbsp;
-                        <a href="session_course_user.php?id_user='.$user['user_id'].'&id_session='.$id_session.'">'.Display::return_icon('course.gif', get_lang('BlockCoursesForThisUser')).'</a>&nbsp;
+                        '.$course_link.'
                         '.$moved_link.'
                         '.$delete_link.'
                         '.$link_to_add_user_in_url.'

main/css/base.css

@@ -4647,8 +4647,6 @@ i.size-32.icon-new-work{
     margin-bottom:5px;    
 }
 
-
-
 /* Fixing z-index */
 #ui-datepicker-div {
     z-index: 1005 !important;

main/inc/ajax/user_manager.ajax.php

@@ -78,7 +78,7 @@ switch ($action) {
             
 			if (!empty($user_id)) {
 				$user_table = Database :: get_main_table(TABLE_MAIN_USER);
-				$sql="UPDATE $user_table SET active='".$status."' WHERE user_id='".$user_id."'";
+				$sql = "UPDATE $user_table SET active='".$status."' WHERE user_id='".$user_id."'";
 				$result = Database::query($sql);
                 
 				//Send and email if account is active
@@ -94,8 +94,8 @@ switch ($action) {
 					$emailbody.=sprintf(get_lang('YouCanNowLoginAtXUsingTheLoginAndThePasswordYouHaveProvided'), api_get_path(WEB_PATH)).",\n\n";
 					$emailbody.=get_lang('HaveFun')."\n\n";
 					//$emailbody.=get_lang('Problem'). "\n\n". get_lang('Formula');
-					$emailbody.=api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n". get_lang('Manager'). " ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".api_get_setting('emailAdministrator');
-					$result = api_mail($recipient_name, $user_info['mail'], $emailsubject, $emailbody, $sender_name, $email_admin);					
+					$emailbody.= api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n". get_lang('Manager'). " ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".api_get_setting('emailAdministrator');
+					$result = api_mail_html($recipient_name, $user_info['mail'], $emailsubject, $emailbody, $sender_name, $email_admin);					
 				}
                 echo $status;
             }				

main/inc/lib/display.lib.php

@@ -645,7 +645,7 @@ class Display {
             }
         }
         //some tags don't have this </XXX>
-        if (in_array($tag, array('img','input','br'))) {
+        if (in_array($tag, array('img', 'input', 'br'))) {
             $return_value = '<'.$tag.' '.$attribute_list.' />';
         } else {
             $return_value = '<'.$tag.' '.$attribute_list.' > '.$content.'</'.$tag.'>';

main/inc/lib/main_api.lib.php

@@ -995,6 +995,7 @@ function _api_format_user($user, $add_password = false) {
     }
 
     $result['complete_name'] 	= api_get_person_name($firstname, $lastname);
+    $result['complete_name_with_username'] 	= $result['complete_name'].' ('.$user['username'].')';
 
     $result['firstname'] 		= $firstname;
     $result['lastname'] 		= $lastname;
@@ -1016,6 +1017,7 @@ function _api_format_user($user, $add_password = false) {
     $result['official_code']    = $user['official_code'];
     $result['status']           = $user['status'];
     $result['auth_source']      = $user['auth_source'];
+    $result['active']           = $user['active'];
 
     if (isset($user['username'])) {
         $result['username']         = $user['username'];