Passed
Push — 1.10.x ( 767d99...288426 )
by Yannick
44:51
created
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/auth.conf.dist.php 1 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.
user_portal.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
     $folder_icon = api_get_path(WEB_IMG_PATH).'icons/22/folder.png';
49 49
     $close_icon = api_get_path(WEB_IMG_PATH).'loading1.gif';
50 50
 
51
-    $htmlHeadXtra[] =  '<script type="text/javascript">
51
+    $htmlHeadXtra[] = '<script type="text/javascript">
52 52
 	$(document).ready(function() {
53 53
 		$(".document_preview_container").hide();
54 54
 		$(".document_preview").click(function() {
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 if ($displayMyCourseViewBySessionLink) {
82 82
     $htmlHeadXtra[] = '
83 83
     <script type="text/javascript">
84
-        userId = ' . $userId . '
84
+        userId = ' . $userId.'
85 85
         $(document).ready(function() {
86 86
             changeMyCoursesView($.cookie("defaultMyCourseView"+userId));
87 87
         });
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
         function changeMyCoursesView(inView)
94 94
         {
95 95
             $.cookie("defaultMyCourseView"+userId, inView, { expires: 365 });
96
-            if (inView == ' . IndexManager::VIEW_BY_SESSION . ') {
96
+            if (inView == ' . IndexManager::VIEW_BY_SESSION.') {
97 97
                 $("#viewBySession").addClass("btn-primary");
98 98
                 $("#viewByDefault").removeClass("btn-primary");
99 99
             } else {
@@ -153,16 +153,16 @@  discard block
 block discarded – undo
153 153
             if (isset($sessionInfo['courses']) && count($sessionInfo['courses']) == 1) {
154 154
                 $courseCode = $sessionInfo['courses'][0]['code'];
155 155
                 $courseInfo = api_get_course_info_by_id($sessionInfo['courses'][0]['real_id']);
156
-                $courseUrl = $courseInfo['course_public_url'] . '?id_session=' . $sessionInfo['session_id'];
157
-                header('Location:' . $courseUrl);
156
+                $courseUrl = $courseInfo['course_public_url'].'?id_session='.$sessionInfo['session_id'];
157
+                header('Location:'.$courseUrl);
158 158
                 exit;
159 159
             }
160 160
 
161 161
             // Session has many courses.
162 162
             if (isset($sessionInfo['session_id'])) {
163
-                $url = api_get_path(WEB_CODE_PATH) . 'session/?session_id=' . $sessionInfo['session_id'];
163
+                $url = api_get_path(WEB_CODE_PATH).'session/?session_id='.$sessionInfo['session_id'];
164 164
 
165
-                header('Location:' . $url);
165
+                header('Location:'.$url);
166 166
                 exit;
167 167
             }
168 168
         }
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
             $courseInfo = api_get_course_info_by_id($courses[0]['real_id']);
179 179
             if (!empty($courseInfo)) {
180 180
                 $courseUrl = $courseInfo['course_public_url'];
181
-                header('Location:' . $courseUrl);
181
+                header('Location:'.$courseUrl);
182 182
                 exit;
183 183
             }
184 184
         }
Please login to merge, or discard this patch.
news_list.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
 }
19 19
 
20 20
 if (!isset($_GET['id']) || empty($_GET['id'])) {
21
-    $content =  SystemAnnouncementManager::display_announcements_slider($visibility, $_GET['id']);
21
+    $content = SystemAnnouncementManager::display_announcements_slider($visibility, $_GET['id']);
22 22
 } else {
23 23
     $content = SystemAnnouncementManager::displayAnnouncement($_GET['id'], $visibility);
24 24
 }
Please login to merge, or discard this patch.
main/gamification/my_progress.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
     $UserIsSubscribedToSession = SessionManager::isUserSubscribedAsStudent($lastSessionId, $user->getId());
43 43
 
44 44
     if (!empty($lastSessionId) && $UserIsSubscribedToSession) {
45
-        $urlWithSession = api_get_self() . '?' . http_build_query([
45
+        $urlWithSession = api_get_self().'?'.http_build_query([
46 46
             'session_id' => $lastCourseAccess->getSessionId()
47 47
         ]);
48 48
 
@@ -116,13 +116,13 @@  discard block
 block discarded – undo
116 116
         foreach ($learningPathList->list as $learningPathId => $learningPath) {
117 117
             $courseData['stats'][] = [
118 118
                 $learningPath['lp_name'],
119
-                'newscorm/lp_controller.php?' . http_build_query([
119
+                'newscorm/lp_controller.php?'.http_build_query([
120 120
                     'action' => 'stats',
121 121
                     'cidReq' => $course->getCode(),
122 122
                     'id_session' => $currentSession->getId(),
123 123
                     'gidReq' => 0,
124 124
                     'lp_id' => $learningPathId
125
-                ]) . api_get_cidreq()
125
+                ]).api_get_cidreq()
126 126
             ];
127 127
         }
128 128
 
Please login to merge, or discard this patch.
main/auth/openid/xrds.lib.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@
 block discarded – undo
42 42
 
43 43
   $name = _xrds_strip_namespace($name);
44 44
   if ($name == 'SERVICE') {
45
-    if (in_array(OPENID_NS_2_0 .'/signon', $xrds_current_service['types']) ||
46
-        in_array(OPENID_NS_2_0 .'/server', $xrds_current_service['types'])) {
45
+    if (in_array(OPENID_NS_2_0.'/signon', $xrds_current_service['types']) ||
46
+        in_array(OPENID_NS_2_0.'/server', $xrds_current_service['types'])) {
47 47
       $xrds_current_service['version'] = 2;
48 48
     }
49 49
     elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) ||
Please login to merge, or discard this patch.
main/auth/openid/login.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 /**
14 14
  * Initialisation
15 15
  */
16
-require_once api_get_path(CONFIGURATION_PATH) . 'auth.conf.php';
16
+require_once api_get_path(CONFIGURATION_PATH).'auth.conf.php';
17 17
 
18 18
 require_once 'openid.lib.php';
19 19
 require_once 'xrds.lib.php';
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
     // Now that there is an association created, move on
69 69
     // to request authentication from the IdP
70 70
     $identity = (!empty($services[0]['delegate'])) ? $services[0]['delegate'] : $claimed_id;
71
-    if (isset($services[0]['types']) && is_array($services[0]['types']) && in_array(OPENID_NS_2_0 . '/server', $services[0]['types'])) {
71
+    if (isset($services[0]['types']) && is_array($services[0]['types']) && in_array(OPENID_NS_2_0.'/server', $services[0]['types'])) {
72 72
         $identity = 'http://openid.net/identifier_select/2.0';
73 73
     }
74 74
     $authn_request = openid_authentication_request($claimed_id, $identity, $return_to, $assoc_handle, $services[0]['version']);
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 
127 127
     $xrds_url = $claimed_id;
128 128
     if (_openid_is_xri($claimed_id)) {
129
-        $xrds_url = 'http://xri.net/' . $claimed_id;
129
+        $xrds_url = 'http://xri.net/'.$claimed_id;
130 130
     }
131 131
     $url = @parse_url($xrds_url);
132 132
     if ($url['scheme'] == 'http' || $url['scheme'] == 'https') {
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
     //@todo Remove Old Associations:
192 192
     $openid_association = Database::get_main_table(TABLE_MAIN_OPENID_ASSOCIATION);
193 193
     $sql = "DELETE FROM $openid_association
194
-            WHERE created + expires_in < '" . api_get_utc_datetime() . "'";
194
+            WHERE created + expires_in < '".api_get_utc_datetime()."'";
195 195
     Database::query($sql);
196 196
 
197 197
     // Check to see if we have an association for this IdP already
@@ -347,17 +347,17 @@  discard block
 block discarded – undo
347 347
     switch ($uri['scheme']) {
348 348
         case 'http':
349 349
             $port = isset($uri['port']) ? $uri['port'] : 80;
350
-            $host = $uri['host'] . ($port != 80 ? ':' . $port : '');
350
+            $host = $uri['host'].($port != 80 ? ':'.$port : '');
351 351
             $fp = @fsockopen($uri['host'], $port, $errno, $errstr, 15);
352 352
             break;
353 353
         case 'https':
354 354
             // Note: Only works for PHP 4.3 compiled with OpenSSL.
355 355
             $port = isset($uri['port']) ? $uri['port'] : 443;
356
-            $host = $uri['host'] . ($port != 443 ? ':' . $port : '');
357
-            $fp = @fsockopen('ssl://' . $uri['host'], $port, $errno, $errstr, 20);
356
+            $host = $uri['host'].($port != 443 ? ':'.$port : '');
357
+            $fp = @fsockopen('ssl://'.$uri['host'], $port, $errno, $errstr, 20);
358 358
             break;
359 359
         default:
360
-            $result->error = 'invalid schema ' . $uri['scheme'];
360
+            $result->error = 'invalid schema '.$uri['scheme'];
361 361
             return $result;
362 362
     }
363 363
 
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
373 373
     // Construct the path to act on.
374 374
     $path = isset($uri['path']) ? $uri['path'] : '/';
375 375
     if (isset($uri['query'])) {
376
-        $path .= '?' . $uri['query'];
376
+        $path .= '?'.$uri['query'];
377 377
     }
378 378
 
379 379
     // Create HTTP request.
@@ -383,23 +383,23 @@  discard block
 block discarded – undo
383 383
         // host that do not take into account the port number.
384 384
         'Host' => "Host: $host",
385 385
         'User-Agent' => 'User-Agent: Chamilo (+http://www.chamilo.org/)',
386
-        'Content-Length' => 'Content-Length: ' . strlen($data)
386
+        'Content-Length' => 'Content-Length: '.strlen($data)
387 387
     );
388 388
 
389 389
     // If the server url has a user then attempt to use basic authentication
390 390
     if (isset($uri['user'])) {
391
-        $defaults['Authorization'] = 'Authorization: Basic ' . base64_encode($uri['user'] . (!empty($uri['pass']) ? ":" . $uri['pass'] : ''));
391
+        $defaults['Authorization'] = 'Authorization: Basic '.base64_encode($uri['user'].(!empty($uri['pass']) ? ":".$uri['pass'] : ''));
392 392
     }
393 393
 
394 394
     foreach ($headers as $header => $value) {
395
-        $defaults[$header] = $header . ': ' . $value;
395
+        $defaults[$header] = $header.': '.$value;
396 396
     }
397 397
 
398
-    $request = $method . ' ' . $path . " HTTP/1.0\r\n";
398
+    $request = $method.' '.$path." HTTP/1.0\r\n";
399 399
     $request .= implode("\r\n", $defaults);
400 400
     $request .= "\r\n\r\n";
401 401
     if ($data) {
402
-        $request .= $data . "\r\n";
402
+        $request .= $data."\r\n";
403 403
     }
404 404
     $result->request = $request;
405 405
 
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
425 425
         if (isset($result->headers[$header]) && $header == 'Set-Cookie') {
426 426
             // RFC 2109: the Set-Cookie response header comprises the token Set-
427 427
             // Cookie:, followed by a comma-separated list of one or more cookies.
428
-            $result->headers[$header] .= ',' . trim($value);
428
+            $result->headers[$header] .= ','.trim($value);
429 429
         } else {
430 430
             $result->headers[$header] = trim($value);
431 431
         }
Please login to merge, or discard this patch.
main/auth/openid/openid.lib.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -9,10 +9,10 @@  discard block
 block discarded – undo
9 9
  * Code
10 10
  */
11 11
 // Diffie-Hellman Key Exchange Default Value.
12
-define('OPENID_DH_DEFAULT_MOD', '155172898181473697471232257763715539915724801' .
13
-        '966915404479707795314057629378541917580651227423698188993727816152646631' .
14
-        '438561595825688188889951272158842675419950341258706556549803580104870537' .
15
-        '681476726513255747040765857479291291572334510643245094715007229621094194' .
12
+define('OPENID_DH_DEFAULT_MOD', '155172898181473697471232257763715539915724801'.
13
+        '966915404479707795314057629378541917580651227423698188993727816152646631'.
14
+        '438561595825688188889951272158842675419950341258706556549803580104870537'.
15
+        '681476726513255747040765857479291291572334510643245094715007229621094194'.
16 16
         '349783925984760375594985848253359305585439638443');
17 17
 
18 18
 // Constants for Diffie-Hellman key exchange computations.
@@ -32,10 +32,10 @@  discard block
 block discarded – undo
32 32
 function openid_redirect_http($url, $message) {
33 33
     $query = array();
34 34
     foreach ($message as $key => $val) {
35
-        $query[] = $key . '=' . urlencode($val);
35
+        $query[] = $key.'='.urlencode($val);
36 36
     }
37 37
     $sep = (strpos($url, '?') === FALSE) ? '?' : '&';
38
-    header('Location: ' . $url . $sep . implode('&', $query), TRUE, 302);
38
+    header('Location: '.$url.$sep.implode('&', $query), TRUE, 302);
39 39
     //exit;
40 40
 }
41 41
 
@@ -44,12 +44,12 @@  discard block
 block discarded – undo
44 44
  * This function should be deprecated for 1.8.6.2 needs documentation
45 45
  */
46 46
 function openid_redirect($url, $message) {
47
-    $output = '<html><head><title>' . get_lang('OpenIDRedirect') . "</title></head>\n<body>";
48
-    $output .= '<form method="post" action="' . $url . '" id="openid-redirect-form">';
47
+    $output = '<html><head><title>'.get_lang('OpenIDRedirect')."</title></head>\n<body>";
48
+    $output .= '<form method="post" action="'.$url.'" id="openid-redirect-form">';
49 49
     foreach ($message as $key => $value) {
50
-        $output .='<input type="hidden" name="' . $key . '" value="' . $value . '">';
50
+        $output .= '<input type="hidden" name="'.$key.'" value="'.$value.'">';
51 51
     }
52
-    $output .= '<noscript><input type="submit" name="submit" value="' . get_lang('Send') . '"/></noscript>';
52
+    $output .= '<noscript><input type="submit" name="submit" value="'.get_lang('Send').'"/></noscript>';
53 53
     $output .= '</form>';
54 54
     $output .= '<script type="text/javascript">document.getElementById("openid-redirect-form").submit();</script>';
55 55
     $output .= "</body></html>";
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
     $normalized_url = $url;
95 95
 
96 96
     if (stristr($url, '://') === FALSE) {
97
-        $normalized_url = 'http://' . $url;
97
+        $normalized_url = 'http://'.$url;
98 98
     }
99 99
 
100 100
     if (substr_count($normalized_url, '/') < 3) {
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
             if ($encoded_message != '') {
134 134
                 $encoded_message .= '&';
135 135
             }
136
-            $encoded_message .= rawurlencode(trim($parts[0])) . '=' . rawurlencode(trim($parts[1]));
136
+            $encoded_message .= rawurlencode(trim($parts[0])).'='.rawurlencode(trim($parts[1]));
137 137
         }
138 138
     }
139 139
 
@@ -164,10 +164,10 @@  discard block
 block discarded – undo
164 164
  */
165 165
 function _openid_nonce() {
166 166
     // YYYY-MM-DDThh:mm:ssTZD UTC, plus some optional extra unique chars
167
-    return gmstrftime('%Y-%m-%dT%H:%M:%S%Z') .
168
-            chr(mt_rand(0, 25) + 65) .
169
-            chr(mt_rand(0, 25) + 65) .
170
-            chr(mt_rand(0, 25) + 65) .
167
+    return gmstrftime('%Y-%m-%dT%H:%M:%S%Z').
168
+            chr(mt_rand(0, 25) + 65).
169
+            chr(mt_rand(0, 25) + 65).
170
+            chr(mt_rand(0, 25) + 65).
171 171
             chr(mt_rand(0, 25) + 65);
172 172
 }
173 173
 
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
  */
177 177
 function _openid_link_href($rel, $html) {
178 178
     $rel = preg_quote($rel);
179
-    preg_match('|<link\s+rel=["\'](.*)' . $rel . '(.*)["\'](.*)/?>|iU', $html, $matches);
179
+    preg_match('|<link\s+rel=["\'](.*)'.$rel.'(.*)["\'](.*)/?>|iU', $html, $matches);
180 180
     if (isset($matches[3])) {
181 181
         preg_match('|href=["\']([^"]+)["\']|iU', $matches[0], $href);
182 182
         return trim($href[1]);
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
  * Pull the http-equiv attribute out of an html meta element
189 189
  */
190 190
 function _openid_meta_httpequiv($equiv, $html) {
191
-    preg_match('|<meta\s+http-equiv=["\']' . $equiv . '["\'](.*)/?>|iU', $html, $matches);
191
+    preg_match('|<meta\s+http-equiv=["\']'.$equiv.'["\'](.*)/?>|iU', $html, $matches);
192 192
     if (isset($matches[1])) {
193 193
         preg_match('|content=["\']([^"]+)["\']|iU', $matches[1], $content);
194 194
         return $content[1];
@@ -209,8 +209,8 @@  discard block
 block discarded – undo
209 209
     $sign_data = array();
210 210
 
211 211
     foreach ($keys_to_sign as $key) {
212
-        if (isset($message_array['openid.' . $key])) {
213
-            $sign_data[$key] = $message_array['openid.' . $key];
212
+        if (isset($message_array['openid.'.$key])) {
213
+            $sign_data[$key] = $message_array['openid.'.$key];
214 214
         }
215 215
     }
216 216
 
@@ -229,8 +229,8 @@  discard block
 block discarded – undo
229 229
     $key = str_pad($key, OPENID_SHA1_BLOCKSIZE, chr(0x00));
230 230
     $ipad = str_repeat(chr(0x36), OPENID_SHA1_BLOCKSIZE);
231 231
     $opad = str_repeat(chr(0x5c), OPENID_SHA1_BLOCKSIZE);
232
-    $hash1 = _openid_sha1(($key ^ $ipad) . $text, true);
233
-    $hmac = _openid_sha1(($key ^ $opad) . $hash1, true);
232
+    $hash1 = _openid_sha1(($key ^ $ipad).$text, true);
233
+    $hmac = _openid_sha1(($key ^ $opad).$hash1, true);
234 234
 
235 235
     return $hmac;
236 236
 }
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
     }
338 338
 
339 339
     do {
340
-        $bytes = "\x00" . _openid_get_bytes($nbytes);
340
+        $bytes = "\x00"._openid_get_bytes($nbytes);
341 341
         $n = _openid_dh_binary_to_long($bytes);
342 342
         // Keep looping if this value is in the low duplicated range.
343 343
     } while (bccomp($n, $duplicate) < 0);
Please login to merge, or discard this patch.
main/auth/set_temp_password.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 $cidReset = true;
12 12
 require_once '../inc/global.inc.php';
13 13
 $this_section = SECTION_COURSES;
14
-$course_id = isset($_GET['course_id'])  ? intval($_GET['course_id']) : null;
14
+$course_id = isset($_GET['course_id']) ? intval($_GET['course_id']) : null;
15 15
 $session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
16 16
 $user_id = api_get_user_id();
17 17
 
Please login to merge, or discard this patch.