chamilo / chamilo-lms

main/reports/templates/courseArticulate.reports.php

Indentation +91 added lines, -91 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
 $reports_template['CourseArticulate'] = array(
-	'description' => 'CourseArticulate',
-	'getSQL' => 'reports_template_CourseArticulate_getSQL',
-	'wizard' =>
+    'description' => 'CourseArticulate',
+    'getSQL' => 'reports_template_CourseArticulate_getSQL',
+    'wizard' =>
 '
 <span id="CourseArticulate" class="step">
 	<span class="font_normal_07em_black">This report does not need any particular settings</span><br />
@@ -12,113 +12,113 @@ 
 ');
 
 function reports_template_CourseArticulate_getSQL() {
-	// settings
+    // settings
 
 
-	// Nom, prenom
-	$query = 'select u.lastname as "Last name", u.firstname as "First name" ';
-	$query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
-	$query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
-	$query .= ' order by u.user_id ';
-	$queries[0] = $query;
-	$extraFieldType = \Chamilo\CoreBundle\Entity\ExtraField::USER_FIELD_TYPE;
-	// Custom Field
-	foreach (array("tags" => "tags") as $k => $v) { // FIXME
-		$query = 'select ufv.value  as "'.$v.'" ';
-		$query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
-		$query .= 'left join'.Database::get_main_table(TABLE_EXTRA_FIELD).' uf ';
-		$query .= ' on uf.variable ="'.$k.'" ';
-		$query .= 'left outer join '.Database::get_main_table(TABLE_EXTRA_FIELD_VALUES).' ufv ';
-		$query .= ' on ufv.item_id = u.user_id and ufv.field_id = uf.id ';
-		$query .= 'where ufv.extra_field_type = '.$extraFieldType.' AND u.user_id in ('.reports_getVisibilitySQL().') ';
-		$query .= ' order by u.user_id ';
-		$queries[] = $query;
-	}
+    // Nom, prenom
+    $query = 'select u.lastname as "Last name", u.firstname as "First name" ';
+    $query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
+    $query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
+    $query .= ' order by u.user_id ';
+    $queries[0] = $query;
+    $extraFieldType = \Chamilo\CoreBundle\Entity\ExtraField::USER_FIELD_TYPE;
+    // Custom Field
+    foreach (array("tags" => "tags") as $k => $v) { // FIXME
+        $query = 'select ufv.value  as "'.$v.'" ';
+        $query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
+        $query .= 'left join'.Database::get_main_table(TABLE_EXTRA_FIELD).' uf ';
+        $query .= ' on uf.variable ="'.$k.'" ';
+        $query .= 'left outer join '.Database::get_main_table(TABLE_EXTRA_FIELD_VALUES).' ufv ';
+        $query .= ' on ufv.item_id = u.user_id and ufv.field_id = uf.id ';
+        $query .= 'where ufv.extra_field_type = '.$extraFieldType.' AND u.user_id in ('.reports_getVisibilitySQL().') ';
+        $query .= ' order by u.user_id ';
+        $queries[] = $query;
+    }
 
 
-	// Stored Value
-	$sv = array();
-	foreach ($sv as $k => $v) {
+    // Stored Value
+    $sv = array();
+    foreach ($sv as $k => $v) {
         if (!isset($v['sql']))
                 $v['sql'] = 'FIELD';
         $sqlField = str_replace('FIELD', 'sv.sv_value', $v['sql']);
         $query = 'select '.$sqlField.' as "'.$v['title'].'" ';
 //		$query = 'select sec_to_time(sv.sv_value) as "'.$v.'" ';
-		$query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
-		$query .= ' left outer join '.Database::get_main_table(TABLE_TRACK_STORED_VALUES).' sv ';
-		$query .= 'on sv.user_id = u.user_id and sv_key = "'.$k.'" ';
-		$query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
-		$query .= ' group by u.user_id ';
-		$query .= ' order by u.user_id ';
-		$queries[] = $query;
-	}
+        $query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
+        $query .= ' left outer join '.Database::get_main_table(TABLE_TRACK_STORED_VALUES).' sv ';
+        $query .= 'on sv.user_id = u.user_id and sv_key = "'.$k.'" ';
+        $query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
+        $query .= ' group by u.user_id ';
+        $query .= ' order by u.user_id ';
+        $queries[] = $query;
+    }
 
-	// first and last connection
-	$query = 'select min(tel.login_date) as "First connection", max(tel.logout_date) as "Latest connection"  ';
-	$query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
-	$query .= 'left outer join '.Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN).' tel ';
-	$query .= ' on tel.login_user_id = u.user_id ';
-	$query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
-	$query .= ' group by u.user_id ';
-	$query .= ' order by u.user_id ';
-	$queries[] = $query;
+    // first and last connection
+    $query = 'select min(tel.login_date) as "First connection", max(tel.logout_date) as "Latest connection"  ';
+    $query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
+    $query .= 'left outer join '.Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN).' tel ';
+    $query .= ' on tel.login_user_id = u.user_id ';
+    $query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
+    $query .= ' group by u.user_id ';
+    $query .= ' order by u.user_id ';
+    $queries[] = $query;
 
-	// SCORM Data
-	$scormData = array();
+    // SCORM Data
+    $scormData = array();
     $course_list = CourseManager::get_courses_list();
-	foreach ($course_list as $code => $details) {
-		$courseId = $details['id'];
-		$list = Database::query('SELECT l.id as lid, l.name as lname, li.id as liid, li.title as lititle '.
-					' FROM '.Database::get_course_table(TABLE_LP_MAIN).' l, '.Database::get_course_table(TABLE_LP_ITEM).' li '.
-					' WHERE l.c_id = '.$courseId.' AND li.c_id = '.$courseId.' AND l.id = li.lp_id');
-		while ($lpItem = Database::fetch_assoc($list)) {
-			$scormData[] = array(
-						//'coursedb' => $details['db_name'],
-						'lid' => $lpItem['lid'],
-						'liid' => $lpItem['liid'],
-						'target_view_count' => 1,
-						'target_indicator' => 'score',
-						'title' => $details['title'].'/'.$lpItem['lname'].'/'.$lpItem['lititle'].'/1/score',
-						'sql' => 'FIELD');
-			$scormData[] = array(
-						//'coursedb' => $details['db_name'],
-						'lid' => $lpItem['lid'],
-						'liid' => $lpItem['liid'],
-						'target_view_count' => 2,
-						'target_indicator' => 'score',
-						'title' => $details['title'].'/'.$lpItem['lname'].'/'.$lpItem['lititle'].'/2/score',
-						'sql' => 'FIELD');
-			$scormData[] = array(
-						//'coursedb' => $details['db_name'],
-						'lid' => $lpItem['lid'],
-						'liid' => $lpItem['liid'],
-						'target_view_count' => null,
-						'target_indicator' => 'score',
-						'title' => $details['title'].'/'.$lpItem['lname'].'/'.$lpItem['lititle'].'/all/score',
-						'sql' => 'avg(FIELD)');
-		}
-	}
+    foreach ($course_list as $code => $details) {
+        $courseId = $details['id'];
+        $list = Database::query('SELECT l.id as lid, l.name as lname, li.id as liid, li.title as lititle '.
+                    ' FROM '.Database::get_course_table(TABLE_LP_MAIN).' l, '.Database::get_course_table(TABLE_LP_ITEM).' li '.
+                    ' WHERE l.c_id = '.$courseId.' AND li.c_id = '.$courseId.' AND l.id = li.lp_id');
+        while ($lpItem = Database::fetch_assoc($list)) {
+            $scormData[] = array(
+                        //'coursedb' => $details['db_name'],
+                        'lid' => $lpItem['lid'],
+                        'liid' => $lpItem['liid'],
+                        'target_view_count' => 1,
+                        'target_indicator' => 'score',
+                        'title' => $details['title'].'/'.$lpItem['lname'].'/'.$lpItem['lititle'].'/1/score',
+                        'sql' => 'FIELD');
+            $scormData[] = array(
+                        //'coursedb' => $details['db_name'],
+                        'lid' => $lpItem['lid'],
+                        'liid' => $lpItem['liid'],
+                        'target_view_count' => 2,
+                        'target_indicator' => 'score',
+                        'title' => $details['title'].'/'.$lpItem['lname'].'/'.$lpItem['lititle'].'/2/score',
+                        'sql' => 'FIELD');
+            $scormData[] = array(
+                        //'coursedb' => $details['db_name'],
+                        'lid' => $lpItem['lid'],
+                        'liid' => $lpItem['liid'],
+                        'target_view_count' => null,
+                        'target_indicator' => 'score',
+                        'title' => $details['title'].'/'.$lpItem['lname'].'/'.$lpItem['lititle'].'/all/score',
+                        'sql' => 'avg(FIELD)');
+        }
+    }
 
-	foreach ($scormData as $v) {
+    foreach ($scormData as $v) {
         if (!isset($v['sql'])) {
             $v['sql'] = 'FIELD';
         }
         $sqlField = str_replace('FIELD', $v['target_indicator'], $v['sql']);
         $query = 'select '.$sqlField.' as "'.$v['title'].'" ';
         $query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
-		$query .= 'left outer join '.Database::get_course_table(TABLE_LP_VIEW).' lv ';
-		$query .= ' on u.user_id = lv.user_id and lv.lp_id = '.$v['lid'];
-		$query .= ' left outer join '.Database::get_course_table(TABLE_LP_ITEM_VIEW).' liv ';
-		$query .= ' on lv.id = liv.lp_view_id ';
-		if ($v['target_view_count'])
-			$query .= ' and liv.view_count = '.$v['target_view_count'];
-		$query .= ' and liv.lp_item_id = '.$v['liid'].' ';
-		$query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
-		$query .= ' group by u.user_id ';
-		$query .= ' order by u.user_id ';
-		$queries[] = $query;
-	}
+        $query .= 'left outer join '.Database::get_course_table(TABLE_LP_VIEW).' lv ';
+        $query .= ' on u.user_id = lv.user_id and lv.lp_id = '.$v['lid'];
+        $query .= ' left outer join '.Database::get_course_table(TABLE_LP_ITEM_VIEW).' liv ';
+        $query .= ' on lv.id = liv.lp_view_id ';
+        if ($v['target_view_count'])
+            $query .= ' and liv.view_count = '.$v['target_view_count'];
+        $query .= ' and liv.lp_item_id = '.$v['liid'].' ';
+        $query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
+        $query .= ' group by u.user_id ';
+        $query .= ' order by u.user_id ';
+        $queries[] = $query;
+    }
 
-	return $queries;
+    return $queries;
 }
 

Braces +6 added lines, -4 removed lines

@@ -39,8 +39,9 @@ 
 	// Stored Value
 	$sv = array();
 	foreach ($sv as $k => $v) {
-        if (!isset($v['sql']))
-                $v['sql'] = 'FIELD';
+        if (!isset($v['sql'])) {
+                        $v['sql'] = 'FIELD';
+        }
         $sqlField = str_replace('FIELD', 'sv.sv_value', $v['sql']);
         $query = 'select '.$sqlField.' as "'.$v['title'].'" ';
 //		$query = 'select sec_to_time(sv.sv_value) as "'.$v.'" ';
@@ -110,8 +111,9 @@ 
 		$query .= ' on u.user_id = lv.user_id and lv.lp_id = '.$v['lid'];
 		$query .= ' left outer join '.Database::get_course_table(TABLE_LP_ITEM_VIEW).' liv ';
 		$query .= ' on lv.id = liv.lp_view_id ';
-		if ($v['target_view_count'])
-			$query .= ' and liv.view_count = '.$v['target_view_count'];
+		if ($v['target_view_count']) {
+					$query .= ' and liv.view_count = '.$v['target_view_count'];
+		}
 		$query .= ' and liv.lp_item_id = '.$v['liid'].' ';
 		$query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
 		$query .= ' group by u.user_id ';

main/reports/templates/generic.reports.php

Indentation +47 added lines, -47 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
 $reports_template['Generic'] = array(
-	'description' => 'Generic',
-	'getSQL' => 'reports_template_Generic_getSQL',
-	'wizard' =>
+    'description' => 'Generic',
+    'getSQL' => 'reports_template_Generic_getSQL',
+    'wizard' =>
 '
 <span id="Generic" class="step">
 	<span class="font_normal_07em_black">This report does not need any particular settings</span><br />
@@ -12,49 +12,49 @@ 
 ');
 
 function reports_template_Generic_getSQL() {
-	// settings
-
-
-	// Nom, prenom
-	$query = 'select u.lastname as "Last name", u.firstname as "First name" ';
-	$query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
-	$query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
-	$query .= ' order by u.user_id ';
-	$queries[0] = $query;
-
-	// Custom Field
-	foreach (array(10 => "description") as $k => $v) {
-		$query = 'select ufv.value  as "'.$v.'" ';
-		$query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
-		$query .= 'left outer join '.Database::get_main_table(TABLE_EXTRA_FIELD_VALUES).' ufv ';
-		$query .= ' on ufv.item_id = u.user_id and ufv.field_id = '.$k;
-		$query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
-		$query .= ' order by u.user_id ';
-		$queries[] = $query;
-	}
-
-	// Stored Value
-	$sv = array();
-	foreach ($sv as $k => $v) {
-		$query = 'select sec_to_time(sv.sv_value) as "'.$v.'" ';
-		$query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
-		$query .= ' left outer join '.Database::get_main_table(TABLE_TRACK_STORED_VALUES).' sv ';
-		$query .= 'on sv.user_id = u.user_id and sv_key = "'.$k.'" ';
-		$query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
-		$query .= ' order by u.user_id ';
-		$queries[] = $query;
-	}
-
-	// premiere connexion
-	$query = 'select min(tel.login_date) as "First connection", max(tel.logout_date) as "Latest connection"  ';
-	$query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
-	$query .= 'left outer join '.Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN).' tel ';
-	$query .= ' on tel.login_user_id = u.user_id ';
-	$query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
-	$query .= ' group by u.user_id ';
-	$query .= ' order by u.user_id ';
-	$queries[] = $query;
-
-	return $queries;
+    // settings
+
+
+    // Nom, prenom
+    $query = 'select u.lastname as "Last name", u.firstname as "First name" ';
+    $query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
+    $query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
+    $query .= ' order by u.user_id ';
+    $queries[0] = $query;
+
+    // Custom Field
+    foreach (array(10 => "description") as $k => $v) {
+        $query = 'select ufv.value  as "'.$v.'" ';
+        $query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
+        $query .= 'left outer join '.Database::get_main_table(TABLE_EXTRA_FIELD_VALUES).' ufv ';
+        $query .= ' on ufv.item_id = u.user_id and ufv.field_id = '.$k;
+        $query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
+        $query .= ' order by u.user_id ';
+        $queries[] = $query;
+    }
+
+    // Stored Value
+    $sv = array();
+    foreach ($sv as $k => $v) {
+        $query = 'select sec_to_time(sv.sv_value) as "'.$v.'" ';
+        $query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
+        $query .= ' left outer join '.Database::get_main_table(TABLE_TRACK_STORED_VALUES).' sv ';
+        $query .= 'on sv.user_id = u.user_id and sv_key = "'.$k.'" ';
+        $query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
+        $query .= ' order by u.user_id ';
+        $queries[] = $query;
+    }
+
+    // premiere connexion
+    $query = 'select min(tel.login_date) as "First connection", max(tel.logout_date) as "Latest connection"  ';
+    $query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
+    $query .= 'left outer join '.Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN).' tel ';
+    $query .= ' on tel.login_user_id = u.user_id ';
+    $query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
+    $query .= ' group by u.user_id ';
+    $query .= ' order by u.user_id ';
+    $queries[] = $query;
+
+    return $queries;
 }
 

main/reports/templates/courseTime.reports.php

Indentation +25 added lines, -25 removed lines

@@ -12,30 +12,30 @@
 ');*/
 
 function reports_template_courseTime_getSQL() {
-	// fetch columns
-	$result = array();
-	$query = 'select r.id as kid, c.title as course '.
-		'from '.
-		Database::get_main_table(TABLE_MAIN_REPORTS_KEYS).' r, '.
-		Database::get_main_table(TABLE_MAIN_COURSE).' c '.
-		'where r.course_id=c.id and r.tool_id is null and r.child_id is null'.
-		' order by c.title';
-	$columns = Database::query($query);
-	if (Database::num_rows($columns) == 0)
-		die('<b>'.get_lang('no data found: '.$query).'</b>');
-	$columns = Database::store_result($columns);
+    // fetch columns
+    $result = array();
+    $query = 'select r.id as kid, c.title as course '.
+        'from '.
+        Database::get_main_table(TABLE_MAIN_REPORTS_KEYS).' r, '.
+        Database::get_main_table(TABLE_MAIN_COURSE).' c '.
+        'where r.course_id=c.id and r.tool_id is null and r.child_id is null'.
+        ' order by c.title';
+    $columns = Database::query($query);
+    if (Database::num_rows($columns) == 0)
+        die('<b>'.get_lang('no data found: '.$query).'</b>');
+    $columns = Database::store_result($columns);
 
-	// fetch data
-	$query = 'select u.lastname Name, u.firstname Firstname';
-	foreach ($columns as $key => $column)
-		$query .= ', sec_to_time(k'.$key.'.report_time) as `'.
-				$column['course'].'` '; 
-	$query .= ' from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
-	foreach ($columns as $key => $column) // fixme sessions
-		$query .= 'left outer join '.
-			Database::get_main_table(TABLE_MAIN_REPORTS_VALUES).
-			' k'.$key.
-			' on k'.$key.'.key_id = '.$column['kid'].
-				' and k'.$key.'.user_id = u.user_id ';
-	return $query;
+    // fetch data
+    $query = 'select u.lastname Name, u.firstname Firstname';
+    foreach ($columns as $key => $column)
+        $query .= ', sec_to_time(k'.$key.'.report_time) as `'.
+                $column['course'].'` '; 
+    $query .= ' from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
+    foreach ($columns as $key => $column) // fixme sessions
+        $query .= 'left outer join '.
+            Database::get_main_table(TABLE_MAIN_REPORTS_VALUES).
+            ' k'.$key.
+            ' on k'.$key.'.key_id = '.$column['kid'].
+                ' and k'.$key.'.user_id = u.user_id ';
+    return $query;
 }

Braces +10 added lines, -6 removed lines

@@ -21,21 +21,25 @@
 		'where r.course_id=c.id and r.tool_id is null and r.child_id is null'.
 		' order by c.title';
 	$columns = Database::query($query);
-	if (Database::num_rows($columns) == 0)
-		die('<b>'.get_lang('no data found: '.$query).'</b>');
+	if (Database::num_rows($columns) == 0) {
+			die('<b>'.get_lang('no data found: '.$query).'</b>');
+	}
 	$columns = Database::store_result($columns);
 
 	// fetch data
 	$query = 'select u.lastname Name, u.firstname Firstname';
-	foreach ($columns as $key => $column)
-		$query .= ', sec_to_time(k'.$key.'.report_time) as `'.
-				$column['course'].'` '; 
+	foreach ($columns as $key => $column) {
+			$query .= ', sec_to_time(k'.$key.'.report_time) as `'.
+				$column['course'].'` ';
+	}
 	$query .= ' from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
-	foreach ($columns as $key => $column) // fixme sessions
+	foreach ($columns as $key => $column) {
+	    // fixme sessions
 		$query .= 'left outer join '.
 			Database::get_main_table(TABLE_MAIN_REPORTS_VALUES).
 			' k'.$key.
 			' on k'.$key.'.key_id = '.$column['kid'].
 				' and k'.$key.'.user_id = u.user_id ';
+	}
 	return $query;
 }

main/reports/reports.cli.php

Indentation +37 added lines, -37 removed lines

@@ -4,55 +4,55 @@
 require_once 'reports.lib.php';
 
 $longopts = array(
-	'course:',
-	'tool:',
-	'ci:',
-	'cn:',
-	'sci:',
-	'scn:',
-	'ssci:',
-	'sscn:',
-	'link:',
-	'addValue',
-	'addKey',
-	'help',
-	'clearAll',
-	'score:',
-	'progress:',
-	'time:',
-	'attempt:',
-	'session:',
-	'attempt:',
-	'uid:',
-	'key:',
-	'addDBKeys',
-	'build');
+    'course:',
+    'tool:',
+    'ci:',
+    'cn:',
+    'sci:',
+    'scn:',
+    'ssci:',
+    'sscn:',
+    'link:',
+    'addValue',
+    'addKey',
+    'help',
+    'clearAll',
+    'score:',
+    'progress:',
+    'time:',
+    'attempt:',
+    'session:',
+    'attempt:',
+    'uid:',
+    'key:',
+    'addDBKeys',
+    'build');
 
 $options = getopt("", $longopts);
 
 echo "\n\n";
 
 if (array_key_exists('help', $options))
-	echo "help message\n";
+    echo "help message\n";
 else if (array_key_exists('clearAll', $options)) {
-	reports_clearAll();
+    reports_clearAll();
 } else if (array_key_exists('build', $options)) {
-	reports_build();
+    reports_build();
 } else if (array_key_exists('addDBKeys', $options)) {
-	reports_addDBKeys();
+    reports_addDBKeys();
 } else if (array_key_exists('addValue', $options)) {
-	reports_addValue($options['key'], $options['session'], $options['uid'],
-			$options['attempt'], $options['score'],
-			$options['progress'], $options['time']);
+    reports_addValue($options['key'], $options['session'], $options['uid'],
+            $options['attempt'], $options['score'],
+            $options['progress'], $options['time']);
 } else if (array_key_exists('addKey', $options)) {
-	echo reports_addKey($options['course'], $options['tool'],
-			$options['ci'], $options['cn'],
-			$options['sci'], $options['scn'],
-			$options['ssci'], $options['sscn'],
-			$options['link']);
-	echo "\n";
+    echo reports_addKey($options['course'], $options['tool'],
+            $options['ci'], $options['cn'],
+            $options['sci'], $options['scn'],
+            $options['ssci'], $options['sscn'],
+            $options['link']);
+    echo "\n";
 } else
-	echo "action not found\n";
+    echo "action not found\n";
 
 echo "\n";
 ?>

Braces +4 added lines, -3 removed lines

@@ -32,9 +32,9 @@ 
 
 echo "\n\n";
 
-if (array_key_exists('help', $options))
+if (array_key_exists('help', $options)) {
 	echo "help message\n";
-else if (array_key_exists('clearAll', $options)) {
+} else if (array_key_exists('clearAll', $options)) {
 	reports_clearAll();
 } else if (array_key_exists('build', $options)) {
 	reports_build();
@@ -51,8 +51,9 @@ 
 			$options['ssci'], $options['sscn'],
 			$options['link']);
 	echo "\n";
-} else
+} else {
 	echo "action not found\n";
+}
 
 echo "\n";
 ?>

main/reports/reports.php

Indentation +120 added lines, -120 removed lines

@@ -34,21 +34,21 @@ 
 
 // "Link" type
 if ($_REQUEST['format'] == 'link') {
-	// converting post vars to get uri
-	$params = '';
-	$kv = array();
-	foreach ($_POST as $key => $value)
-		if ($key != 'format')
-			$kv[] = $key.'='.urlencode($value);
-	$query_string = join("&", $kv);
-	die('<a href="reports.php?format=directlink&'.$query_string.'">'.get_lang('ReportTypeLink').'</a>');
+    // converting post vars to get uri
+    $params = '';
+    $kv = array();
+    foreach ($_POST as $key => $value)
+        if ($key != 'format')
+            $kv[] = $key.'='.urlencode($value);
+    $query_string = join("&", $kv);
+    die('<a href="reports.php?format=directlink&'.$query_string.'">'.get_lang('ReportTypeLink').'</a>');
 }
 
 if ($_REQUEST['format'] == 'directlink') {
-	foreach (array('jquery.dataTables.min.js') as $js)
-		$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/'.$js.'" type="text/javascript" language="javascript"></script>'."\n";
+    foreach (array('jquery.dataTables.min.js') as $js)
+        $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/'.$js.'" type="text/javascript" language="javascript"></script>'."\n";
 
-	$htmlCSSXtra[] = 'dataTable.css';
+    $htmlCSSXtra[] = 'dataTable.css';
 
 ?>
     <script type="text/javascript">
@@ -63,62 +63,62 @@ 
 		}
     </script>
 <?php
-	Display::display_header($tool_name);
-	echo '<div id="result" class="result">';
+    Display::display_header($tool_name);
+    echo '<div id="result" class="result">';
 }
 
 // outputing a link to csv file instead of outputing csv data directly
 if ($_REQUEST['format'] == 'csv')  {
-	// converting post vars to get uri
-	$params = '';
-	$kv = array();
-	foreach ($_POST as $key => $value)
-		if ($key != 'format')
-			$kv[] = $key.'='.urlencode($value);
-	$query_string = join("&", $kv);
-	die('<a href="reports.php?format=downloadcsv&'.$query_string.'">'.get_lang('DownloadFile').'</a>');
+    // converting post vars to get uri
+    $params = '';
+    $kv = array();
+    foreach ($_POST as $key => $value)
+        if ($key != 'format')
+            $kv[] = $key.'='.urlencode($value);
+    $query_string = join("&", $kv);
+    die('<a href="reports.php?format=downloadcsv&'.$query_string.'">'.get_lang('DownloadFile').'</a>');
 } else if ($_REQUEST['format'] == 'downloadcsv') {
-	if ((strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false) && (strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') == false)) {
-		header("Pragma: must-revalidate");
-		header("Cache-Control: must-revalidate");
-		header("Content-type: application/vnd.ms-excel");
-	}
-	else {
-		header("Content-type: text/csv");
-	}
-	$date = date("Y-m-d");
-	$filename = "reporting-$date.csv";
-	header("Content-Disposition: attachment; filename=$filename");
-	$_REQUEST['format'] = 'csv';
+    if ((strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false) && (strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') == false)) {
+        header("Pragma: must-revalidate");
+        header("Cache-Control: must-revalidate");
+        header("Content-type: application/vnd.ms-excel");
+    }
+    else {
+        header("Content-type: text/csv");
+    }
+    $date = date("Y-m-d");
+    $filename = "reporting-$date.csv";
+    header("Content-Disposition: attachment; filename=$filename");
+    $_REQUEST['format'] = 'csv';
 }
 
 
 
 if (is_array($reports_template[$_REQUEST['type']])) {
-	$query = $reports_template[$_REQUEST['type']]['getSQL']();
-	if (! is_array($query))
-		$query = array($query);
-	if ($_REQUEST['format'] == 'sql')
-		die(var_export($query, true));
+    $query = $reports_template[$_REQUEST['type']]['getSQL']();
+    if (! is_array($query))
+        $query = array($query);
+    if ($_REQUEST['format'] == 'sql')
+        die(var_export($query, true));
 
-	$result = multiquery_query($query);
+    $result = multiquery_query($query);
 
 
-	// check number of result
-	$numberOfResult = multiquery_num_rows($result);
-	if ($numberOfResult == 0) {
-		// This case should be taken care of by the display template itself, we should let the script run
-		//die(get_lang('NoDataAvailable'));
-	}
+    // check number of result
+    $numberOfResult = multiquery_num_rows($result);
+    if ($numberOfResult == 0) {
+        // This case should be taken care of by the display template itself, we should let the script run
+        //die(get_lang('NoDataAvailable'));
+    }
 } else {
-	die('<b>'.get_lang('ErrorWhileBuildingReport').'</b>');
+    die('<b>'.get_lang('ErrorWhileBuildingReport').'</b>');
 }
 
 if ($_REQUEST['format'] == 'html' || $_REQUEST['format'] == 'directlink') {
-	if (isset($reports_template[$_REQUEST['type']]['html_header'])) {
-		echo $reports_template[$_REQUEST['type']]['html_header'];
-	}
-	echo '<script type="text/javascript" charset="utf-8">
+    if (isset($reports_template[$_REQUEST['type']]['html_header'])) {
+        echo $reports_template[$_REQUEST['type']]['html_header'];
+    }
+    echo '<script type="text/javascript" charset="utf-8">
 			$(document).ready(function() {
 
 				$("#reportsData'.$idsuffix.'").dataTable({
@@ -143,50 +143,50 @@ 
 				});
 			} );
 		</script>';
-	echo '<table id="reportsData'.$idsuffix.'" class="display">'; // FIXME style
-
-	// counting fields
-	$nfields = multiquery_num_fields($result);
-	$columns = array();
-	$columns_islink = array();
-	echo '<thead><tr>';
-	for ($i=0; $i < $nfields; $i++)	{
-		$columns[$i] = multiquery_field_name($result, $i);
-		if (substr($columns[$i], -5, 5) != '_link') {
-			$column_islink[$i] = false;
-			echo '<th>'.$columns[$i].'</th>';
-		} else
-			$columns_islink[$i] = true;
-	}
-
-	// checking resolving link column id
-	$columns_flip = array_flip($columns);
-	$columns_link = array();
-	for ($i=0; $i < $nfields; $i++)
-		if ($column_islink[$i] == false && array_key_exists($columns[$i].'_link', $columns_flip))
-			$columns_link[$i] = $columns_flip[$columns[$i].'_link'];
-		else
-			$columns_link[$i] = '';
-	echo '</tr></thead><tbody>';
-	while ($row = multiquery_fetch_row($result)) {
-		echo '<tr>';
-		for ($i = 0; $i<$nfields; $i++)
-			if (!$columns_islink[$i]){ // ignore links
-				if ($columns_link[$i] != '') // link is defined
-					if (substr($columns_link[$i],0,10) == 'javascript') {
-						echo '<td><a href="#" onclick="'.$row[$columns_link[$i]].'">'.$row[$i].'</a></td>';
-					}
-					else {
-						echo '<td><a href="'.$row[$columns_link[$i]].'">'.$row[$i].'</a></td>';
-					}
-				else
-					echo '<td>'.$row[$i].'</td>';
-			}
-		echo "</tr>\n";
-	}
-	echo '</tbody></table>';
-	if ($_REQUEST['format'] == 'directlink') {
-		echo '</div>
+    echo '<table id="reportsData'.$idsuffix.'" class="display">'; // FIXME style
+
+    // counting fields
+    $nfields = multiquery_num_fields($result);
+    $columns = array();
+    $columns_islink = array();
+    echo '<thead><tr>';
+    for ($i=0; $i < $nfields; $i++)	{
+        $columns[$i] = multiquery_field_name($result, $i);
+        if (substr($columns[$i], -5, 5) != '_link') {
+            $column_islink[$i] = false;
+            echo '<th>'.$columns[$i].'</th>';
+        } else
+            $columns_islink[$i] = true;
+    }
+
+    // checking resolving link column id
+    $columns_flip = array_flip($columns);
+    $columns_link = array();
+    for ($i=0; $i < $nfields; $i++)
+        if ($column_islink[$i] == false && array_key_exists($columns[$i].'_link', $columns_flip))
+            $columns_link[$i] = $columns_flip[$columns[$i].'_link'];
+        else
+            $columns_link[$i] = '';
+    echo '</tr></thead><tbody>';
+    while ($row = multiquery_fetch_row($result)) {
+        echo '<tr>';
+        for ($i = 0; $i<$nfields; $i++)
+            if (!$columns_islink[$i]){ // ignore links
+                if ($columns_link[$i] != '') // link is defined
+                    if (substr($columns_link[$i],0,10) == 'javascript') {
+                        echo '<td><a href="#" onclick="'.$row[$columns_link[$i]].'">'.$row[$i].'</a></td>';
+                    }
+                    else {
+                        echo '<td><a href="'.$row[$columns_link[$i]].'">'.$row[$i].'</a></td>';
+                    }
+                else
+                    echo '<td>'.$row[$i].'</td>';
+            }
+        echo "</tr>\n";
+    }
+    echo '</tbody></table>';
+    if ($_REQUEST['format'] == 'directlink') {
+        echo '</div>
 		<div id="result2" class="result" style="margin: 50px;">
 		</div>
 		<div id="result3" class="result" style="margin: 100px;">
@@ -194,36 +194,36 @@ 
 		<div id="result4" class="result" style="margin: 150px;">
 		</div>';
 
-		Display::display_footer();
+        Display::display_footer();
 
-	}
+    }
 } else if ($_REQUEST['format'] == 'csv') {
-	$nfields = multiquery_num_fields($result);
-	$columns = array();
-	$columns_islink = array();
-	for ($i=0; $i < $nfields; $i++)	{
-		$columns[$i] = multiquery_field_name($result, $i);
-		if (substr($columns[$i], -5, 5) != '_link') {
-			$column_islink[$i] = false;
-			echo csv_escaping($columns[$i]).',';
-		} else
-			$columns_islink[$i] = true;
-	}
-
-	echo "\n";
-	while ($row = multiquery_fetch_row($result)) {
-		for ($i = 0; $i<$nfields; $i++)
-			if (!$columns_islink[$i]) // ignore links
-				echo csv_escaping($row[$i]).',';  // fixme
-		echo "\n";
-	}
+    $nfields = multiquery_num_fields($result);
+    $columns = array();
+    $columns_islink = array();
+    for ($i=0; $i < $nfields; $i++)	{
+        $columns[$i] = multiquery_field_name($result, $i);
+        if (substr($columns[$i], -5, 5) != '_link') {
+            $column_islink[$i] = false;
+            echo csv_escaping($columns[$i]).',';
+        } else
+            $columns_islink[$i] = true;
+    }
+
+    echo "\n";
+    while ($row = multiquery_fetch_row($result)) {
+        for ($i = 0; $i<$nfields; $i++)
+            if (!$columns_islink[$i]) // ignore links
+                echo csv_escaping($row[$i]).',';  // fixme
+        echo "\n";
+    }
 } else die(get_lang('UnknownFormat'));
 
 function csv_escaping($value, $csv_separator = ',') {
-	$value = str_replace('"','""',$value);
-	if (strpos($value, '""') or strpos($value, $csv_separator) or $value != trim($value) ) {
-		$value = '"'.$value.'"';
-	}
-	return $value;
+    $value = str_replace('"','""',$value);
+    if (strpos($value, '""') or strpos($value, $csv_separator) or $value != trim($value) ) {
+        $value = '"'.$value.'"';
+    }
+    return $value;
 }
 ?>

Spacing +13 added lines, -13 removed lines

@@ -24,7 +24,7 @@ 
 $this_section = SECTION_REPORTS;
 
 // setting the name of the tool
-$tool_name=get_lang('Reports');
+$tool_name = get_lang('Reports');
 
 // loading templates
 reports_loadTemplates();
@@ -68,7 +68,7 @@ 
 }
 
 // outputing a link to csv file instead of outputing csv data directly
-if ($_REQUEST['format'] == 'csv')  {
+if ($_REQUEST['format'] == 'csv') {
 	// converting post vars to get uri
 	$params = '';
 	$kv = array();
@@ -96,7 +96,7 @@ 
 
 if (is_array($reports_template[$_REQUEST['type']])) {
 	$query = $reports_template[$_REQUEST['type']]['getSQL']();
-	if (! is_array($query))
+	if (!is_array($query))
 		$query = array($query);
 	if ($_REQUEST['format'] == 'sql')
 		die(var_export($query, true));
@@ -150,7 +150,7 @@ 
 	$columns = array();
 	$columns_islink = array();
 	echo '<thead><tr>';
-	for ($i=0; $i < $nfields; $i++)	{
+	for ($i = 0; $i < $nfields; $i++) {
 		$columns[$i] = multiquery_field_name($result, $i);
 		if (substr($columns[$i], -5, 5) != '_link') {
 			$column_islink[$i] = false;
@@ -162,7 +162,7 @@ 
 	// checking resolving link column id
 	$columns_flip = array_flip($columns);
 	$columns_link = array();
-	for ($i=0; $i < $nfields; $i++)
+	for ($i = 0; $i < $nfields; $i++)
 		if ($column_islink[$i] == false && array_key_exists($columns[$i].'_link', $columns_flip))
 			$columns_link[$i] = $columns_flip[$columns[$i].'_link'];
 		else
@@ -170,10 +170,10 @@ 
 	echo '</tr></thead><tbody>';
 	while ($row = multiquery_fetch_row($result)) {
 		echo '<tr>';
-		for ($i = 0; $i<$nfields; $i++)
-			if (!$columns_islink[$i]){ // ignore links
+		for ($i = 0; $i < $nfields; $i++)
+			if (!$columns_islink[$i]) { // ignore links
 				if ($columns_link[$i] != '') // link is defined
-					if (substr($columns_link[$i],0,10) == 'javascript') {
+					if (substr($columns_link[$i], 0, 10) == 'javascript') {
 						echo '<td><a href="#" onclick="'.$row[$columns_link[$i]].'">'.$row[$i].'</a></td>';
 					}
 					else {
@@ -201,7 +201,7 @@ 
 	$nfields = multiquery_num_fields($result);
 	$columns = array();
 	$columns_islink = array();
-	for ($i=0; $i < $nfields; $i++)	{
+	for ($i = 0; $i < $nfields; $i++) {
 		$columns[$i] = multiquery_field_name($result, $i);
 		if (substr($columns[$i], -5, 5) != '_link') {
 			$column_islink[$i] = false;
@@ -212,16 +212,16 @@ 
 
 	echo "\n";
 	while ($row = multiquery_fetch_row($result)) {
-		for ($i = 0; $i<$nfields; $i++)
+		for ($i = 0; $i < $nfields; $i++)
 			if (!$columns_islink[$i]) // ignore links
-				echo csv_escaping($row[$i]).',';  // fixme
+				echo csv_escaping($row[$i]).','; // fixme
 		echo "\n";
 	}
 } else die(get_lang('UnknownFormat'));
 
 function csv_escaping($value, $csv_separator = ',') {
-	$value = str_replace('"','""',$value);
-	if (strpos($value, '""') or strpos($value, $csv_separator) or $value != trim($value) ) {
+	$value = str_replace('"', '""', $value);
+	if (strpos($value, '""') or strpos($value, $csv_separator) or $value != trim($value)) {
 		$value = '"'.$value.'"';
 	}
 	return $value;

Braces +43 added lines, -31 removed lines

@@ -37,16 +37,18 @@ 
 	// converting post vars to get uri
 	$params = '';
 	$kv = array();
-	foreach ($_POST as $key => $value)
-		if ($key != 'format')
+	foreach ($_POST as $key => $value) {
+			if ($key != 'format')
 			$kv[] = $key.'='.urlencode($value);
+	}
 	$query_string = join("&", $kv);
 	die('<a href="reports.php?format=directlink&'.$query_string.'">'.get_lang('ReportTypeLink').'</a>');
 }
 
 if ($_REQUEST['format'] == 'directlink') {
-	foreach (array('jquery.dataTables.min.js') as $js)
-		$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/'.$js.'" type="text/javascript" language="javascript"></script>'."\n";
+	foreach (array('jquery.dataTables.min.js') as $js) {
+			$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/'.$js.'" type="text/javascript" language="javascript"></script>'."\n";
+	}
 
 	$htmlCSSXtra[] = 'dataTable.css';
 
@@ -72,9 +74,10 @@ 
 	// converting post vars to get uri
 	$params = '';
 	$kv = array();
-	foreach ($_POST as $key => $value)
-		if ($key != 'format')
+	foreach ($_POST as $key => $value) {
+			if ($key != 'format')
 			$kv[] = $key.'='.urlencode($value);
+	}
 	$query_string = join("&", $kv);
 	die('<a href="reports.php?format=downloadcsv&'.$query_string.'">'.get_lang('DownloadFile').'</a>');
 } else if ($_REQUEST['format'] == 'downloadcsv') {
@@ -82,8 +85,7 @@ 
 		header("Pragma: must-revalidate");
 		header("Cache-Control: must-revalidate");
 		header("Content-type: application/vnd.ms-excel");
-	}
-	else {
+	} else {
 		header("Content-type: text/csv");
 	}
 	$date = date("Y-m-d");
@@ -96,10 +98,12 @@ 
 
 if (is_array($reports_template[$_REQUEST['type']])) {
 	$query = $reports_template[$_REQUEST['type']]['getSQL']();
-	if (! is_array($query))
-		$query = array($query);
-	if ($_REQUEST['format'] == 'sql')
-		die(var_export($query, true));
+	if (! is_array($query)) {
+			$query = array($query);
+	}
+	if ($_REQUEST['format'] == 'sql') {
+			die(var_export($query, true));
+	}
 
 	$result = multiquery_query($query);
 
@@ -155,32 +159,35 @@ 
 		if (substr($columns[$i], -5, 5) != '_link') {
 			$column_islink[$i] = false;
 			echo '<th>'.$columns[$i].'</th>';
-		} else
-			$columns_islink[$i] = true;
+		} else {
+					$columns_islink[$i] = true;
+		}
 	}
 
 	// checking resolving link column id
 	$columns_flip = array_flip($columns);
 	$columns_link = array();
-	for ($i=0; $i < $nfields; $i++)
-		if ($column_islink[$i] == false && array_key_exists($columns[$i].'_link', $columns_flip))
+	for ($i=0; $i < $nfields; $i++) {
+			if ($column_islink[$i] == false && array_key_exists($columns[$i].'_link', $columns_flip))
 			$columns_link[$i] = $columns_flip[$columns[$i].'_link'];
-		else
-			$columns_link[$i] = '';
+	}
+		else {
+					$columns_link[$i] = '';
+		}
 	echo '</tr></thead><tbody>';
 	while ($row = multiquery_fetch_row($result)) {
 		echo '<tr>';
-		for ($i = 0; $i<$nfields; $i++)
-			if (!$columns_islink[$i]){ // ignore links
+		for ($i = 0; $i<$nfields; $i++) {
+					if (!$columns_islink[$i]){ // ignore links
 				if ($columns_link[$i] != '') // link is defined
 					if (substr($columns_link[$i],0,10) == 'javascript') {
 						echo '<td><a href="#" onclick="'.$row[$columns_link[$i]].'">'.$row[$i].'</a></td>';
-					}
-					else {
+		}
+					} else {
 						echo '<td><a href="'.$row[$columns_link[$i]].'">'.$row[$i].'</a></td>';
-					}
-				else
-					echo '<td>'.$row[$i].'</td>';
+					} else {
+									echo '<td>'.$row[$i].'</td>';
+				}
 			}
 		echo "</tr>\n";
 	}
@@ -206,18 +213,23 @@ 
 		if (substr($columns[$i], -5, 5) != '_link') {
 			$column_islink[$i] = false;
 			echo csv_escaping($columns[$i]).',';
-		} else
-			$columns_islink[$i] = true;
+		} else {
+					$columns_islink[$i] = true;
+		}
 	}
 
 	echo "\n";
 	while ($row = multiquery_fetch_row($result)) {
-		for ($i = 0; $i<$nfields; $i++)
-			if (!$columns_islink[$i]) // ignore links
-				echo csv_escaping($row[$i]).',';  // fixme
+		for ($i = 0; $i<$nfields; $i++) {
+					if (!$columns_islink[$i]) // ignore links
+				echo csv_escaping($row[$i]).',';
+		}
+		// fixme
 		echo "\n";
 	}
-} else die(get_lang('UnknownFormat'));
+} else {
+    die(get_lang('UnknownFormat'));
+}
 
 function csv_escaping($value, $csv_separator = ',') {
 	$value = str_replace('"','""',$value);

main/mySpace/lp_tracking.php

Spacing +14 added lines, -14 removed lines

@@ -17,7 +17,7 @@ 
 	$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 @@ 
 }
 
 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);
@@ -62,15 +62,15 @@ 
 
 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);

Indentation +11 added lines, -11 removed lines

@@ -11,10 +11,10 @@ 
 $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 @@ 
 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"));

main/mySpace/current_courses.php

Spacing +13 added lines, -13 removed lines

@@ -34,11 +34,11 @@ 
 		}
 
 		$teachers = CourseManager::get_teacher_list_from_course_code($course_code);
-		$teacher_list =  array();
+		$teacher_list = array();
 
 		if (!empty($teachers)) {
-			foreach($teachers as $teacher) {
-				$teacher_list[]= $teacher['firstname'].' '.$teacher['lastname'];
+			foreach ($teachers as $teacher) {
+				$teacher_list[] = $teacher['firstname'].' '.$teacher['lastname'];
 			}
 		}
 
@@ -54,7 +54,7 @@ 
 			$students[] = $student['user_id'];
 		}
 
-		$t_lp 	= Database :: get_course_table(TABLE_LP_MAIN);
+		$t_lp = Database :: get_course_table(TABLE_LP_MAIN);
 		$sql_lp = "SELECT lp.name, lp.id FROM $t_lp lp
 				   WHERE c_id = $course_id AND lp.session_id = 0";
 		$rs_lp 	= Database::query($sql_lp);
@@ -67,7 +67,7 @@ 
 		);
 
 		$total_tools = 0;
-		foreach($total_tools_list as $tool) {
+		foreach ($total_tools_list as $tool) {
 			$total_tools += $tool['count_access_tool'];
 		}
 
@@ -93,16 +93,16 @@ 
 				if (!empty($students)) {
 					foreach ($students  as $student_id) {
 						$avg_student_progress   = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
-						$myavg_temp 			= Tracking::get_avg_student_score($student_id, $course_code, array($lp_id), $session_id);
+						$myavg_temp = Tracking::get_avg_student_score($student_id, $course_code, array($lp_id), $session_id);
 						$avg_progress_in_course = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
 
 						if (intval($avg_progress_in_course) == 100) {
 							$count_students_complete_all_activities++;
 						}
 						if (intval($avg_progress_in_course) > 0 && intval($avg_progress_in_course) <= 50) {
-							$count_students_complete_all_activities_at_50 ++;
+							$count_students_complete_all_activities_at_50++;
 						}
-						$total_average_progress +=$avg_progress_in_course;
+						$total_average_progress += $avg_progress_in_course;
 
 						$time_spent = Tracking::get_time_spent_on_the_course($student_id, $course_id, $session_id);
 						$total_time_spent += $time_spent;
@@ -139,7 +139,7 @@ 
 						    ORDER BY item_type";
 				$res_lpi = Database::query($sql_lpi);
 				while ($row_lpi = Database::fetch_array($res_lpi)) {
-					switch($row_lpi['item_type']) {
+					switch ($row_lpi['item_type']) {
 						case 'document':
 							$array[$i]['learnpath_docs']++;
 							break;
@@ -171,10 +171,10 @@ 
 
 				if (!empty($student_count)) {
 					$array[$i]['count_students_accessing'] = $count_students_accessing;
-					$array[$i]['count_students_accessing_percentage'] = round($count_students_accessing / $student_count *100 , 0);
+					$array[$i]['count_students_accessing_percentage'] = round($count_students_accessing / $student_count * 100, 0);
 					$array[$i]['count_students_complete_all_activities_at_50'] = $count_students_complete_all_activities;
-					$array[$i]['count_students_complete_all_activities'] = round($count_students_complete_all_activities / $student_count *100 , 0);;
-					$array[$i]['average_percentage_activities_completed_per_student'] = round($count_students_complete_all_activities/$student_count*100,2);
+					$array[$i]['count_students_complete_all_activities'] = round($count_students_complete_all_activities / $student_count * 100, 0); ;
+					$array[$i]['average_percentage_activities_completed_per_student'] = round($count_students_complete_all_activities / $student_count * 100, 2);
 					$array[$i]['total_time_spent'] = 0;
 					$array[$i]['average_time_spent_per_student'] = 0;
 
@@ -241,7 +241,7 @@ 
 	exit;
 }
 
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('MySpace'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('MySpace'));
 
 Display::display_header(get_lang('CurrentCourses'));
 

Indentation +209 added lines, -209 removed lines

@@ -12,7 +12,7 @@ 
 $filename = 'reporting.xls';
 
 if (!api_is_allowed_to_create_course()) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $user_id = api_get_user_id();
@@ -23,222 +23,222 @@ 
 $session_id = 0;
 
 if (!empty($my_courses)) {
-	foreach ($my_courses as $course) {
-		$course_code = $course['code'];
-		$course_id = $course['real_id'];
-		$course_info = api_get_course_info($course_code);
-
-		//Only show open courses
-		if ($course_info['visibility'] == 0) {
-			continue;
-		}
-
-		$teachers = CourseManager::get_teacher_list_from_course_code($course_code);
-		$teacher_list =  array();
-
-		if (!empty($teachers)) {
-			foreach($teachers as $teacher) {
-				$teacher_list[]= $teacher['firstname'].' '.$teacher['lastname'];
-			}
-		}
-
-		$tmp_students = CourseManager :: get_student_list_from_course_code($course_code, false);
-
-		//Cleaning students only REAL students
-		$students = array();
-		foreach ($tmp_students  as $student) {
-			$user_info = api_get_user_info($student['user_id']);
-			if ($user_info['status'] != STUDENT) {
-				continue;
-			}
-			$students[] = $student['user_id'];
-		}
-
-		$t_lp 	= Database :: get_course_table(TABLE_LP_MAIN);
-		$sql_lp = "SELECT lp.name, lp.id FROM $t_lp lp
+    foreach ($my_courses as $course) {
+        $course_code = $course['code'];
+        $course_id = $course['real_id'];
+        $course_info = api_get_course_info($course_code);
+
+        //Only show open courses
+        if ($course_info['visibility'] == 0) {
+            continue;
+        }
+
+        $teachers = CourseManager::get_teacher_list_from_course_code($course_code);
+        $teacher_list =  array();
+
+        if (!empty($teachers)) {
+            foreach($teachers as $teacher) {
+                $teacher_list[]= $teacher['firstname'].' '.$teacher['lastname'];
+            }
+        }
+
+        $tmp_students = CourseManager :: get_student_list_from_course_code($course_code, false);
+
+        //Cleaning students only REAL students
+        $students = array();
+        foreach ($tmp_students  as $student) {
+            $user_info = api_get_user_info($student['user_id']);
+            if ($user_info['status'] != STUDENT) {
+                continue;
+            }
+            $students[] = $student['user_id'];
+        }
+
+        $t_lp 	= Database :: get_course_table(TABLE_LP_MAIN);
+        $sql_lp = "SELECT lp.name, lp.id FROM $t_lp lp
 				   WHERE c_id = $course_id AND lp.session_id = 0";
-		$rs_lp 	= Database::query($sql_lp);
-		$t_lpi 	= Database :: get_course_table(TABLE_LP_ITEM);
-		$t_news = Database :: get_course_table(TABLE_ANNOUNCEMENT);
-
-		$total_tools_list = Tracking::get_tools_most_used_by_course(
-			$course_id,
-			$session_id
-		);
-
-		$total_tools = 0;
-		foreach($total_tools_list as $tool) {
-			$total_tools += $tool['count_access_tool'];
-		}
-
-		if (Database :: num_rows($rs_lp) > 0) {
-			while ($learnpath = Database :: fetch_array($rs_lp)) {
-				$lp_id = $learnpath['id'];
-
-				$lp_items =
-				$array[$i]['lp'] = '<a href="'.api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?cidReq='.$course_code.'&amp;action=view&amp;lp_id='.$lp_id.'" target="_blank">'.$learnpath['name'].'</a>';
-
-				$array[$i]['teachers'] = '';
-				if (!empty($teacher_list)) {
-					$array[$i]['teachers'] = implode(', ', $teacher_list);
-				}
-
-				$array[$i]['course_name'] = $course['title'];
-				$count_students_accessing = 0;
-				$count_students_complete_all_activities = 0;
-				$count_students_complete_all_activities_at_50 = 0;
-				$total_time_spent = 0;
-				$total_average_progress = 0;
-
-				if (!empty($students)) {
-					foreach ($students  as $student_id) {
-						$avg_student_progress   = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
-						$myavg_temp 			= Tracking::get_avg_student_score($student_id, $course_code, array($lp_id), $session_id);
-						$avg_progress_in_course = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
-
-						if (intval($avg_progress_in_course) == 100) {
-							$count_students_complete_all_activities++;
-						}
-						if (intval($avg_progress_in_course) > 0 && intval($avg_progress_in_course) <= 50) {
-							$count_students_complete_all_activities_at_50 ++;
-						}
-						$total_average_progress +=$avg_progress_in_course;
-
-						$time_spent = Tracking::get_time_spent_on_the_course($student_id, $course_id, $session_id);
-						$total_time_spent += $time_spent;
-						if (!empty($time_spent)) {
-							$count_students_accessing++;
-						}
-					}
-					//$total_tools += $nb_assignments +  $messages + $links + $chat_last_connection + $documents;
-				}
-
-				$student_count = count($students);
-
-				$array[$i]['count_students'] = $student_count;
-				$array[$i]['count_students_accessing'] = 0;
-				$array[$i]['count_students_accessing_percentage'] = 0;
-				$array[$i]['count_students_complete_all_activities_at_50'] = 0;
-				$array[$i]['count_students_complete_all_activities'] = 0;
-				$array[$i]['average_percentage_activities_completed_per_student'] = 0;
-				$array[$i]['total_time_spent'] = 0;
-				$array[$i]['average_time_spent_per_student'] = 0;
-				$array[$i]['total_time_spent'] = 0;
-				$array[$i]['average_time_spent_per_student'] = 0;
-				//$array[$i]['tools_used'] = 0;
-				$array[$i]['learnpath_docs'] = 0;
-				$array[$i]['learnpath_exercises'] = 0;
-				$array[$i]['learnpath_links'] = 0;
-				$array[$i]['learnpath_forums'] = 0;
-				$array[$i]['learnpath_assignments'] = 0;
-
-				//registering the number of each category of
-				//items in learning path
-				$sql_lpi = "SELECT lpi.item_type FROM $t_lpi lpi
+        $rs_lp 	= Database::query($sql_lp);
+        $t_lpi 	= Database :: get_course_table(TABLE_LP_ITEM);
+        $t_news = Database :: get_course_table(TABLE_ANNOUNCEMENT);
+
+        $total_tools_list = Tracking::get_tools_most_used_by_course(
+            $course_id,
+            $session_id
+        );
+
+        $total_tools = 0;
+        foreach($total_tools_list as $tool) {
+            $total_tools += $tool['count_access_tool'];
+        }
+
+        if (Database :: num_rows($rs_lp) > 0) {
+            while ($learnpath = Database :: fetch_array($rs_lp)) {
+                $lp_id = $learnpath['id'];
+
+                $lp_items =
+                $array[$i]['lp'] = '<a href="'.api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?cidReq='.$course_code.'&amp;action=view&amp;lp_id='.$lp_id.'" target="_blank">'.$learnpath['name'].'</a>';
+
+                $array[$i]['teachers'] = '';
+                if (!empty($teacher_list)) {
+                    $array[$i]['teachers'] = implode(', ', $teacher_list);
+                }
+
+                $array[$i]['course_name'] = $course['title'];
+                $count_students_accessing = 0;
+                $count_students_complete_all_activities = 0;
+                $count_students_complete_all_activities_at_50 = 0;
+                $total_time_spent = 0;
+                $total_average_progress = 0;
+
+                if (!empty($students)) {
+                    foreach ($students  as $student_id) {
+                        $avg_student_progress   = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
+                        $myavg_temp 			= Tracking::get_avg_student_score($student_id, $course_code, array($lp_id), $session_id);
+                        $avg_progress_in_course = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
+
+                        if (intval($avg_progress_in_course) == 100) {
+                            $count_students_complete_all_activities++;
+                        }
+                        if (intval($avg_progress_in_course) > 0 && intval($avg_progress_in_course) <= 50) {
+                            $count_students_complete_all_activities_at_50 ++;
+                        }
+                        $total_average_progress +=$avg_progress_in_course;
+
+                        $time_spent = Tracking::get_time_spent_on_the_course($student_id, $course_id, $session_id);
+                        $total_time_spent += $time_spent;
+                        if (!empty($time_spent)) {
+                            $count_students_accessing++;
+                        }
+                    }
+                    //$total_tools += $nb_assignments +  $messages + $links + $chat_last_connection + $documents;
+                }
+
+                $student_count = count($students);
+
+                $array[$i]['count_students'] = $student_count;
+                $array[$i]['count_students_accessing'] = 0;
+                $array[$i]['count_students_accessing_percentage'] = 0;
+                $array[$i]['count_students_complete_all_activities_at_50'] = 0;
+                $array[$i]['count_students_complete_all_activities'] = 0;
+                $array[$i]['average_percentage_activities_completed_per_student'] = 0;
+                $array[$i]['total_time_spent'] = 0;
+                $array[$i]['average_time_spent_per_student'] = 0;
+                $array[$i]['total_time_spent'] = 0;
+                $array[$i]['average_time_spent_per_student'] = 0;
+                //$array[$i]['tools_used'] = 0;
+                $array[$i]['learnpath_docs'] = 0;
+                $array[$i]['learnpath_exercises'] = 0;
+                $array[$i]['learnpath_links'] = 0;
+                $array[$i]['learnpath_forums'] = 0;
+                $array[$i]['learnpath_assignments'] = 0;
+
+                //registering the number of each category of
+                //items in learning path
+                $sql_lpi = "SELECT lpi.item_type FROM $t_lpi lpi
 						    WHERE c_id = $course_id AND lpi.lp_id = $lp_id
 						    ORDER BY item_type";
-				$res_lpi = Database::query($sql_lpi);
-				while ($row_lpi = Database::fetch_array($res_lpi)) {
-					switch($row_lpi['item_type']) {
-						case 'document':
-							$array[$i]['learnpath_docs']++;
-							break;
-						case 'quiz':
-							$array[$i]['learnpath_exercises']++;
-							break;
-						case 'link':
-							$array[$i]['learnpath_links']++;
-							break;
-						case 'forum':
-						case 'thread':
-							$array[$i]['learnpath_forums']++;
-							break;
-						case 'student_publication':
-							$array[$i]['learnpath_assignments']++;
-							break;
-					}
-				}
-				// Count announcements
-				$array[$i]['total_announcements'] = 0;
-				$sql_news = "SELECT count(id) FROM $t_news WHERE c_id = $course_id ";
-				$res_news = Database::query($sql_news);
-				while ($row_news = Database::fetch_array($res_news)) {
-					$array[$i]['total_announcements'] = $row_news[0];
-				}
-
-				//@todo don't know what means this value
-				$count_students_complete_all_activities_at_50 = 0;
-
-				if (!empty($student_count)) {
-					$array[$i]['count_students_accessing'] = $count_students_accessing;
-					$array[$i]['count_students_accessing_percentage'] = round($count_students_accessing / $student_count *100 , 0);
-					$array[$i]['count_students_complete_all_activities_at_50'] = $count_students_complete_all_activities;
-					$array[$i]['count_students_complete_all_activities'] = round($count_students_complete_all_activities / $student_count *100 , 0);;
-					$array[$i]['average_percentage_activities_completed_per_student'] = round($count_students_complete_all_activities/$student_count*100,2);
-					$array[$i]['total_time_spent'] = 0;
-					$array[$i]['average_time_spent_per_student'] = 0;
-
-					if (!empty($total_time_spent)) {
-						$array[$i]['total_time_spent'] = api_time_to_hms($total_time_spent);
-						$array[$i]['average_time_spent_per_student'] = api_time_to_hms($total_time_spent / $student_count);
-					}
-					//$array[$i]['tools_used'] = $total_tools;
-				}
-				$i++;
-			}
-		}
-	}
+                $res_lpi = Database::query($sql_lpi);
+                while ($row_lpi = Database::fetch_array($res_lpi)) {
+                    switch($row_lpi['item_type']) {
+                        case 'document':
+                            $array[$i]['learnpath_docs']++;
+                            break;
+                        case 'quiz':
+                            $array[$i]['learnpath_exercises']++;
+                            break;
+                        case 'link':
+                            $array[$i]['learnpath_links']++;
+                            break;
+                        case 'forum':
+                        case 'thread':
+                            $array[$i]['learnpath_forums']++;
+                            break;
+                        case 'student_publication':
+                            $array[$i]['learnpath_assignments']++;
+                            break;
+                    }
+                }
+                // Count announcements
+                $array[$i]['total_announcements'] = 0;
+                $sql_news = "SELECT count(id) FROM $t_news WHERE c_id = $course_id ";
+                $res_news = Database::query($sql_news);
+                while ($row_news = Database::fetch_array($res_news)) {
+                    $array[$i]['total_announcements'] = $row_news[0];
+                }
+
+                //@todo don't know what means this value
+                $count_students_complete_all_activities_at_50 = 0;
+
+                if (!empty($student_count)) {
+                    $array[$i]['count_students_accessing'] = $count_students_accessing;
+                    $array[$i]['count_students_accessing_percentage'] = round($count_students_accessing / $student_count *100 , 0);
+                    $array[$i]['count_students_complete_all_activities_at_50'] = $count_students_complete_all_activities;
+                    $array[$i]['count_students_complete_all_activities'] = round($count_students_complete_all_activities / $student_count *100 , 0);;
+                    $array[$i]['average_percentage_activities_completed_per_student'] = round($count_students_complete_all_activities/$student_count*100,2);
+                    $array[$i]['total_time_spent'] = 0;
+                    $array[$i]['average_time_spent_per_student'] = 0;
+
+                    if (!empty($total_time_spent)) {
+                        $array[$i]['total_time_spent'] = api_time_to_hms($total_time_spent);
+                        $array[$i]['average_time_spent_per_student'] = api_time_to_hms($total_time_spent / $student_count);
+                    }
+                    //$array[$i]['tools_used'] = $total_tools;
+                }
+                $i++;
+            }
+        }
+    }
 }
 
 $headers = array(
-	get_lang('LearningPath'),
-	get_lang('Teachers'),
-	get_lang('Courses'),
-	get_lang('NumberOfStudents'),
-	get_lang('NumberStudentsAccessingCourse'),
-	get_lang('PercentageStudentsAccessingCourse'),
-	get_lang('NumberStudentsCompleteAllActivities'),
-	get_lang('PercentageStudentsCompleteAllActivities'),
-	get_lang('AverageOfActivitiesCompletedPerStudent'),
-	get_lang('TotalTimeSpentInTheCourse'),
-	get_lang('AverageTimePerStudentInCourse'),
-	get_lang('NumberOfDocumentsInLearnpath'),
-	get_lang('NumberOfExercisesInLearnpath'),
-	get_lang('NumberOfLinksInLearnpath'),
-	get_lang('NumberOfForumsInLearnpath'),
-	get_lang('NumberOfAssignmentsInLearnpath'),
-	get_lang('NumberOfAnnouncementsInCourse'),
+    get_lang('LearningPath'),
+    get_lang('Teachers'),
+    get_lang('Courses'),
+    get_lang('NumberOfStudents'),
+    get_lang('NumberStudentsAccessingCourse'),
+    get_lang('PercentageStudentsAccessingCourse'),
+    get_lang('NumberStudentsCompleteAllActivities'),
+    get_lang('PercentageStudentsCompleteAllActivities'),
+    get_lang('AverageOfActivitiesCompletedPerStudent'),
+    get_lang('TotalTimeSpentInTheCourse'),
+    get_lang('AverageTimePerStudentInCourse'),
+    get_lang('NumberOfDocumentsInLearnpath'),
+    get_lang('NumberOfExercisesInLearnpath'),
+    get_lang('NumberOfLinksInLearnpath'),
+    get_lang('NumberOfForumsInLearnpath'),
+    get_lang('NumberOfAssignmentsInLearnpath'),
+    get_lang('NumberOfAnnouncementsInCourse'),
 );
 
 if (isset($_GET['export'])) {
-	global $charset;
+    global $charset;
     $spreadsheet = new PHPExcel();
     $spreadsheet->setActiveSheetIndex(0);
     $worksheet = $spreadsheet->getActiveSheet();
 
-	$line = 0;
-	$column = 0; //skip the first column (row titles)
-
-	foreach ($headers as $header) {
-		$worksheet->setCellValueByColumnAndRow($column, $line, $header);
-		$column++;
-	}
-	$line++;
-	foreach ($array as $row) {
-		$column = 0;
-		foreach ($row as $item) {
-			$worksheet->setCellValueByColumnAndRow($column, $line, html_entity_decode(strip_tags($item)));
-			$column++;
-		}
-		$line++;
-	}
-	$line++;
+    $line = 0;
+    $column = 0; //skip the first column (row titles)
+
+    foreach ($headers as $header) {
+        $worksheet->setCellValueByColumnAndRow($column, $line, $header);
+        $column++;
+    }
+    $line++;
+    foreach ($array as $row) {
+        $column = 0;
+        foreach ($row as $item) {
+            $worksheet->setCellValueByColumnAndRow($column, $line, html_entity_decode(strip_tags($item)));
+            $column++;
+        }
+        $line++;
+    }
+    $line++;
 
     $file = api_get_path(SYS_ARCHIVE_PATH).api_replace_dangerous_char($filename);
     $writer = new PHPExcel_Writer_Excel2007($spreadsheet);
     $writer->save($file);
     DocumentManager::file_send_for_download($file, true, $filename);
-	exit;
+    exit;
 }
 
 $interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('MySpace'));
@@ -249,20 +249,20 @@ 
 $row = 0;
 $column = 0;
 foreach ($headers as $header) {
-	$table->setHeaderContents($row, $column, $header);
-	$column++;
+    $table->setHeaderContents($row, $column, $header);
+    $column++;
 }
 $row++;
 
 foreach ($array as $row_table) {
-	$column = 0;
-	foreach ($row_table as $cell) {
-		$table->setCellContents($row, $column, $cell);
-		//$table->updateCellAttributes($row, $column, 'align="center"');
-		$column++;
-	}
-	$table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true);
-	$row++;
+    $column = 0;
+    foreach ($row_table as $cell) {
+        $table->setCellContents($row, $column, $cell);
+        //$table->updateCellAttributes($row, $column, 'align="center"');
+        $column++;
+    }
+    $table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true);
+    $row++;
 }
 
 echo '<div class="actions">';

main/mySpace/user_edit.php

Indentation +35 added lines, -35 removed lines

@@ -113,23 +113,23 @@ 
 $form->addGroup($html_results_enabled);
 // Validate form
 if ($form->validate()) {
-	$check = Security::check_token('post');
-	if ($check) {
-		$user = $form->exportValues();
-		$email = $userInfo['email'];
+    $check = Security::check_token('post');
+    if ($check) {
+        $user = $form->exportValues();
+        $email = $userInfo['email'];
         $username = $userInfo['username'];
-		$send_mail = intval($user['mail']['send_mail']);
+        $send_mail = intval($user['mail']['send_mail']);
         $auth_source = PLATFORM_AUTH_SOURCE;
 
         $resetPassword = $user['password']['password_auto'] == '1' ? 0 : 2;
 
-		if (count($extAuthSource) > 0 && $user['password']['password_auto'] == '2') {
-			//$auth_source = $user['password']['auth_source'];
-			//$password = 'PLACEHOLDER';
-		} else {
-			//$auth_source = PLATFORM_AUTH_SOURCE;
-			//$password = $user['password']['password_auto'] == '1' ? api_generate_password() : $user['password']['password'];
-		}
+        if (count($extAuthSource) > 0 && $user['password']['password_auto'] == '2') {
+            //$auth_source = $user['password']['auth_source'];
+            //$password = 'PLACEHOLDER';
+        } else {
+            //$auth_source = PLATFORM_AUTH_SOURCE;
+            //$password = $user['password']['password_auto'] == '1' ? api_generate_password() : $user['password']['password'];
+        }
 
         $auth_source = $userInfo['auth_source'];
         $password = $user['password']['password_auto'] == '1' ? api_generate_password() : $user['password']['password'];
@@ -157,18 +157,18 @@ 
             $resetPassword
         );
 
-		if (!empty($email) && $send_mail) {
-			$emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
-			$portal_url = api_get_path(WEB_PATH);
-			if (api_is_multiple_url_enabled()) {
-				$access_url_id = api_get_current_access_url_id();
-				if ($access_url_id != -1) {
-					$url = api_get_access_url($access_url_id);
-					$portal_url = $url['url'];
-				}
-			}
-
-			$emailbody = get_lang('Dear')." ".stripslashes(api_get_person_name($userInfo['firstname'], $userInfo['lastname'])).",\n\n".
+        if (!empty($email) && $send_mail) {
+            $emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
+            $portal_url = api_get_path(WEB_PATH);
+            if (api_is_multiple_url_enabled()) {
+                $access_url_id = api_get_current_access_url_id();
+                if ($access_url_id != -1) {
+                    $url = api_get_access_url($access_url_id);
+                    $portal_url = $url['url'];
+                }
+            }
+
+            $emailbody = get_lang('Dear')." ".stripslashes(api_get_person_name($userInfo['firstname'], $userInfo['lastname'])).",\n\n".
                 get_lang('YouAreReg')." ". api_get_setting('siteName') ." ".get_lang('WithTheFollowingSettings')."\n\n".
                 get_lang('Username')." : ". $username ."\n". get_lang('Pass')." : ".stripslashes($password)."\n\n" .
                 get_lang('Address') ." ". api_get_setting('siteName') ." ".
@@ -181,26 +181,26 @@ 
                 api_get_setting('administratorTelephone')."\n" .
                 get_lang('Email') ." : ".api_get_setting('emailAdministrator');
 
-			api_mail_html(
+            api_mail_html(
                 api_get_person_name($userInfo['firstname'], $userInfo['lastname'], null, PERSON_NAME_EMAIL_ADDRESS),
                 $email,
                 $emailsubject,
                 $emailbody
             );
-		}
+        }
 
-		Security::clear_token();
+        Security::clear_token();
         $tok = Security::get_token();
         header('Location: '.$url.'&message=1');
         exit();
-	}
+    }
 } else {
-	if (isset($_POST['submit'])) {
-		Security::clear_token();
-	}
-	$token = Security::get_token();
-	$form->addElement('hidden', 'sec_token');
-	$form->setConstants(array('sec_token' => $token));
+    if (isset($_POST['submit'])) {
+        Security::clear_token();
+    }
+    $token = Security::get_token();
+    $form->addElement('hidden', 'sec_token');
+    $form->setConstants(array('sec_token' => $token));
 }
 
 $interbreadcrumb[] = array(
@@ -212,7 +212,7 @@ 
 Display::display_header($tool_name);
 
 if (isset($_REQUEST['message'])) {
-	Display::display_normal_message(get_lang('Updated'));
+    Display::display_normal_message(get_lang('Updated'));
 }
 $form->display();
 

Spacing +14 added lines, -14 removed lines

@@ -89,15 +89,15 @@ 
 	$group[] =& $form->createElement('select', 'auth_source', null, $auth_sources);
 	$group[] =& $form->createElement('static', '', '', '<br />');
 }*/
-$group[] =& $form->createElement('radio', 'password_auto', get_lang('Password'), get_lang('AutoGeneratePassword').'<br />', 1);
-$group[] =& $form->createElement('radio', 'password_auto', 'id="radio_user_password"', null, 0);
-$group[] =& $form->createElement('password', 'password', null, array('onkeydown' => 'javascript: password_switch_radio_button(document.user_add,"password[password_auto]");'));
+$group[] = & $form->createElement('radio', 'password_auto', get_lang('Password'), get_lang('AutoGeneratePassword').'<br />', 1);
+$group[] = & $form->createElement('radio', 'password_auto', 'id="radio_user_password"', null, 0);
+$group[] = & $form->createElement('password', 'password', null, array('onkeydown' => 'javascript: password_switch_radio_button(document.user_add,"password[password_auto]");'));
 $form->addGroup($group, 'password', get_lang('Password'), '');
 
 // Send email
 $group = array();
-$group[] =& $form->createElement('radio', 'send_mail', null, get_lang('Yes'), 1);
-$group[] =& $form->createElement('radio', 'send_mail', null, get_lang('No'), 0);
+$group[] = & $form->createElement('radio', 'send_mail', null, get_lang('Yes'), 1);
+$group[] = & $form->createElement('radio', 'send_mail', null, get_lang('No'), 0);
 $form->addGroup($group, 'mail', get_lang('SendMailToNewUser'), '&nbsp;');
 
 // Set default values
@@ -108,7 +108,7 @@ 
 
 $form->setDefaults($defaults);
 // Submit button
-$select_level = array ();
+$select_level = array();
 $html_results_enabled[] = $form->addButtonUpdate(get_lang('Update'), 'submit', true);
 $form->addGroup($html_results_enabled);
 // Validate form
@@ -169,17 +169,17 @@ 
 			}
 
 			$emailbody = get_lang('Dear')." ".stripslashes(api_get_person_name($userInfo['firstname'], $userInfo['lastname'])).",\n\n".
-                get_lang('YouAreReg')." ". api_get_setting('siteName') ." ".get_lang('WithTheFollowingSettings')."\n\n".
-                get_lang('Username')." : ". $username ."\n". get_lang('Pass')." : ".stripslashes($password)."\n\n" .
-                get_lang('Address') ." ". api_get_setting('siteName') ." ".
-                get_lang('Is') ." : ".$portal_url."\n\n".
-                get_lang('Problem'). "\n\n".
+                get_lang('YouAreReg')." ".api_get_setting('siteName')." ".get_lang('WithTheFollowingSettings')."\n\n".
+                get_lang('Username')." : ".$username."\n".get_lang('Pass')." : ".stripslashes($password)."\n\n".
+                get_lang('Address')." ".api_get_setting('siteName')." ".
+                get_lang('Is')." : ".$portal_url."\n\n".
+                get_lang('Problem')."\n\n".
                 get_lang('SignatureFormula').",\n\n".
                 api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n".
-                get_lang('Manager'). " ".
+                get_lang('Manager')." ".
                 api_get_setting('siteName')."\nT. ".
-                api_get_setting('administratorTelephone')."\n" .
-                get_lang('Email') ." : ".api_get_setting('emailAdministrator');
+                api_get_setting('administratorTelephone')."\n".
+                get_lang('Email')." : ".api_get_setting('emailAdministrator');
 
 			api_mail_html(
                 api_get_person_name($userInfo['firstname'], $userInfo['lastname'], null, PERSON_NAME_EMAIL_ADDRESS),

main/mySpace/company_reports_resumed.php

Spacing +6 added lines, -6 removed lines

@@ -89,15 +89,15 @@ 
 if (api_is_student_boss()) {
     $actions .= Display::url(
         Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . "auth/my_progress.php"
+        api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
     );
     $actions .= Display::url(
         Display::return_icon('user.png', get_lang('Students'), array(), ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . "mySpace/student.php"
+        api_get_path(WEB_CODE_PATH)."mySpace/student.php"
     );
     $actions .= Display::url(
         Display::return_icon("statistics.png", get_lang("CompanyReport"), array(), ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . "mySpace/company_reports.php"
+        api_get_path(WEB_CODE_PATH)."mySpace/company_reports.php"
     );
     $actions .= Display::url(
         Display::return_icon(
@@ -106,7 +106,7 @@ 
             [],
             ICON_SIZE_MEDIUM
         ),
-        api_get_path(WEB_CODE_PATH) . "gradebook/certificate_report.php"
+        api_get_path(WEB_CODE_PATH)."gradebook/certificate_report.php"
     );
 }
 
@@ -119,7 +119,7 @@ 
 if (!api_is_student_boss()) {
     $content .= Display::url(
         get_lang("CompanyReport"),
-        api_get_path(WEB_CODE_PATH) . "mySpace/company_reports.php",
+        api_get_path(WEB_CODE_PATH)."mySpace/company_reports.php",
         array(
             'class' => 'btn btn-success'
         )
@@ -127,7 +127,7 @@ 
 }
 
 $content .= '</div>';
-$content .= '<h1 class="page-header">' . get_lang('CompanyReportResumed') . '</h1>';
+$content .= '<h1 class="page-header">'.get_lang('CompanyReportResumed').'</h1>';
 $content .= Display::grid_html('user_course_report');
 
 $tpl = new Template($tool_name);