Completed
Push — 1.10.x ( 501d19...0db498 )
by Yannick
89:35 queued 49:03
created
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/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.
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/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.