@@ -19,26 +19,26 @@ discard block |
||
19 | 19 | use Doctrine\ORM\Tools\Console\ConsoleRunner; |
20 | 20 | use Symfony\Component\Console\Helper\HelperSet; |
21 | 21 | |
22 | -(@include_once __DIR__ . '/../vendor/autoload.php') || @include_once __DIR__ . '/../../../autoload.php'; |
|
22 | +(@include_once __DIR__.'/../vendor/autoload.php') || @include_once __DIR__.'/../../../autoload.php'; |
|
23 | 23 | |
24 | -$directories = array(getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config'); |
|
24 | +$directories = array(getcwd(), getcwd().DIRECTORY_SEPARATOR.'config'); |
|
25 | 25 | |
26 | 26 | $configFile = null; |
27 | 27 | foreach ($directories as $directory) { |
28 | - $configFile = $directory . DIRECTORY_SEPARATOR . 'cli-config.php'; |
|
28 | + $configFile = $directory.DIRECTORY_SEPARATOR.'cli-config.php'; |
|
29 | 29 | |
30 | 30 | if (file_exists($configFile)) { |
31 | 31 | break; |
32 | 32 | } |
33 | 33 | } |
34 | 34 | |
35 | -if ( ! file_exists($configFile)) { |
|
35 | +if (!file_exists($configFile)) { |
|
36 | 36 | ConsoleRunner::printCliConfigTemplate(); |
37 | 37 | exit(1); |
38 | 38 | } |
39 | 39 | |
40 | -if ( ! is_readable($configFile)) { |
|
41 | - echo 'Configuration file [' . $configFile . '] does not have read permission.' . "\n"; |
|
40 | +if (!is_readable($configFile)) { |
|
41 | + echo 'Configuration file ['.$configFile.'] does not have read permission.'."\n"; |
|
42 | 42 | exit(1); |
43 | 43 | } |
44 | 44 | |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | |
55 | 55 | $helperSet = require $configFile; |
56 | 56 | |
57 | -if ( ! ($helperSet instanceof HelperSet)) { |
|
57 | +if (!($helperSet instanceof HelperSet)) { |
|
58 | 58 | foreach ($GLOBALS as $helperSetCandidate) { |
59 | 59 | if ($helperSetCandidate instanceof HelperSet) { |
60 | 60 | $helperSet = $helperSetCandidate; |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | 'self_sent' => false, // this key states that we can't add user to this event through the admin panel |
24 | 24 | 'name_lang_var' => get_lang('PortalHomepageEdited'), |
25 | 25 | 'desc_lang_var' => get_lang('PortalHomepageEdited'), |
26 | - 'available_keyvars' => array (// keys used for the mail template |
|
26 | + 'available_keyvars' => array(// keys used for the mail template |
|
27 | 27 | 'url' => 'portal', |
28 | 28 | 'sitename' => 'sitename', |
29 | 29 | 'firstname' => 'firstname', |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | 'self_sent' => true, // this key states that we can't add user to this event through the admin panel |
46 | 46 | 'name_lang_var' => get_lang('UserRegistrationTitle'), |
47 | 47 | 'desc_lang_var' => get_lang('UserRegistrationComment'), |
48 | - 'available_keyvars' => array (// keys used for the mail template |
|
48 | + 'available_keyvars' => array(// keys used for the mail template |
|
49 | 49 | 'url' => 'portal', |
50 | 50 | 'sitename' => 'sitename', |
51 | 51 | 'firstname' => 'firstname', |
@@ -57,7 +57,7 @@ |
||
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 |
@@ -48,7 +48,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -18,7 +18,7 @@ |
||
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 | } |
@@ -42,8 +42,8 @@ |
||
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']) || |
@@ -9,10 +9,10 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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); |
@@ -11,7 +11,7 @@ |
||
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 |
@@ -9,5 +9,5 @@ |
||
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(); |