chamilo / chamilo-lms

main/reports/modules/scorm.php

Indentation +100 added lines, -100 removed lines

@@ -7,117 +7,117 @@
 }
 
 function reports_modules_scorm_init_forEachCourses($course_code, $course_id, $course_db) {
-	global $reports_modules;
+    global $reports_modules;
 	
-	$reports_modules_scorm_toolid = reports_getToolId(TOOL_LEARNPATH);
+    $reports_modules_scorm_toolid = reports_getToolId(TOOL_LEARNPATH);
 
-	// package level
-	array_push($reports_modules['scorm'], 
-	  array('keys_query' =>  
-		'select '.$course_id.' as course_id, '.
-		$reports_modules_scorm_toolid.' as tool_id, '.
-		'lp.id as child_id, lp.name as child_name, '.
-		"'".$course_db."'".' as course_db from '.
-		Database::get_course_table(TABLE_LP_MAIN).' lp',
-		'values_query_function' => 'reports_modules_scorm_packageVal'));		
+    // package level
+    array_push($reports_modules['scorm'], 
+        array('keys_query' =>  
+        'select '.$course_id.' as course_id, '.
+        $reports_modules_scorm_toolid.' as tool_id, '.
+        'lp.id as child_id, lp.name as child_name, '.
+        "'".$course_db."'".' as course_db from '.
+        Database::get_course_table(TABLE_LP_MAIN).' lp',
+        'values_query_function' => 'reports_modules_scorm_packageVal'));		
 
-	// sco level
-	array_push($reports_modules['scorm'], 
-	  array('keys_query' =>  
-		'select '.$course_id.' as course_id, '.
-		$reports_modules_scorm_toolid.' as tool_id, '.
-		'lp.id as child_id, lp.name as child_name, '.
-		'lpi.id as subchild_id, lpi.title as subchild_name, '.
-		"'".$course_db."'".' as course_db from '.
-		Database::get_course_table(TABLE_LP_MAIN, $course_db).
-		' lp,'.
-		Database::get_course_table(TABLE_LP_ITEM, $course_db).
-		' lpi where lp.id = lpi.lp_id',
-		'values_query_function' => 'reports_modules_scorm_scoVal'));		
+    // sco level
+    array_push($reports_modules['scorm'], 
+        array('keys_query' =>  
+        'select '.$course_id.' as course_id, '.
+        $reports_modules_scorm_toolid.' as tool_id, '.
+        'lp.id as child_id, lp.name as child_name, '.
+        'lpi.id as subchild_id, lpi.title as subchild_name, '.
+        "'".$course_db."'".' as course_db from '.
+        Database::get_course_table(TABLE_LP_MAIN, $course_db).
+        ' lp,'.
+        Database::get_course_table(TABLE_LP_ITEM, $course_db).
+        ' lpi where lp.id = lpi.lp_id',
+        'values_query_function' => 'reports_modules_scorm_scoVal'));		
 
-	// objectives level
-	array_push($reports_modules['scorm'], 
-	  array('keys_query' =>  
-		'select distinct '.$course_id.' as course_id, '.
-		$reports_modules_scorm_toolid.' as tool_id, '.
-		'lp.id as child_id, lp.name as child_name, '.
-		'lpi.id as subchild_id, '.
-		'lpi.title as subchild_name, '.
-		'null as subsubchild_id, '.
-		'lpivo.objective_id as subsubchild_name, '.
-		"'".$course_db."'".' as course_db from '.
-		Database::get_course_table(TABLE_LP_MAIN, $course_db).
-		' lp,'.
-		Database::get_course_table(TABLE_LP_ITEM, $course_db).
-		' lpi, '.
-		Database::get_course_table(TABLE_LP_ITEM_VIEW, $course_db).
-		' lpiv, '.
-		Database::get_course_table(TABLE_LP_IV_OBJECTIVE, $course_db).
-		' lpivo '.
-		'where lp.id = lpi.lp_id '.
-		'and lpi.id = lpiv.lp_item_id '.
-		'and lpiv.id = lpivo.lp_iv_id ',
-		'values_query_function' => 'reports_modules_scorm_objVal'));		
+    // objectives level
+    array_push($reports_modules['scorm'], 
+        array('keys_query' =>  
+        'select distinct '.$course_id.' as course_id, '.
+        $reports_modules_scorm_toolid.' as tool_id, '.
+        'lp.id as child_id, lp.name as child_name, '.
+        'lpi.id as subchild_id, '.
+        'lpi.title as subchild_name, '.
+        'null as subsubchild_id, '.
+        'lpivo.objective_id as subsubchild_name, '.
+        "'".$course_db."'".' as course_db from '.
+        Database::get_course_table(TABLE_LP_MAIN, $course_db).
+        ' lp,'.
+        Database::get_course_table(TABLE_LP_ITEM, $course_db).
+        ' lpi, '.
+        Database::get_course_table(TABLE_LP_ITEM_VIEW, $course_db).
+        ' lpiv, '.
+        Database::get_course_table(TABLE_LP_IV_OBJECTIVE, $course_db).
+        ' lpivo '.
+        'where lp.id = lpi.lp_id '.
+        'and lpi.id = lpiv.lp_item_id '.
+        'and lpiv.id = lpivo.lp_iv_id ',
+        'values_query_function' => 'reports_modules_scorm_objVal'));		
 }
 
 function reports_modules_scorm_packageVal($scorm, $key_id) {
-	return array('type'=> 'sql', 'sql' => 
-			'select '.$key_id.', user_id as uid, '.
-			'session_id, view_count as attempt, null as score, '.
-			'progress as progress, '.
-			'null as time, null as ts from '.
-			Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']).
-			' where lp_id = '.$scorm['child_id']);
+    return array('type'=> 'sql', 'sql' => 
+            'select '.$key_id.', user_id as uid, '.
+            'session_id, view_count as attempt, null as score, '.
+            'progress as progress, '.
+            'null as time, null as ts from '.
+            Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']).
+            ' where lp_id = '.$scorm['child_id']);
 }
 
 function reports_modules_scorm_scoVal($scorm, $key_id) {
-	return array('type'=> 'sql', 'sql' => 
-			'select '.$key_id.', lpv.user_id as uid, '.
-			'lpv.session_id, lpiv.view_count as attempt, '.
-			'lpiv.score as score, '.
-			'(case lpiv.status '.
-				'when "incomplete" then 0 '.
-				'when "completed" then 1 '.
-				'when "passed" then 2 '.
-				'when "failed" then 3 '.
-				'when "browsed" then 4 '.
-				'when "not attempted" then 5 '.
-				'else 6 '.
-			'end) as progress, '.
-			'lpiv.total_time as time, null as ts from '.
-			Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']).
-			' lpv, '.
-			Database::get_course_table(TABLE_LP_ITEM_VIEW, $scorm['course_db']).
-			' lpiv '.
-			' where lpv.lp_id = '.$scorm['child_id'].
-			' and lpiv.lp_item_id = '.$scorm['subchild_id'].
-			' and lpiv.lp_view_id = lpv.id');
+    return array('type'=> 'sql', 'sql' => 
+            'select '.$key_id.', lpv.user_id as uid, '.
+            'lpv.session_id, lpiv.view_count as attempt, '.
+            'lpiv.score as score, '.
+            '(case lpiv.status '.
+                'when "incomplete" then 0 '.
+                'when "completed" then 1 '.
+                'when "passed" then 2 '.
+                'when "failed" then 3 '.
+                'when "browsed" then 4 '.
+                'when "not attempted" then 5 '.
+                'else 6 '.
+            'end) as progress, '.
+            'lpiv.total_time as time, null as ts from '.
+            Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']).
+            ' lpv, '.
+            Database::get_course_table(TABLE_LP_ITEM_VIEW, $scorm['course_db']).
+            ' lpiv '.
+            ' where lpv.lp_id = '.$scorm['child_id'].
+            ' and lpiv.lp_item_id = '.$scorm['subchild_id'].
+            ' and lpiv.lp_view_id = lpv.id');
 }
 
 function reports_modules_scorm_objVal($scorm, $key_id) {
-	return array('type'=> 'sql', 'sql' => 
-			'select '.$key_id.', lpv.user_id as uid, '.
-			'lpv.session_id, lpiv.view_count as attempt, '.
-			'lpivo.score_raw as score, '.
-			'(case lpivo.status '.
-				'when "incomplete" then 0 '.
-				'when "completed" then 1 '.
-				'when "passed" then 2 '.
-				'when "failed" then 3 '.
-				'when "browsed" then 4 '.
-				'when "not attempted" then 5 '.
-				'else 6 '.
-			'end) as progress, '.
-			'null as time, null as ts from '.
-			Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']).
-			' lpv, '.
-			Database::get_course_table(TABLE_LP_ITEM_VIEW, $scorm['course_db']).
-			' lpiv, '.
-			Database::get_course_table(TABLE_LP_IV_OBJECTIVE, $scorm['course_db']).
-			' lpivo '.
-			' where lpv.lp_id = '.$scorm['child_id'].
-			' and lpiv.lp_item_id = '.$scorm['subchild_id'].
-			' and lpivo.objective_id = "'.$scorm['subsubchild_name'].'" '.
-			' and lpiv.lp_view_id = lpv.id'.
-			' and lpivo.lp_iv_id=lpiv.id');
+    return array('type'=> 'sql', 'sql' => 
+            'select '.$key_id.', lpv.user_id as uid, '.
+            'lpv.session_id, lpiv.view_count as attempt, '.
+            'lpivo.score_raw as score, '.
+            '(case lpivo.status '.
+                'when "incomplete" then 0 '.
+                'when "completed" then 1 '.
+                'when "passed" then 2 '.
+                'when "failed" then 3 '.
+                'when "browsed" then 4 '.
+                'when "not attempted" then 5 '.
+                'else 6 '.
+            'end) as progress, '.
+            'null as time, null as ts from '.
+            Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']).
+            ' lpv, '.
+            Database::get_course_table(TABLE_LP_ITEM_VIEW, $scorm['course_db']).
+            ' lpiv, '.
+            Database::get_course_table(TABLE_LP_IV_OBJECTIVE, $scorm['course_db']).
+            ' lpivo '.
+            ' where lpv.lp_id = '.$scorm['child_id'].
+            ' and lpiv.lp_item_id = '.$scorm['subchild_id'].
+            ' and lpivo.objective_id = "'.$scorm['subsubchild_name'].'" '.
+            ' and lpiv.lp_view_id = lpv.id'.
+            ' and lpivo.lp_iv_id=lpiv.id');
 }

main/reports/modules/course.php

Indentation +13 added lines, -13 removed lines

@@ -7,23 +7,23 @@
 }
 
 function reports_modules_course_init_forEachCourses($course_code, $course_id, $course_db) {
-	global $reports_modules;
+    global $reports_modules;
 
 //	$reports_modules_course_toolid = reports_getToolId(TOOL_QUIZ);
 
-	array_push($reports_modules['course'],
-	  array('keys_query' =>
-		'select '.$course_id.' as course_id, "'.$course_code.'" as course_code',
-		'values_query_function' => 'reports_modules_course_val'));
+    array_push($reports_modules['course'],
+        array('keys_query' =>
+        'select '.$course_id.' as course_id, "'.$course_code.'" as course_code',
+        'values_query_function' => 'reports_modules_course_val'));
 }
 
 function reports_modules_course_val($course, $key_id) {
-	return array('type'=> 'sql', 'sql' =>
-			'select '.$key_id.', user_id as uid, '.
-			'-1 as session_id, -1 as attempt, null as score, '.
-			'NULL as progress, '.
-			'(sum(logout_course_date) - sum(login_course_date)) as time, null as ts from '.
-			Database::get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS).
-			' where c_id = ' . $course['real_id'] .
-			' group by user_id');
+    return array('type'=> 'sql', 'sql' =>
+            'select '.$key_id.', user_id as uid, '.
+            '-1 as session_id, -1 as attempt, null as score, '.
+            'NULL as progress, '.
+            '(sum(logout_course_date) - sum(login_course_date)) as time, null as ts from '.
+            Database::get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS).
+            ' where c_id = ' . $course['real_id'] .
+            ' group by user_id');
 }

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;
 }
 

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;
 }

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";
 ?>

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;
 }
 ?>

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();
 

main/mySpace/index.php

Indentation +6 added lines, -6 removed lines

@@ -102,7 +102,7 @@ 
 }
 
 if ($is_drh) {
-	$view = 'drh';
+    $view = 'drh';
     $menu_items[] = Display::url(Display::return_icon('user_na.png', get_lang('Students'), array(), ICON_SIZE_MEDIUM), '#');
     $menu_items[] = Display::url(Display::return_icon('teacher.png', get_lang('Trainers'), array(), ICON_SIZE_MEDIUM), 'teachers.php');
     $menu_items[] = Display::url(Display::return_icon('course.png', get_lang('Courses'), array(), ICON_SIZE_MEDIUM), 'course.php');
@@ -143,7 +143,7 @@ 
         echo "</div><br />";
     }
 } else {
-	echo Display::url(
+    echo Display::url(
         Display::return_icon('stats.png', get_lang('MyStats'),'',ICON_SIZE_MEDIUM),
         api_get_path(WEB_CODE_PATH)."auth/my_progress.php"
     );
@@ -397,11 +397,11 @@ 
 
 // Send the csv file if asked
 if ($export_csv) {
-	ob_end_clean();
-	Export :: arrayToCsv($csv_content, 'reporting_index');
-	exit;
+    ob_end_clean();
+    Export :: arrayToCsv($csv_content, 'reporting_index');
+    exit;
 }
 
 if (!$export_csv) {
-	Display::display_footer();
+    Display::display_footer();
 }