Completed
Pull Request — 1.11.x (#1459)
by José
164:59 queued 133:05
created
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
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>
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
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
 
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
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">
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
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">
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
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>
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
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>
Please login to merge, or discard this patch.
custompages/language.php 3 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -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)) {
Please login to merge, or discard this patch.
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -24,15 +24,15 @@
 block discarded – undo
24 24
 $lang_match = $chamilo_langs[get_preferred_language($available_langs)];
25 25
 // recover previous value ...
26 26
 if (isset($_SESSION['user_language_choice']))
27
-	$lang_match = $_SESSION['user_language_choice'];
27
+    $lang_match = $_SESSION['user_language_choice'];
28 28
 
29 29
 // Chamilo parameter, on logout
30 30
 if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_REQUEST['language'], $chamilo_langs)) {
31
-	$lang_match = $_REQUEST['language'];
31
+    $lang_match = $_REQUEST['language'];
32 32
 }
33 33
 // Incoming link parameter
34 34
 if (isset($_REQUEST['lang']) && !empty($_REQUEST['lang']) && in_array($_REQUEST['lang'], $available_langs)) {
35
-	$lang_match = $chamilo_langs[$_REQUEST['lang']];
35
+    $lang_match = $chamilo_langs[$_REQUEST['lang']];
36 36
 }
37 37
 
38 38
 $detect = api_get_setting('auto_detect_language_custom_pages');
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
  * @package chamilo.custompages
7 7
  */
8 8
 // Get helper functions
9
-require_once __DIR__ . '/language.inc.php';
9
+require_once __DIR__.'/language.inc.php';
10 10
 
11 11
 // Define the languages you want to make available for auto-detection here
12 12
 $available_langs = array('en', 'fr', 'es', 'gl', 'eu');
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
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">
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
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;
Please login to merge, or discard this patch.
app/config/events.conf.dist.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
         'self_sent' => false, // this key states that we can't add user to this event through the admin panel
24 24
         'name_lang_var' => get_lang('PortalHomepageEdited'),
25 25
         'desc_lang_var' => get_lang('PortalHomepageEdited'),
26
-        'available_keyvars' => array (// keys used for the mail template
26
+        'available_keyvars' => array(// keys used for the mail template
27 27
             'url'           => 'portal',
28 28
             'sitename'      => 'sitename',
29 29
             'firstname'     => 'firstname',
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
         'self_sent' => true, // this key states that we can't add user to this event through the admin panel
46 46
         'name_lang_var' => get_lang('UserRegistrationTitle'),
47 47
         'desc_lang_var' => get_lang('UserRegistrationComment'),
48
-        'available_keyvars' => array (// keys used for the mail template
48
+        'available_keyvars' => array(// keys used for the mail template
49 49
             'url'           => 'portal',
50 50
             'sitename'      => 'sitename',
51 51
             'firstname'     => 'firstname',
Please login to merge, or discard this patch.
app/config/profile.conf.dist.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,11 +19,11 @@
 block discarded – undo
19 19
 
20 20
 // Replacing user photos
21 21
 define('KEEP_THE_NAME_WHEN_CHANGE_IMAGE', true);
22
-	// true  -> the new image have the name of previous.
23
-	// false -> a new name is build for each upladed image.
22
+    // true  -> the new image have the name of previous.
23
+    // false -> a new name is build for each upladed image.
24 24
 define('KEEP_THE_OLD_IMAGE_AFTER_CHANGE', true);
25
-	// true  -> if KEEP_THE_NAME_WHEN_CHANGE_IMAGE is true, the  previous image is rename before.
26
-	// false -> only the last image still on server.
25
+    // true  -> if KEEP_THE_NAME_WHEN_CHANGE_IMAGE is true, the  previous image is rename before.
26
+    // false -> only the last image still on server.
27 27
 
28 28
 // Official code
29 29
 // Don't forget to change name of offical code in your organization
Please login to merge, or discard this patch.
app/config/auth.conf.dist.php 2 patches
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -39,29 +39,29 @@
 block discarded – undo
39 39
  * Array of connection parameters
40 40
  **/
41 41
 $extldap_config = array(
42
-  //base dommain string
43
-  'base_dn' => 'DC=cblue,DC=be',
44
-  //admin distinguished name
45
-  'admin_dn' => 'CN=admin,dc=cblue,dc=be',
46
-  //admin password
47
-  'admin_password' => 'pass',
48
-  //ldap host
49
-  'host' => array('1.2.3.4', '2.3.4.5', '3.4.5.6'),
50
-  // filter
42
+    //base dommain string
43
+    'base_dn' => 'DC=cblue,DC=be',
44
+    //admin distinguished name
45
+    'admin_dn' => 'CN=admin,dc=cblue,dc=be',
46
+    //admin password
47
+    'admin_password' => 'pass',
48
+    //ldap host
49
+    'host' => array('1.2.3.4', '2.3.4.5', '3.4.5.6'),
50
+    // filter
51 51
 //  'filter' => '', // no () arround the string
52
-  //'port' => , default on 389
53
-  //protocl version (2 or 3)
54
-  'protocol_version' => 3,
55
-  // set this to 0 to connect to AD server
56
-  'referrals' => 0,
57
-  //String used to search the user in ldap. %username will ber replaced by the username.
58
-  //See extldap_get_user_search_string() function below
52
+    //'port' => , default on 389
53
+    //protocl version (2 or 3)
54
+    'protocol_version' => 3,
55
+    // set this to 0 to connect to AD server
56
+    'referrals' => 0,
57
+    //String used to search the user in ldap. %username will ber replaced by the username.
58
+    //See extldap_get_user_search_string() function below
59 59
 //  'user_search' => 'sAMAccountName=%username%',  // no () arround the string
60
-  'user_search' => 'uid=%username%',  // no () arround the string
61
-  //encoding used in ldap (most common are UTF-8 and ISO-8859-1
62
-  'encoding' => 'UTF-8',
63
-  //Set to true if user info have to be update at each login
64
-  'update_userinfo' => true
60
+    'user_search' => 'uid=%username%',  // no () arround the string
61
+    //encoding used in ldap (most common are UTF-8 and ISO-8859-1
62
+    'encoding' => 'UTF-8',
63
+    //Set to true if user info have to be update at each login
64
+    'update_userinfo' => true
65 65
 );
66 66
 
67 67
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
   //String used to search the user in ldap. %username will ber replaced by the username.
58 58
   //See extldap_get_user_search_string() function below
59 59
 //  'user_search' => 'sAMAccountName=%username%',  // no () arround the string
60
-  'user_search' => 'uid=%username%',  // no () arround the string
60
+  'user_search' => 'uid=%username%', // no () arround the string
61 61
   //encoding used in ldap (most common are UTF-8 and ISO-8859-1
62 62
   'encoding' => 'UTF-8',
63 63
   //Set to true if user info have to be update at each login
Please login to merge, or discard this patch.