Completed
Push — 1.10.x ( c82817...6a93c3 )
by Yannick
202:42 queued 149:59
created
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.
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.
main/auth/profile.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
 }
32 32
 
33 33
 $htmlHeadXtra[] = api_get_password_checker_js('#username', '#password1');
34
-$htmlHeadXtra[] = '<link  href="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
35
-$htmlHeadXtra[] = '<script src="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.js"></script>';
34
+$htmlHeadXtra[] = '<link  href="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
35
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.js"></script>';
36 36
 $htmlHeadXtra[] = '<script>
37 37
 $(document).ready(function() {
38 38
     var $image = $("#previewImage");
@@ -168,10 +168,10 @@  discard block
 block discarded – undo
168 168
 if (api_is_western_name_order()) {
169 169
     //    FIRST NAME and LAST NAME
170 170
     $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40));
171
-    $form->addElement('text', 'lastname',  get_lang('LastName'),  array('size' => 40));
171
+    $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
172 172
 } else {
173 173
     //    LAST NAME and FIRST NAME
174
-    $form->addElement('text', 'lastname',  get_lang('LastName'),  array('size' => 40));
174
+    $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
175 175
     $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40));
176 176
 }
177 177
 if (api_get_setting('profile', 'name') !== 'true') {
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
 $form->applyFilter(array('lastname', 'firstname'), 'stripslashes');
181 181
 $form->applyFilter(array('lastname', 'firstname'), 'trim');
182 182
 $form->applyFilter(array('lastname', 'firstname'), 'html_filter');
183
-$form->addRule('lastname' , get_lang('ThisFieldIsRequired'), 'required');
183
+$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
184 184
 $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
185 185
 
186 186
 //    USERNAME
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
     $form->freeze('email');
224 224
 }
225 225
 
226
-if (api_get_setting('registration', 'email') == 'true' &&  api_get_setting('profile', 'email') == 'true') {
226
+if (api_get_setting('registration', 'email') == 'true' && api_get_setting('profile', 'email') == 'true') {
227 227
     $form->applyFilter('email', 'stripslashes');
228 228
     $form->applyFilter('email', 'trim');
229 229
     $form->addRule('email', get_lang('ThisFieldIsRequired'), 'required');
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
389 389
 
390 390
 // the $jquery_ready_content variable collects all functions that
391 391
 // will be load in the $(document).ready javascript function
392
-$htmlHeadXtra[] ='<script>
392
+$htmlHeadXtra[] = '<script>
393 393
 $(document).ready(function(){
394 394
     '.$jquery_ready_content.'
395 395
 });
@@ -545,7 +545,7 @@  discard block
 block discarded – undo
545 545
 
546 546
             if (!check_user_email($user_data['email']) &&
547 547
                 empty($user_data['password0'])
548
-            ){
548
+            ) {
549 549
                 Display::addFlash(
550 550
                     Display:: return_message(
551 551
                         get_lang('ToChangeYourEmailMustTypeYourPassword'),
@@ -654,7 +654,7 @@  discard block
 block discarded – undo
654 654
     $available_values_to_modify = array();
655 655
     foreach ($profile_list as $key => $status) {
656 656
         if ($status == 'true') {
657
-            switch($key) {
657
+            switch ($key) {
658 658
                 case 'login':
659 659
                     $available_values_to_modify[] = 'username';
660 660
                     break;
@@ -787,10 +787,10 @@  discard block
 block discarded – undo
787 787
 
788 788
         if (isset($_GET['type']) && $_GET['type'] == 'extended') {
789 789
             $actions .= '<a href="profile.php?type=reduced'.$show.'">'.
790
-                Display::return_icon('edit.png', get_lang('EditNormalProfile'),'',16).'</a>';
790
+                Display::return_icon('edit.png', get_lang('EditNormalProfile'), '', 16).'</a>';
791 791
         } else {
792 792
             $actions .= '<a href="profile.php?type=extended'.$show.'">'.
793
-                Display::return_icon('edit.png', get_lang('EditExtendProfile'),'',16).'</a>';
793
+                Display::return_icon('edit.png', get_lang('EditExtendProfile'), '', 16).'</a>';
794 794
         }
795 795
         $actions .= '</div>';
796 796
     }
Please login to merge, or discard this patch.
main/auth/cas/logout.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,5 +9,5 @@
 block discarded – undo
9 9
 require_once('authcas.php');
10 10
 global $cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri;
11 11
 
12
-phpCAS::client($cas_auth_ver,$cas_auth_server,$cas_auth_port,$cas_auth_uri);
12
+phpCAS::client($cas_auth_ver, $cas_auth_server, $cas_auth_port, $cas_auth_uri);
13 13
 phpCAS::logout();
Please login to merge, or discard this patch.
main/auth/cas/logincas.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
         $firstpage = $_GET['firstpage'];
40 40
         setcookie("GotoCourse", $firstpage);
41 41
     }
42
-    if (!is_object($PHPCAS_CLIENT) ) {
42
+    if (!is_object($PHPCAS_CLIENT)) {
43 43
         phpCAS::client(
44 44
             $cas_auth_ver,
45 45
             $cas_auth_server,
Please login to merge, or discard this patch.
main/auth/cas/lib/CAS/PGTStorage/pgt-file.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -131,17 +131,17 @@  discard block
 block discarded – undo
131 131
    *
132 132
    * @public
133 133
    */
134
-  function PGTStorageFile($cas_parent,$format,$path)
134
+  function PGTStorageFile($cas_parent, $format, $path)
135 135
     {
136 136
       phpCAS::traceBegin();
137 137
       // call the ancestor's constructor
138 138
       $this->PGTStorage($cas_parent);
139 139
 
140
-      if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;
141
-      if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;
140
+      if (empty($format)) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;
141
+      if (empty($path)) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;
142 142
 
143 143
       // check that the path is an absolute path
144
-      if (getenv("OS")=="Windows_NT"){
144
+      if (getenv("OS") == "Windows_NT") {
145 145
       	
146 146
       	 if (!preg_match('`^[a-zA-Z]:`', $path)) {
147 147
 	     	phpCAS::error('an absolute path is needed for PGT storage to file');
@@ -151,13 +151,13 @@  discard block
 block discarded – undo
151 151
       else
152 152
       {
153 153
       
154
-      	if ( $path[0] != '/' ) {
154
+      	if ($path[0] != '/') {
155 155
 			phpCAS::error('an absolute path is needed for PGT storage to file');
156 156
       	}
157 157
 
158 158
       	// store the path (with a leading and trailing '/')      
159
-      	$path = preg_replace('|[/]*$|','/',$path);
160
-      	$path = preg_replace('|^[/]*|','/',$path);
159
+      	$path = preg_replace('|[/]*$|', '/', $path);
160
+      	$path = preg_replace('|^[/]*|', '/', $path);
161 161
       }
162 162
       
163 163
       $this->_path = $path;
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
     {
187 187
       phpCAS::traceBegin();
188 188
       // if the storage has already been initialized, return immediatly
189
-      if ( $this->isInitialized() )
189
+      if ($this->isInitialized())
190 190
 	return;
191 191
       // call the ancestor's method (mark as initialized)
192 192
       parent::init();
@@ -222,12 +222,12 @@  discard block
 block discarded – undo
222 222
    *
223 223
    * @public
224 224
    */
225
-  function write($pgt,$pgt_iou)
225
+  function write($pgt, $pgt_iou)
226 226
     {
227 227
       phpCAS::traceBegin();
228 228
       $fname = $this->getPGTIouFilename($pgt_iou);
229
-      if ( $f=fopen($fname,"w") ) {
230
-	if ( fputs($f,$pgt) === FALSE ) {
229
+      if ($f = fopen($fname, "w")) {
230
+	if (fputs($f, $pgt) === FALSE) {
231 231
 	  phpCAS::error('could not write PGT to `'.$fname.'\'');
232 232
 	}
233 233
 	fclose($f);
@@ -252,10 +252,10 @@  discard block
 block discarded – undo
252 252
       phpCAS::traceBegin();
253 253
       $pgt = FALSE;
254 254
       $fname = $this->getPGTIouFilename($pgt_iou);
255
-      if ( !($f=fopen($fname,"r")) ) {
255
+      if (!($f = fopen($fname, "r"))) {
256 256
 	phpCAS::trace('could not open `'.$fname.'\'');
257 257
       } else {
258
-	if ( ($pgt=fgets($f)) === FALSE ) {
258
+	if (($pgt = fgets($f)) === FALSE) {
259 259
 	  phpCAS::trace('could not read PGT from `'.$fname.'\'');
260 260
 	} 
261 261
 	fclose($f);
Please login to merge, or discard this patch.