chamilo / chamilo-lms

main/reports/templates/courseArticulate.reports.php

Indentation +91 added lines, -91 removed lines

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

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

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

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

main/forum/viewthread_threaded.inc.php

Indentation +2 added lines, -2 removed lines

@@ -457,8 +457,8 @@
 
 // The post has been displayed => it can be removed from the what's new array
 if (isset($whatsnew_post_info[$forumId][$threadId][$row['post_id']])) {
-  unset($whatsnew_post_info[$forumId][$threadId][$row['post_id']]);
-  unset($_SESSION['whatsnew_post_info'][$forumId][$threadId][$row['post_id']]);
+    unset($whatsnew_post_info[$forumId][$threadId][$row['post_id']]);
+    unset($_SESSION['whatsnew_post_info'][$forumId][$threadId][$row['post_id']]);
 }
 echo "</table>";