Completed
Push — 1.11.x ( 683301...61da54 )
by José
78:34 queued 46:29
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
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
     $url = api_get_path(WEB_AJAX_PATH).'document.ajax.php?a=document_preview';
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
-    $htmlHeadXtra[] =  '<script>
50
+    $htmlHeadXtra[] = '<script>
51 51
 	$(document).ready(function() {
52 52
 		$(".document_preview_container").hide();
53 53
 		$(".document_preview").click(function() {
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 if ($displayMyCourseViewBySessionLink) {
80 80
     $htmlHeadXtra[] = '
81 81
     <script>
82
-        userId = ' . $userId . '
82
+        userId = ' . $userId.'
83 83
         $(document).ready(function() {
84 84
             changeMyCoursesView($.cookie("defaultMyCourseView"+userId));
85 85
         });
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
         function changeMyCoursesView(inView)
92 92
         {
93 93
             $.cookie("defaultMyCourseView"+userId, inView, { expires: 365 });
94
-            if (inView == ' . IndexManager::VIEW_BY_SESSION . ') {
94
+            if (inView == ' . IndexManager::VIEW_BY_SESSION.') {
95 95
                 $("#viewBySession").addClass("btn-primary");
96 96
                 $("#viewByDefault").removeClass("btn-primary");
97 97
             } else {
@@ -150,16 +150,16 @@  discard block
 block discarded – undo
150 150
             if (isset($sessionInfo['courses']) && count($sessionInfo['courses']) == 1) {
151 151
                 $courseCode = $sessionInfo['courses'][0]['code'];
152 152
                 $courseInfo = api_get_course_info_by_id($sessionInfo['courses'][0]['real_id']);
153
-                $courseUrl = $courseInfo['course_public_url'] . '?id_session=' . $sessionInfo['session_id'];
154
-                header('Location:' . $courseUrl);
153
+                $courseUrl = $courseInfo['course_public_url'].'?id_session='.$sessionInfo['session_id'];
154
+                header('Location:'.$courseUrl);
155 155
                 exit;
156 156
             }
157 157
 
158 158
             // Session has many courses.
159 159
             if (isset($sessionInfo['session_id'])) {
160
-                $url = api_get_path(WEB_CODE_PATH) . 'session/?session_id=' . $sessionInfo['session_id'];
160
+                $url = api_get_path(WEB_CODE_PATH).'session/?session_id='.$sessionInfo['session_id'];
161 161
 
162
-                header('Location:' . $url);
162
+                header('Location:'.$url);
163 163
                 exit;
164 164
             }
165 165
         }
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
             $courseInfo = api_get_course_info_by_id($courses[0]['real_id']);
176 176
             if (!empty($courseInfo)) {
177 177
                 $courseUrl = $courseInfo['course_public_url'];
178
-                header('Location:' . $courseUrl);
178
+                header('Location:'.$courseUrl);
179 179
                 exit;
180 180
             }
181 181
         }
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/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/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   +7 added lines patch added patch discarded remove patch
@@ -242,6 +242,9 @@  discard block
 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 = '';
@@ -404,6 +407,10 @@  discard block
 block discarded – undo
404 407
  */
405 408
 if (!function_exists('bcpowmod')) {
406 409
 
410
+    /**
411
+     * @param string $exp
412
+     * @param string $mod
413
+     */
407 414
     function bcpowmod($base, $exp, $mod) {
408 415
         $square = bcmod($base, $mod);
409 416
         $result = 1;
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/profile.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -684,7 +684,7 @@
 block discarded – undo
684 684
 
685 685
     foreach ($user_data as $key => $value) {
686 686
         if (substr($key, 0, 6) == 'extra_') { //an extra field
687
-           continue;
687
+            continue;
688 688
         } elseif (strpos($key, 'remove_extra_') !== false) {
689 689
         } else {
690 690
             if (in_array($key, $available_values_to_modify)) {
Please login to merge, or discard this 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
 $userGeolocalization = api_get_setting('enable_profile_user_address_geolocalization') == 'true';
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 type="text/javascript" src="//maps.googleapis.com/maps/api/js?sensor=true" ></script>';
37 37
 $htmlHeadXtra[] = '<script>
38 38
 $(document).ready(function() {
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
     $htmlHeadXtra[] = '<script>
102 102
     $(document).ready(function() {
103 103
 
104
-        var address = "' . $user_data['address'] . '";
104
+        var address = "' . $user_data['address'].'";
105 105
         initializeGeo(address, false);
106 106
 
107 107
         $("#geolocalization").on("click", function() {
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
             };
134 134
 
135 135
             var geoError = function(error) {
136
-                alert("Geocode ' . get_lang('Error') . ': " + error);
136
+                alert("Geocode ' . get_lang('Error').': " + error);
137 137
             };
138 138
 
139 139
             var geoOptions = {
@@ -184,11 +184,11 @@  discard block
 block discarded – undo
184 184
                             infowindow.open(map, marker);
185 185
                         });
186 186
                     } else {
187
-                        alert("' . get_lang("NotFound") . '");
187
+                        alert("' . get_lang("NotFound").'");
188 188
                     }
189 189
 
190 190
                 } else {
191
-                    alert("Geocode ' . get_lang('Error') . ': " + status);
191
+                    alert("Geocode ' . get_lang('Error').': " + status);
192 192
                 }
193 193
             });
194 194
         }
@@ -213,10 +213,10 @@  discard block
 block discarded – undo
213 213
 if (api_is_western_name_order()) {
214 214
     //    FIRST NAME and LAST NAME
215 215
     $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40));
216
-    $form->addElement('text', 'lastname',  get_lang('LastName'),  array('size' => 40));
216
+    $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
217 217
 } else {
218 218
     //    LAST NAME and FIRST NAME
219
-    $form->addElement('text', 'lastname',  get_lang('LastName'),  array('size' => 40));
219
+    $form->addElement('text', 'lastname', get_lang('LastName'), array('size' => 40));
220 220
     $form->addElement('text', 'firstname', get_lang('FirstName'), array('size' => 40));
221 221
 }
222 222
 if (api_get_setting('profile', 'name') !== 'true') {
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 $form->applyFilter(array('lastname', 'firstname'), 'stripslashes');
226 226
 $form->applyFilter(array('lastname', 'firstname'), 'trim');
227 227
 $form->applyFilter(array('lastname', 'firstname'), 'html_filter');
228
-$form->addRule('lastname' , get_lang('ThisFieldIsRequired'), 'required');
228
+$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
229 229
 $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
230 230
 
231 231
 //    USERNAME
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
     $form->freeze('email');
271 271
 }
272 272
 
273
-if (api_get_setting('registration', 'email') == 'true' &&  api_get_setting('profile', 'email') == 'true') {
273
+if (api_get_setting('registration', 'email') == 'true' && api_get_setting('profile', 'email') == 'true') {
274 274
     $form->applyFilter('email', 'stripslashes');
275 275
     $form->applyFilter('email', 'trim');
276 276
     $form->addRule('email', get_lang('ThisFieldIsRequired'), 'required');
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
449 449
 
450 450
 // the $jquery_ready_content variable collects all functions that
451 451
 // will be load in the $(document).ready javascript function
452
-$htmlHeadXtra[] ='<script>
452
+$htmlHeadXtra[] = '<script>
453 453
 $(document).ready(function(){
454 454
     '.$jquery_ready_content.'
455 455
 });
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.