chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unused functions.

Browse Source
1.10.x
Julio Montoya 11 years ago
parent a02b548fd3
commit 44bd8b5214
6 changed files with 39 additions and 888 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      main/admin/group_add.php
  2. 38
      main/inc/lib/formvalidator/Rule/Filetype.php
  3. 526
      main/inc/lib/internationalization.lib.php
  4. 132
      main/inc/lib/internationalization_internal.lib.php
  5. 3
      main/mySpace/user_add.php
  6. 226
      tests/main/inc/lib/internationalization.lib.test.php

2
main/admin/group_add.php
Unescape View File

@ -67,7 +67,7 @@ $form->addElement('file', 'picture', get_lang('AddPicture'));
$allowed_picture_types = array('jpg', 'jpeg', 'png', 'gif');
$form->addRule(
'picture',
get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')',
get_lang('OnlyImagesAllowed').' ('.implode(', ', $allowed_picture_types).')',
'filetype',
$allowed_picture_types
);

38
main/inc/lib/formvalidator/Rule/Filetype.php
Unescape View File

@ -6,21 +6,25 @@
*/
class HTML_QuickForm_Rule_Filetype extends HTML_QuickForm_Rule
{
/**
* Function to check if a filetype is allowed
* @see HTML_QuickForm_Rule
* @param array $file Uploaded file
* @param array $extensions Allowed extensions
* @return boolean True if filetype is allowed
*/
function validate($file,$extensions = array())
{
$parts = explode('.',$file['name']);
if( count($parts) < 2 )
{
return false;
}
$ext = $parts[count($parts)-1];
return api_in_array_nocase($ext, $extensions);
}
/**
* Function to check if a filetype is allowed
* @see HTML_QuickForm_Rule
*
* @param array $file Uploaded file
* @param array $extensions Allowed extensions
*
* @return boolean True if filetype is allowed
*/
function validate($file, $extensions = array())
{
$parts = explode('.', $file['name']);
if (count($parts) < 2) {
return false;
}
$ext = $parts[count($parts) - 1];
$extensions = array_map('strtolower', $extensions);
return in_array(api_strtolower($ext), $extensions);
}
}

526
main/inc/lib/internationalization.lib.php
Unescape View File

@ -93,7 +93,7 @@ function api_set_internationalization_default_encoding($encoding) {
$result = _api_mb_internal_encoding();
_api_mb_internal_encoding($encoding);
_api_mb_regex_encoding($encoding);
_api_iconv_set_encoding('iconv_internal_encoding', $encoding);
//_api_iconv_set_encoding('iconv_internal_encoding', $encoding);
return $result;
}
@ -1399,18 +1399,6 @@ function api_ord($character, $encoding) {
return _api_utf8_ord(api_utf8_encode($character, $encoding));
}
/**
* Takes a Unicode codepoint and returns its correspondent character, encoded in given encoding.
* @param int $codepoint The Unicode codepoint.
* @param string $encoding (optional) The encoding of the returned character. If it is omitted, the platform character set will be used by default.
* @return string Returns the corresponding character, encoded as it has been requested.
* This is a multibyte aware version of the function chr().
* @link http://php.net/manual/en/function.chr.php
*/
function api_chr($codepoint, $encoding) {
return api_utf8_decode(_api_utf8_chr($codepoint), $encoding);
}
/**
* This function returns a string or an array with all occurrences of search in subject (ignoring case) replaced with the given replace value.
* @param mixed $search String or array of strings to be found.
@ -2102,46 +2090,6 @@ function api_ereg($pattern, $string, & $regs = null) {
return ereg($pattern, $string, $regs);
}
/**
* Note: Try to avoid using this function. Use api_preg_replace() with Perl-compatible regular expression syntax.
*
* Scans string for matches to pattern, then replaces the matched text with replacement, with extended multibyte support.
* By default this function uses the platform character set.
* @param string $pattern The regular expression pattern.
* @param string $replacement The replacement text.
* @param string $string The searched string.
* @param string $option (optional) Matching condition.
* If i is specified for the matching condition parameter, the case will be ignored.
* If x is specified, white space will be ignored.
* If m is specified, match will be executed in multiline mode and line break will be included in '.'.
* If p is specified, match will be executed in POSIX mode, line break will be considered as normal character.
* If e is specified, replacement string will be evaluated as PHP expression.
* @return mixed The modified string is returned. If no matches are found within the string, then it will be returned unchanged. FALSE will be returned on error.
* This function is aimed at replacing the functions ereg_replace() and mb_ereg_replace() for human-language strings.
* @link http://php.net/manual/en/function.ereg-replace
* @link http://php.net/manual/en/function.mb-ereg-replace
*/
function api_ereg_replace($pattern, $replacement, $string, $option = null) {
$encoding = _api_mb_regex_encoding();
if (_api_mb_supports($encoding)) {
if (is_null($option)) {
return @mb_ereg_replace($pattern, $replacement, $string);
}
return @mb_ereg_replace($pattern, $replacement, $string, $option);
}
if (MBSTRING_INSTALLED && api_is_encoding_supported($encoding)) {
_api_mb_regex_encoding('UTF-8');
if (is_null($option)) {
$result = api_utf8_decode(@mb_ereg_replace(api_utf8_encode($pattern, $encoding), api_utf8_encode($replacement, $encoding), api_utf8_encode($string, $encoding)), $encoding);
} else {
$result = api_utf8_decode(@mb_ereg_replace(api_utf8_encode($pattern, $encoding), api_utf8_encode($replacement, $encoding), api_utf8_encode($string, $encoding), $option), $encoding);
}
_api_mb_regex_encoding($encoding);
return $result;
}
return ereg_replace($pattern, $replacement, $string);
}
/**
* Note: Try to avoid using this function. Use api_preg_match() with Perl-compatible regular expression syntax.
*
@ -2183,46 +2131,6 @@ function api_eregi($pattern, $string, & $regs = null) {
return eregi($pattern, $string, $regs);
}
/**
* Note: Try to avoid using this function. Use api_preg_replace() with Perl-compatible regular expression syntax.
*
* Scans string for matches to pattern, then replaces the matched text with replacement, ignoring case, with extended multibyte support.
* By default this function uses the platform character set.
* @param string $pattern The regular expression pattern.
* @param string $replacement The replacement text.
* @param string $string The searched string.
* @param string $option (optional) Matching condition.
* If i is specified for the matching condition parameter, the case will be ignored.
* If x is specified, white space will be ignored.
* If m is specified, match will be executed in multiline mode and line break will be included in '.'.
* If p is specified, match will be executed in POSIX mode, line break will be considered as normal character.
* If e is specified, replacement string will be evaluated as PHP expression.
* @return mixed The modified string is returned. If no matches are found within the string, then it will be returned unchanged. FALSE will be returned on error.
* This function is aimed at replacing the functions eregi_replace() and mb_eregi_replace() for human-language strings.
* @link http://php.net/manual/en/function.eregi-replace
* @link http://php.net/manual/en/function.mb-eregi-replace
*/
function api_eregi_replace($pattern, $replacement, $string, $option = null) {
$encoding = _api_mb_regex_encoding();
if (_api_mb_supports($encoding)) {
if (is_null($option)) {
return @mb_eregi_replace($pattern, $replacement, $string);
}
return @mb_eregi_replace($pattern, $replacement, $string, $option);
}
if (MBSTRING_INSTALLED && api_is_encoding_supported($encoding)) {
_api_mb_regex_encoding('UTF-8');
if (is_null($option)) {
$result = api_utf8_decode(@mb_eregi_replace(api_utf8_encode($pattern, $encoding), api_utf8_encode($replacement, $encoding), api_utf8_encode($string, $encoding)), $encoding);
} else {
$result = api_utf8_decode(@mb_eregi_replace(api_utf8_encode($pattern, $encoding), api_utf8_encode($replacement, $encoding), api_utf8_encode($string, $encoding), $option), $encoding);
}
_api_mb_regex_encoding($encoding);
return $result;
}
return eregi_replace($pattern, $replacement, $string);
}
/**
* String comparison
*/
@ -2264,20 +2172,6 @@ function api_strcmp($string1, $string2, $language = null, $encoding = null)
return strcmp($string1, $string2);
}
/**
* Performs string comparison in so called "natural order", case insensitive, language sensitive, with extended multibyte support.
* @param string $string1 The first string.
* @param string $string2 The second string.
* @param string $language (optional) The language in which comparison is to be made. If language is omitted, interface language is assumed then.
* @param string $encoding (optional) The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
* @return int Returns < 0 if $string1 is less than $string2; > 0 if $string1 is greater than $string2; and 0 if the strings are equal.
* This function is aimed at replacing the function strnatcasecmp() for human-language strings.
* @link http://php.net/manual/en/function.strnatcasecmp
*/
function api_strnatcasecmp($string1, $string2, $language = null, $encoding = null) {
return api_strnatcmp(api_strtolower($string1, $encoding), api_strtolower($string2, $encoding), $language, $encoding);
}
/**
* Performs string comparison in so called "natural order", case sensitive, language sensitive, with extended multibyte support.
* @param string $string1 The first string.
@ -2304,77 +2198,6 @@ function api_strnatcmp($string1, $string2, $language = null, $encoding = null) {
* Sorting arrays
*/
/**
* Sorts an array with maintaining index association, elements will be arranged from the lowest to the highest.
* @param array $array The input array.
* @param int $sort_flag (optional) Shows how elements of the array to be compared.
* @param string $language (optional) The language in which comparison is to be made. If language is omitted, interface language is assumed then.
* @param string $encoding (optional) The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
* @return bool Returns TRUE on success, FALSE on error.
* Note: $sort_flag may have the following values:
* SORT_REGULAR - internal PHP-rules for comparison will be applied, without preliminary changing types;
* SORT_NUMERIC - items will be compared as numbers;
* SORT_STRING - items will be compared as strings. If intl extension is enabled, then comparison will be language-sensitive using internally a created ICU locale;
* SORT_LOCALE_STRING - items will be compared as strings depending on the current POSIX locale. If intl extension is enabled, then comparison will be language-sensitive using internally a created ICU locale.
* This function is aimed at replacing the function asort() for sorting human-language strings.
* @link http://php.net/manual/en/function.asort.php
* @link http://php.net/manual/en/collator.asort.php
*/
function api_asort(&$array, $sort_flag = SORT_REGULAR, $language = null, $encoding = null) {
if (INTL_INSTALLED) {
if (empty($encoding)) {
$encoding = _api_mb_internal_encoding();
}
$collator = _api_get_collator($language);
if (is_object($collator)) {
if (api_is_utf8($encoding)) {
$sort_flag = ($sort_flag == SORT_LOCALE_STRING) ? SORT_STRING : $sort_flag;
return collator_asort($collator, $array, _api_get_collator_sort_flag($sort_flag));
}
elseif ($sort_flag == SORT_STRING || $sort_flag == SORT_LOCALE_STRING) {
global $_api_collator, $_api_encoding;
$_api_collator = $collator;
$_api_encoding = $encoding;
return uasort($array, '_api_cmp');
}
}
}
return asort($array, $sort_flag);
}
/**
* Sorts an array with maintaining index association, elements will be arranged from the highest to the lowest (in reverse order).
* @param array $array The input array.
* @param int $sort_flag (optional) Shows how elements of the array to be compared.
* @param string $language (optional) The language in which comparison is to be made. If language is omitted, interface language is assumed then.
* @param string $encoding (optional) The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
* @return bool Returns TRUE on success, FALSE on error.
* Note: $sort_flag may have the following values:
* SORT_REGULAR - internal PHP-rules for comparison will be applied, without preliminary changing types;
* SORT_NUMERIC - items will be compared as numbers;
* SORT_STRING - items will be compared as strings. If intl extension is enabled, then comparison will be language-sensitive using internally a created ICU locale;
* SORT_LOCALE_STRING - items will be compared as strings depending on the current POSIX locale. If intl extension is enabled, then comparison will be language-sensitive using internally a created ICU locale.
* This function is aimed at replacing the function arsort() for sorting human-language strings.
* @link http://php.net/manual/en/function.arsort.php
*/
function api_arsort(&$array, $sort_flag = SORT_REGULAR, $language = null, $encoding = null) {
if (INTL_INSTALLED) {
if (empty($encoding)) {
$encoding = _api_mb_internal_encoding();
}
$collator = _api_get_collator($language);
if (is_object($collator)) {
if ($sort_flag == SORT_STRING || $sort_flag == SORT_LOCALE_STRING) {
global $_api_collator, $_api_encoding;
$_api_collator = $collator;
$_api_encoding = $encoding;
return uasort($array, '_api_rcmp');
}
}
}
return arsort($array, $sort_flag);
}
/**
* Sorts an array using natural order algorithm.
* @param array $array The input array.
@ -2423,297 +2246,6 @@ function api_natrsort(&$array, $language = null, $encoding = null) {
return uasort($array, '_api_strnatrcmp');
}
/**
* Sorts an array using natural order algorithm, case-insensitive.
* @param array $array The input array.
* @param string $language (optional) The language in which comparison is to be made. If language is omitted, interface language is assumed then.
* @param string $encoding (optional) The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
* @return bool Returns TRUE on success, FALSE on error.
* This function is aimed at replacing the function natcasesort() for sorting human-language strings.
* @link http://php.net/manual/en/function.natcasesort.php
*/
function api_natcasesort(&$array, $language = null, $encoding = null) {
if (INTL_INSTALLED) {
if (empty($encoding)) {
$encoding = _api_mb_internal_encoding();
}
$collator = _api_get_alpha_numerical_collator($language);
if (is_object($collator)) {
global $_api_collator, $_api_encoding;
$_api_collator = $collator;
$_api_encoding = $encoding;
return uasort($array, '_api_casecmp');
}
}
return natcasesort($array);
}
/**
* Sorts an array using natural order algorithm, case-insensitive, reverse order.
* @param array $array The input array.
* @param string $language (optional) The language in which comparison is to be made. If language is omitted, interface language is assumed then.
* @param string $encoding (optional) The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
* @return bool Returns TRUE on success, FALSE on error.
*/
function api_natcasersort(&$array, $language = null, $encoding = null) {
if (INTL_INSTALLED) {
if (empty($encoding)) {
$encoding = _api_mb_internal_encoding();
}
$collator = _api_get_alpha_numerical_collator($language);
if (is_object($collator)) {
global $_api_collator, $_api_encoding;
$_api_collator = $collator;
$_api_encoding = $encoding;
return uasort($array, '_api_casercmp');
}
}
return uasort($array, '_api_strnatcasercmp');
}
/**
* Sorts an array by keys, elements will be arranged from the lowest key to the highest key.
* @param array $array The input array.
* @param int $sort_flag (optional) Shows how keys of the array to be compared.
* @param string $language (optional) The language in which comparison is to be made. If language is omitted, interface language is assumed then.
* @param string $encoding (optional) The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
* @return bool Returns TRUE on success, FALSE on error.
* Note: $sort_flag may have the following values:
* SORT_REGULAR - internal PHP-rules for comparison will be applied, without preliminary changing types;
* SORT_NUMERIC - keys will be compared as numbers;
* SORT_STRING - keys will be compared as strings. If intl extension is enabled, then comparison will be language-sensitive using internally a created ICU locale;
* SORT_LOCALE_STRING - keys will be compared as strings depending on the current POSIX locale. If intl extension is enabled, then comparison will be language-sensitive using internally a created ICU locale.
* This function is aimed at replacing the function ksort() for sorting human-language key strings.
* @link http://php.net/manual/en/function.ksort.php
*/
function api_ksort(&$array, $sort_flag = SORT_REGULAR, $language = null, $encoding = null) {
if (INTL_INSTALLED) {
if (empty($encoding)) {
$encoding = _api_mb_internal_encoding();
}
$collator = _api_get_collator($language);
if (is_object($collator)) {
if ($sort_flag == SORT_STRING || $sort_flag == SORT_LOCALE_STRING) {
global $_api_collator, $_api_encoding;
$_api_collator = $collator;
$_api_encoding = $encoding;
return uksort($array, '_api_cmp');
}
}
}
return ksort($array, $sort_flag);
}
/**
* Sorts an array by keys, elements will be arranged from the highest key to the lowest key (in reverse order).
* @param array $array The input array.
* @param int $sort_flag (optional) Shows how keys of the array to be compared.
* @param string $language (optional) The language in which comparison is to be made. If language is omitted, interface language is assumed then.
* @param string $encoding (optional) The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
* @return bool Returns TRUE on success, FALSE on error.
* Note: $sort_flag may have the following values:
* SORT_REGULAR - internal PHP-rules for comparison will be applied, without preliminary changing types;
* SORT_NUMERIC - keys will be compared as numbers;
* SORT_STRING - keys will be compared as strings. If intl extension is enabled, then comparison will be language-sensitive using internally a created ICU locale;
* SORT_LOCALE_STRING - keys will be compared as strings depending on the current POSIX locale. If intl extension is enabled, then comparison will be language-sensitive using internally a created ICU locale.
* This function is aimed at replacing the function krsort() for sorting human-language key strings.
* @link http://php.net/manual/en/function.krsort.php
*/
function api_krsort(&$array, $sort_flag = SORT_REGULAR, $language = null, $encoding = null) {
if (INTL_INSTALLED) {
if (empty($encoding)) {
$encoding = _api_mb_internal_encoding();
}
$collator = _api_get_collator($language);
if (is_object($collator)) {
if ($sort_flag == SORT_STRING || $sort_flag == SORT_LOCALE_STRING) {
global $_api_collator, $_api_encoding;
$_api_collator = $collator;
$_api_encoding = $encoding;
return uksort($array, '_api_rcmp');
}
}
}
return krsort($array, $sort_flag);
}
/**
* Sorts an array by keys using natural order algorithm.
* @param array $array The input array.
* @param string $language (optional) The language in which comparison is to be made. If language is omitted, interface language is assumed then.
* @param string $encoding (optional) The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
* @return bool Returns TRUE on success, FALSE on error.
*/
function api_knatsort(&$array, $language = null, $encoding = null) {
if (INTL_INSTALLED) {
if (empty($encoding)) {
$encoding = _api_mb_internal_encoding();
}
$collator = _api_get_alpha_numerical_collator($language);
if (is_object($collator)) {
global $_api_collator, $_api_encoding;
$_api_collator = $collator;
$_api_encoding = $encoding;
return uksort($array, '_api_cmp');
}
}
return uksort($array, 'strnatcmp');
}
/**
* Sorts an array by keys using natural order algorithm in reverse order.
* @param array $array The input array.
* @param string $language (optional) The language in which comparison is to be made. If language is omitted, interface language is assumed then.
* @param string $encoding (optional) The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
* @return bool Returns TRUE on success, FALSE on error.
*/
function api_knatrsort(&$array, $language = null, $encoding = null) {
if (INTL_INSTALLED) {
if (empty($encoding)) {
$encoding = _api_mb_internal_encoding();
}
$collator = _api_get_alpha_numerical_collator($language);
if (is_object($collator)) {
global $_api_collator, $_api_encoding;
$_api_collator = $collator;
$_api_encoding = $encoding;
return uksort($array, '_api_rcmp');
}
}
return uksort($array, '_api_strnatrcmp');
}
/**
* Sorts an array by keys using natural order algorithm, case insensitive.
* @param array $array The input array.
* @param string $language (optional) The language in which comparison is to be made. If language is omitted, interface language is assumed then.
* @param string $encoding (optional) The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
* @return bool Returns TRUE on success, FALSE on error.
*/
function api_knatcasesort(&$array, $language = null, $encoding = null) {
if (INTL_INSTALLED) {
if (empty($encoding)) {
$encoding = _api_mb_internal_encoding();
}
$collator = _api_get_alpha_numerical_collator($language);
if (is_object($collator)) {
global $_api_collator, $_api_encoding;
$_api_collator = $collator;
$_api_encoding = $encoding;
return uksort($array, '_api_casecmp');
}
}
return uksort($array, 'strnatcasecmp');
}
/**
* Sorts an array, elements will be arranged from the lowest to the highest.
* @param array $array The input array.
* @param int $sort_flag (optional) Shows how elements of the array to be compared.
* @param string $language (optional) The language in which comparison is to be made. If language is omitted, interface language is assumed then.
* @param string $encoding (optional) The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
* @return bool Returns TRUE on success, FALSE on error.
* Note: $sort_flag may have the following values:
* SORT_REGULAR - internal PHP-rules for comparison will be applied, without preliminary changing types;
* SORT_NUMERIC - items will be compared as numbers;
* SORT_STRING - items will be compared as strings. If intl extension is enabled, then comparison will be language-sensitive using internally a created ICU locale;
* SORT_LOCALE_STRING - items will be compared as strings depending on the current POSIX locale. If intl extension is enabled, then comparison will be language-sensitive using internally a created ICU locale.
* This function is aimed at replacing the function sort() for sorting human-language strings.
* @link http://php.net/manual/en/function.sort.php
* @link http://php.net/manual/en/collator.sort.php
*/
function api_sort(&$array, $sort_flag = SORT_REGULAR, $language = null, $encoding = null) {
if (INTL_INSTALLED) {
if (empty($encoding)) {
$encoding = _api_mb_internal_encoding();
}
$collator = _api_get_collator($language);
if (is_object($collator)) {
if (api_is_utf8($encoding)) {
$sort_flag = ($sort_flag == SORT_LOCALE_STRING) ? SORT_STRING : $sort_flag;
return collator_sort($collator, $array, _api_get_collator_sort_flag($sort_flag));
} elseif ($sort_flag == SORT_STRING || $sort_flag == SORT_LOCALE_STRING) {
global $_api_collator, $_api_encoding;
$_api_collator = $collator;
$_api_encoding = $encoding;
return usort($array, '_api_cmp');
}
}
}
return sort($array, $sort_flag);
}
/**
* Sorts an array, elements will be arranged from the highest to the lowest (in reverse order).
* @param array $array The input array.
* @param int $sort_flag (optional) Shows how elements of the array to be compared.
* @param string $language (optional) The language in which comparison is to be made. If language is omitted, interface language is assumed then.
* @param string $encoding (optional) The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
* @return bool Returns TRUE on success, FALSE on error.
* Note: $sort_flag may have the following values:
* SORT_REGULAR - internal PHP-rules for comparison will be applied, without preliminary changing types;
* SORT_NUMERIC - items will be compared as numbers;
* SORT_STRING - items will be compared as strings. If intl extension is enabled, then comparison will be language-sensitive using internally a created ICU locale;
* SORT_LOCALE_STRING - items will be compared as strings depending on the current POSIX locale. If intl extension is enabled, then comparison will be language-sensitive using internally a created ICU locale.
* This function is aimed at replacing the function rsort() for sorting human-language strings.
* @link http://php.net/manual/en/function.rsort.php
*/
function api_rsort(&$array, $sort_flag = SORT_REGULAR, $language = null, $encoding = null) {
if (INTL_INSTALLED) {
if (empty($encoding)) {
$encoding = _api_mb_internal_encoding();
}
$collator = _api_get_collator($language);
if (is_object($collator)) {
if ($sort_flag == SORT_STRING || $sort_flag == SORT_LOCALE_STRING) {
global $_api_collator, $_api_encoding;
$_api_collator = $collator;
$_api_encoding = $encoding;
return usort($array, '_api_rcmp');
}
}
}
return rsort($array, $sort_flag);
}
/**
* Common sting operations with arrays
*/
/**
* Checks if a value exists in an array, a case insensitive version of in_array() function with extended multibyte support.
* @param mixed $needle The searched value. If needle is a string, the comparison is done in a case-insensitive manner.
* @param array $haystack The array.
* @param bool $strict (optional) If is set to TRUE then the function will also check the types of the $needle in the $haystack. The default value if FALSE.
* @param string $encoding (optional) The used internally by this function character encoding. If it is omitted, the platform character set will be used by default.
* @return bool Returns TRUE if $needle is found in the array, FALSE otherwise.
* @link http://php.net/manual/en/function.in-array.php
*/
function api_in_array_nocase($needle, $haystack, $strict = false, $encoding = null) {
if (is_array($needle)) {
foreach ($needle as $item) {
if (api_in_array_nocase($item, $haystack, $strict, $encoding)) return true;
}
return false;
}
if (!is_string($needle)) {
return in_array($needle, $haystack, $strict);
}
$needle = api_strtolower($needle, $encoding);
if (!is_array($haystack)) {
return false;
}
foreach ($haystack as $item) {
if ($strict && !is_string($item)) {
continue;
}
if (api_strtolower($item, $encoding) == $needle) {
return true;
}
}
return false;
}
/**
* Encoding management functions
*/
@ -2835,41 +2367,6 @@ function api_get_system_encoding() {
return $system_encoding;
}
/**
* This function returns the encoding, currently used by the file system.
* @return string The file system's encoding, it depends on the locale that OS currently uses.
* @link http://php.net/manual/en/function.setlocale.php
* Note: For Linux systems, to see all installed locales type in a terminal locale -a
*/
function api_get_file_system_encoding() {
static $file_system_encoding;
if (!isset($file_system_encoding)) {
$locale = setlocale(LC_CTYPE, '0');
$seek_pos = strpos($locale, '.');
if ($seek_pos !== false) {
$file_system_encoding = substr($locale, $seek_pos + 1);
if (IS_WINDOWS_OS) {
$file_system_encoding = 'CP'.$file_system_encoding;
}
}
// Dealing with some aliases.
$file_system_encoding = str_ireplace('utf8', 'UTF-8', $file_system_encoding);
$file_system_encoding = preg_replace('/^CP65001$/', 'UTF-8', $file_system_encoding);
$file_system_encoding = preg_replace('/^CP(125[0-9])$/', 'WINDOWS-\1', $file_system_encoding);
$file_system_encoding = str_replace('WINDOWS-1252', 'ISO-8859-15', $file_system_encoding);
if (empty($file_system_encoding)) {
if (IS_WINDOWS_OS) {
// Not expected for Windows, this assignment is here just in case.
$file_system_encoding = api_get_system_encoding();
} else {
// For Ububntu and other UTF-8 enabled Linux systems this fits with the default settings.
$file_system_encoding = 'UTF-8';
}
}
}
return $file_system_encoding;
}
/**
* Checks whether a specified encoding is supported by this API.
* @param string $encoding The specified encoding.
@ -2972,7 +2469,6 @@ function api_detect_encoding($string, $language = null) {
*/
function api_is_valid_utf8(&$string)
{
return Utf8::isUtf8($string);
}
@ -2994,27 +2490,12 @@ function api_is_valid_ascii(&$string)
*
* @return bool
*/
function api_is_valid_date($date, $format = 'Y-m-d H:i:s') {
function api_is_valid_date($date, $format = 'Y-m-d H:i:s')
{
$d = DateTime::createFromFormat($format, $date);
return $d && $d->format($format) == $date;
}
/**
* Return the encoding country code for jquery datepicker
* used for exemple in main/exercice/exercise_report.php
*/
function get_datepicker_langage_code() {
$languaje = 'en-GB';
$platform_isocode = strtolower(api_get_language_isocode());
// languages supported by jqgrid see files in main/inc/lib/javascript/jqgrid/js/i18n
$datapicker_langs = array('af', 'ar', 'ar-DZ', 'az', 'bg', 'bs', 'ca', 'cs', 'cy-GB', 'da', 'de', 'el', 'en-AU', 'en-GB', 'en-NZ', 'eo', 'es', 'et', 'eu', 'fa', 'fi', 'fo', 'fr', 'fr-CH', 'gl', 'he', 'hi', 'hr', 'hu', 'hy', 'id', 'is', 'it', 'ja', 'ka', 'kk', 'km', 'ko', 'lb', 'lt', 'lv', 'mk', 'ml', 'ms', 'nl', 'nl-BE', 'no', 'pl', 'pt', 'pt-BR', 'rm', 'ro', 'ru', 'sk', 'sl', 'sq', 'sr', 'sr-SR', 'sv', 'ta', 'th', 'tj', 'tr', 'uk', 'vi', 'zh-CN', 'zh-HK', 'zh-TW');
if (in_array($platform_isocode, $datapicker_langs)) {
$languaje = $platform_isocode;
}
return $languaje;
}
/**
* Returns the variable translated
* @param string $variable the string to translate
@ -3025,6 +2506,7 @@ function get_plugin_lang($variable, $pluginName) {
$plugin = $pluginName::create();
return $plugin->get_lang($variable);
}
/**
* Functions for internal use behind this API
*/

132
main/inc/lib/internationalization_internal.lib.php
Unescape View File

@ -255,43 +255,6 @@ function _api_get_character_map_name($encoding) {
return isset($character_map_selector[$encoding]) ? $character_map_selector[$encoding] : '';
}
/**
* This function parses a given conversion table (a text file) and creates in the memory
* two tables for conversion - character set from/to Unicode codepoints.
* @param string $name The name of the thext file that contains the conversion table, for example 'CP1252' (file CP1252.TXT will be parsed).
* @return array Returns an array that contains forward and reverse tables (from/to Unicode).
*/
function &_api_parse_character_map($name) {
$result = array();
$file = dirname(__FILE__).'/internationalization_database/conversion/' . $name . '.TXT';
if (file_exists($file)) {
$text = @file_get_contents($file);
if ($text !== false) {
$text = explode(chr(10), $text);
foreach ($text as $line) {
if (empty($line)) {
continue;
}
if (!empty($line) && trim($line) && $line[0] != '#') {
$matches = array();
preg_match('/[[:space:]]*0x([[:alnum:]]*)[[:space:]]+0x([[:alnum:]]*)[[:space:]]+/', $line, $matches);
$ord = hexdec(trim($matches[1]));
if ($ord > 127) {
$codepoint = hexdec(trim($matches[2]));
$result['local'][$ord] = $codepoint;
$result['unicode'][$codepoint] = $ord;
}
}
}
} else {
return false ;
}
} else {
return false;
}
return $result;
}
/**
* Takes an UTF-8 string and returns an array of integer values representing the Unicode characters.
* Astral planes are supported ie. the ints in the output can be > 0xFFFF. Occurrances of the BOM are ignored.
@ -801,7 +764,8 @@ function & _api_non_utf8_encodings() {
* Note: This function is used in the global initialization script for setting the internal encoding to the platform's character set.
* @link http://php.net/manual/en/function.mb-internal-encoding
*/
function _api_mb_internal_encoding($encoding = null) {
function _api_mb_internal_encoding($encoding = null)
{
static $mb_internal_encoding = null;
if (empty($encoding)) {
if (is_null($mb_internal_encoding)) {
@ -846,98 +810,6 @@ function _api_mb_regex_encoding($encoding = null) {
return false;
}
/**
* Retrieves specified internal encoding configuration variable within the PHP iconv extension.
* @param string $type The parameter $type could be: 'iconv_internal_encoding', 'iconv_input_encoding', or 'iconv_output_encoding'.
* @return mixed The function returns the requested encoding or FALSE on error.
* @link http://php.net/manual/en/function.iconv-get-encoding
*/
function _api_iconv_get_encoding($type) {
return _api_iconv_set_encoding($type);
}
/**
* Sets specified internal encoding configuration variables within the PHP iconv extension.
* @param string $type The parameter $type could be: 'iconv_internal_encoding', 'iconv_input_encoding', or 'iconv_output_encoding'.
* @param string $encoding (optional) The desired encoding to be set.
* @return bool Returns TRUE on success, FALSE on error.
* Note: This function is used in the global initialization script for setting these three internal encodings to the platform's character set.
* @link http://php.net/manual/en/function.iconv-set-encoding
*/
function _api_iconv_set_encoding($type, $encoding = null) {
static $iconv_internal_encoding = null;
static $iconv_input_encoding = null;
static $iconv_output_encoding = null;
if (!ICONV_INSTALLED) {
return false;
}
switch ($type) {
case 'iconv_internal_encoding':
if (empty($encoding)) {
if (is_null($iconv_internal_encoding)) {
$iconv_internal_encoding = @iconv_get_encoding($type);
}
return $iconv_internal_encoding;
}
if (_api_iconv_supports($encoding)) {
if(@iconv_set_encoding($type, $encoding)) {
$iconv_internal_encoding = $encoding;
return true;
}
return false;
}
return false;
case 'iconv_input_encoding':
if (empty($encoding)) {
if (is_null($iconv_input_encoding)) {
$iconv_input_encoding = @iconv_get_encoding($type);
}
return $iconv_input_encoding;
}
if (_api_iconv_supports($encoding)) {
if(@iconv_set_encoding($type, $encoding)) {
$iconv_input_encoding = $encoding;
return true;
}
return false;
}
return false;
case 'iconv_output_encoding':
if (empty($encoding)) {
if (is_null($iconv_output_encoding)) {
$iconv_output_encoding = @iconv_get_encoding($type);
}
return $iconv_output_encoding;
}
if (_api_iconv_supports($encoding)) {
if(@iconv_set_encoding($type, $encoding)) {
$iconv_output_encoding = $encoding;
return true;
}
return false;
}
return false;
}
return false;
}
/**
* Checks whether a given encoding is known to define single-byte characters only.
* The result might be not accurate for unknown by this library encodings. This is not fatal,
* then the library picks up conversions plus Unicode related internal algorithms.
* @param string $encoding A given encoding identificator.
* @return bool TRUE if the encoding is known as single-byte (for ISO-8859-15, WINDOWS-1251, etc.), FALSE otherwise.
*/
function _api_is_single_byte_encoding($encoding) {
static $checked = array();
if (!isset($checked[$encoding])) {
$character_map = _api_get_character_map_name(api_refine_encoding_id($encoding));
$checked[$encoding] = (!empty($character_map)
&& !in_array($character_map, array('UTF-8', 'HTML-ENTITIES')));
}
return $checked[$encoding];
}
/**
* Checks whether the specified encoding is supported by the PHP mbstring extension.
* @param string $encoding The specified encoding.

3
main/mySpace/user_add.php
Unescape View File

@ -189,8 +189,7 @@ if (api_is_session_admin()) {
$session_list[$session['id']]=$session['name'];
}
}
//asort($session_list);
//api_asort($session_list, SORT_STRING);
api_natsort($session_list);
$form->addElement('select', 'session_id', get_lang('Session'), $session_list);
}

226
tests/main/inc/lib/internationalization.lib.test.php
Unescape View File

@ -237,18 +237,6 @@ class TestInternationalization extends UnitTestCase {
//var_dump($res);
}
public function test_api_chr() {
$encoding = 'UTF-8';
$codepoints = array(1048, 1074, 1072, 1085, 32, 73, 118, 97, 110);
$characters = array('И', 'в', 'а', 'н', ' ', 'I', 'v', 'a', 'n'); // UTF-8
$res = array();
foreach ($codepoints as $codepoint) {
$res[] = api_chr($codepoint, $encoding);
}
$this->assertTrue($res == $characters);
//var_dump($res);
}
public function test_api_str_ireplace() {
$search = 'Á'; // UTF-8
$replace = 'a';
@ -502,17 +490,6 @@ class TestInternationalization extends UnitTestCase {
//var_dump($res);
}
public function test_api_ereg_replace() {
$pattern = 'file=([^"\'&]*)$';
$string = 'http://localhost/dokeos/main/scorm/showinframes.php?id=5&amp;file=test.php';
$replacement = 'file=my_test.php';
$option = null;
$res = api_ereg_replace($pattern, $replacement, $string, $option);
$this->assertTrue(is_string($res));
$this->assertTrue(strlen($res) == 77);
//var_dump($res);
}
public function test_api_eregi() {
$pattern = 'scorm/showinframes.php([^"\'&]*)(&|&amp;)file=([^"\'&]*)$';
$string = 'http://localhost/dokeos/main/scorm/showinframes.php?id=5&amp;file=test.php';
@ -523,16 +500,6 @@ class TestInternationalization extends UnitTestCase {
//var_dump($res);
}
public function test_api_eregi_replace() {
$pattern = 'file=([^"\'&]*)$';
$string = 'http://localhost/dokeos/main/scorm/showinframes.php?id=5&amp;file=test.php';
$replacement = 'file=my_test.php';
$option = null;
$res = api_eregi_replace($pattern, $replacement, $string, $option);
$this->assertTrue(is_string($res));
$this->assertTrue(strlen($res) == 77);
//var_dump($res);
}
/**
* ----------------------------------------------------------------------------
@ -562,17 +529,6 @@ class TestInternationalization extends UnitTestCase {
//var_dump($res);
}
public function test_api_strnatcasecmp() {
$string1 = '201áéíóu.txt'; // UTF-8
$string2 = '30Áéíóu.TXT'; // UTF-8
$language = 'english';
$encoding = 'UTF-8';
$res = api_strnatcasecmp($string1, $string2, $language, $encoding);
$this->assertTrue(is_numeric($res));
$this->assertTrue($res == 1);
//var_dump($res);
}
public function test_api_strnatcmp() {
$string1 = '201áéíóu.txt'; // UTF-8
$string2 = '30áéíóu.TXT'; // UTF-8
@ -585,37 +541,11 @@ class TestInternationalization extends UnitTestCase {
}
/**
* ----------------------------------------------------------------------------
* Sorting arrays
* ----------------------------------------------------------------------------
*/
public function test_api_asort() {
$array = array('úéo', 'aíó', 'áed'); // UTF-8
$sort_flag = SORT_REGULAR;
$language = 'english';
$encoding = 'UTF-8';
$res = api_asort($array, $sort_flag, $language, $encoding);
$keys = array_keys($array);
$this->assertTrue(is_bool($res));
$this->assertTrue($array[$keys[0]] == 'aíó' || $array[$keys[0]] == 'áed'); // The second result is given when intl php-extension is active.
//var_dump($array);
//var_dump($res);
}
public function test_api_arsort() {
$array = array('aíó', 'úéo', 'áed'); // UTF-8
$sort_flag = SORT_REGULAR;
$language = 'english';
$encoding = 'UTF-8';
$res = api_arsort($array, $sort_flag, $language, $encoding);
$keys = array_keys($array);
$this->assertTrue(is_bool($res));
$this->assertTrue($array[$keys[0]] == 'úéo');
//var_dump($array);
//var_dump($res);
}
/**
* ----------------------------------------------------------------------------
* Sorting arrays
* ----------------------------------------------------------------------------
*/
public function test_api_natsort() {
$array = array('img12.png', 'img10.png', 'img2.png', 'img1.png'); // UTF-8
@ -641,140 +571,11 @@ class TestInternationalization extends UnitTestCase {
//var_dump($res);
}
public function test_api_natcasesort() {
$array = array('img2.png', 'img10.png', 'Img12.png', 'img1.png'); // UTF-8
$language = 'english';
$encoding = 'UTF-8';
$res = api_natcasesort($array, $language, $encoding);
$keys = array_keys($array);
$this->assertTrue(is_bool($res));
$this->assertTrue($array[$keys[0]] == 'img1.png');
//var_dump($array);
//var_dump($res);
}
public function test_api_natcasersort() {
$array = array('img2.png', 'img10.png', 'Img12.png', 'img1.png'); // UTF-8
$language = 'english';
$encoding = 'UTF-8';
$res = api_natcasersort($array, $language, $encoding);
$keys = array_keys($array);
$this->assertTrue(is_bool($res));
$this->assertTrue($array[$keys[0]] == 'Img12.png');
//var_dump($array);
//var_dump($res);
}
public function test_api_ksort() {
$array = array('aíó' => 'img2.png', 'úéo' => 'img10.png', 'áed' => 'img12.png', 'áedc' => 'img1.png'); // UTF-8
$sort_flag = SORT_REGULAR;
$language = 'english';
$encoding = 'UTF-8';
$res = api_ksort($array, $sort_flag, $language, $encoding);
$keys = array_keys($array);
$this->assertTrue(is_bool($res));
$this->assertTrue($array[$keys[0]] == 'img2.png');
//var_dump($array);
//var_dump($res);
}
public function test_api_krsort() {
$array = array('aíó' => 'img2.png', 'úéo' => 'img10.png', 'áed' => 'img12.png', 'áedc' => 'img1.png'); // UTF-8
$sort_flag = SORT_REGULAR;
$language = 'english';
$encoding = 'UTF-8';
$res = api_krsort($array, $sort_flag, $language, $encoding);
$keys = array_keys($array);
$this->assertTrue(is_bool($res));
$this->assertTrue($array[$keys[0]] == 'img10.png');
//var_dump($array);
//var_dump($res);
}
public function test_api_knatsort() {
$array = array('img2.png' => 'aíó', 'img10.png' => 'úéo', 'img12.png' => 'áed', 'img1.png' => 'áedc'); // UTF-8
$language = 'english';
$encoding = 'UTF-8';
$res = api_knatsort($array, $language, $encoding);
$keys = array_keys($array);
$this->assertTrue(is_bool($res));
$this->assertTrue($array[$keys[0]] == 'áedc');
//var_dump($array);
//var_dump($res);
}
public function test_api_knatrsort() {
$array = array('img2.png' => 'aíó', 'img10.png' => 'úéo', 'IMG12.PNG' => 'áed', 'img1.png' => 'áedc'); // UTF-8
$language = 'english';
$encoding = 'UTF-8';
$res = api_knatrsort($array, $language, $encoding);
$keys = array_keys($array);
$this->assertTrue(is_bool($res));
$this->assertTrue($array[$keys[0]] == 'úéo' || $array[$keys[0]] == 'áed'); // The second result is given when intl php-extension is active.
//var_dump($array);
//var_dump($res);
}
public function test_api_knatcasesort() {
$array = array('img2.png' => 'aíó', 'img10.png' => 'úéo', 'IMG12.PNG' => 'áed', 'img1.png' => 'áedc'); // UTF-8
$language = 'english';
$encoding = 'UTF-8';
$res = api_knatcasesort($array, $language, $encoding);
$keys = array_keys($array);
$this->assertTrue(is_bool($res));
$this->assertTrue($array[$keys[0]] == 'áedc');
//var_dump($array);
//var_dump($res);
}
public function test_api_sort() {
$array = array('úéo', 'aíó', 'áed', 'áedc'); // UTF-8
$sort_flag = SORT_REGULAR;
$language = 'english';
$encoding = 'UTF-8';
$res = api_sort($array, $sort_flag, $language, $encoding);
$this->assertTrue(is_bool($res));
$this->assertTrue($array[0] == 'aíó' || $array[0] == 'áed'); // The second result is given when intl php-extension is active.
//var_dump($array);
//var_dump($res);
}
public function testapi_rsort() {
$array = array('aíó', 'úéo', 'áed', 'áedc'); // UTF-8
$sort_flag = SORT_REGULAR;
$language = 'english';
$encoding = 'UTF-8';
$res = api_rsort($array, $sort_flag, $language, $encoding);
$this->assertTrue(is_bool($res));
$this->assertTrue($array[0] == 'úéo');
//var_dump($array);
//var_dump($res);
}
/**
* ----------------------------------------------------------------------------
* Common sting operations with arrays
* ----------------------------------------------------------------------------
*/
public function test_api_in_array_nocase() {
$needle = 'áéíó'; // UTF-8
$haystack = array('Áéíó', 'uáé', 'íóú'); // UTF-8
$strict = false;
$encoding = 'UTF-8';
$res = api_in_array_nocase($needle, $haystack, $strict, $encoding);
$this->assertTrue(is_bool($res));
$this->assertTrue($res === true);
//var_dump($res);
}
/**
* ----------------------------------------------------------------------------
* Encoding management functions
* ----------------------------------------------------------------------------
*/
/**
* ----------------------------------------------------------------------------
* Encoding management functions
* ----------------------------------------------------------------------------
*/
public function test_api_refine_encoding_id() {
$encoding = 'koI8-r';
@ -834,13 +635,6 @@ class TestInternationalization extends UnitTestCase {
//var_dump($res);
}
public function test_api_get_file_system_encoding() {
$res = api_get_file_system_encoding();
$this->assertTrue(is_string($res));
$this->assertTrue($res);
//var_dump($res);
}
public function test_api_is_encoding_supported() {
$encoding1 = 'UTF-8';
$encoding2 = 'XXXX#%#%VR^%BBDNdjlrsg;d';

Write Preview
Loading…
Cancel
Save