Completed
Push — 1.10.x ( fe0e5a...3a6f9c )
by Yannick
134:15 queued 86:39
created
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
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">
Please login to merge, or discard this patch.
custompages/language.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -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)];
Please login to merge, or discard this patch.
custompages/index-unlogged-dist.php 1 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 1 patch
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.
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 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -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
 		}
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/Migrations/Schema/V110/Version20150507152600.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
             '',
57 57
             'radio',
58 58
             'Platform',
59
-            ($value?'true':'false'),
59
+            ($value ? 'true' : 'false'),
60 60
             'HideGlobalAnnouncementsWhenNotLoggedInText',
61 61
             'HideGlobalAnnouncementsWhenNotLoggedInComment',
62 62
             null,
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
             '',
79 79
             'textfield',
80 80
             'Course',
81
-            ($value?$value:''),
81
+            ($value ? $value : ''),
82 82
             'CourseCreationUsesTemplateText',
83 83
             'CourseCreationUsesTemplateComment',
84 84
             null,
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
             '',
101 101
             'radio',
102 102
             'Security',
103
-            ($value?'true':'false'),
103
+            ($value ? 'true' : 'false'),
104 104
             'EnablePasswordStrengthCheckerText',
105 105
             'EnablePasswordStrengthCheckerComment',
106 106
             null,
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
             '',
123 123
             'radio',
124 124
             'Security',
125
-            ($value?'true':'false'),
125
+            ($value ? 'true' : 'false'),
126 126
             'EnableCaptchaText',
127 127
             'EnableCaptchaComment',
128 128
             null,
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
             '',
142 142
             'textfield',
143 143
             'Security',
144
-            ($value?$value:5),
144
+            ($value ? $value : 5),
145 145
             'CaptchaNumberOfMistakesBeforeBlockingAccountText',
146 146
             'CaptchaNumberOfMistakesBeforeBlockingAccountComment',
147 147
             null,
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
             '',
159 159
             'textfield',
160 160
             'Security',
161
-            ($value?$value:5),
161
+            ($value ? $value : 5),
162 162
             'CaptchaTimeAccountIsLockedText',
163 163
             'CaptchaTimeAccountIsLockedComment',
164 164
             null,
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
             '',
177 177
             'radio',
178 178
             'Session',
179
-            ($value?'true':'false'),
179
+            ($value ? 'true' : 'false'),
180 180
             'DRHAccessToAllSessionContentText',
181 181
             'DRHAccessToAllSessionContentComment',
182 182
             null,
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
             '',
196 196
             'radio',
197 197
             'Tools',
198
-            ($value?'true':'false'),
198
+            ($value ? 'true' : 'false'),
199 199
             'ShowGroupForaInGeneralToolText',
200 200
             'ShowGroupForaInGeneralToolComment',
201 201
             null,
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
             '',
215 215
             'radio',
216 216
             'Session',
217
-            ($value?'true':'false'),
217
+            ($value ? 'true' : 'false'),
218 218
             'TutorsCanAssignStudentsToSessionsText',
219 219
             'TutorsCanAssignStudentsToSessionsComment',
220 220
             null,
Please login to merge, or discard this patch.