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

Feature #272 - Reworks for some functions to make them stable against non-string input parameters.

Browse Source
skala
Ivan Tcholakov 16 years ago
parent af63dfa703
commit 02d9c8a694
2 changed files with 45 additions and 39 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. 45
      main/inc/lib/internationalization.lib.php
  2. 39
      main/inc/lib/internationalization_internal.lib.php

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

@ -3243,10 +3243,11 @@ function api_is_valid_utf8(&$string) {
// wrongly detected as UTF-8. Possibly, there would be problems with other // wrongly detected as UTF-8. Possibly, there would be problems with other
// languages too. An alternative implementation will be used. // languages too. An alternative implementation will be used.
$len = api_byte_count($string); $str = (string)$string;
$len = api_byte_count($str);
$i = 0; $i = 0;
while ($i < $len) { while ($i < $len) {
$byte1 = ord($string[$i++]); // Here the current character begins. Its size is $byte1 = ord($str[$i++]); // Here the current character begins. Its size is
// determined by the senior bits in the first byte. // determined by the senior bits in the first byte.
if (($byte1 & 0x80) == 0x00) { // 0xxxxxxx if (($byte1 & 0x80) == 0x00) { // 0xxxxxxx
@ -3267,7 +3268,7 @@ function api_is_valid_utf8(&$string) {
return false; // Here the string ends unexpectedly. return false; // Here the string ends unexpectedly.
} }
if (!((ord($string[$i++]) & 0xC0) == 0x80)) if (!((ord($str[$i++]) & 0xC0) == 0x80))
return false; // Invalid second byte, invalid string. return false; // Invalid second byte, invalid string.
} }
@ -3280,13 +3281,13 @@ function api_is_valid_utf8(&$string) {
if ($i == $len) { if ($i == $len) {
return false; // Unexpected end of the string. return false; // Unexpected end of the string.
} }
if (!((ord($string[$i++]) & 0xC0) == 0x80)) { if (!((ord($str[$i++]) & 0xC0) == 0x80)) {
return false; // Invalid second byte. return false; // Invalid second byte.
} }
if ($i == $len) { if ($i == $len) {
return false; // Unexpected end of the string. return false; // Unexpected end of the string.
} }
if (!((ord($string[$i++]) & 0xC0) == 0x80)) { if (!((ord($str[$i++]) & 0xC0) == 0x80)) {
return false; // Invalid third byte, invalid string. return false; // Invalid third byte, invalid string.
} }
} }
@ -3300,19 +3301,19 @@ function api_is_valid_utf8(&$string) {
if ($i == $len) { if ($i == $len) {
return false; return false;
} }
if (!((ord($string[$i++]) & 0xC0) == 0x80)) { if (!((ord($str[$i++]) & 0xC0) == 0x80)) {
return false; return false;
} }
if ($i == $len) { if ($i == $len) {
return false; return false;
} }
if (!((ord($string[$i++]) & 0xC0) == 0x80)) { if (!((ord($str[$i++]) & 0xC0) == 0x80)) {
return false; return false;
} }
if ($i == $len) { if ($i == $len) {
return false; return false;
} }
if (!((ord($string[$i++]) & 0xC0) == 0x80)) { if (!((ord($str[$i++]) & 0xC0) == 0x80)) {
return false; return false;
} }
} }
@ -3326,25 +3327,25 @@ function api_is_valid_utf8(&$string) {
if ($i == $len) { if ($i == $len) {
return false; return false;
} }
if (!((ord($string[$i++]) & 0xC0) == 0x80)) { if (!((ord($str[$i++]) & 0xC0) == 0x80)) {
return false; return false;
} }
if ($i == $len) { if ($i == $len) {
return false; return false;
} }
if (!((ord($string[$i++]) & 0xC0) == 0x80)) { if (!((ord($str[$i++]) & 0xC0) == 0x80)) {
return false; return false;
} }
if ($i == $len) { if ($i == $len) {
return false; return false;
} }
if (!((ord($string[$i++]) & 0xC0) == 0x80)) { if (!((ord($str[$i++]) & 0xC0) == 0x80)) {
return false; return false;
} }
if ($i == $len) { if ($i == $len) {
return false; return false;
} }
if (!((ord($string[$i++]) & 0xC0) == 0x80)) { if (!((ord($str[$i++]) & 0xC0) == 0x80)) {
return false; return false;
} }
} }
@ -3358,31 +3359,31 @@ function api_is_valid_utf8(&$string) {
if ($i == $len) { if ($i == $len) {
return false; return false;
} }
if (!((ord($string[$i++]) & 0xC0) == 0x80)) { if (!((ord($str[$i++]) & 0xC0) == 0x80)) {
return false; return false;
} }
if ($i == $len) { if ($i == $len) {
return false; return false;
} }
if (!((ord($string[$i++]) & 0xC0) == 0x80)) { if (!((ord($str[$i++]) & 0xC0) == 0x80)) {
return false; return false;
} }
if ($i == $len) { if ($i == $len) {
return false; return false;
} }
if (!((ord($string[$i++]) & 0xC0) == 0x80)) { if (!((ord($str[$i++]) & 0xC0) == 0x80)) {
return false; return false;
} }
if ($i == $len) { if ($i == $len) {
return false; return false;
} }
if (!((ord($string[$i++]) & 0xC0) == 0x80)) { if (!((ord($str[$i++]) & 0xC0) == 0x80)) {
return false; return false;
} }
if ($i == $len) { if ($i == $len) {
return false; return false;
} }
if (!((ord($string[$i++]) & 0xC0) == 0x80)) { if (!((ord($str[$i++]) & 0xC0) == 0x80)) {
return false; return false;
} }
} }
@ -3428,17 +3429,21 @@ function api_is_valid_ascii(&$string) {
* @link http://php.net/manual/en/function.str-getcsv.php (exists as of PHP 5 >= 5.3.0) * @link http://php.net/manual/en/function.str-getcsv.php (exists as of PHP 5 >= 5.3.0)
*/ */
function & api_str_getcsv(& $string, $delimiter = ',', $enclosure = '"', $escape = '\\') { function & api_str_getcsv(& $string, $delimiter = ',', $enclosure = '"', $escape = '\\') {
$delimiter = (string)$delimiter;
if (api_byte_count($delimiter) > 1) { $delimiter = $delimiter[1]; } if (api_byte_count($delimiter) > 1) { $delimiter = $delimiter[1]; }
$enclosure = (string)$enclosure;
if (api_byte_count($enclosure) > 1) { $enclosure = $enclosure[1]; } if (api_byte_count($enclosure) > 1) { $enclosure = $enclosure[1]; }
$escape = (string)$escape;
if (api_byte_count($escape) > 1) { $escape = $escape[1]; } if (api_byte_count($escape) > 1) { $escape = $escape[1]; }
$len = api_byte_count($string); $str = (string)$string;
$len = api_byte_count($str);
$enclosed = false; $enclosed = false;
$escaped = false; $escaped = false;
$value = ''; $value = '';
$result = array(); $result = array();
for ($i = 0; $i < $len; $i++) { for ($i = 0; $i < $len; $i++) {
$char = $string[$i]; $char = $str[$i];
if ($char == $escape) { if ($char == $escape) {
if (!$escaped) { if (!$escaped) {
$escaped = true; $escaped = true;
@ -3448,7 +3453,7 @@ function & api_str_getcsv(& $string, $delimiter = ',', $enclosure = '"', $escape
$escaped = false; $escaped = false;
switch ($char) { switch ($char) {
case $enclosure: case $enclosure:
if ($enclosed && $string[$i + 1] == $enclosure) { if ($enclosed && $str[$i + 1] == $enclosure) {
$value .= $char; $value .= $char;
$i++; $i++;
} else { } else {

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

@ -331,45 +331,46 @@ function _api_clean_person_name($person_name) {
* @param string $from_encoding The encoding that $string is being converted from. * @param string $from_encoding The encoding that $string is being converted from.
* @return string Returns the converted string. * @return string Returns the converted string.
*/ */
function _api_convert_encoding($string, $to_encoding, $from_encoding) { function _api_convert_encoding(&$string, $to_encoding, $from_encoding) {
$str = (string)$string;
static $character_map = array(); static $character_map = array();
static $utf8_compatible = array('UTF-8', 'US-ASCII'); static $utf8_compatible = array('UTF-8', 'US-ASCII');
if (empty($string)) { if (empty($str)) {
return $string; return $str;
} }
$to_encoding = api_refine_encoding_id($to_encoding); $to_encoding = api_refine_encoding_id($to_encoding);
$from_encoding = api_refine_encoding_id($from_encoding); $from_encoding = api_refine_encoding_id($from_encoding);
if (api_equal_encodings($to_encoding, $from_encoding)) { if (api_equal_encodings($to_encoding, $from_encoding)) {
return $string; return $str;
} }
if ($to_encoding == 'HTML-ENTITIES') { if ($to_encoding == 'HTML-ENTITIES') {
return api_htmlentities($string, ENT_QUOTES, $from_encoding); return api_htmlentities($str, ENT_QUOTES, $from_encoding);
} }
if ($from_encoding == 'HTML-ENTITIES') { if ($from_encoding == 'HTML-ENTITIES') {
return api_html_entity_decode($string, ENT_QUOTES, $to_encoding); return api_html_entity_decode($str, ENT_QUOTES, $to_encoding);
} }
$to = _api_get_character_map_name($to_encoding); $to = _api_get_character_map_name($to_encoding);
$from = _api_get_character_map_name($from_encoding); $from = _api_get_character_map_name($from_encoding);
if (empty($to) || empty($from) || $to == $from || (in_array($to, $utf8_compatible) && in_array($from, $utf8_compatible))) { if (empty($to) || empty($from) || $to == $from || (in_array($to, $utf8_compatible) && in_array($from, $utf8_compatible))) {
return $string; return $str;
} }
if (!isset($character_map[$to])) { if (!isset($character_map[$to])) {
$character_map[$to] = &_api_parse_character_map($to); $character_map[$to] = &_api_parse_character_map($to);
} }
if ($character_map[$to] === false) { if ($character_map[$to] === false) {
return $string; return $str;
} }
if (!isset($character_map[$from])) { if (!isset($character_map[$from])) {
$character_map[$from] = &_api_parse_character_map($from); $character_map[$from] = &_api_parse_character_map($from);
} }
if ($character_map[$from] === false) { if ($character_map[$from] === false) {
return $string; return $str;
} }
if ($from != 'UTF-8') { if ($from != 'UTF-8') {
$len = api_byte_count($string); $len = api_byte_count($str);
$codepoints = array(); $codepoints = array();
for ($i = 0; $i < $len; $i++) { for ($i = 0; $i < $len; $i++) {
$ord = ord($string[$i]); $ord = ord($str[$i]);
if ($ord > 127) { if ($ord > 127) {
if (isset($character_map[$from]['local'][$ord])) { if (isset($character_map[$from]['local'][$ord])) {
$codepoints[] = $character_map[$from]['local'][$ord]; $codepoints[] = $character_map[$from]['local'][$ord];
@ -381,7 +382,7 @@ function _api_convert_encoding($string, $to_encoding, $from_encoding) {
} }
} }
} else { } else {
$codepoints = _api_utf8_to_unicode($string); $codepoints = _api_utf8_to_unicode($str);
} }
if ($to != 'UTF-8') { if ($to != 'UTF-8') {
foreach ($codepoints as $i => &$codepoint) { foreach ($codepoints as $i => &$codepoint) {
@ -395,11 +396,11 @@ function _api_convert_encoding($string, $to_encoding, $from_encoding) {
$codepoint = chr($codepoint); $codepoint = chr($codepoint);
} }
} }
$string = implode($codepoints); $str = implode($codepoints);
} else { } else {
$string = _api_utf8_from_unicode($codepoints); $str = _api_utf8_from_unicode($codepoints);
} }
return $string; return $str;
} }
/** /**
@ -468,16 +469,16 @@ function &_api_parse_character_map($name) {
* @link http://hsivonen.iki.fi/php-utf8/ * @link http://hsivonen.iki.fi/php-utf8/
* @author Ivan Tcholakov, August 2009, adaptation for the Dokeos LMS. * @author Ivan Tcholakov, August 2009, adaptation for the Dokeos LMS.
*/ */
function _api_utf8_to_unicode($string) { function _api_utf8_to_unicode(&$string) {
if (!is_string($string)) { $string = (string)$string; } // A quick workaround after testing. $str = (string)$string;
$state = 0; // cached expected number of octets after the current octet $state = 0; // cached expected number of octets after the current octet
// until the beginning of the next UTF8 character sequence // until the beginning of the next UTF8 character sequence
$codepoint = 0; // cached Unicode character $codepoint = 0; // cached Unicode character
$bytes = 1; // cached expected number of octets in the current sequence $bytes = 1; // cached expected number of octets in the current sequence
$result = array(); $result = array();
$len = api_byte_count($string); $len = api_byte_count($str);
for ($i = 0; $i < $len; $i++) { for ($i = 0; $i < $len; $i++) {
$byte = ord($string[$i]); $byte = ord($str[$i]);
if ($state == 0) { if ($state == 0) {
// When state is zero we expect either a US-ASCII character or a multi-octet sequence. // When state is zero we expect either a US-ASCII character or a multi-octet sequence.
if (0 == (0x80 & ($byte))) { if (0 == (0x80 & ($byte))) {

Write Preview
Loading…
Cancel
Save