From e7c88ff91bcd685cef1bb7e952932176b467ec00 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 3 Feb 2011 14:40:15 +0100
Subject: [PATCH] Minor corrections

---
 main/admin/add_courses_to_session.php |  8 +++---
 main/admin/session_course_edit.php    | 36 +++++++--------------------
 main/inc/lib/usermanager.lib.php      |  6 +++--
 3 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/main/admin/add_courses_to_session.php b/main/admin/add_courses_to_session.php
index b0d66e258a..218521d61b 100755
--- a/main/admin/add_courses_to_session.php
+++ b/main/admin/add_courses_to_session.php
@@ -11,21 +11,19 @@ $language_file='admin';
 // resetting the course id
 $cidReset=true;
 
-require_once('../inc/global.inc.php');
+require_once '../inc/global.inc.php';
 
 // including additonal libraries
 
 require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php';
-require_once (api_get_path(LIBRARY_PATH).'add_courses_to_session_functions.lib.php');
+require_once api_get_path(LIBRARY_PATH).'add_courses_to_session_functions.lib.php';
 
 
 $xajax = new xajax();
 //$xajax->debugOn();
 $xajax -> registerFunction (array('search_courses', 'AddCourseToSession', 'search_courses'));
 
-
-
-// setting the section (for the tabs)
+// Setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
 
 // Access restrictions
diff --git a/main/admin/session_course_edit.php b/main/admin/session_course_edit.php
index f1617ac935..1888b7543f 100755
--- a/main/admin/session_course_edit.php
+++ b/main/admin/session_course_edit.php
@@ -1,15 +1,14 @@
-<?php //$id: $
-/* For licensing terms, see /dokeos_license.txt */
+<?php
+/* For licensing terms, see /license.txt */
 /**
  * Implements the edition of course-session settings
- * @package dokeos.admin
+ * @package chamilo.admin
  */
 // name of the language file that needs to be included
 $language_file='admin';
-
 $cidReset=true;
 
-require '../inc/global.inc.php';
+require_once '../inc/global.inc.php';
 require_once '../inc/lib/sessionmanager.lib.php';
 // setting the section (for the tabs)
 /*$this_section=SECTION_PLATFORM_ADMIN;
@@ -79,9 +78,7 @@ if ($_POST['formSent']) {
 		exit();
 
 	}
-
-}else {
-
+} else {
 	$sql = "SELECT id_user FROM $tbl_session_rel_course_rel_user WHERE id_session = '$id_session' AND course_code = '$course_code' AND status = 2 ";
 	$rs = Database::query($sql);
 
@@ -117,20 +114,15 @@ api_display_tool_title($tool_name);
 <table border="0" cellpadding="5" cellspacing="0" width="550">
 
 <?php
-if(!empty($errorMsg))
-{
+if(!empty($errorMsg)) {
 ?>
-
 <tr>
   <td colspan="2">
-
 <?php
 	Display::display_normal_message($errorMsg);
 ?>
-
   </td>
 </tr>
-
 <?php
 }
 ?>
@@ -141,19 +133,13 @@ if(!empty($errorMsg))
 	<option value="0">----- <?php echo get_lang("Choose") ?> -----</option>
 	<option value="0" <?php if(count($arr_infos) == 0) echo 'selected="selected"'; ?>><?php echo get_lang('None') ?></option>
 <?php
-
-foreach($coaches as $enreg)
-{
+foreach($coaches as $enreg) {
 ?>
-
-	<option value="<?php echo $enreg['user_id']; ?>" <?php if((!$sent && (is_array($arr_infos) && in_array($enreg['user_id'],$arr_infos))) || ($sent && $enreg['user_id'] == $id_coach)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?></option>
-
+<option value="<?php echo $enreg['user_id']; ?>" <?php if((!$sent && (is_array($arr_infos) && in_array($enreg['user_id'],$arr_infos))) || ($sent && $enreg['user_id'] == $id_coach)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?></option>
 <?php
 }
-
 unset($coaches);
 ?>
-
   </select></td>
 </tr>
 <tr>
@@ -161,11 +147,7 @@ unset($coaches);
   <td><button class="save" type="submit" name="name" value="<?php echo get_lang('AssignCoach') ?>"><?php echo get_lang('AssignCoach') ?></button>
 </td>
 </tr>
-
 </table>
-
 </form>
-
 <?php
-Display::display_footer();
-?>
+Display::display_footer();
\ No newline at end of file
diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index 86f6992e4c..f7e8934497 100755
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -1919,7 +1919,8 @@ class UserManager
 		if (api_is_allowed_to_create_course()) {
 			foreach($sessions as $enreg) {
 				$id_session = $enreg['id'];
-				$personal_course_list_sql = "SELECT DISTINCT course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, ".(api_is_western_name_order() ? "CONCAT(user.firstname,' ',user.lastname)" : "CONCAT(user.lastname,' ',user.firstname)")." t, email, course.course_language l, 1 sort, category_code user_course_cat, date_start, date_end, session.id as id_session, session.name as session_name
+				$personal_course_list_sql = "SELECT DISTINCT course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, ".(api_is_western_name_order() ? "CONCAT(user.firstname,' ',user.lastname)" : "CONCAT(user.lastname,' ',user.firstname)")." t, email, course.course_language l, 1 sort, category_code user_course_cat, date_start, date_end, " .
+                        "session.id as id_session, session.name as session_name
 					FROM $tbl_session_course_user as session_course_user
 						INNER JOIN $tbl_course AS course
 							ON course.code = session_course_user.course_code
@@ -1958,7 +1959,8 @@ class UserManager
 										 ORDER BY i";
 				*/
 			// this query is very similar to the above query, but it will check the session_rel_course_user table if there are courses registered to our user or not
-			$personal_course_list_sql = "SELECT distinct course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, CONCAT(user.lastname,' ',user.firstname) t, email, course.course_language l, 1 sort, category_code user_course_cat, date_start, date_end, session.id as id_session, session.name as session_name, IF((session_course_user.id_user = 3 AND session_course_user.status=2),'2', '5')
+			$personal_course_list_sql = "SELECT distinct course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, CONCAT(user.lastname,' ',user.firstname) t, email, course.course_language l, 1 sort, category_code user_course_cat, date_start, date_end, session.id as id_session, session.name as session_name, " .
+                                        "IF((session_course_user.id_user = 3 AND session_course_user.status=2),'2', '5')
 										FROM $tbl_session_course_user as session_course_user
 										INNER JOIN $tbl_course AS course
 										ON course.code = session_course_user.course_code AND session_course_user.id_session = $id_session