chamilo / chamilo-lms

whoisonlinesession.php

Spacing +2 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
             $time_limit = 60;
         }
 
-        $online_time    = time() - $time_limit*60;
+        $online_time    = time() - $time_limit * 60;
         $current_date   = api_get_utc_datetime($online_time);
 
         $students_online = array();
@@ -97,7 +97,7 @@ 
 
 			$result = Database::query($sql);
 
-			while($user_list = Database::fetch_array($result)) {
+			while ($user_list = Database::fetch_array($result)) {
 				$students_online[$user_list['access_user_id']] = $user_list;
 			}
 		}

Indentation +39 added lines, -39 removed lines

@@ -41,10 +41,10 @@ 
 		</th>
 	</tr>
 <?php
-	$session_is_coach = array();
-	if (isset($_user['user_id']) && $_user['user_id'] != '') {
-		$_user['user_id'] = intval($_user['user_id']);
-		$sql = "SELECT DISTINCT session.id,
+    $session_is_coach = array();
+    if (isset($_user['user_id']) && $_user['user_id'] != '') {
+        $_user['user_id'] = intval($_user['user_id']);
+        $sql = "SELECT DISTINCT session.id,
 					name,
 					access_start_date,
 					access_end_date
@@ -53,13 +53,13 @@ 
 					ON srcru.user_id = ".$_user['user_id']." AND srcru.status=2
 					AND session.id = srcru.session_id
 				ORDER BY access_start_date, access_end_date, name";
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
-		while ($session = Database:: fetch_array($result)) {
-			$session_is_coach[$session['id']] = $session;
-		}
+        while ($session = Database:: fetch_array($result)) {
+            $session_is_coach[$session['id']] = $session;
+        }
 
-		$sql = "SELECT DISTINCT session.id,
+        $sql = "SELECT DISTINCT session.id,
 					name,
 					access_start_date,
 					access_end_date
@@ -67,9 +67,9 @@ 
 				WHERE session.id_coach = ".$_user['user_id']."
 				ORDER BY access_start_date, access_end_date, name";
         $result = Database::query($sql);
-		while ($session = Database:: fetch_array($result)) {
-			$session_is_coach[$session['id']] = $session;
-		}
+        while ($session = Database:: fetch_array($result)) {
+            $session_is_coach[$session['id']] = $session;
+        }
 
         if (empty($time_limit)) {
             $time_limit = api_get_setting('time_limit_whosonline');
@@ -82,7 +82,7 @@ 
 
         $students_online = array();
         foreach ($session_is_coach as $session) {
-			$sql = "SELECT DISTINCT last_access.access_user_id,
+            $sql = "SELECT DISTINCT last_access.access_user_id,
 						last_access.access_date,
 						last_access.c_id,
 						last_access.access_session_id,
@@ -95,49 +95,49 @@ 
 					AND access_date >= '$current_date'
 					GROUP BY access_user_id";
 
-			$result = Database::query($sql);
+            $result = Database::query($sql);
 
-			while($user_list = Database::fetch_array($result)) {
-				$students_online[$user_list['access_user_id']] = $user_list;
-			}
-		}
+            while($user_list = Database::fetch_array($result)) {
+                $students_online[$user_list['access_user_id']] = $user_list;
+            }
+        }
 
-		if (count($students_online) > 0) {
-			foreach ($students_online as $student_online) {
-				echo "<tr>
+        if (count($students_online) > 0) {
+            foreach ($students_online as $student_online) {
+                echo "<tr>
 						<td>
 					";
-				echo $student_online['name'];
-				echo "	</td>
+                echo $student_online['name'];
+                echo "	</td>
 						<td align='center'>
 					 ";
-				$courseInfo = api_get_course_info_by_id($student_online['c_id']);
-				echo $courseInfo['title'];
-				echo "	</td>
+                $courseInfo = api_get_course_info_by_id($student_online['c_id']);
+                echo $courseInfo['title'];
+                echo "	</td>
 						<td align='center'>
 					 ";
-							 if (!empty($student_online['email'])) {
-								echo $student_online['email'];
-							 } else {
-							 	echo get_lang('NoEmail');
-							 }
-				echo "	</td>
+                                if (!empty($student_online['email'])) {
+                                echo $student_online['email'];
+                                } else {
+                                    echo get_lang('NoEmail');
+                                }
+                echo "	</td>
 						<td align='center'>
 					 ";
-				echo '<a href="main/chat/chat.php?cidReq='.$courseInfo['code'].'&id_session='.$student_online['access_session_id'].'"> -> </a>';
-				echo "	</td>
+                echo '<a href="main/chat/chat.php?cidReq='.$courseInfo['code'].'&id_session='.$student_online['access_session_id'].'"> -> </a>';
+                echo "	</td>
 					</tr>
 					 ";
-			}
-		} else {
-			echo '	<tr>
+            }
+        } else {
+            echo '	<tr>
 						<td colspan="4">
 							'.get_lang('NoOnlineStudents').'
 						</td>
 					</tr>
 				 ';
-		}
-	}
+        }
+    }
 ?>
 </table>
 <?php

user.php

Indentation +12 added lines, -12 removed lines

@@ -27,18 +27,18 @@
 $array_keys = array_keys($_GET);
 
 if (!empty($array_keys)) {
-	$username 	= substr($array_keys[0],0,20); // max len of an username
-	$friend_id 	= UserManager::get_user_id_from_username($username);
+    $username 	= substr($array_keys[0],0,20); // max len of an username
+    $friend_id 	= UserManager::get_user_id_from_username($username);
 
-	if ($friend_id) {
-		SocialManager::display_individual_user($friend_id);
-	} else {
-		// we cant find your friend
-		header('Location: whoisonline.php');
-		exit;
-	}
+    if ($friend_id) {
+        SocialManager::display_individual_user($friend_id);
+    } else {
+        // we cant find your friend
+        header('Location: whoisonline.php');
+        exit;
+    }
 } else {
-		// we cant find your friend
-	header('Location: whoisonline.php');
-	exit;
+        // we cant find your friend
+    header('Location: whoisonline.php');
+    exit;
 }

Spacing +2 added lines, -2 removed lines

@@ -27,8 +27,8 @@
 $array_keys = array_keys($_GET);
 
 if (!empty($array_keys)) {
-	$username 	= substr($array_keys[0],0,20); // max len of an username
-	$friend_id 	= UserManager::get_user_id_from_username($username);
+	$username 	= substr($array_keys[0], 0, 20); // max len of an username
+	$friend_id = UserManager::get_user_id_from_username($username);
 
 	if ($friend_id) {
 		SocialManager::display_individual_user($friend_id);

custompages/lostpassword-dist.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 ?>
 <html>
 <head>
-	<title><?php echo custompages_get_lang('LostPassword');?></title>
+	<title><?php echo custompages_get_lang('LostPassword'); ?></title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<!--[if !IE 6]><!-->
 	<link rel="stylesheet" type="text/css" href="../../custompages/style.css" />
@@ -43,7 +43,7 @@ 
 		<div id="lostpassword-form-box" class="form-box">
             <?php
             if (isset($content['info']) && !empty($content['info'])) {
-                echo '<div id="registration-form-error" class="form-error"><ul>' . $content['info'] . '</ul></div>';
+                echo '<div id="registration-form-error" class="form-error"><ul>'.$content['info'].'</ul></div>';
             }
 
             echo isset($content['form']) ? $content['form'] : ''

custompages/registration-dist.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
 ?>
 <html>
 <head>
-    <title><?php echo custompages_get_lang('Registration');?></title>
+    <title><?php echo custompages_get_lang('Registration'); ?></title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">

custompages/language.inc.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
     }
     krsort($langs, SORT_NUMERIC);
     // Choosing the best match
-    foreach($langs as $weight => $codes) {
+    foreach ($langs as $weight => $codes) {
 		foreach ($codes as $code) {
         	if (in_array($code, $available_langs)) {
             	return $code;
@@ -56,7 +56,7 @@ 
 $chamilo_langs = array(null => 'english', 'en' => 'english', 'fr' => 'french', 'es' => 'spanish');
 
 // Which of these can we actually pick from ?
-$available_langs = array('en','fr');
+$available_langs = array('en', 'fr');
 
 // Let's find out which language to serve to this particular browser
 $lang_match = $chamilo_langs[get_preferred_language($available_langs)];

Indentation +8 added lines, -8 removed lines

@@ -29,11 +29,11 @@ 
     krsort($langs, SORT_NUMERIC);
     // Choosing the best match
     foreach($langs as $weight => $codes) {
-		foreach ($codes as $code) {
-        	if (in_array($code, $available_langs)) {
-            	return $code;
-        	}
-		}
+        foreach ($codes as $code) {
+            if (in_array($code, $available_langs)) {
+                return $code;
+            }
+        }
     }
     // No match
     return null;
@@ -44,7 +44,7 @@ 
  * use this if you want to avoid translation caching issues
  */
 function cp_get_lang($variable) {
-	return get_lang($variable, null, $_SESSION['user_language_choice']);
+    return get_lang($variable, null, $_SESSION['user_language_choice']);
 }
 /**
  * Code
@@ -63,12 +63,12 @@ 
 
 // Chamilo overrides this parameters at some places, e.g. in the logout link
 if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_REQUEST['language'], $chamilo_langs)) {
-	$lang_match = $_REQUEST['language'];
+    $lang_match = $_REQUEST['language'];
 }
 
 // Maybe a language had already been selected, we should honor this
 if (isset($_SESSION['user_language_choice']) && in_array($_SESSION['user_language_choice'], $chamilo_langs)) {
-	$lang_match = $_SESSION['user_language_choice'];
+    $lang_match = $_SESSION['user_language_choice'];
 }
 
 // We need to set the relevant session variables to the best match, to use Chamilo's i18n lib.

custompages/index-unlogged-dist.php

Indentation +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 		<div id="login-form-box" class="form-box">
             <div id="login-form-info" class="form-info">
             <?php if (isset($content['info']) && !empty($content['info'])) {
-              echo $content['info'];
+                echo $content['info'];
             }
             ?>
             </div>

Spacing +3 added lines, -3 removed lines

@@ -89,14 +89,14 @@
             ?>
             <form id="login-form" class="form" action="<?php echo api_get_path(WEB_PATH)?>index.php" method="post">
                 <div>
-                    <label for="login">*<?php echo custompages_get_lang('User');?></label>
+                    <label for="login">*<?php echo custompages_get_lang('User'); ?></label>
                     <input name="login" type="text" /><br />
-                    <label for="password">*<?php echo custompages_get_lang('Password');?></label>
+                    <label for="password">*<?php echo custompages_get_lang('Password'); ?></label>
                     <input name="password" type="password" /><br />
                 </div>
             </form>
             <div id="login-form-submit" class="form-submit" onclick="document.forms['login-form'].submit();">
-                <span><?php echo custompages_get_lang('LoginEnter');?></span>
+                <span><?php echo custompages_get_lang('LoginEnter'); ?></span>
             </div> <!-- #form-submit -->
 			<div id="links">
 

custompages/first_login-dist.php

Spacing +9 added lines, -9 removed lines

@@ -13,17 +13,17 @@ 
 /**
  * Security checks
  */
-if (! isset($_SESSION['conditional_login']['uid']))
+if (!isset($_SESSION['conditional_login']['uid']))
   die("Not Authorised");
 
 if (isset($_POST['password'])) {
     $u = api_get_user_info($_SESSION['conditional_login']['uid']);
     if ($_POST['password'] != $_POST['password2']) {
-        header('Location: '. api_get_self().'?invalid=2');
+        header('Location: '.api_get_self().'?invalid=2');
         exit();
     }
-    if (empty($_POST['password'])){ //|| !api_check_password($password)) { //Pass must be at least 5 char long with 2 digits and 3 letters
-        header('Location: '. api_get_self().'?invalid=1');
+    if (empty($_POST['password'])) { //|| !api_check_password($password)) { //Pass must be at least 5 char long with 2 digits and 3 letters
+        header('Location: '.api_get_self().'?invalid=1');
         exit();
     }
     $password = $_POST['password'];
@@ -99,23 +99,23 @@ 
 		<div id="header">
 			<img src="/custompages/images/header.png" alt="Logo" />
 		</div> <!-- #header -->
-    <h2> <?php echo custompages_get_lang('FirstLogin');?> </h2>
+    <h2> <?php echo custompages_get_lang('FirstLogin'); ?> </h2>
 
 		<div id="changepassword-form-box" class="form-box">
-      <div class="info"> <?php echo custompages_get_lang('FirstLoginChangePassword');?> </div>
+      <div class="info"> <?php echo custompages_get_lang('FirstLoginChangePassword'); ?> </div>
 		<?php if (isset($error_message)) {
 			echo '<div id="changepassword-form-error" class="form-error">'.$error_message.'</div>';
 		}?>
 			<form id="changepassword-form" class="form" method="post">
 				<div>
-          <label for="password">*<?php echo custompages_get_lang('Password');?></label>
+          <label for="password">*<?php echo custompages_get_lang('Password'); ?></label>
 					<input name="password" type="password" /><br />
-          <label for="password2">*<?php echo custompages_get_lang('Password');?></label>
+          <label for="password2">*<?php echo custompages_get_lang('Password'); ?></label>
 					<input name="password2" type="password" /><br />
 				</div>
 			</form>
 			<div id="changepassword-form-submit" class="form-submit" onclick="document.forms['changepassword-form'].submit();">
-      <span><?php echo custompages_get_lang('LoginEnter');?></span>
+      <span><?php echo custompages_get_lang('LoginEnter'); ?></span>
 			</div> <!-- #form-submit -->
 		</div> <!-- #form -->
 		<div id="footer">

Braces +2 added lines, -1 removed lines

@@ -4,8 +4,9 @@
 require_once dirname(__FILE__).'/../../inc/global.inc.php';
 $url =  api_get_path(WEB_PATH).'main/auth/conditional_login/complete_phone_number.php';
 
-if (! isset($_SESSION['conditional_login']['uid']))
+if (! isset($_SESSION['conditional_login']['uid'])) {
   die("Not Authorised");
+}
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html lang="fr" xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml">

Indentation +23 added lines, -23 removed lines

@@ -14,7 +14,7 @@ 
  * Security checks
  */
 if (! isset($_SESSION['conditional_login']['uid']))
-  die("Not Authorised");
+    die("Not Authorised");
 
 if (isset($_POST['password'])) {
     $u = api_get_user_info($_SESSION['conditional_login']['uid']);
@@ -27,26 +27,26 @@ 
         exit();
     }
     $password = $_POST['password'];
-	$updated = UserManager::update_user(
-		$u['user_id'],
-		$u['firstname'],
-		$u['lastname'],
-		$u['username'],
-		$password,
-		$u['auth_source'],
-		$u['email'],
-		$u['status'],
-		$u['official_code'],
-		$u['phone'],
-		$u['picture_uri'],
-		$u['expiration_date'],
-		$u['active'],
-		$u['creator_id'],
-		$u['hr_dept_id'],
-		null,
-		$u['language'],
-		''
-	);
+    $updated = UserManager::update_user(
+        $u['user_id'],
+        $u['firstname'],
+        $u['lastname'],
+        $u['username'],
+        $password,
+        $u['auth_source'],
+        $u['email'],
+        $u['status'],
+        $u['official_code'],
+        $u['phone'],
+        $u['picture_uri'],
+        $u['expiration_date'],
+        $u['active'],
+        $u['creator_id'],
+        $u['hr_dept_id'],
+        null,
+        $u['language'],
+        ''
+    );
 
     if ($updated !== false) {
         UserManager::update_extra_field_value($u['user_id'], 'already_logged_in', 'true');
@@ -104,8 +104,8 @@ 
 		<div id="changepassword-form-box" class="form-box">
       <div class="info"> <?php echo custompages_get_lang('FirstLoginChangePassword');?> </div>
 		<?php if (isset($error_message)) {
-			echo '<div id="changepassword-form-error" class="form-error">'.$error_message.'</div>';
-		}?>
+            echo '<div id="changepassword-form-error" class="form-error">'.$error_message.'</div>';
+        }?>
 			<form id="changepassword-form" class="form" method="post">
 				<div>
           <label for="password">*<?php echo custompages_get_lang('Password');?></label>

custompages/loggedout-dist.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
                     You have been logged out.
                 </div>
             </div>
-            <a href="<?php echo $www . 'user_portal.php'; ?>">Go to your portal</a>
+            <a href="<?php echo $www.'user_portal.php'; ?>">Go to your portal</a>
             <div id="footer">
                 <img src="<?php echo $www ?>/custompages/images/footer.png" alt="footer"/>
             </div>

custompages/language.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 		$langs[$rawlang[1]] = $rawlang[0];
 	}
 	krsort($langs, SORT_NUMERIC);
-	foreach($langs as $weight => $code) {
+	foreach ($langs as $weight => $code) {
 		if (in_array($code, $available_langs)) {
 			return $code;
 		}

Braces +2 added lines, -1 removed lines

@@ -48,8 +48,9 @@
 );
 $lang_match = $chamilo_langs[get_preferred_language($available_langs)];
 // recover previous value ...
-if (isset($_SESSION['user_language_choice']))
+if (isset($_SESSION['user_language_choice'])) {
 	$lang_match = $_SESSION['user_language_choice'];
+}
 
 // Chamilo parameter, on logout
 if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_REQUEST['language'], $chamilo_langs)) {

Indentation +22 added lines, -22 removed lines

@@ -9,30 +9,30 @@ 
  * Get the preferred language base on the browser headers
  */
 function get_preferred_language($available_langs) {
-	$langs = array();
-	foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $httplang) {
-		$rawlang = explode(';q=', $httplang);
-		if (strpos($rawlang[0], '-') !== FALSE) {
-			$rawlang[0] = substr($rawlang[0], 0, strpos($rawlang[0], '-'));
-		}
-		if (count($rawlang) == 1) {
-			$rawlang[1] = 1.0;
-		}
-		$langs[$rawlang[1]] = $rawlang[0];
-	}
-	krsort($langs, SORT_NUMERIC);
-	foreach($langs as $weight => $code) {
-		if (in_array($code, $available_langs)) {
-			return $code;
-		}
-	}
-	return null;
+    $langs = array();
+    foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $httplang) {
+        $rawlang = explode(';q=', $httplang);
+        if (strpos($rawlang[0], '-') !== FALSE) {
+            $rawlang[0] = substr($rawlang[0], 0, strpos($rawlang[0], '-'));
+        }
+        if (count($rawlang) == 1) {
+            $rawlang[1] = 1.0;
+        }
+        $langs[$rawlang[1]] = $rawlang[0];
+    }
+    krsort($langs, SORT_NUMERIC);
+    foreach($langs as $weight => $code) {
+        if (in_array($code, $available_langs)) {
+            return $code;
+        }
+    }
+    return null;
 }
 /**
  * Get a language variable in a specific language
  */
 function custompages_get_lang($variable) {
-	return get_lang($variable, null, $_SESSION['user_language_choice']);
+    return get_lang($variable, null, $_SESSION['user_language_choice']);
 }
 
 $available_langs = array('en', 'fr', 'es', 'gl', 'eu');
@@ -49,15 +49,15 @@ 
 $lang_match = $chamilo_langs[get_preferred_language($available_langs)];
 // recover previous value ...
 if (isset($_SESSION['user_language_choice']))
-	$lang_match = $_SESSION['user_language_choice'];
+    $lang_match = $_SESSION['user_language_choice'];
 
 // Chamilo parameter, on logout
 if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_REQUEST['language'], $chamilo_langs)) {
-	$lang_match = $_REQUEST['language'];
+    $lang_match = $_REQUEST['language'];
 }
 // Incoming link parameter
 if (isset($_REQUEST['lang']) && !empty($_REQUEST['lang']) && in_array($_REQUEST['lang'], $available_langs)) {
-	$lang_match = $chamilo_langs[$_REQUEST['lang']];
+    $lang_match = $chamilo_langs[$_REQUEST['lang']];
 }
 
 $detect = api_get_setting('auto_detect_language_custom_pages');