Completed
Push — 1.10.x ( c135db...ea3352 )
by Julito
26:21
created
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.
user_portal.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -188,7 +188,7 @@
 block discarded – undo
188 188
 
189 189
 //Show the chamilo mascot
190 190
 if (empty($courseAndSessions['html']) && !isset($_GET['history'])) {
191
-	$controller->tpl->assign('welcome_to_course_block', $controller->return_welcome_to_course_block());
191
+    $controller->tpl->assign('welcome_to_course_block', $controller->return_welcome_to_course_block());
192 192
 }
193 193
 
194 194
 $controller->tpl->assign('content', $courseAndSessions['html']);
Please login to merge, or discard this 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 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
 
8 8
 $actions = '';
9 9
 if (api_is_platform_admin()) {
10
-	$actions = '<a href="'.api_get_path(WEB_PATH).'main/admin/system_announcements.php">'.
10
+    $actions = '<a href="'.api_get_path(WEB_PATH).'main/admin/system_announcements.php">'.
11 11
         Display::return_icon('edit.png', get_lang('EditSystemAnnouncement'), array(), 32).'</a>';
12 12
 }
13 13
 
Please login to merge, or discard this 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 3 patches
Indentation   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -16,70 +16,70 @@
 block discarded – undo
16 16
  * Main entry point for parsing XRDS documents
17 17
  */
18 18
 function xrds_parse($xml) {
19
-  global $xrds_services;
19
+    global $xrds_services;
20 20
 
21
-  $parser = xml_parser_create_ns();
22
-  xml_set_element_handler($parser, '_xrds_element_start', '_xrds_element_end');
23
-  xml_set_character_data_handler($parser, '_xrds_cdata');
21
+    $parser = xml_parser_create_ns();
22
+    xml_set_element_handler($parser, '_xrds_element_start', '_xrds_element_end');
23
+    xml_set_character_data_handler($parser, '_xrds_cdata');
24 24
 
25
-  xml_parse($parser, $xml);
26
-  xml_parser_free($parser);
25
+    xml_parse($parser, $xml);
26
+    xml_parser_free($parser);
27 27
 
28
-  return $xrds_services;
28
+    return $xrds_services;
29 29
 }
30 30
 
31 31
 /**
32 32
  * Parser callback functions
33 33
  */
34 34
 function _xrds_element_start(&$parser, $name, $attribs) {
35
-  global $xrds_open_elements;
35
+    global $xrds_open_elements;
36 36
 
37
-  $xrds_open_elements[] = _xrds_strip_namespace($name);
37
+    $xrds_open_elements[] = _xrds_strip_namespace($name);
38 38
 }
39 39
 
40 40
 function _xrds_element_end(&$parser, $name) {
41
-  global $xrds_open_elements, $xrds_services, $xrds_current_service;
41
+    global $xrds_open_elements, $xrds_services, $xrds_current_service;
42 42
 
43
-  $name = _xrds_strip_namespace($name);
44
-  if ($name == 'SERVICE') {
43
+    $name = _xrds_strip_namespace($name);
44
+    if ($name == 'SERVICE') {
45 45
     if (in_array(OPENID_NS_2_0 .'/signon', $xrds_current_service['types']) ||
46 46
         in_array(OPENID_NS_2_0 .'/server', $xrds_current_service['types'])) {
47
-      $xrds_current_service['version'] = 2;
47
+        $xrds_current_service['version'] = 2;
48 48
     }
49 49
     elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) ||
50 50
             in_array(OPENID_NS_1_0, $xrds_current_service['types'])) {
51
-      $xrds_current_service['version'] = 1;
51
+        $xrds_current_service['version'] = 1;
52 52
     }
53 53
     if (!empty($xrds_current_service['version'])) {
54
-      $xrds_services[] = $xrds_current_service;
54
+        $xrds_services[] = $xrds_current_service;
55 55
     }
56 56
     $xrds_current_service = array();
57
-  }
58
-  array_pop($xrds_open_elements);
57
+    }
58
+    array_pop($xrds_open_elements);
59 59
 }
60 60
 
61 61
 function _xrds_cdata(&$parser, $data) {
62
-  global $xrds_open_elements, $xrds_services, $xrds_current_service;
63
-  $path = strtoupper(implode('/', $xrds_open_elements));
64
-  switch ($path) {
62
+    global $xrds_open_elements, $xrds_services, $xrds_current_service;
63
+    $path = strtoupper(implode('/', $xrds_open_elements));
64
+    switch ($path) {
65 65
     case 'XRDS/XRD/SERVICE/TYPE':
66 66
       $xrds_current_service['types'][] = $data;
67
-      break;
67
+        break;
68 68
     case 'XRDS/XRD/SERVICE/URI':
69 69
       $xrds_current_service['uri'] = $data;
70
-      break;
70
+        break;
71 71
     case 'XRDS/XRD/SERVICE/DELEGATE':
72 72
       $xrds_current_service['delegate'] = $data;
73
-      break;
74
-  }
73
+        break;
74
+    }
75 75
 }
76 76
 
77 77
 function _xrds_strip_namespace($name) {
78
-  // Strip namespacing.
79
-  $pos = strrpos($name, ':');
80
-  if ($pos !== FALSE) {
78
+    // Strip namespacing.
79
+    $pos = strrpos($name, ':');
80
+    if ($pos !== FALSE) {
81 81
     $name = substr($name, $pos + 1, strlen($name));
82
-  }
82
+    }
83 83
 
84
-  return $name;
84
+    return $name;
85 85
 }
Please login to merge, or discard this 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.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,8 +45,7 @@
 block discarded – undo
45 45
     if (in_array(OPENID_NS_2_0 .'/signon', $xrds_current_service['types']) ||
46 46
         in_array(OPENID_NS_2_0 .'/server', $xrds_current_service['types'])) {
47 47
       $xrds_current_service['version'] = 2;
48
-    }
49
-    elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) ||
48
+    } elseif (in_array(OPENID_NS_1_1, $xrds_current_service['types']) ||
50 49
             in_array(OPENID_NS_1_0, $xrds_current_service['types'])) {
51 50
       $xrds_current_service['version'] = 1;
52 51
     }
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 3 patches
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.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,8 +61,9 @@
 block discarded – undo
61 61
  */
62 62
 function _openid_is_xri($identifier) {
63 63
     $firstchar = substr($identifier, 0, 1);
64
-    if ($firstchar == "@" || $firstchar == "=")
65
-        return TRUE;
64
+    if ($firstchar == "@" || $firstchar == "=") {
65
+            return TRUE;
66
+    }
66 67
 
67 68
     if (stristr($identifier, 'xri://') !== FALSE) {
68 69
         return TRUE;
Please login to merge, or discard this patch.
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -242,6 +242,9 @@
 block discarded – undo
242 242
     return $hmac;
243 243
 }
244 244
 
245
+/**
246
+ * @param string|false $text
247
+ */
245 248
 function _openid_sha1($text) {
246 249
     $hex = sha1($text);
247 250
     $raw = '';
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.
main/auth/inscription.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
         if (api_get_setting('registration', 'email') != 'true') {
91 91
             $form->addRule('email', get_lang('ThisFieldIsRequired'), 'required');
92 92
         }
93
-        $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
93
+        $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
94 94
         $form->addRule('email', get_lang('UserTaken'), 'username_available');
95 95
     }
96 96
 
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
         $form->addElement('text', 'username', get_lang('UserName'), array('id' => 'username', 'size' => USERNAME_MAX_LENGTH));
124 124
         $form->applyFilter('username', 'trim');
125 125
         $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
126
-        $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
126
+        $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
127 127
         $form->addRule('username', get_lang('UsernameWrong'), 'username');
128 128
         $form->addRule('username', get_lang('UserTaken'), 'username_available');
129 129
     }
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
     if (CHECK_PASS_EASY_TO_FIND) {
145 145
         $form->addRule(
146 146
             'password1',
147
-            get_lang('PassTooEasy') . ': ' . api_generate_password(),
147
+            get_lang('PassTooEasy').': '.api_generate_password(),
148 148
             'callback',
149 149
             'api_check_password'
150 150
         );
@@ -209,13 +209,13 @@  discard block
 block discarded – undo
209 209
             'sessionVar'   => basename(__FILE__, '.php'),
210 210
             'imageOptions' => array(
211 211
                 'font_size' => 20,
212
-                'font_path' => api_get_path(SYS_FONTS_PATH) . 'opensans/',
212
+                'font_path' => api_get_path(SYS_FONTS_PATH).'opensans/',
213 213
                 'font_file' => 'OpenSans-Regular.ttf',
214 214
                     //'output' => 'gif'
215 215
             )
216 216
         );
217 217
 
218
-        $captcha_question =  $form->addElement('CAPTCHA_Image', 'captcha_question', '', $options);
218
+        $captcha_question = $form->addElement('CAPTCHA_Image', 'captcha_question', '', $options);
219 219
         $form->addElement('static', null, null, get_lang('ClickOnTheImageForANewOne'));
220 220
 
221 221
         $form->addElement('text', 'captcha', get_lang('EnterTheLettersYouSee'), array('size' => 40));
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
         }
334 334
     }
335 335
 
336
-    $tool_name = get_lang('Registration', null, (!empty($_POST['language'])?$_POST['language']: $_user['language']));
336
+    $tool_name = get_lang('Registration', null, (!empty($_POST['language']) ? $_POST['language'] : $_user['language']));
337 337
 
338 338
     if (api_get_setting('allow_terms_conditions') == 'true' && $user_already_registered_show_terms) {
339 339
         $tool_name = get_lang('TermsAndConditions');
@@ -354,11 +354,11 @@  discard block
 block discarded – undo
354 354
     }
355 355
 
356 356
     if (file_exists($home.'register_top_'.$user_selected_language.'.html')) {
357
-        $home_top_temp = @(string)file_get_contents($home.'register_top_'.$user_selected_language.'.html');
357
+        $home_top_temp = @(string) file_get_contents($home.'register_top_'.$user_selected_language.'.html');
358 358
         $open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
359 359
         $open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
360 360
         if (!empty($open)) {
361
-            $content =  '<div class="well_border">'.$open.'</div>';
361
+            $content = '<div class="well_border">'.$open.'</div>';
362 362
         }
363 363
     }
364 364
 
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
             null,
408 408
             get_lang('IHaveReadAndAgree').'&nbsp;<a href="inscription.php?legal" target="_blank">'.get_lang('TermsAndConditions').'</a>'
409 409
         );
410
-        $form->addRule('legal_accept',  get_lang('ThisFieldIsRequired'), 'required');
410
+        $form->addRule('legal_accept', get_lang('ThisFieldIsRequired'), 'required');
411 411
     } else {
412 412
         $preview = LegalManager::show_last_condition($term_preview);
413 413
         $form->addElement('label', null, $preview);
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
580 580
                 Database::query($sql);
581 581
 
582 582
                 // 2. Send mail to all platform admin
583
-                $emailsubject  = get_lang('ApprovalForNewAccount', null, $values['language']).': '.$values['username'];
583
+                $emailsubject = get_lang('ApprovalForNewAccount', null, $values['language']).': '.$values['username'];
584 584
                 $emailbody = get_lang('ApprovalForNewAccount', null, $values['language'])."\n";
585 585
                 $emailbody .= get_lang('UserName', null, $values['language']).': '.$values['username']."\n";
586 586
 
@@ -667,7 +667,7 @@  discard block
 block discarded – undo
667 667
         '<p>'.
668 668
         get_lang('Dear', null, $_user['language']).' '.
669 669
         stripslashes(Security::remove_XSS($recipient_name)).',<br /><br />'.
670
-        get_lang('PersonalSettings',null,$_user['language']).".</p>";
670
+        get_lang('PersonalSettings', null, $_user['language']).".</p>";
671 671
 
672 672
     $form_data = array(
673 673
         'button' => Display::button('next', get_lang('Next', null, $_user['language']), array('class' => 'btn btn-primary btn-large')),
@@ -680,14 +680,14 @@  discard block
 block discarded – undo
680 680
     } else {
681 681
 
682 682
         if (!empty($values['email'])) {
683
-            $text_after_registration.= '<p>'.get_lang('MailHasBeenSent', null, $_user['language']).'.</p>';
683
+            $text_after_registration .= '<p>'.get_lang('MailHasBeenSent', null, $_user['language']).'.</p>';
684 684
         }
685 685
 
686 686
         if ($is_allowedCreateCourse) {
687 687
             if ($usersCanCreateCourse) {
688
-                $form_data['message'] = '<p>'. get_lang('NowGoCreateYourCourse', null, $_user['language']). "</p>";
688
+                $form_data['message'] = '<p>'.get_lang('NowGoCreateYourCourse', null, $_user['language'])."</p>";
689 689
             }
690
-            $form_data['action']  = '../create_course/add_course.php';
690
+            $form_data['action'] = '../create_course/add_course.php';
691 691
 
692 692
             if (api_get_setting('course_validation') == 'true') {
693 693
                 $form_data['button'] = Display::button(
@@ -707,7 +707,7 @@  discard block
 block discarded – undo
707 707
         } else {
708 708
             if (api_get_setting('allow_students_to_browse_courses') == 'true') {
709 709
                 $form_data['action'] = 'courses.php?action=subscribe';
710
-                $form_data['message'] = '<p>'. get_lang('NowGoChooseYourCourses', null, $_user['language']). ".</p>";
710
+                $form_data['message'] = '<p>'.get_lang('NowGoChooseYourCourses', null, $_user['language']).".</p>";
711 711
             } else {
712 712
                 $form_data['action'] = api_get_path(WEB_PATH).'user_portal.php';
713 713
             }
Please login to merge, or discard this patch.