Inspection of "Merge pull request #1341 from jloguercio/1.11.x" - chamilo/chamilo-lms - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — 1.11.x ( 60645e...aacf46 )

by José

created 2016-08-02 23:18 UTC

Status

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -2,7 +2,7 @@
 block discarded – undo
 // $Id: x05.php,v 1.1.8.1 2008/06/12 20:34:31 smk Exp $
 
 return array(
-  'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, 'A', 'B', 'G', 'D', 'E', 'Z', 'E', 'E', 'T`', 'Zh', 'I', 'L', 'Kh', 'Ts', 'K',

Please login to merge, or discard this patch.

main/work/show_file.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@
 block discarded – undo
 use ChamiloSession as Session;
 
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_STUDENTPUBLICATION;
+$current_course_tool = TOOL_STUDENTPUBLICATION;
 
 api_protect_course_script(true);
 

Please login to merge, or discard this patch.

main/work/add_document.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@
 block discarded – undo
 use ChamiloSession as Session;
 
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_STUDENTPUBLICATION;
+$current_course_tool = TOOL_STUDENTPUBLICATION;
 
 api_protect_course_script(true);
 

Please login to merge, or discard this patch.

main/work/download.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@
 block discarded – undo
 use ChamiloSession as Session;
 
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_STUDENTPUBLICATION;
+$current_course_tool = TOOL_STUDENTPUBLICATION;
 
 api_protect_course_script(true);
 

Please login to merge, or discard this patch.

main/work/upload.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@
 block discarded – undo
 use ChamiloSession as Session;
 
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_STUDENTPUBLICATION;
+$current_course_tool = TOOL_STUDENTPUBLICATION;
 
 api_protect_course_script(true);
 

Please login to merge, or discard this patch.

main/auth/ldap/newUser.php 1 patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -21,17 +21,17 @@
 block discarded – undo
 
 if ($ldap_login_success)
 {
-	//error_log('Found user '.$login.' on LDAP server',0);
-	/*
+    //error_log('Found user '.$login.' on LDAP server',0);
+    /*
 		In here, we know that
 		- the user does not exist in dokeos
 		- the users login and password are correct
 	*/
-	$info_array = ldap_find_user_info($login);
-	ldap_put_user_info_locally($login, $info_array);
+    $info_array = ldap_find_user_info($login);
+    ldap_put_user_info_locally($login, $info_array);
 } else {
     //error_log('Could not find '.$login.' on LDAP server',0);
-	$loginFailed = true;
-	unset($_user['user_id']);
-	$uidReset = false;
+    $loginFailed = true;
+    unset($_user['user_id']);
+    $uidReset = false;
 }

Please login to merge, or discard this patch.

main/webservices/soap_session.php 1 patch

Indentation +60 added lines, -60 removed lines patch added patch discarded remove patch

@@ -13,19 +13,19 @@  discard block
 block discarded – undo
 $s->register(
     'WSSession.CreateSession',
     array(
-	'secret_key' => 'xsd:string',
-	'name' => 'xsd:string',
-	'start_date' => 'xsd:string',
-	'end_date' => 'xsd:string',
-	'nb_days_access_before' => 'xsd:int',
-	'nb_days_access_after' => 'xsd:int',
-	'nolimit' => 'xsd:int',
-	'visibility' => 'xsd:int',
-	'user_id_field_name' => 'xsd:string',
-	'user_id_value' => 'xsd:string',
-	'session_id_field_name' => 'xsd:string',
-	'session_id_value' => 'xsd:string',
-	'extras' => 'tns:extra_field'
+    'secret_key' => 'xsd:string',
+    'name' => 'xsd:string',
+    'start_date' => 'xsd:string',
+    'end_date' => 'xsd:string',
+    'nb_days_access_before' => 'xsd:int',
+    'nb_days_access_after' => 'xsd:int',
+    'nolimit' => 'xsd:int',
+    'visibility' => 'xsd:int',
+    'user_id_field_name' => 'xsd:string',
+    'user_id_value' => 'xsd:string',
+    'session_id_field_name' => 'xsd:string',
+    'session_id_value' => 'xsd:string',
+    'extras' => 'tns:extra_field'
     ),
     array('return' => 'xsd:int')
 );
@@ -33,50 +33,50 @@  discard block
 block discarded – undo
 $s->register(
     'WSSession.DeleteSession',
     array(
-	'secret_key' => 'xsd:string',
-	'session_id_field_name' => 'xsd:string',
-	'session_id_value' => 'xsd:string'
+    'secret_key' => 'xsd:string',
+    'session_id_field_name' => 'xsd:string',
+    'session_id_value' => 'xsd:string'
     )
 );
 
 $s->register(
     'WSSession.EditSession',
     array(
-	'secret_key' => 'xsd:string',
-	'name' => 'xsd:string',
-	'start_date' => 'xsd:string',
-	'end_date' => 'xsd:string',
-	'nb_days_access_before' => 'xsd:int',
-	'nb_days_access_after' => 'xsd:int',
-	'nolimit' => 'xsd:int',
-	'visibility' => 'xsd:int',
-	'user_id_field_name' => 'xsd:string',
-	'user_id_value' => 'xsd:string',
-	'session_id_field_name' => 'xsd:string',
-	'session_id_value' => 'xsd:string',
-	'extras' => 'tns:extra_field'
+    'secret_key' => 'xsd:string',
+    'name' => 'xsd:string',
+    'start_date' => 'xsd:string',
+    'end_date' => 'xsd:string',
+    'nb_days_access_before' => 'xsd:int',
+    'nb_days_access_after' => 'xsd:int',
+    'nolimit' => 'xsd:int',
+    'visibility' => 'xsd:int',
+    'user_id_field_name' => 'xsd:string',
+    'user_id_value' => 'xsd:string',
+    'session_id_field_name' => 'xsd:string',
+    'session_id_value' => 'xsd:string',
+    'extras' => 'tns:extra_field'
     )
 );
 
 $s->register(
     'WSSession.SubscribeUserToSession',
     array(
-	'secret_key' => 'xsd:string',
-	'user_id_field_name' => 'xsd:string',
-	'user_id_value' => 'xsd:string',
-	'session_id_field_name' => 'xsd:string',
-	'session_id_value' => 'xsd:string'
+    'secret_key' => 'xsd:string',
+    'user_id_field_name' => 'xsd:string',
+    'user_id_value' => 'xsd:string',
+    'session_id_field_name' => 'xsd:string',
+    'session_id_value' => 'xsd:string'
     )
 );
 
 $s->register(
     'WSSession.UnsubscribeUserFromSession',
     array(
-	'secret_key' => 'xsd:string',
-	'user_id_field_name' => 'xsd:string',
-	'user_id_value' => 'xsd:string',
-	'session_id_field_name' => 'xsd:string',
-	'session_id_value' => 'xsd:string'
+    'secret_key' => 'xsd:string',
+    'user_id_field_name' => 'xsd:string',
+    'user_id_value' => 'xsd:string',
+    'session_id_field_name' => 'xsd:string',
+    'session_id_value' => 'xsd:string'
     )
 );
 
@@ -84,46 +84,46 @@  discard block
 block discarded – undo
     'WSSession.SubscribeTeacherToSessionCourse',
     array(
         'secret_key' => 'xsd:string',
-	'user_id_field_name' => 'xsd:string',
-	'user_id_value' => 'xsd:string',
-	'session_id_field_name' => 'xsd:string',
-	'session_id_value' => 'xsd:string',
+    'user_id_field_name' => 'xsd:string',
+    'user_id_value' => 'xsd:string',
+    'session_id_field_name' => 'xsd:string',
+    'session_id_value' => 'xsd:string',
         'course_id_field_name' => 'xsd:string',
-	'course_id_value' => 'xsd:string'
+    'course_id_value' => 'xsd:string'
     )
 );
 
 $s->register(
     'WSSession.UnsubscribeTeacherFromSessionCourse',
     array(
-	'secret_key' => 'xsd:string',
-	'user_id_field_name' => 'xsd:string',
-	'user_id_value' => 'xsd:string',
-	'session_id_field_name' => 'xsd:string',
-	'session_id_value' => 'xsd:string',
+    'secret_key' => 'xsd:string',
+    'user_id_field_name' => 'xsd:string',
+    'user_id_value' => 'xsd:string',
+    'session_id_field_name' => 'xsd:string',
+    'session_id_value' => 'xsd:string',
         'course_id_field_name' => 'xsd:string',
-	'course_id_value' => 'xsd:string'
+    'course_id_value' => 'xsd:string'
     )
 );
 
 $s->register(
     'WSSession.SubscribeCourseToSession',
     array(
-	'secret_key' => 'xsd:string',
-	'course_id_field_name' => 'xsd:string',
-	'course_id_value' => 'xsd:string',
-	'session_id_field_name' => 'xsd:string',
-	'session_id_value' => 'xsd:string'
+    'secret_key' => 'xsd:string',
+    'course_id_field_name' => 'xsd:string',
+    'course_id_value' => 'xsd:string',
+    'session_id_field_name' => 'xsd:string',
+    'session_id_value' => 'xsd:string'
     )
 );
 
 $s->register(
     'WSSession.UnsubscribeCourseFromSession',
     array(
-	'secret_key' => 'xsd:string',
-	'course_id_field_name' => 'xsd:string',
-	'course_id_value' => 'xsd:string',
-	'session_id_field_name' => 'xsd:string',
-	'session_id_value' => 'xsd:string'
+    'secret_key' => 'xsd:string',
+    'course_id_field_name' => 'xsd:string',
+    'course_id_value' => 'xsd:string',
+    'session_id_field_name' => 'xsd:string',
+    'session_id_value' => 'xsd:string'
     )
 );

Please login to merge, or discard this patch.

main/mySpace/lp_tracking.php 2 patches

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -11,10 +11,10 @@  discard block
 block discarded – undo
 $from_myspace = false;
 $from_link = '';
 if (isset($_GET['from']) && $_GET['from'] == 'myspace') {
-	$from_link = '&from=myspace';
-	$this_section = SECTION_TRACKING;
+    $from_link = '&from=myspace';
+    $this_section = SECTION_TRACKING;
 } else {
-	$this_section = SECTION_COURSES;
+    $this_section = SECTION_COURSES;
 }
 
 $session_id  = isset($_REQUEST['id_session']) && !empty($_REQUEST['id_session']) ? intval($_REQUEST['id_session']) : api_get_session_id();
@@ -35,19 +35,19 @@  discard block
 block discarded – undo
 if (!api_is_platform_admin(true) &&
     !CourseManager :: is_course_teacher(api_get_user_id(), $courseCode) &&
     !Tracking :: is_allowed_to_coach_student(api_get_user_id(), $user_id) && !api_is_drh() && !api_is_course_tutor()) {
-	api_not_allowed();
+    api_not_allowed();
 }
 
 if ($origin == 'user_course') {
-	$interbreadcrumb[] = array ("url" => api_get_path(WEB_COURSE_PATH).$course_info['directory'], 'name' => $course_info['name']);
-	$interbreadcrumb[] = array ("url" => "../user/user.php?cidReq=".$courseCode, "name" => get_lang("Users"));
+    $interbreadcrumb[] = array ("url" => api_get_path(WEB_COURSE_PATH).$course_info['directory'], 'name' => $course_info['name']);
+    $interbreadcrumb[] = array ("url" => "../user/user.php?cidReq=".$courseCode, "name" => get_lang("Users"));
 } else if($origin == 'tracking_course') {
-	$interbreadcrumb[] = array ("url" => "../tracking/courseLog.php?cidReq=".$courseCode.'&id_session='.$session_id, "name" => get_lang("Tracking"));
+    $interbreadcrumb[] = array ("url" => "../tracking/courseLog.php?cidReq=".$courseCode.'&id_session='.$session_id, "name" => get_lang("Tracking"));
 } else {
-	$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
-	$interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang("MyStudents"));
- 	$interbreadcrumb[] = array ("url" => "myStudents.php?student=".$user_id, "name" => get_lang("StudentDetails"));
- 	$nameTools=get_lang("DetailsStudentInCourse");
+    $interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
+    $interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang("MyStudents"));
+        $interbreadcrumb[] = array ("url" => "myStudents.php?student=".$user_id, "name" => get_lang("StudentDetails"));
+        $nameTools=get_lang("DetailsStudentInCourse");
 }
 
 $interbreadcrumb[] = array("url" => "myStudents.php?student=".$user_id."&course=".$courseCode."&details=true&origin=".$origin , "name" => get_lang("DetailsStudentInCourse"));

Please login to merge, or discard this patch.

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -17,7 +17,7 @@  discard block
 block discarded – undo
 	$this_section = SECTION_COURSES;
 }
 
-$session_id  = isset($_REQUEST['id_session']) && !empty($_REQUEST['id_session']) ? intval($_REQUEST['id_session']) : api_get_session_id();
+$session_id = isset($_REQUEST['id_session']) && !empty($_REQUEST['id_session']) ? intval($_REQUEST['id_session']) : api_get_session_id();
 $export_csv = isset($_GET['export']) && $_GET['export'] == 'csv' ? true : false;
 $user_id = isset($_GET['student_id']) ? intval($_GET['student_id']) : api_get_user_id();
 $courseCode = isset($_GET['course']) ? Security::remove_XSS($_GET['course']) : api_get_course_id();
@@ -39,18 +39,18 @@  discard block
 block discarded – undo
 }
 
 if ($origin == 'user_course') {
-	$interbreadcrumb[] = array ("url" => api_get_path(WEB_COURSE_PATH).$course_info['directory'], 'name' => $course_info['name']);
-	$interbreadcrumb[] = array ("url" => "../user/user.php?cidReq=".$courseCode, "name" => get_lang("Users"));
-} else if($origin == 'tracking_course') {
-	$interbreadcrumb[] = array ("url" => "../tracking/courseLog.php?cidReq=".$courseCode.'&id_session='.$session_id, "name" => get_lang("Tracking"));
+	$interbreadcrumb[] = array("url" => api_get_path(WEB_COURSE_PATH).$course_info['directory'], 'name' => $course_info['name']);
+	$interbreadcrumb[] = array("url" => "../user/user.php?cidReq=".$courseCode, "name" => get_lang("Users"));
+} else if ($origin == 'tracking_course') {
+	$interbreadcrumb[] = array("url" => "../tracking/courseLog.php?cidReq=".$courseCode.'&id_session='.$session_id, "name" => get_lang("Tracking"));
 } else {
-	$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
-	$interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang("MyStudents"));
- 	$interbreadcrumb[] = array ("url" => "myStudents.php?student=".$user_id, "name" => get_lang("StudentDetails"));
- 	$nameTools=get_lang("DetailsStudentInCourse");
+	$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace'));
+	$interbreadcrumb[] = array("url" => "student.php", "name" => get_lang("MyStudents"));
+ 	$interbreadcrumb[] = array("url" => "myStudents.php?student=".$user_id, "name" => get_lang("StudentDetails"));
+ 	$nameTools = get_lang("DetailsStudentInCourse");
 }
 
-$interbreadcrumb[] = array("url" => "myStudents.php?student=".$user_id."&course=".$courseCode."&details=true&origin=".$origin , "name" => get_lang("DetailsStudentInCourse"));
+$interbreadcrumb[] = array("url" => "myStudents.php?student=".$user_id."&course=".$courseCode."&details=true&origin=".$origin, "name" => get_lang("DetailsStudentInCourse"));
 $nameTools = get_lang('LearningPathDetails');
 $sql = 'SELECT name	FROM '.Database::get_course_table(TABLE_LP_MAIN).' WHERE c_id = '.$course_info['real_id'].' AND id='.$lp_id;
 $rs  = Database::query($sql);
@@ -58,19 +58,19 @@  discard block
 block discarded – undo
 
 $origin = 'tracking';
 
-$output = require_once api_get_path(SYS_CODE_PATH) . 'lp/lp_stats.php';
+$output = require_once api_get_path(SYS_CODE_PATH).'lp/lp_stats.php';
 
 Display :: display_header($nameTools);
 echo '<div class ="actions">';
-echo '<a href="javascript:history.back();">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
+echo '<a href="javascript:history.back();">'.Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '<a href="javascript: void(0);" onclick="javascript: window.print();">
-        '.Display::return_icon('printer.png',get_lang('Print'),'',ICON_SIZE_MEDIUM).'</a>';
+        '.Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '<a href="'.api_get_self().'?export=csv&'.Security::remove_XSS($_SERVER['QUERY_STRING']).'">
-        '.Display::return_icon('export_csv.png',get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a>';
+        '.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 echo '<div class="clear"></div>';
 $session_name = api_get_session_name($session_id);
-$table_title = ($session_name? Display::return_icon('session.png', get_lang('Session'), array(), ICON_SIZE_SMALL).' '.$session_name.' ':' ').
+$table_title = ($session_name ? Display::return_icon('session.png', get_lang('Session'), array(), ICON_SIZE_SMALL).' '.$session_name.' ' : ' ').
     Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_info['name'].' '.
     Display::return_icon('user.png', get_lang('User'), array(), ICON_SIZE_SMALL).' '.$name;
 echo Display::page_header($table_title);

Please login to merge, or discard this patch.

inc/lib/internationalization_database/conversion/character_map_selector.php 1 patch

Indentation +189 added lines, -189 removed lines patch added patch discarded remove patch

		@@ -9,194 +9,194 @@
		block discarded – undo
9	9	// See http://demo.icu-project.org/icu-bin/convexp
10	10	return array(
11	11
12		- // UTF-8 multibyte encoding
13		-
14		- 'UTF-8' => 'UTF-8',
15		- 'WINDOWS-65001' => 'UTF-8',
16		- 'CP65001' => 'UTF-8',
17		- 'WIN-65001' => 'UTF-8',
18		- 'WIN65001' => 'UTF-8',
19		- '65001' => 'UTF-8',
20		-
21		- // HTML entities
22		-
23		- 'HTML-ENTITIES' => 'HTML-ENTITIES',
24		-
25		- // Singlebyte encodings
26		-
27		- 'US-ASCII' => 'US-ASCII',
28		- 'US' => 'US-ASCII',
29		- 'ASCII' => 'US-ASCII',
30		- 'CP367' => 'US-ASCII',
31		- 'ISO646-US' => 'US-ASCII',
32		-
33		- 'ISO-8859-1' => '8859-1',
34		- 'ISO8859-1' => '8859-1',
35		- '8859-1' => '8859-1',
36		- 'LATIN1' => '8859-1',
37		- 'CP819' => '8859-1',
38		-
39		- 'ISO-8859-2' => '8859-2',
40		- 'ISO8859-2' => '8859-2',
41		- '8859-2' => '8859-2',
42		- 'LATIN2' => '8859-2',
43		- 'CP912' => '8859-2',
44		-
45		- 'ISO-8859-3' => '8859-3',
46		- 'ISO8859-3' => '8859-3',
47		- '8859-3' => '8859-3',
48		- 'LATIN3' => '8859-3',
49		- 'CP913' => '8859-3',
50		-
51		- 'ISO-8859-4' => '8859-4',
52		- 'ISO8859-4' => '8859-4',
53		- '8859-4' => '8859-4',
54		- 'LATIN4' => '8859-4',
55		- 'CP914' => '8859-4',
56		-
57		- 'ISO-8859-5' => '8859-5',
58		- 'ISO8859-5' => '8859-5',
59		- '8859-5' => '8859-5',
60		- 'CYRILLIC' => '8859-5',
61		- 'CP915' => '8859-5',
62		-
63		- 'ISO-8859-6' => '8859-6',
64		- 'ISO8859-6' => '8859-6',
65		- '8859-6' => '8859-6',
66		- 'ARABIC' => '8859-6',
67		- 'CP1089' => '8859-6',
68		-
69		- 'ISO-8859-7' => '8859-7',
70		- 'ISO8859-7' => '8859-7',
71		- '8859-7' => '8859-7',
72		- 'GREEK' => '8859-7',
73		-
74		- 'ISO-8859-8' => '8859-8',
75		- 'ISO8859-8' => '8859-8',
76		- '8859-8' => '8859-8',
77		- 'HEBREW' => '8859-8',
78		-
79		- 'ISO-8859-9' => '8859-9',
80		- 'ISO8859-9' => '8859-9',
81		- '8859-9' => '8859-9',
82		- 'LATIN5' => '8859-9',
83		- 'TURKISH' => '8859-9',
84		- 'CP920' => '8859-9',
85		-
86		- 'ISO-8859-10' => '8859-10',
87		- 'ISO8859-10' => '8859-10',
88		- '8859-10' => '8859-10',
89		- 'LATIN6' => '8859-10',
90		-
91		- 'ISO-8859-11' => '8859-11',
92		- 'ISO8859-11' => '8859-11',
93		- '8859-11' => '8859-11',
94		- 'THAI8' => '8859-11',
95		-
96		- 'ISO-8859-13' => '8859-13',
97		- 'ISO8859-13' => '8859-13',
98		- '8859-13' => '8859-13',
99		- 'CP921' => '8859-13',
100		-
101		- 'ISO-8859-14' => '8859-14',
102		- 'ISO8859-14' => '8859-14',
103		- '8859-14' => '8859-14',
104		- 'LATIN8' => '8859-14',
105		- 'ISO-CELTIC' => '8859-14',
106		-
107		- 'ISO-8859-15' => '8859-15',
108		- 'ISO8859-15' => '8859-15',
109		- '8859-15' => '8859-15',
110		- 'LATIN0' => '8859-15',
111		- 'LATIN-9' => '8859-15',
112		- 'CP923' => '8859-15',
113		-
114		- 'WINDOWS-855' => 'CP855',
115		- 'CP855' => 'CP855',
116		- 'WINDOWS-855' => 'CP855',
117		- 'WIN-855' => 'CP855',
118		- 'WIN855' => 'CP855',
119		- '855' => 'CP855',
120		- 'IBM-855' => 'CP855',
121		- 'IBM855' => 'CP855',
122		-
123		- 'WINDOWS-866' => 'CP866',
124		- 'CP866' => 'CP866',
125		- 'WINDOWS-866' => 'CP866',
126		- 'WIN-866' => 'CP866',
127		- 'WIN866' => 'CP866',
128		- '866' => 'CP866',
129		- 'IBM-866' => 'CP866',
130		- 'IBM866' => 'CP866',
131		-
132		- 'WINDOWS-874' => 'CP874',
133		- 'TIS-620' => 'CP874',
134		- 'CP874' => 'CP874',
135		- 'EUCTH' => 'CP874',
136		- 'WIN-874' => 'CP874',
137		- 'WIN874' => 'CP874',
138		- '874' => 'CP874',
139		-
140		- 'WINDOWS-1250' => 'CP1250',
141		- 'CP1250' => 'CP1250',
142		- 'WIN-1250' => 'CP1250',
143		- 'WIN1250' => 'CP1250',
144		- '1250' => 'CP1250',
145		-
146		- 'WINDOWS-1251' => 'CP1251',
147		- 'CP1251' => 'CP1251',
148		- 'ANSI1251' => 'CP1251',
149		- 'WIN-1251' => 'CP1251',
150		- 'WIN1251' => 'CP1251',
151		- '1251' => 'CP1251',
152		-
153		- 'WINDOWS-1252' => 'CP1252',
154		- 'CP1252' => 'CP1252',
155		- 'WIN-1252' => 'CP1252',
156		- 'WIN1252' => 'CP1252',
157		- '1252' => 'CP1252',
158		-
159		- 'WINDOWS-1253' => 'CP1253',
160		- 'CP1253' => 'CP1253',
161		- 'WIN-1253' => 'CP1253',
162		- 'WIN1253' => 'CP1253',
163		- '1253' => 'CP1253',
164		-
165		- 'WINDOWS-1254' => 'CP1254',
166		- 'CP1254' => 'CP1254',
167		- 'WIN-1254' => 'CP1254',
168		- 'WIN1254' => 'CP1254',
169		- '1254' => 'CP1254',
170		-
171		- 'WINDOWS-1255' => 'CP1255',
172		- 'CP1255' => 'CP1255',
173		- 'WIN-1255' => 'CP1255',
174		- 'WIN1255' => 'CP1255',
175		- '1255' => 'CP1255',
176		-
177		- 'WINDOWS-1256' => 'CP1256',
178		- 'CP1256' => 'CP1256',
179		- 'WIN-1256' => 'CP1256',
180		- 'WIN1256' => 'CP1256',
181		- '1256' => 'CP1256',
182		-
183		- 'WINDOWS-1257' => 'CP1257',
184		- 'CP1257' => 'CP1257',
185		- 'WIN-1257' => 'CP1257',
186		- 'WIN1257' => 'CP1257',
187		- '1257' => 'CP1257',
188		-
189		- 'WINDOWS-1258' => 'CP1258',
190		- 'CP1258' => 'CP1258',
191		- 'WIN-1258' => 'CP1258',
192		- 'WIN1258' => 'CP1258',
193		- '1258' => 'CP1258',
194		-
195		- 'KOI8-R' => 'KOI8-R',
196		- 'CP878' => 'KOI8-R',
197		- 'KOI8R' => 'KOI8-R',
198		- 'KOI8-RU' => 'KOI8-R',
199		-
200		- 'KOI8-U' => 'KOI8-U',
	12	+ // UTF-8 multibyte encoding
	13	+
	14	+ 'UTF-8' => 'UTF-8',
	15	+ 'WINDOWS-65001' => 'UTF-8',
	16	+ 'CP65001' => 'UTF-8',
	17	+ 'WIN-65001' => 'UTF-8',
	18	+ 'WIN65001' => 'UTF-8',
	19	+ '65001' => 'UTF-8',
	20	+
	21	+ // HTML entities
	22	+
	23	+ 'HTML-ENTITIES' => 'HTML-ENTITIES',
	24	+
	25	+ // Singlebyte encodings
	26	+
	27	+ 'US-ASCII' => 'US-ASCII',
	28	+ 'US' => 'US-ASCII',
	29	+ 'ASCII' => 'US-ASCII',
	30	+ 'CP367' => 'US-ASCII',
	31	+ 'ISO646-US' => 'US-ASCII',
	32	+
	33	+ 'ISO-8859-1' => '8859-1',
	34	+ 'ISO8859-1' => '8859-1',
	35	+ '8859-1' => '8859-1',
	36	+ 'LATIN1' => '8859-1',
	37	+ 'CP819' => '8859-1',
	38	+
	39	+ 'ISO-8859-2' => '8859-2',
	40	+ 'ISO8859-2' => '8859-2',
	41	+ '8859-2' => '8859-2',
	42	+ 'LATIN2' => '8859-2',
	43	+ 'CP912' => '8859-2',
	44	+
	45	+ 'ISO-8859-3' => '8859-3',
	46	+ 'ISO8859-3' => '8859-3',
	47	+ '8859-3' => '8859-3',
	48	+ 'LATIN3' => '8859-3',
	49	+ 'CP913' => '8859-3',
	50	+
	51	+ 'ISO-8859-4' => '8859-4',
	52	+ 'ISO8859-4' => '8859-4',
	53	+ '8859-4' => '8859-4',
	54	+ 'LATIN4' => '8859-4',
	55	+ 'CP914' => '8859-4',
	56	+
	57	+ 'ISO-8859-5' => '8859-5',
	58	+ 'ISO8859-5' => '8859-5',
	59	+ '8859-5' => '8859-5',
	60	+ 'CYRILLIC' => '8859-5',
	61	+ 'CP915' => '8859-5',
	62	+
	63	+ 'ISO-8859-6' => '8859-6',
	64	+ 'ISO8859-6' => '8859-6',
	65	+ '8859-6' => '8859-6',
	66	+ 'ARABIC' => '8859-6',
	67	+ 'CP1089' => '8859-6',
	68	+
	69	+ 'ISO-8859-7' => '8859-7',
	70	+ 'ISO8859-7' => '8859-7',
	71	+ '8859-7' => '8859-7',
	72	+ 'GREEK' => '8859-7',
	73	+
	74	+ 'ISO-8859-8' => '8859-8',
	75	+ 'ISO8859-8' => '8859-8',
	76	+ '8859-8' => '8859-8',
	77	+ 'HEBREW' => '8859-8',
	78	+
	79	+ 'ISO-8859-9' => '8859-9',
	80	+ 'ISO8859-9' => '8859-9',
	81	+ '8859-9' => '8859-9',
	82	+ 'LATIN5' => '8859-9',
	83	+ 'TURKISH' => '8859-9',
	84	+ 'CP920' => '8859-9',
	85	+
	86	+ 'ISO-8859-10' => '8859-10',
	87	+ 'ISO8859-10' => '8859-10',
	88	+ '8859-10' => '8859-10',
	89	+ 'LATIN6' => '8859-10',
	90	+
	91	+ 'ISO-8859-11' => '8859-11',
	92	+ 'ISO8859-11' => '8859-11',
	93	+ '8859-11' => '8859-11',
	94	+ 'THAI8' => '8859-11',
	95	+
	96	+ 'ISO-8859-13' => '8859-13',
	97	+ 'ISO8859-13' => '8859-13',
	98	+ '8859-13' => '8859-13',
	99	+ 'CP921' => '8859-13',
	100	+
	101	+ 'ISO-8859-14' => '8859-14',
	102	+ 'ISO8859-14' => '8859-14',
	103	+ '8859-14' => '8859-14',
	104	+ 'LATIN8' => '8859-14',
	105	+ 'ISO-CELTIC' => '8859-14',
	106	+
	107	+ 'ISO-8859-15' => '8859-15',
	108	+ 'ISO8859-15' => '8859-15',
	109	+ '8859-15' => '8859-15',
	110	+ 'LATIN0' => '8859-15',
	111	+ 'LATIN-9' => '8859-15',
	112	+ 'CP923' => '8859-15',
	113	+
	114	+ 'WINDOWS-855' => 'CP855',
	115	+ 'CP855' => 'CP855',
	116	+ 'WINDOWS-855' => 'CP855',
	117	+ 'WIN-855' => 'CP855',
	118	+ 'WIN855' => 'CP855',
	119	+ '855' => 'CP855',
	120	+ 'IBM-855' => 'CP855',
	121	+ 'IBM855' => 'CP855',
	122	+
	123	+ 'WINDOWS-866' => 'CP866',
	124	+ 'CP866' => 'CP866',
	125	+ 'WINDOWS-866' => 'CP866',
	126	+ 'WIN-866' => 'CP866',
	127	+ 'WIN866' => 'CP866',
	128	+ '866' => 'CP866',
	129	+ 'IBM-866' => 'CP866',
	130	+ 'IBM866' => 'CP866',
	131	+
	132	+ 'WINDOWS-874' => 'CP874',
	133	+ 'TIS-620' => 'CP874',
	134	+ 'CP874' => 'CP874',
	135	+ 'EUCTH' => 'CP874',
	136	+ 'WIN-874' => 'CP874',
	137	+ 'WIN874' => 'CP874',
	138	+ '874' => 'CP874',
	139	+
	140	+ 'WINDOWS-1250' => 'CP1250',
	141	+ 'CP1250' => 'CP1250',
	142	+ 'WIN-1250' => 'CP1250',
	143	+ 'WIN1250' => 'CP1250',
	144	+ '1250' => 'CP1250',
	145	+
	146	+ 'WINDOWS-1251' => 'CP1251',
	147	+ 'CP1251' => 'CP1251',
	148	+ 'ANSI1251' => 'CP1251',
	149	+ 'WIN-1251' => 'CP1251',
	150	+ 'WIN1251' => 'CP1251',
	151	+ '1251' => 'CP1251',
	152	+
	153	+ 'WINDOWS-1252' => 'CP1252',
	154	+ 'CP1252' => 'CP1252',
	155	+ 'WIN-1252' => 'CP1252',
	156	+ 'WIN1252' => 'CP1252',
	157	+ '1252' => 'CP1252',
	158	+
	159	+ 'WINDOWS-1253' => 'CP1253',
	160	+ 'CP1253' => 'CP1253',
	161	+ 'WIN-1253' => 'CP1253',
	162	+ 'WIN1253' => 'CP1253',
	163	+ '1253' => 'CP1253',
	164	+
	165	+ 'WINDOWS-1254' => 'CP1254',
	166	+ 'CP1254' => 'CP1254',
	167	+ 'WIN-1254' => 'CP1254',
	168	+ 'WIN1254' => 'CP1254',
	169	+ '1254' => 'CP1254',
	170	+
	171	+ 'WINDOWS-1255' => 'CP1255',
	172	+ 'CP1255' => 'CP1255',
	173	+ 'WIN-1255' => 'CP1255',
	174	+ 'WIN1255' => 'CP1255',
	175	+ '1255' => 'CP1255',
	176	+
	177	+ 'WINDOWS-1256' => 'CP1256',
	178	+ 'CP1256' => 'CP1256',
	179	+ 'WIN-1256' => 'CP1256',
	180	+ 'WIN1256' => 'CP1256',
	181	+ '1256' => 'CP1256',
	182	+
	183	+ 'WINDOWS-1257' => 'CP1257',
	184	+ 'CP1257' => 'CP1257',
	185	+ 'WIN-1257' => 'CP1257',
	186	+ 'WIN1257' => 'CP1257',
	187	+ '1257' => 'CP1257',
	188	+
	189	+ 'WINDOWS-1258' => 'CP1258',
	190	+ 'CP1258' => 'CP1258',
	191	+ 'WIN-1258' => 'CP1258',
	192	+ 'WIN1258' => 'CP1258',
	193	+ '1258' => 'CP1258',
	194	+
	195	+ 'KOI8-R' => 'KOI8-R',
	196	+ 'CP878' => 'KOI8-R',
	197	+ 'KOI8R' => 'KOI8-R',
	198	+ 'KOI8-RU' => 'KOI8-R',
	199	+
	200	+ 'KOI8-U' => 'KOI8-U',
201	201
202	202	);

Please login to merge, or discard this patch.

		@@ -2,7 +2,7 @@
		block discarded – undo
2	2	// $Id: x05.php,v 1.1.8.1 2008/06/12 20:34:31 smk Exp $
3	3
4	4	return array(
5		- 'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
	5	+ 'en' => array(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
6	6	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
7	7	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
8	8	NULL, 'A', 'B', 'G', 'D', 'E', 'Z', 'E', 'E', 'T`', 'Zh', 'I', 'L', 'Kh', 'Ts', 'K',

		@@ -4,7 +4,7 @@
		block discarded – undo
4	4	use ChamiloSession as Session;
5	5
6	6	require_once '../inc/global.inc.php';
7		-$current_course_tool = TOOL_STUDENTPUBLICATION;
	7	+$current_course_tool = TOOL_STUDENTPUBLICATION;
8	8
9	9	api_protect_course_script(true);
10	10

		@@ -21,17 +21,17 @@
		block discarded – undo
21	21
22	22	if ($ldap_login_success)
23	23	{
24		- //error_log('Found user '.$login.' on LDAP server',0);
25		- /*
	24	+ //error_log('Found user '.$login.' on LDAP server',0);
	25	+ /*
26	26	In here, we know that
27	27	- the user does not exist in dokeos
28	28	- the users login and password are correct
29	29	*/
30		- $info_array = ldap_find_user_info($login);
31		- ldap_put_user_info_locally($login, $info_array);
	30	+ $info_array = ldap_find_user_info($login);
	31	+ ldap_put_user_info_locally($login, $info_array);
32	32	} else {
33	33	//error_log('Could not find '.$login.' on LDAP server',0);
34		- $loginFailed = true;
35		- unset($_user['user_id']);
36		- $uidReset = false;
	34	+ $loginFailed = true;
	35	+ unset($_user['user_id']);
	36	+ $uidReset = false;
37	37	}

		@@ -13,19 +13,19 @@ discard block
		block discarded – undo
13	13	$s->register(
14	14	'WSSession.CreateSession',
15	15	array(
16		- 'secret_key' => 'xsd:string',
17		- 'name' => 'xsd:string',
18		- 'start_date' => 'xsd:string',
19		- 'end_date' => 'xsd:string',
20		- 'nb_days_access_before' => 'xsd:int',
21		- 'nb_days_access_after' => 'xsd:int',
22		- 'nolimit' => 'xsd:int',
23		- 'visibility' => 'xsd:int',
24		- 'user_id_field_name' => 'xsd:string',
25		- 'user_id_value' => 'xsd:string',
26		- 'session_id_field_name' => 'xsd:string',
27		- 'session_id_value' => 'xsd:string',
28		- 'extras' => 'tns:extra_field'
	16	+ 'secret_key' => 'xsd:string',
	17	+ 'name' => 'xsd:string',
	18	+ 'start_date' => 'xsd:string',
	19	+ 'end_date' => 'xsd:string',
	20	+ 'nb_days_access_before' => 'xsd:int',
	21	+ 'nb_days_access_after' => 'xsd:int',
	22	+ 'nolimit' => 'xsd:int',
	23	+ 'visibility' => 'xsd:int',
	24	+ 'user_id_field_name' => 'xsd:string',
	25	+ 'user_id_value' => 'xsd:string',
	26	+ 'session_id_field_name' => 'xsd:string',
	27	+ 'session_id_value' => 'xsd:string',
	28	+ 'extras' => 'tns:extra_field'
29	29	),
30	30	array('return' => 'xsd:int')
31	31	);
		@@ -33,50 +33,50 @@ discard block
		block discarded – undo
33	33	$s->register(
34	34	'WSSession.DeleteSession',
35	35	array(
36		- 'secret_key' => 'xsd:string',
37		- 'session_id_field_name' => 'xsd:string',
38		- 'session_id_value' => 'xsd:string'
	36	+ 'secret_key' => 'xsd:string',
	37	+ 'session_id_field_name' => 'xsd:string',
	38	+ 'session_id_value' => 'xsd:string'
39	39	)
40	40	);
41	41
42	42	$s->register(
43	43	'WSSession.EditSession',
44	44	array(
45		- 'secret_key' => 'xsd:string',
46		- 'name' => 'xsd:string',
47		- 'start_date' => 'xsd:string',
48		- 'end_date' => 'xsd:string',
49		- 'nb_days_access_before' => 'xsd:int',
50		- 'nb_days_access_after' => 'xsd:int',
51		- 'nolimit' => 'xsd:int',
52		- 'visibility' => 'xsd:int',
53		- 'user_id_field_name' => 'xsd:string',
54		- 'user_id_value' => 'xsd:string',
55		- 'session_id_field_name' => 'xsd:string',
56		- 'session_id_value' => 'xsd:string',
57		- 'extras' => 'tns:extra_field'
	45	+ 'secret_key' => 'xsd:string',
	46	+ 'name' => 'xsd:string',
	47	+ 'start_date' => 'xsd:string',
	48	+ 'end_date' => 'xsd:string',
	49	+ 'nb_days_access_before' => 'xsd:int',
	50	+ 'nb_days_access_after' => 'xsd:int',
	51	+ 'nolimit' => 'xsd:int',
	52	+ 'visibility' => 'xsd:int',
	53	+ 'user_id_field_name' => 'xsd:string',
	54	+ 'user_id_value' => 'xsd:string',
	55	+ 'session_id_field_name' => 'xsd:string',
	56	+ 'session_id_value' => 'xsd:string',
	57	+ 'extras' => 'tns:extra_field'
58	58	)
59	59	);
60	60
61	61	$s->register(
62	62	'WSSession.SubscribeUserToSession',
63	63	array(
64		- 'secret_key' => 'xsd:string',
65		- 'user_id_field_name' => 'xsd:string',
66		- 'user_id_value' => 'xsd:string',
67		- 'session_id_field_name' => 'xsd:string',
68		- 'session_id_value' => 'xsd:string'
	64	+ 'secret_key' => 'xsd:string',
	65	+ 'user_id_field_name' => 'xsd:string',
	66	+ 'user_id_value' => 'xsd:string',
	67	+ 'session_id_field_name' => 'xsd:string',
	68	+ 'session_id_value' => 'xsd:string'
69	69	)
70	70	);
71	71
72	72	$s->register(
73	73	'WSSession.UnsubscribeUserFromSession',
74	74	array(
75		- 'secret_key' => 'xsd:string',
76		- 'user_id_field_name' => 'xsd:string',
77		- 'user_id_value' => 'xsd:string',
78		- 'session_id_field_name' => 'xsd:string',
79		- 'session_id_value' => 'xsd:string'
	75	+ 'secret_key' => 'xsd:string',
	76	+ 'user_id_field_name' => 'xsd:string',
	77	+ 'user_id_value' => 'xsd:string',
	78	+ 'session_id_field_name' => 'xsd:string',
	79	+ 'session_id_value' => 'xsd:string'
80	80	)
81	81	);
82	82
		@@ -84,46 +84,46 @@ discard block
		block discarded – undo
84	84	'WSSession.SubscribeTeacherToSessionCourse',
85	85	array(
86	86	'secret_key' => 'xsd:string',
87		- 'user_id_field_name' => 'xsd:string',
88		- 'user_id_value' => 'xsd:string',
89		- 'session_id_field_name' => 'xsd:string',
90		- 'session_id_value' => 'xsd:string',
	87	+ 'user_id_field_name' => 'xsd:string',
	88	+ 'user_id_value' => 'xsd:string',
	89	+ 'session_id_field_name' => 'xsd:string',
	90	+ 'session_id_value' => 'xsd:string',
91	91	'course_id_field_name' => 'xsd:string',
92		- 'course_id_value' => 'xsd:string'
	92	+ 'course_id_value' => 'xsd:string'
93	93	)
94	94	);
95	95
96	96	$s->register(
97	97	'WSSession.UnsubscribeTeacherFromSessionCourse',
98	98	array(
99		- 'secret_key' => 'xsd:string',
100		- 'user_id_field_name' => 'xsd:string',
101		- 'user_id_value' => 'xsd:string',
102		- 'session_id_field_name' => 'xsd:string',
103		- 'session_id_value' => 'xsd:string',
	99	+ 'secret_key' => 'xsd:string',
	100	+ 'user_id_field_name' => 'xsd:string',
	101	+ 'user_id_value' => 'xsd:string',
	102	+ 'session_id_field_name' => 'xsd:string',
	103	+ 'session_id_value' => 'xsd:string',
104	104	'course_id_field_name' => 'xsd:string',
105		- 'course_id_value' => 'xsd:string'
	105	+ 'course_id_value' => 'xsd:string'
106	106	)
107	107	);
108	108
109	109	$s->register(
110	110	'WSSession.SubscribeCourseToSession',
111	111	array(
112		- 'secret_key' => 'xsd:string',
113		- 'course_id_field_name' => 'xsd:string',
114		- 'course_id_value' => 'xsd:string',
115		- 'session_id_field_name' => 'xsd:string',
116		- 'session_id_value' => 'xsd:string'
	112	+ 'secret_key' => 'xsd:string',
	113	+ 'course_id_field_name' => 'xsd:string',
	114	+ 'course_id_value' => 'xsd:string',
	115	+ 'session_id_field_name' => 'xsd:string',
	116	+ 'session_id_value' => 'xsd:string'
117	117	)
118	118	);
119	119
120	120	$s->register(
121	121	'WSSession.UnsubscribeCourseFromSession',
122	122	array(
123		- 'secret_key' => 'xsd:string',
124		- 'course_id_field_name' => 'xsd:string',
125		- 'course_id_value' => 'xsd:string',
126		- 'session_id_field_name' => 'xsd:string',
127		- 'session_id_value' => 'xsd:string'
	123	+ 'secret_key' => 'xsd:string',
	124	+ 'course_id_field_name' => 'xsd:string',
	125	+ 'course_id_value' => 'xsd:string',
	126	+ 'session_id_field_name' => 'xsd:string',
	127	+ 'session_id_value' => 'xsd:string'
128	128	)
129	129	);

		@@ -11,10 +11,10 @@ discard block
		block discarded – undo
11	11	$from_myspace = false;
12	12	$from_link = '';
13	13	if (isset($_GET['from']) && $_GET['from'] == 'myspace') {
14		- $from_link = '&from=myspace';
15		- $this_section = SECTION_TRACKING;
	14	+ $from_link = '&from=myspace';
	15	+ $this_section = SECTION_TRACKING;
16	16	} else {
17		- $this_section = SECTION_COURSES;
	17	+ $this_section = SECTION_COURSES;
18	18	}
19	19
20	20	$session_id = isset($_REQUEST['id_session']) && !empty($_REQUEST['id_session']) ? intval($_REQUEST['id_session']) : api_get_session_id();
		@@ -35,19 +35,19 @@ discard block
		block discarded – undo
35	35	if (!api_is_platform_admin(true) &&
36	36	!CourseManager :: is_course_teacher(api_get_user_id(), $courseCode) &&
37	37	!Tracking :: is_allowed_to_coach_student(api_get_user_id(), $user_id) && !api_is_drh() && !api_is_course_tutor()) {
38		- api_not_allowed();
	38	+ api_not_allowed();
39	39	}
40	40
41	41	if ($origin == 'user_course') {
42		- $interbreadcrumb[] = array ("url" => api_get_path(WEB_COURSE_PATH).$course_info['directory'], 'name' => $course_info['name']);
43		- $interbreadcrumb[] = array ("url" => "../user/user.php?cidReq=".$courseCode, "name" => get_lang("Users"));
	42	+ $interbreadcrumb[] = array ("url" => api_get_path(WEB_COURSE_PATH).$course_info['directory'], 'name' => $course_info['name']);
	43	+ $interbreadcrumb[] = array ("url" => "../user/user.php?cidReq=".$courseCode, "name" => get_lang("Users"));
44	44	} else if($origin == 'tracking_course') {
45		- $interbreadcrumb[] = array ("url" => "../tracking/courseLog.php?cidReq=".$courseCode.'&id_session='.$session_id, "name" => get_lang("Tracking"));
	45	+ $interbreadcrumb[] = array ("url" => "../tracking/courseLog.php?cidReq=".$courseCode.'&id_session='.$session_id, "name" => get_lang("Tracking"));
46	46	} else {
47		- $interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
48		- $interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang("MyStudents"));
49		- $interbreadcrumb[] = array ("url" => "myStudents.php?student=".$user_id, "name" => get_lang("StudentDetails"));
50		- $nameTools=get_lang("DetailsStudentInCourse");
	47	+ $interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
	48	+ $interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang("MyStudents"));
	49	+ $interbreadcrumb[] = array ("url" => "myStudents.php?student=".$user_id, "name" => get_lang("StudentDetails"));
	50	+ $nameTools=get_lang("DetailsStudentInCourse");
51	51	}
52	52
53	53	$interbreadcrumb[] = array("url" => "myStudents.php?student=".$user_id."&course=".$courseCode."&details=true&origin=".$origin , "name" => get_lang("DetailsStudentInCourse"));

		@@ -17,7 +17,7 @@ discard block
		block discarded – undo
17	17	$this_section = SECTION_COURSES;
18	18	}
19	19
20		-$session_id = isset($_REQUEST['id_session']) && !empty($_REQUEST['id_session']) ? intval($_REQUEST['id_session']) : api_get_session_id();
	20	+$session_id = isset($_REQUEST['id_session']) && !empty($_REQUEST['id_session']) ? intval($_REQUEST['id_session']) : api_get_session_id();
21	21	$export_csv = isset($_GET['export']) && $_GET['export'] == 'csv' ? true : false;
22	22	$user_id = isset($_GET['student_id']) ? intval($_GET['student_id']) : api_get_user_id();
23	23	$courseCode = isset($_GET['course']) ? Security::remove_XSS($_GET['course']) : api_get_course_id();
		@@ -39,18 +39,18 @@ discard block
		block discarded – undo
39	39	}
40	40
41	41	if ($origin == 'user_course') {
42		- $interbreadcrumb[] = array ("url" => api_get_path(WEB_COURSE_PATH).$course_info['directory'], 'name' => $course_info['name']);
43		- $interbreadcrumb[] = array ("url" => "../user/user.php?cidReq=".$courseCode, "name" => get_lang("Users"));
44		-} else if($origin == 'tracking_course') {
45		- $interbreadcrumb[] = array ("url" => "../tracking/courseLog.php?cidReq=".$courseCode.'&id_session='.$session_id, "name" => get_lang("Tracking"));
	42	+ $interbreadcrumb[] = array("url" => api_get_path(WEB_COURSE_PATH).$course_info['directory'], 'name' => $course_info['name']);
	43	+ $interbreadcrumb[] = array("url" => "../user/user.php?cidReq=".$courseCode, "name" => get_lang("Users"));
	44	+} else if ($origin == 'tracking_course') {
	45	+ $interbreadcrumb[] = array("url" => "../tracking/courseLog.php?cidReq=".$courseCode.'&id_session='.$session_id, "name" => get_lang("Tracking"));
46	46	} else {
47		- $interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
48		- $interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang("MyStudents"));
49		- $interbreadcrumb[] = array ("url" => "myStudents.php?student=".$user_id, "name" => get_lang("StudentDetails"));
50		- $nameTools=get_lang("DetailsStudentInCourse");
	47	+ $interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace'));
	48	+ $interbreadcrumb[] = array("url" => "student.php", "name" => get_lang("MyStudents"));
	49	+ $interbreadcrumb[] = array("url" => "myStudents.php?student=".$user_id, "name" => get_lang("StudentDetails"));
	50	+ $nameTools = get_lang("DetailsStudentInCourse");
51	51	}
52	52
53		-$interbreadcrumb[] = array("url" => "myStudents.php?student=".$user_id."&course=".$courseCode."&details=true&origin=".$origin , "name" => get_lang("DetailsStudentInCourse"));
	53	+$interbreadcrumb[] = array("url" => "myStudents.php?student=".$user_id."&course=".$courseCode."&details=true&origin=".$origin, "name" => get_lang("DetailsStudentInCourse"));
54	54	$nameTools = get_lang('LearningPathDetails');
55	55	$sql = 'SELECT name FROM '.Database::get_course_table(TABLE_LP_MAIN).' WHERE c_id = '.$course_info['real_id'].' AND id='.$lp_id;
56	56	$rs = Database::query($sql);
		@@ -58,19 +58,19 @@ discard block
		block discarded – undo
58	58
59	59	$origin = 'tracking';
60	60
61		-$output = require_once api_get_path(SYS_CODE_PATH) . 'lp/lp_stats.php';
	61	+$output = require_once api_get_path(SYS_CODE_PATH).'lp/lp_stats.php';
62	62
63	63	Display :: display_header($nameTools);
64	64	echo '<div class ="actions">';
65		-echo '<a href="javascript:history.back();">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
	65	+echo '<a href="javascript:history.back();">'.Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
66	66	echo '<a href="javascript: void(0);" onclick="javascript: window.print();">
67		- '.Display::return_icon('printer.png',get_lang('Print'),'',ICON_SIZE_MEDIUM).'</a>';
	67	+ '.Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).'</a>';
68	68	echo '<a href="'.api_get_self().'?export=csv&'.Security::remove_XSS($_SERVER['QUERY_STRING']).'">
69		- '.Display::return_icon('export_csv.png',get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a>';
	69	+ '.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
70	70	echo '</div>';
71	71	echo '<div class="clear"></div>';
72	72	$session_name = api_get_session_name($session_id);
73		-$table_title = ($session_name? Display::return_icon('session.png', get_lang('Session'), array(), ICON_SIZE_SMALL).' '.$session_name.' ':' ').
	73	+$table_title = ($session_name ? Display::return_icon('session.png', get_lang('Session'), array(), ICON_SIZE_SMALL).' '.$session_name.' ' : ' ').
74	74	Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_info['name'].' '.
75	75	Display::return_icon('user.png', get_lang('User'), array(), ICON_SIZE_SMALL).' '.$name;
76	76	echo Display::page_header($table_title);

chamilo / chamilo-lms

Push — 1.11.x ( 60645e...aacf46 )

Status

Category

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +60 added lines, -60 removed lines patch added patch discarded remove patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Indentation +189 added lines, -189 removed lines patch added patch discarded remove patch