@@ -9,30 +9,30 @@ discard block |
||
9 | 9 | * Get the preferred language base on the browser headers |
10 | 10 | */ |
11 | 11 | function get_preferred_language($available_langs) { |
12 | - $langs = array(); |
|
13 | - foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $httplang) { |
|
14 | - $rawlang = explode(';q=', $httplang); |
|
15 | - if (strpos($rawlang[0], '-') !== FALSE) { |
|
16 | - $rawlang[0] = substr($rawlang[0], 0, strpos($rawlang[0], '-')); |
|
17 | - } |
|
18 | - if (count($rawlang) == 1) { |
|
19 | - $rawlang[1] = 1.0; |
|
20 | - } |
|
21 | - $langs[$rawlang[1]] = $rawlang[0]; |
|
22 | - } |
|
23 | - krsort($langs, SORT_NUMERIC); |
|
24 | - foreach($langs as $weight => $code) { |
|
25 | - if (in_array($code, $available_langs)) { |
|
26 | - return $code; |
|
27 | - } |
|
28 | - } |
|
29 | - return null; |
|
12 | + $langs = array(); |
|
13 | + foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $httplang) { |
|
14 | + $rawlang = explode(';q=', $httplang); |
|
15 | + if (strpos($rawlang[0], '-') !== FALSE) { |
|
16 | + $rawlang[0] = substr($rawlang[0], 0, strpos($rawlang[0], '-')); |
|
17 | + } |
|
18 | + if (count($rawlang) == 1) { |
|
19 | + $rawlang[1] = 1.0; |
|
20 | + } |
|
21 | + $langs[$rawlang[1]] = $rawlang[0]; |
|
22 | + } |
|
23 | + krsort($langs, SORT_NUMERIC); |
|
24 | + foreach($langs as $weight => $code) { |
|
25 | + if (in_array($code, $available_langs)) { |
|
26 | + return $code; |
|
27 | + } |
|
28 | + } |
|
29 | + return null; |
|
30 | 30 | } |
31 | 31 | /** |
32 | - * Get a language variable in a specific language |
|
33 | - */ |
|
32 | + * Get a language variable in a specific language |
|
33 | + */ |
|
34 | 34 | function custompages_get_lang($variable) { |
35 | - return get_lang($variable, null, $_SESSION['user_language_choice']); |
|
35 | + return get_lang($variable, null, $_SESSION['user_language_choice']); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | $available_langs = array('en', 'fr', 'es', 'gl', 'eu'); |
@@ -49,15 +49,15 @@ discard block |
||
49 | 49 | $lang_match = $chamilo_langs[get_preferred_language($available_langs)]; |
50 | 50 | // recover previous value ... |
51 | 51 | if (isset($_SESSION['user_language_choice'])) |
52 | - $lang_match = $_SESSION['user_language_choice']; |
|
52 | + $lang_match = $_SESSION['user_language_choice']; |
|
53 | 53 | |
54 | 54 | // Chamilo parameter, on logout |
55 | 55 | if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_REQUEST['language'], $chamilo_langs)) { |
56 | - $lang_match = $_REQUEST['language']; |
|
56 | + $lang_match = $_REQUEST['language']; |
|
57 | 57 | } |
58 | 58 | // Incoming link parameter |
59 | 59 | if (isset($_REQUEST['lang']) && !empty($_REQUEST['lang']) && in_array($_REQUEST['lang'], $available_langs)) { |
60 | - $lang_match = $chamilo_langs[$_REQUEST['lang']]; |
|
60 | + $lang_match = $chamilo_langs[$_REQUEST['lang']]; |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | $detect = api_get_setting('auto_detect_language_custom_pages'); |
@@ -27,22 +27,22 @@ |
||
27 | 27 | |
28 | 28 | if (!empty($_POST)) |
29 | 29 | { |
30 | - foreach ( $_POST as $key => $value ) |
|
31 | - { |
|
32 | - if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) ) |
|
33 | - continue; |
|
30 | + foreach ( $_POST as $key => $value ) |
|
31 | + { |
|
32 | + if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) ) |
|
33 | + continue; |
|
34 | 34 | |
35 | - if ( get_magic_quotes_gpc() ) |
|
36 | - $value = htmlspecialchars( stripslashes((string)$value) ); |
|
37 | - else |
|
38 | - $value = htmlspecialchars( (string)$value ); |
|
35 | + if ( get_magic_quotes_gpc() ) |
|
36 | + $value = htmlspecialchars( stripslashes((string)$value) ); |
|
37 | + else |
|
38 | + $value = htmlspecialchars( (string)$value ); |
|
39 | 39 | ?> |
40 | 40 | <tr> |
41 | 41 | <th style="vertical-align: top"><?php echo htmlspecialchars( (string)$key ); ?></th> |
42 | 42 | <td><pre class="samples"><?php echo $value; ?></pre></td> |
43 | 43 | </tr> |
44 | 44 | <?php |
45 | - } |
|
45 | + } |
|
46 | 46 | } |
47 | 47 | ?> |
48 | 48 | </table> |
@@ -16,7 +16,7 @@ |
||
16 | 16 | */ |
17 | 17 | public function up(Schema $schema) |
18 | 18 | { |
19 | - $this->addSql('ALTER TABLE session ADD COLUMN access_start_date datetime'); |
|
19 | + $this->addSql('ALTER TABLE session ADD COLUMN access_start_date datetime'); |
|
20 | 20 | $this->addSql('ALTER TABLE session ADD COLUMN access_end_date datetime'); |
21 | 21 | $this->addSql('ALTER TABLE session ADD COLUMN coach_access_start_date datetime'); |
22 | 22 | $this->addSql('ALTER TABLE session ADD COLUMN coach_access_end_date datetime'); |
@@ -19,11 +19,11 @@ |
||
19 | 19 | |
20 | 20 | // Replacing user photos |
21 | 21 | define('KEEP_THE_NAME_WHEN_CHANGE_IMAGE', true); |
22 | - // true -> the new image have the name of previous. |
|
23 | - // false -> a new name is build for each upladed image. |
|
22 | + // true -> the new image have the name of previous. |
|
23 | + // false -> a new name is build for each upladed image. |
|
24 | 24 | define('KEEP_THE_OLD_IMAGE_AFTER_CHANGE', true); |
25 | - // true -> if KEEP_THE_NAME_WHEN_CHANGE_IMAGE is true, the previous image is rename before. |
|
26 | - // false -> only the last image still on server. |
|
25 | + // true -> if KEEP_THE_NAME_WHEN_CHANGE_IMAGE is true, the previous image is rename before. |
|
26 | + // false -> only the last image still on server. |
|
27 | 27 | |
28 | 28 | // Official code |
29 | 29 | // Don't forget to change name of offical code in your organization |
@@ -39,29 +39,29 @@ |
||
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 |
@@ -188,7 +188,7 @@ |
||
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']); |
@@ -7,7 +7,7 @@ |
||
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 |
@@ -16,70 +16,70 @@ |
||
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 | } |
@@ -684,7 +684,7 @@ |
||
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)) { |