Inspection of "Merge pull request #1446 from jloguercio/1.10.x" - chamilo/chamilo-lms - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — 1.10.x ( 741c6a...d44d46 )

by José

created 2016-10-10 16:54 UTC

Status

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -11,7 +11,7 @@  discard block
 block discarded – undo
 ?>
 <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 @@  discard block
 block discarded – undo
 		<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'] : ''

Please login to merge, or discard this patch.

custompages/registration-dist.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -81,7 +81,7 @@
 block discarded – undo
 ?>
 <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">

Please login to merge, or discard this patch.

custompages/language.inc.php 2 patches

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -28,7 +28,7 @@  discard block
 block discarded – undo
     }
     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 @@  discard block
 block discarded – undo
 $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)];

Please login to merge, or discard this patch.

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -29,11 +29,11 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
  * 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 @@  discard block
 block discarded – undo
 
 // 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.

Please login to merge, or discard this patch.

custompages/index-unlogged-dist.php 2 patches

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -79,7 +79,7 @@
 block discarded – undo
 		<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>

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -89,14 +89,14 @@
 block discarded – undo
             ?>
             <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">
 

Please login to merge, or discard this patch.

custompages/first_login-dist.php 3 patches

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -13,17 +13,17 @@  discard block
 block discarded – undo
 /**
  * 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 @@  discard block
 block discarded – undo
 		<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">

Please login to merge, or discard this patch.

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

@@ -4,8 +4,9 @@
 block discarded – undo
 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">

Please login to merge, or discard this patch.

Indentation +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -14,7 +14,7 @@  discard block
 block discarded – undo
  * 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 @@  discard block
 block discarded – undo
         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 @@  discard block
 block discarded – undo
 		<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>

Please login to merge, or discard this patch.

custompages/loggedout-dist.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -52,7 +52,7 @@
 block discarded – undo
                     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>

Please login to merge, or discard this patch.

custompages/language.php 3 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -21,7 +21,7 @@
 block discarded – undo
 		$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;
 		}

Please login to merge, or discard this patch.

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

@@ -48,8 +48,9 @@
 block discarded – undo
 );
 $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)) {

Please login to merge, or discard this patch.

Indentation +22 added lines, -22 removed lines patch added patch discarded remove patch

@@ -9,30 +9,30 @@  discard block
 block discarded – undo
  * 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 @@  discard block
 block discarded – undo
 $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');

Please login to merge, or discard this patch.

custompages/registration-feedback-dist.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -13,7 +13,7 @@  discard block
 block discarded – undo
 ?>
 <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">
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
                     </div>
                     <div id="registration-form-box" class="form-box">
                         <div class="block-form-login">
-                            <?php   echo $content['info'];  ?>
+                            <?php   echo $content['info']; ?>
                         </div>
                     </div>
                     <div id="footer">

Please login to merge, or discard this patch.

bin/doctrine.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -19,26 +19,26 @@  discard block
 block discarded – undo
 use Doctrine\ORM\Tools\Console\ConsoleRunner;
 use Symfony\Component\Console\Helper\HelperSet;
 
-(@include_once __DIR__ . '/../vendor/autoload.php') || @include_once __DIR__ . '/../../../autoload.php';
+(@include_once __DIR__.'/../vendor/autoload.php') || @include_once __DIR__.'/../../../autoload.php';
 
-$directories = array(getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config');
+$directories = array(getcwd(), getcwd().DIRECTORY_SEPARATOR.'config');
 
 $configFile = null;
 foreach ($directories as $directory) {
-    $configFile = $directory . DIRECTORY_SEPARATOR . 'cli-config.php';
+    $configFile = $directory.DIRECTORY_SEPARATOR.'cli-config.php';
 
     if (file_exists($configFile)) {
         break;
     }
 }
 
-if ( ! file_exists($configFile)) {
+if (!file_exists($configFile)) {
     ConsoleRunner::printCliConfigTemplate();
     exit(1);
 }
 
-if ( ! is_readable($configFile)) {
-    echo 'Configuration file [' . $configFile . '] does not have read permission.' . "\n";
+if (!is_readable($configFile)) {
+    echo 'Configuration file ['.$configFile.'] does not have read permission.'."\n";
     exit(1);
 }
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
 
 $helperSet = require $configFile;
 
-if ( ! ($helperSet instanceof HelperSet)) {
+if (!($helperSet instanceof HelperSet)) {
     foreach ($GLOBALS as $helperSetCandidate) {
         if ($helperSetCandidate instanceof HelperSet) {
             $helperSet = $helperSetCandidate;

Please login to merge, or discard this patch.

		@@ -89,14 +89,14 @@
		block discarded – undo
89	89	?>
90	90	<form id="login-form" class="form" action="<?php echo api_get_path(WEB_PATH)?>index.php" method="post">
91	91	<div>
92		- <label for="login">*<?php echo custompages_get_lang('User');?></label>
	92	+ <label for="login">*<?php echo custompages_get_lang('User'); ?></label>
93	93	<input name="login" type="text" /><br />
94		- <label for="password">*<?php echo custompages_get_lang('Password');?></label>
	94	+ <label for="password">*<?php echo custompages_get_lang('Password'); ?></label>
95	95	<input name="password" type="password" /><br />
96	96	</div>
97	97	</form>
98	98	<div id="login-form-submit" class="form-submit" onclick="document.forms['login-form'].submit();">
99		- <span><?php echo custompages_get_lang('LoginEnter');?></span>
	99	+ <span><?php echo custompages_get_lang('LoginEnter'); ?></span>
100	100	</div> <!-- #form-submit -->
101	101	<div id="links">
102	102

		@@ -11,7 +11,7 @@ discard block
		block discarded – undo
11	11	?>
12	12	<html>
13	13	<head>
14		- <title><?php echo custompages_get_lang('LostPassword');?></title>
	14	+ <title><?php echo custompages_get_lang('LostPassword'); ?></title>
15	15	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
16	16	<!--[if !IE 6]><!-->
17	17	<link rel="stylesheet" type="text/css" href="../../custompages/style.css" />
		@@ -43,7 +43,7 @@ discard block
		block discarded – undo
43	43	<div id="lostpassword-form-box" class="form-box">
44	44	<?php
45	45	if (isset($content['info']) && !empty($content['info'])) {
46		- echo '<div id="registration-form-error" class="form-error"><ul>' . $content['info'] . '</ul></div>';
	46	+ echo '<div id="registration-form-error" class="form-error"><ul>'.$content['info'].'</ul></div>';
47	47	}
48	48
49	49	echo isset($content['form']) ? $content['form'] : ''

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

		@@ -28,7 +28,7 @@ discard block
		block discarded – undo
28	28	}
29	29	krsort($langs, SORT_NUMERIC);
30	30	// Choosing the best match
31		- foreach($langs as $weight => $codes) {
	31	+ foreach ($langs as $weight => $codes) {
32	32	foreach ($codes as $code) {
33	33	if (in_array($code, $available_langs)) {
34	34	return $code;
		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	$chamilo_langs = array(null => 'english', 'en' => 'english', 'fr' => 'french', 'es' => 'spanish');
57	57
58	58	// Which of these can we actually pick from ?
59		-$available_langs = array('en','fr');
	59	+$available_langs = array('en', 'fr');
60	60
61	61	// Let's find out which language to serve to this particular browser
62	62	$lang_match = $chamilo_langs[get_preferred_language($available_langs)];

		@@ -29,11 +29,11 @@ discard block
		block discarded – undo
29	29	krsort($langs, SORT_NUMERIC);
30	30	// Choosing the best match
31	31	foreach($langs as $weight => $codes) {
32		- foreach ($codes as $code) {
33		- if (in_array($code, $available_langs)) {
34		- return $code;
35		- }
36		- }
	32	+ foreach ($codes as $code) {
	33	+ if (in_array($code, $available_langs)) {
	34	+ return $code;
	35	+ }
	36	+ }
37	37	}
38	38	// No match
39	39	return null;
		@@ -44,7 +44,7 @@ discard block
		block discarded – undo
44	44	* use this if you want to avoid translation caching issues
45	45	*/
46	46	function cp_get_lang($variable) {
47		- return get_lang($variable, null, $_SESSION['user_language_choice']);
	47	+ return get_lang($variable, null, $_SESSION['user_language_choice']);
48	48	}
49	49	/**
50	50	* Code
		@@ -63,12 +63,12 @@ discard block
		block discarded – undo
63	63
64	64	// Chamilo overrides this parameters at some places, e.g. in the logout link
65	65	if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_REQUEST['language'], $chamilo_langs)) {
66		- $lang_match = $_REQUEST['language'];
	66	+ $lang_match = $_REQUEST['language'];
67	67	}
68	68
69	69	// Maybe a language had already been selected, we should honor this
70	70	if (isset($_SESSION['user_language_choice']) && in_array($_SESSION['user_language_choice'], $chamilo_langs)) {
71		- $lang_match = $_SESSION['user_language_choice'];
	71	+ $lang_match = $_SESSION['user_language_choice'];
72	72	}
73	73
74	74	// We need to set the relevant session variables to the best match, to use Chamilo's i18n lib.

		@@ -79,7 +79,7 @@
		block discarded – undo
79	79	<div id="login-form-box" class="form-box">
80	80	<div id="login-form-info" class="form-info">
81	81	<?php if (isset($content['info']) && !empty($content['info'])) {
82		- echo $content['info'];
	82	+ echo $content['info'];
83	83	}
84	84	?>
85	85	</div>

		@@ -13,17 +13,17 @@ discard block
		block discarded – undo
13	13	/**
14	14	* Security checks
15	15	*/
16		-if (! isset($_SESSION['conditional_login']['uid']))
	16	+if (!isset($_SESSION['conditional_login']['uid']))
17	17	die("Not Authorised");
18	18
19	19	if (isset($_POST['password'])) {
20	20	$u = api_get_user_info($_SESSION['conditional_login']['uid']);
21	21	if ($_POST['password'] != $_POST['password2']) {
22		- header('Location: '. api_get_self().'?invalid=2');
	22	+ header('Location: '.api_get_self().'?invalid=2');
23	23	exit();
24	24	}
25		- if (empty($_POST['password'])){ //\|\| !api_check_password($password)) { //Pass must be at least 5 char long with 2 digits and 3 letters
26		- header('Location: '. api_get_self().'?invalid=1');
	25	+ if (empty($_POST['password'])) { //\|\| !api_check_password($password)) { //Pass must be at least 5 char long with 2 digits and 3 letters
	26	+ header('Location: '.api_get_self().'?invalid=1');
27	27	exit();
28	28	}
29	29	$password = $_POST['password'];
		@@ -99,23 +99,23 @@ discard block
		block discarded – undo
99	99	<div id="header">
100	100	<img src="/custompages/images/header.png" alt="Logo" />
101	101	</div> <!-- #header -->
102		- <h2> <?php echo custompages_get_lang('FirstLogin');?> </h2>
	102	+ <h2> <?php echo custompages_get_lang('FirstLogin'); ?> </h2>
103	103
104	104	<div id="changepassword-form-box" class="form-box">
105		- <div class="info"> <?php echo custompages_get_lang('FirstLoginChangePassword');?> </div>
	105	+ <div class="info"> <?php echo custompages_get_lang('FirstLoginChangePassword'); ?> </div>
106	106	<?php if (isset($error_message)) {
107	107	echo '<div id="changepassword-form-error" class="form-error">'.$error_message.'</div>';
108	108	}?>
109	109	<form id="changepassword-form" class="form" method="post">
110	110	<div>
111		- <label for="password">*<?php echo custompages_get_lang('Password');?></label>
	111	+ <label for="password">*<?php echo custompages_get_lang('Password'); ?></label>
112	112	<input name="password" type="password" /><br />
113		- <label for="password2">*<?php echo custompages_get_lang('Password');?></label>
	113	+ <label for="password2">*<?php echo custompages_get_lang('Password'); ?></label>
114	114	<input name="password2" type="password" /><br />
115	115	</div>
116	116	</form>
117	117	<div id="changepassword-form-submit" class="form-submit" onclick="document.forms['changepassword-form'].submit();">
118		- <span><?php echo custompages_get_lang('LoginEnter');?></span>
	118	+ <span><?php echo custompages_get_lang('LoginEnter'); ?></span>
119	119	</div> <!-- #form-submit -->
120	120	</div> <!-- #form -->
121	121	<div id="footer">

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

		@@ -14,7 +14,7 @@ discard block
		block discarded – undo
14	14	* Security checks
15	15	*/
16	16	if (! isset($_SESSION['conditional_login']['uid']))
17		- die("Not Authorised");
	17	+ die("Not Authorised");
18	18
19	19	if (isset($_POST['password'])) {
20	20	$u = api_get_user_info($_SESSION['conditional_login']['uid']);
		@@ -27,26 +27,26 @@ discard block
		block discarded – undo
27	27	exit();
28	28	}
29	29	$password = $_POST['password'];
30		- $updated = UserManager::update_user(
31		- $u['user_id'],
32		- $u['firstname'],
33		- $u['lastname'],
34		- $u['username'],
35		- $password,
36		- $u['auth_source'],
37		- $u['email'],
38		- $u['status'],
39		- $u['official_code'],
40		- $u['phone'],
41		- $u['picture_uri'],
42		- $u['expiration_date'],
43		- $u['active'],
44		- $u['creator_id'],
45		- $u['hr_dept_id'],
46		- null,
47		- $u['language'],
48		- ''
49		- );
	30	+ $updated = UserManager::update_user(
	31	+ $u['user_id'],
	32	+ $u['firstname'],
	33	+ $u['lastname'],
	34	+ $u['username'],
	35	+ $password,
	36	+ $u['auth_source'],
	37	+ $u['email'],
	38	+ $u['status'],
	39	+ $u['official_code'],
	40	+ $u['phone'],
	41	+ $u['picture_uri'],
	42	+ $u['expiration_date'],
	43	+ $u['active'],
	44	+ $u['creator_id'],
	45	+ $u['hr_dept_id'],
	46	+ null,
	47	+ $u['language'],
	48	+ ''
	49	+ );
50	50
51	51	if ($updated !== false) {
52	52	UserManager::update_extra_field_value($u['user_id'], 'already_logged_in', 'true');
		@@ -104,8 +104,8 @@ discard block
		block discarded – undo
104	104	<div id="changepassword-form-box" class="form-box">
105	105	<div class="info"> <?php echo custompages_get_lang('FirstLoginChangePassword');?> </div>
106	106	<?php if (isset($error_message)) {
107		- echo '<div id="changepassword-form-error" class="form-error">'.$error_message.'</div>';
108		- }?>
	107	+ echo '<div id="changepassword-form-error" class="form-error">'.$error_message.'</div>';
	108	+ }?>
109	109	<form id="changepassword-form" class="form" method="post">
110	110	<div>
111	111	<label for="password">*<?php echo custompages_get_lang('Password');?></label>

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

		@@ -21,7 +21,7 @@
		block discarded – undo
21	21	$langs[$rawlang[1]] = $rawlang[0];
22	22	}
23	23	krsort($langs, SORT_NUMERIC);
24		- foreach($langs as $weight => $code) {
	24	+ foreach ($langs as $weight => $code) {
25	25	if (in_array($code, $available_langs)) {
26	26	return $code;
27	27	}

		@@ -48,8 +48,9 @@
		block discarded – undo
48	48	);
49	49	$lang_match = $chamilo_langs[get_preferred_language($available_langs)];
50	50	// recover previous value ...
51		-if (isset($_SESSION['user_language_choice']))
	51	+if (isset($_SESSION['user_language_choice'])) {
52	52	$lang_match = $_SESSION['user_language_choice'];
	53	+}
53	54
54	55	// Chamilo parameter, on logout
55	56	if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_REQUEST['language'], $chamilo_langs)) {

		@@ -9,30 +9,30 @@ discard block
		block discarded – undo
9	9	* Get the preferred language base on the browser headers
10	10	*/
11	11	function get_preferred_language($available_langs) {
12		- $langs = array();
13		- foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $httplang) {
14		- $rawlang = explode(';q=', $httplang);
15		- if (strpos($rawlang[0], '-') !== FALSE) {
16		- $rawlang[0] = substr($rawlang[0], 0, strpos($rawlang[0], '-'));
17		- }
18		- if (count($rawlang) == 1) {
19		- $rawlang[1] = 1.0;
20		- }
21		- $langs[$rawlang[1]] = $rawlang[0];
22		- }
23		- krsort($langs, SORT_NUMERIC);
24		- foreach($langs as $weight => $code) {
25		- if (in_array($code, $available_langs)) {
26		- return $code;
27		- }
28		- }
29		- return null;
	12	+ $langs = array();
	13	+ foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $httplang) {
	14	+ $rawlang = explode(';q=', $httplang);
	15	+ if (strpos($rawlang[0], '-') !== FALSE) {
	16	+ $rawlang[0] = substr($rawlang[0], 0, strpos($rawlang[0], '-'));
	17	+ }
	18	+ if (count($rawlang) == 1) {
	19	+ $rawlang[1] = 1.0;
	20	+ }
	21	+ $langs[$rawlang[1]] = $rawlang[0];
	22	+ }
	23	+ krsort($langs, SORT_NUMERIC);
	24	+ foreach($langs as $weight => $code) {
	25	+ if (in_array($code, $available_langs)) {
	26	+ return $code;
	27	+ }
	28	+ }
	29	+ return null;
30	30	}
31	31	/**
32	32	* Get a language variable in a specific language
33	33	*/
34	34	function custompages_get_lang($variable) {
35		- return get_lang($variable, null, $_SESSION['user_language_choice']);
	35	+ return get_lang($variable, null, $_SESSION['user_language_choice']);
36	36	}
37	37
38	38	$available_langs = array('en', 'fr', 'es', 'gl', 'eu');
		@@ -49,15 +49,15 @@ discard block
		block discarded – undo
49	49	$lang_match = $chamilo_langs[get_preferred_language($available_langs)];
50	50	// recover previous value ...
51	51	if (isset($_SESSION['user_language_choice']))
52		- $lang_match = $_SESSION['user_language_choice'];
	52	+ $lang_match = $_SESSION['user_language_choice'];
53	53
54	54	// Chamilo parameter, on logout
55	55	if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_REQUEST['language'], $chamilo_langs)) {
56		- $lang_match = $_REQUEST['language'];
	56	+ $lang_match = $_REQUEST['language'];
57	57	}
58	58	// Incoming link parameter
59	59	if (isset($_REQUEST['lang']) && !empty($_REQUEST['lang']) && in_array($_REQUEST['lang'], $available_langs)) {
60		- $lang_match = $chamilo_langs[$_REQUEST['lang']];
	60	+ $lang_match = $chamilo_langs[$_REQUEST['lang']];
61	61	}
62	62
63	63	$detect = api_get_setting('auto_detect_language_custom_pages');

		@@ -13,7 +13,7 @@ discard block
		block discarded – undo
13	13	?>
14	14	<html>
15	15	<head>
16		- <title><?php echo custompages_get_lang('Registration');?></title>
	16	+ <title><?php echo custompages_get_lang('Registration'); ?></title>
17	17	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
18	18	<meta http-equiv="X-UA-Compatible" content="IE=edge">
19	19	<meta name="viewport" content="width=device-width, initial-scale=1.0">
		@@ -39,7 +39,7 @@ discard block
		block discarded – undo
39	39	</div>
40	40	<div id="registration-form-box" class="form-box">
41	41	<div class="block-form-login">
42		- <?php echo $content['info']; ?>
	42	+ <?php echo $content['info']; ?>
43	43	</div>
44	44	</div>
45	45	<div id="footer">

		@@ -19,26 +19,26 @@ discard block
		block discarded – undo
19	19	use Doctrine\ORM\Tools\Console\ConsoleRunner;
20	20	use Symfony\Component\Console\Helper\HelperSet;
21	21
22		-(@include_once __DIR__ . '/../vendor/autoload.php') \|\| @include_once __DIR__ . '/../../../autoload.php';
	22	+(@include_once __DIR__.'/../vendor/autoload.php') \|\| @include_once __DIR__.'/../../../autoload.php';
23	23
24		-$directories = array(getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config');
	24	+$directories = array(getcwd(), getcwd().DIRECTORY_SEPARATOR.'config');
25	25
26	26	$configFile = null;
27	27	foreach ($directories as $directory) {
28		- $configFile = $directory . DIRECTORY_SEPARATOR . 'cli-config.php';
	28	+ $configFile = $directory.DIRECTORY_SEPARATOR.'cli-config.php';
29	29
30	30	if (file_exists($configFile)) {
31	31	break;
32	32	}
33	33	}
34	34
35		-if ( ! file_exists($configFile)) {
	35	+if (!file_exists($configFile)) {
36	36	ConsoleRunner::printCliConfigTemplate();
37	37	exit(1);
38	38	}
39	39
40		-if ( ! is_readable($configFile)) {
41		- echo 'Configuration file [' . $configFile . '] does not have read permission.' . "\n";
	40	+if (!is_readable($configFile)) {
	41	+ echo 'Configuration file ['.$configFile.'] does not have read permission.'."\n";
42	42	exit(1);
43	43	}
44	44
		@@ -54,7 +54,7 @@ discard block
		block discarded – undo
54	54
55	55	$helperSet = require $configFile;
56	56
57		-if ( ! ($helperSet instanceof HelperSet)) {
	57	+if (!($helperSet instanceof HelperSet)) {
58	58	foreach ($GLOBALS as $helperSetCandidate) {
59	59	if ($helperSetCandidate instanceof HelperSet) {
60	60	$helperSet = $helperSetCandidate;

chamilo / chamilo-lms

Push — 1.10.x ( 741c6a...d44d46 )

Status

Category

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +23 added lines, -23 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +22 added lines, -22 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch