chamilo / chamilo-lms

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/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 +208 added lines, -208 removed lines

@@ -12,7 +12,7 @@ 
 $filename = 'reporting.xlsx';
 
 if (!api_is_allowed_to_create_course()) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $user_id = api_get_user_id();
@@ -23,226 +23,226 @@ 
 $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).'lp/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).'lp/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) {
+    $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++;
+            $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'));
@@ -253,20 +253,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/progression.php

Spacing +4 added lines, -4 removed lines

@@ -16,14 +16,14 @@
 $this_section = SECTION_TRACKING;
 
 api_block_anonymous_users();
-$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
+$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace'));
 Display :: display_header($nameTools);
 
 // Database Table Definitions
-$tbl_course 		= Database :: get_main_table(TABLE_MAIN_COURSE);
-$tbl_user 			= Database :: get_main_table(TABLE_MAIN_USER);
+$tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE);
+$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
 $tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
-$tbl_session 		= Database :: get_main_table(TABLE_MAIN_SESSION);
+$tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
 $tbl_track_exercice = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
 
 /*

Indentation +27 added lines, -27 removed lines

@@ -33,36 +33,36 @@
 $result_course = Database::query($sql_course);
 
 if (Database::num_rows($result_course) > 0) {
-	if (isset($_POST['export'])) {
-		$export_result = export_csv($header, $data, 'test.csv'); // TODO: There is no data for exporting yet.
-		Display :: display_error_message($export_result);
-	}
-	echo '<table class="data_table"><tr><th>'.get_lang('Course').'</th><th>'.get_lang('TempsFrequentation').'</th><th>'.get_lang('Progression').'</th><th>'.get_lang('MoyenneTest').'</th></tr>';
-	$header = array(get_lang('Course', ''), get_lang('TempsFrequentation', ''), get_lang('Progression', ''), get_lang('MoyenneTest', ''));
-	while ($a_course = Database::fetch_array($result_course)) {
-		// TODO: This query is to be checked, there are no HotPotatoes tests results.
-		$sql_moy_test = "SELECT exe_result,exe_weighting
+    if (isset($_POST['export'])) {
+        $export_result = export_csv($header, $data, 'test.csv'); // TODO: There is no data for exporting yet.
+        Display :: display_error_message($export_result);
+    }
+    echo '<table class="data_table"><tr><th>'.get_lang('Course').'</th><th>'.get_lang('TempsFrequentation').'</th><th>'.get_lang('Progression').'</th><th>'.get_lang('MoyenneTest').'</th></tr>';
+    $header = array(get_lang('Course', ''), get_lang('TempsFrequentation', ''), get_lang('Progression', ''), get_lang('MoyenneTest', ''));
+    while ($a_course = Database::fetch_array($result_course)) {
+        // TODO: This query is to be checked, there are no HotPotatoes tests results.
+        $sql_moy_test = "SELECT exe_result,exe_weighting
 			FROM $tbl_track_exercice
 			WHERE c_id = ".$a_course['id'];
-		$result_moy_test = Database::query($sql_moy_test);
-		$result = 0;
-		$weighting = 0;
-		while ($moy_test = Database::fetch_array($result_moy_test)) {
-			$result = $result + $moy_test['exe_result'];
-			$weighting = $weighting + $moy_test['exe_weighting'];
-		}
-		if ($weighting != 0) {
-			$moyenne_test = round(($result * 100) / $weighting);
-		} else {
-			$moyenne_test = null;
-		}
-		echo '<tr><td>'.$a_course['title'].'</td><td> </td><td> </td><td>'.(is_null($moyenne_test) ? '' : $moyenne_test.'%').'</td> </tr>';
-	}
-	echo '</table>';
-	echo "<br /><br />";
-	echo "<form method='post'><input type='submit' name='export' value='".get_lang('ExportExcel')."'/><form>";
+        $result_moy_test = Database::query($sql_moy_test);
+        $result = 0;
+        $weighting = 0;
+        while ($moy_test = Database::fetch_array($result_moy_test)) {
+            $result = $result + $moy_test['exe_result'];
+            $weighting = $weighting + $moy_test['exe_weighting'];
+        }
+        if ($weighting != 0) {
+            $moyenne_test = round(($result * 100) / $weighting);
+        } else {
+            $moyenne_test = null;
+        }
+        echo '<tr><td>'.$a_course['title'].'</td><td> </td><td> </td><td>'.(is_null($moyenne_test) ? '' : $moyenne_test.'%').'</td> </tr>';
+    }
+    echo '</table>';
+    echo "<br /><br />";
+    echo "<form method='post'><input type='submit' name='export' value='".get_lang('ExportExcel')."'/><form>";
 } else {
-	echo get_lang('NoCourse');
+    echo get_lang('NoCourse');
 }
 
 Display :: display_footer();

main/mySpace/coaches.php

Indentation +77 added lines, -77 removed lines

@@ -19,7 +19,7 @@ 
 $interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
 
 if (isset($_GET["id_student"])) {
-	$interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang('Students'));
+    $interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang('Students'));
 }
 
 Display :: display_header($nameTools);
@@ -41,26 +41,26 @@ 
  */
 
 if (isset($_POST['export'])) {
-	$order_clause = api_is_western_name_order(PERSON_NAME_DATA_EXPORT) ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
+    $order_clause = api_is_western_name_order(PERSON_NAME_DATA_EXPORT) ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
 } else {
-	$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
+    $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
 }
 
 if (isset($_GET["id_student"])) {
-	$id_student = intval($_GET["id_student"]);
-	$sql_coachs = "SELECT DISTINCT srcru.user_id as id_coach
+    $id_student = intval($_GET["id_student"]);
+    $sql_coachs = "SELECT DISTINCT srcru.user_id as id_coach
 		FROM $tbl_session_rel_course_rel_user as srcru
 		WHERE srcru.user_id='$id_student' AND srcru.status=2";
 } else {
-	if (api_is_platform_admin()) {
-		$sql_coachs = "SELECT DISTINCT
+    if (api_is_platform_admin()) {
+        $sql_coachs = "SELECT DISTINCT
 			srcru.user_id as id_coach, user_id, lastname, firstname
 			FROM $tbl_user, $tbl_session_rel_course_rel_user srcru
 			WHERE
 			 	srcru.user_id=user_id AND
 			 	srcru.status=2 ".$order_clause;
-	} else {
-		$sql_coachs = "SELECT DISTINCT user_id as id_coach, user.user_id, lastname, firstname
+    } else {
+        $sql_coachs = "SELECT DISTINCT user_id as id_coach, user.user_id, lastname, firstname
 			FROM
 			$tbl_user as user,
 			$tbl_session_rel_course_user as srcu,
@@ -74,13 +74,13 @@ 
 				srcu.user_id = user.user_id AND
 				srcu.status = 2
 				".$order_clause;
-	}
+    }
 }
 
 $result_coachs = Database::query($sql_coachs);
 
 if (api_is_western_name_order()) {
-	echo '<table class="data_table">
+    echo '<table class="data_table">
 	    <tr>
             <th>'.get_lang('FirstName').'</th>
             <th>'.get_lang('LastName').'</th>
@@ -89,7 +89,7 @@ 
             <th>'.get_lang('Students').'</th>
         </tr>';
 } else {
-	echo '<table class="data_table">
+    echo '<table class="data_table">
 	        <tr>
                 <th>'.get_lang('LastName').'</th>
                 <th>'.get_lang('FirstName').'</th>
@@ -100,79 +100,79 @@ 
 }
 
 if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) {
-	$header[] = get_lang('FirstName', '');
-	$header[] = get_lang('LastName', '');
+    $header[] = get_lang('FirstName', '');
+    $header[] = get_lang('LastName', '');
 } else {
-	$header[] = get_lang('LastName', '');
-	$header[] = get_lang('FirstName', '');
+    $header[] = get_lang('LastName', '');
+    $header[] = get_lang('FirstName', '');
 }
 $header[] = get_lang('ConnectionTime', '');
 
 if (Database::num_rows($result_coachs) > 0) {
-	while ($coachs = Database::fetch_array($result_coachs)) {
-		$id_coach = $coachs["id_coach"];
+    while ($coachs = Database::fetch_array($result_coachs)) {
+        $id_coach = $coachs["id_coach"];
 
-		if (isset($_GET["id_student"])) {
-			$sql_infos_coach = "SELECT lastname, firstname
+        if (isset($_GET["id_student"])) {
+            $sql_infos_coach = "SELECT lastname, firstname
             FROM $tbl_user
             WHERE user_id='$id_coach'";
-			$result_coachs_infos = Database::query($sql_infos_coach);
-			$lastname = Database::result($result_coachs_infos, 0, "lastname");
-			$firstname = Database::result($result_coachs_infos, 0, "firstname");
-		} else {
-			$lastname = $coachs["lastname"];
-			$firstname = $coachs["firstname"];
-		}
-
-		$sql_connection_time = "SELECT login_date, logout_date
+            $result_coachs_infos = Database::query($sql_infos_coach);
+            $lastname = Database::result($result_coachs_infos, 0, "lastname");
+            $firstname = Database::result($result_coachs_infos, 0, "firstname");
+        } else {
+            $lastname = $coachs["lastname"];
+            $firstname = $coachs["firstname"];
+        }
+
+        $sql_connection_time = "SELECT login_date, logout_date
         FROM $tbl_track_login
         WHERE login_user_id ='$id_coach' AND logout_date <> 'null'";
-		$result_connection_time = Database::query($sql_connection_time);
-
-		$nb_seconds = 0;
-		while ($connections = Database::fetch_array($result_connection_time)) {
-			$login_date = $connections["login_date"];
-			$logout_date = $connections["logout_date"];
-			$timestamp_login_date = strtotime($login_date);
-			$timestamp_logout_date = strtotime($logout_date);
-			$nb_seconds += ($timestamp_logout_date - $timestamp_login_date);
-		}
-
-		if ($nb_seconds == 0) {
-			$s_connection_time = '';
-		} else {
-			$s_connection_time = api_time_to_hms($nb_seconds);
-		}
-
-		if ($i % 2 == 0) {
-			$css_class = "row_odd";
-			if ($i % 20 == 0 && $i != 0) {
-				if (api_is_western_name_order()) {
-					echo '<tr>
+        $result_connection_time = Database::query($sql_connection_time);
+
+        $nb_seconds = 0;
+        while ($connections = Database::fetch_array($result_connection_time)) {
+            $login_date = $connections["login_date"];
+            $logout_date = $connections["logout_date"];
+            $timestamp_login_date = strtotime($login_date);
+            $timestamp_logout_date = strtotime($logout_date);
+            $nb_seconds += ($timestamp_logout_date - $timestamp_login_date);
+        }
+
+        if ($nb_seconds == 0) {
+            $s_connection_time = '';
+        } else {
+            $s_connection_time = api_time_to_hms($nb_seconds);
+        }
+
+        if ($i % 2 == 0) {
+            $css_class = "row_odd";
+            if ($i % 20 == 0 && $i != 0) {
+                if (api_is_western_name_order()) {
+                    echo '<tr>
 					    <th>'.get_lang('FirstName').'</th>
                         <th>'.get_lang('LastName').'</th>
                         <th>'.get_lang('ConnectionTime').'</th>
                         <th>'.get_lang('AdminCourses').'</th>
                         <th>'.get_lang('Students').'</th>
 					</tr>';
-				} else {
-					echo '<tr>
+                } else {
+                    echo '<tr>
 					    <th>'.get_lang('LastName').'</th>
                         <th>'.get_lang('FirstName').'</th>
                         <th>'.get_lang('ConnectionTime').'</th>
                         <th>'.get_lang('AdminCourses').'</th>
                         <th>'.get_lang('Students').'</th>
 					</tr>';
-				}
-			}
-		} else {
-			$css_class = "row_even";
-		}
+                }
+            }
+        } else {
+            $css_class = "row_even";
+        }
 
-		$i++;
+        $i++;
 
-		if (api_is_western_name_order()) {
-			echo '<tr class="'.$css_class.'">
+        if (api_is_western_name_order()) {
+            echo '<tr class="'.$css_class.'">
 			        <td>'.$firstname.'</td><td>'.$lastname.'</td><td>'.$s_connection_time.'</td>
 			        <td>
 			            <a href="course.php?type=coach&user_id='.$id_coach.'">
@@ -185,8 +185,8 @@ 
 			            </a>
 			            </td>
                     </tr>';
-		} else {
-			echo '<tr class="'.$css_class.'">
+        } else {
+            echo '<tr class="'.$css_class.'">
 			        <td>'.$lastname.'</td><td>'.$firstname.'</td>
 			        <td>'.$s_connection_time.'</td>
 			        <td>
@@ -197,25 +197,25 @@ 
                         '.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a>
                     </td>
                     </tr>';
-		}
-
-		if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) {
-			$data[$id_coach]["firstname"] = $firstname;
-			$data[$id_coach]["lastname"] = $lastname;
-		} else {
-			$data[$id_coach]["lastname"] = $lastname;
-			$data[$id_coach]["firstname"] = $firstname;
-		}
-		$data[$id_coach]["connection_time"] = $s_connection_time;
-	}
+        }
+
+        if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) {
+            $data[$id_coach]["firstname"] = $firstname;
+            $data[$id_coach]["lastname"] = $lastname;
+        } else {
+            $data[$id_coach]["lastname"] = $lastname;
+            $data[$id_coach]["firstname"] = $firstname;
+        }
+        $data[$id_coach]["connection_time"] = $s_connection_time;
+    }
 } else {
-	// No results
-	echo '<tr><td colspan="5">'.get_lang("NoResult").'</td></tr>';
+    // No results
+    echo '<tr><td colspan="5">'.get_lang("NoResult").'</td></tr>';
 }
 echo '</table>';
 
 if (isset($_POST['export'])){
-	export_csv($header, $data, 'coaches.csv');
+    export_csv($header, $data, 'coaches.csv');
 }
 
 echo "<br /><br />";

Spacing +13 added lines, -13 removed lines

@@ -16,10 +16,10 @@ 
 $nameTools = get_lang('Tutors');
 
 api_block_anonymous_users();
-$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
+$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace'));
 
 if (isset($_GET["id_student"])) {
-	$interbreadcrumb[] = array ("url" => "student.php", "name" => get_lang('Students'));
+	$interbreadcrumb[] = array("url" => "student.php", "name" => get_lang('Students'));
 }
 
 Display :: display_header($nameTools);
@@ -27,14 +27,14 @@ 
 api_display_tool_title($nameTools);
 
 // Database Table Definitions
-$tbl_course 						= Database :: get_main_table(TABLE_MAIN_COURSE);
-$tbl_course_user 					= Database :: get_main_table(TABLE_MAIN_COURSE_USER);
-$tbl_user 							= Database :: get_main_table(TABLE_MAIN_USER);
-$tbl_session 						= Database :: get_main_table(TABLE_MAIN_SESSION);
-$tbl_session_rel_course 			= Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
-$tbl_session_rel_course_rel_user 	= Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-$tbl_session_rel_user 				= Database :: get_main_table(TABLE_MAIN_SESSION_USER);
-$tbl_track_login 					= Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
+$tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE);
+$tbl_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
+$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
+$tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
+$tbl_session_rel_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
+$tbl_session_rel_course_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+$tbl_session_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_USER);
+$tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN);
 
 /**
  * MAIN PART
@@ -214,7 +214,7 @@ 
 }
 echo '</table>';
 
-if (isset($_POST['export'])){
+if (isset($_POST['export'])) {
 	export_csv($header, $data, 'coaches.csv');
 }
 
@@ -222,8 +222,8 @@ 
 echo "
     <br /><br />
     <form method='post' action='coaches.php'>
-        <button type='submit' class='save' name='export' value='" . get_lang('ExportExcel') . "'>
-            " . get_lang('ExportExcel') . "
+        <button type='submit' class='save' name='export' value='" . get_lang('ExportExcel')."'>
+            " . get_lang('ExportExcel')."
         </button>
     <form>
 ";

main/mySpace/user_import.php

Spacing +6 added lines, -6 removed lines

@@ -15,12 +15,12 @@ 
 $tool_name = get_lang('ImportUserListXMLCSV');
 api_block_anonymous_users();
 
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('MySpace'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('MySpace'));
 $id_session = '';
 if (isset($_GET['id_session']) && $_GET['id_session'] != '') {
  	$id_session = intval($_GET['id_session']);
-	$interbreadcrumb[] = array ('url' => 'session.php', 'name' => get_lang('Sessions'));
-	$interbreadcrumb[] = array ('url' => 'course.php?id_session='.$id_session.'', 'name' => get_lang('Course'));
+	$interbreadcrumb[] = array('url' => 'session.php', 'name' => get_lang('Sessions'));
+	$interbreadcrumb[] = array('url' => 'course.php?id_session='.$id_session.'', 'name' => get_lang('Course'));
 }
 
 // Set this option to true to enforce strict purification for usenames.
@@ -62,7 +62,7 @@ 
 
         if (count($errors) == 0) {
             if (!empty($id_session)) {
-                $tbl_session_rel_course	= Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
+                $tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
                 // Selecting all the courses from the session id requested.
                 $sql = "SELECT c_id FROM $tbl_session_rel_course WHERE session_id ='$id_session'";
                 $result = Database::query($sql);
@@ -103,10 +103,10 @@ 
 
 $form = new FormValidator('user_import');
 $form->addElement('hidden', 'formSent');
-$form->addElement('hidden', 'id_session',$id_session);
+$form->addElement('hidden', 'id_session', $id_session);
 $form->addElement('file', 'import_file', get_lang('ImportFileLocation'));
 $form->addRule('import_file', get_lang('ThisFieldIsRequired'), 'required');
-$allowed_file_types = array ('xml', 'csv');
+$allowed_file_types = array('xml', 'csv');
 $form->addRule('import_file', get_lang('InvalidExtension').' ('.implode(',', $allowed_file_types).')', 'filetype', $allowed_file_types);
 $form->addElement('radio', 'file_type', get_lang('FileType'), 'XML (<a href="../admin/example.xml" target="_blank">'.get_lang('ExampleXMLFile').'</a>)', 'xml');
 $form->addElement('radio', 'file_type', null, 'CSV (<a href="../admin/example.csv" target="_blank">'.get_lang('ExampleCSVFile').'</a>)', 'csv');

Indentation +4 added lines, -4 removed lines

@@ -18,9 +18,9 @@ 
 $interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('MySpace'));
 $id_session = '';
 if (isset($_GET['id_session']) && $_GET['id_session'] != '') {
- 	$id_session = intval($_GET['id_session']);
-	$interbreadcrumb[] = array ('url' => 'session.php', 'name' => get_lang('Sessions'));
-	$interbreadcrumb[] = array ('url' => 'course.php?id_session='.$id_session.'', 'name' => get_lang('Course'));
+        $id_session = intval($_GET['id_session']);
+    $interbreadcrumb[] = array ('url' => 'session.php', 'name' => get_lang('Sessions'));
+    $interbreadcrumb[] = array ('url' => 'course.php?id_session='.$id_session.'', 'name' => get_lang('Course'));
 }
 
 // Set this option to true to enforce strict purification for usenames.
@@ -89,7 +89,7 @@ 
 Display :: display_header($tool_name);
 
 if ($_FILES['import_file']['size'] == 0 && $_POST) {
-	Display::display_error_message(get_lang('ThisFieldIsRequired'));
+    Display::display_error_message(get_lang('ThisFieldIsRequired'));
 }
 
 if (count($errors) != 0) {

main/mySpace/course.php

Indentation +2 added lines, -2 removed lines

@@ -36,8 +36,8 @@
 
 function count_courses()
 {
-	global $nb_courses;
-	return $nb_courses;
+    global $nb_courses;
+    return $nb_courses;
 }
 
 //checking if the current coach is the admin coach

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
 $sessionId = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
 
 api_block_anonymous_users();
-$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
+$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace'));
 
 if (isset($_GET["id_session"]) && $_GET["id_session"] != "") {
     $interbreadcrumb[] = array("url" => "session.php", "name" => get_lang('Sessions'));
@@ -66,7 +66,7 @@ 
             $user_id = intval($_GET['user_id']);
             $user_info = api_get_user_info($user_id);
             $title = get_lang('AssignedCoursesTo').' '.api_get_person_name($user_info['firstname'], $user_info['lastname']);
-            $courses  = CourseManager::get_course_list_of_user_as_course_admin($user_id);
+            $courses = CourseManager::get_course_list_of_user_as_course_admin($user_id);
         } else {
             $title = get_lang('YourCourseList');
             $courses = CourseManager::get_courses_followed_by_drh(api_get_user_id());
@@ -81,7 +81,7 @@ 
 
     if (!api_is_session_admin()) {
         $menu_items[] = Display::url(
-            Display::return_icon('stats.png', get_lang('MyStats'),'',ICON_SIZE_MEDIUM),
+            Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM),
             api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
         );
         $menu_items[] = Display::url(

main/mySpace/admin.php

Spacing +10 added lines, -10 removed lines

@@ -35,13 +35,13 @@ 
 }
 $sql = "SELECT user.user_id,lastname,firstname,email
         FROM $tbl_user as user, $tbl_admin as admin
-        WHERE admin.user_id=user.user_id" . $order_clause;
+        WHERE admin.user_id=user.user_id".$order_clause;
 $result_admins = Database::query($sql);
 
 if (api_is_western_name_order()) {
-    echo '<table class="data_table"><tr><th>' . get_lang('FirstName') . '</th><th>' . get_lang('LastName') . '</th><th>' . get_lang('Email') . '</th></tr>';
+    echo '<table class="data_table"><tr><th>'.get_lang('FirstName').'</th><th>'.get_lang('LastName').'</th><th>'.get_lang('Email').'</th></tr>';
 } else {
-    echo '<table class="data_table"><tr><th>' . get_lang('LastName') . '</th><th>' . get_lang('FirstName') . '</th><th>' . get_lang('Email') . '</th></tr>';
+    echo '<table class="data_table"><tr><th>'.get_lang('LastName').'</th><th>'.get_lang('FirstName').'</th><th>'.get_lang('Email').'</th></tr>';
 }
 
 if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) {
@@ -65,9 +65,9 @@ 
             $css_class = "row_odd";
             if ($i % 20 == 0 && $i != 0) {
                 if (api_is_western_name_order()) {
-                    echo '<tr><th>' . get_lang('FirstName') . '</th><th>' . get_lang('LastName') . '</th><th>' . get_lang('Email') . '</th></tr>';
+                    echo '<tr><th>'.get_lang('FirstName').'</th><th>'.get_lang('LastName').'</th><th>'.get_lang('Email').'</th></tr>';
                 } else {
-                    echo '<tr><th>' . get_lang('LastName') . '</th><th>' . get_lang('FirstName') . '</th><th>' . get_lang('Email') . '</th></tr>';
+                    echo '<tr><th>'.get_lang('LastName').'</th><th>'.get_lang('FirstName').'</th><th>'.get_lang('Email').'</th></tr>';
                 }
             }
         } else {
@@ -77,9 +77,9 @@ 
         $i++;
 
         if (api_is_western_name_order()) {
-            echo "<tr class=" . $css_class . "><td>$firstname</td><td>$lastname</td><td><a href='mailto:" . $email . "'>$email</a></td></tr>";
+            echo "<tr class=".$css_class."><td>$firstname</td><td>$lastname</td><td><a href='mailto:".$email."'>$email</a></td></tr>";
         } else {
-            echo "<tr class=" . $css_class . "><td>$lastname</td><td>$firstname</td><td><a href='mailto:" . $email . "'>$email</a></td></tr>";
+            echo "<tr class=".$css_class."><td>$lastname</td><td>$firstname</td><td><a href='mailto:".$email."'>$email</a></td></tr>";
         }
 
         if (api_is_western_name_order(PERSON_NAME_DATA_EXPORT)) {
@@ -93,7 +93,7 @@ 
     }
 } else {
     // No results
-    echo '<tr><td colspan="3">' . get_lang('NoResults') . '</td></tr>';
+    echo '<tr><td colspan="3">'.get_lang('NoResults').'</td></tr>';
 }
 echo '</table>';
 
@@ -104,8 +104,8 @@ 
 echo "
     <br /><br />
     <form method='post' action='admin.php'>
-        <button type='submit' class='save' name='export' value='" . get_lang('ExportExcel') . "'>
-            " . get_lang('ExportExcel') . "
+        <button type='submit' class='save' name='export' value='" . get_lang('ExportExcel')."'>
+            " . get_lang('ExportExcel')."
         </button>
     <form>
 ";