mirror of
https://github.com/e107inc/e107.git
synced 2025-08-02 12:48:26 +02:00
toASCII method added.
This commit is contained in:
Cameron
@@ -2402,7 +2402,7 @@ class eUrlRule
|
||||
|
||||
if(is_array($route)) $route = implode('/', $route);
|
||||
|
||||
|
||||
|
||||
|
||||
$tr = array();
|
||||
if ($route !== $this->route)
|
||||
@@ -2472,18 +2472,24 @@ class eUrlRule
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$tp = e107::getParser();
|
||||
$urlFormat = e107::getConfig()->get('url_sef_translate');
|
||||
|
||||
foreach ($this->params as $key => $value)
|
||||
{
|
||||
// FIX - non-latin URLs proper encoded
|
||||
$tr["<$key>"] = rawurlencode($params[$key]);
|
||||
$tr["<$key>"] = rawurlencode($params[$key]); //todo transliterate non-latin
|
||||
// $tr["<$key>"] = eHelper::title2sef($tp->toASCII($params[$key]), $urlFormat); // enabled to test.
|
||||
unset($params[$key]);
|
||||
}
|
||||
|
||||
$suffix = $this->urlSuffix === null ? $manager->urlSuffix : $this->urlSuffix;
|
||||
|
||||
// XXX TODO Find better place for this check which will affect all types of SEF URL configurations. (@see news/sef_noid_url.php for duplicate)
|
||||
$urlFormat = e107::getConfig()->get('url_sef_translate');
|
||||
|
||||
|
||||
|
||||
|
||||
if($urlFormat == 'dashl' || $urlFormat == 'underscorel' || $urlFormat == 'plusl') // convert template to lowercase when using lowercase SEF URL format.
|
||||
{
|
||||
@@ -2491,6 +2497,7 @@ class eUrlRule
|
||||
}
|
||||
|
||||
$url = strtr($this->template, $tr);
|
||||
|
||||
|
||||
if(empty($params))
|
||||
{
|
||||
@@ -4359,7 +4366,7 @@ class eHelper
|
||||
*/
|
||||
public static function title2sef($title, $type = null)
|
||||
{
|
||||
$char_map = array(
|
||||
/*$char_map = array(
|
||||
// Latin
|
||||
'À' => 'A', 'Á' => 'A', 'Â' => 'A', 'Ã' => 'A', 'Ä' => 'A', 'Å' => 'A', 'Æ' => 'AE', 'Ç' => 'C',
|
||||
'È' => 'E', 'É' => 'E', 'Ê' => 'E', 'Ë' => 'E', 'Ì' => 'I', 'Í' => 'I', 'Î' => 'I', 'Ï' => 'I',
|
||||
@@ -4416,9 +4423,11 @@ class eHelper
|
||||
'Š' => 'S', 'Ū' => 'u', 'Ž' => 'Z',
|
||||
'ā' => 'a', 'č' => 'c', 'ē' => 'e', 'ģ' => 'g', 'ī' => 'i', 'ķ' => 'k', 'ļ' => 'l', 'ņ' => 'n',
|
||||
'š' => 's', 'ū' => 'u', 'ž' => 'z'
|
||||
);
|
||||
);*/
|
||||
|
||||
$title = str_replace(array_keys($char_map), $char_map, $title);
|
||||
$tp = e107::getParser();
|
||||
|
||||
$title = $tp->toASCII($title);
|
||||
|
||||
$title = str_replace(array('/',' '),' ',$title);
|
||||
$title = str_replace(array("&",",","(",")"),'',$title);
|
||||
@@ -4436,7 +4445,7 @@ class eHelper
|
||||
{
|
||||
$type = e107::getPref('url_sef_translate');
|
||||
}
|
||||
$tp = e107::getParser();
|
||||
|
||||
switch ($type)
|
||||
{
|
||||
case 'dashl': //dasherize, to lower case
|
||||
|
||||
@@ -1996,65 +1996,66 @@ class e_parse extends e_parser
|
||||
function toASCII($text)
|
||||
{
|
||||
|
||||
$forn[] = utf8_encode("Ç"); $chg[] = "C";
|
||||
$char_map = array(
|
||||
// Latin
|
||||
'À' => 'A', 'Á' => 'A', 'Â' => 'A', 'Ã' => 'A', 'Ä' => 'A', 'Å' => 'A', 'Æ' => 'AE', 'Ç' => 'C',
|
||||
'È' => 'E', 'É' => 'E', 'Ê' => 'E', 'Ë' => 'E', 'Ì' => 'I', 'Í' => 'I', 'Î' => 'I', 'Ï' => 'I',
|
||||
'Ð' => 'D', 'Ñ' => 'N', 'Ò' => 'O', 'Ó' => 'O', 'Ô' => 'O', 'Õ' => 'O', 'Ö' => 'O', 'Ő' => 'O',
|
||||
'Ø' => 'O', 'Ù' => 'U', 'Ú' => 'U', 'Û' => 'U', 'Ü' => 'U', 'Ű' => 'U', 'Ý' => 'Y', 'Þ' => 'TH',
|
||||
'ß' => 'ss',
|
||||
'à' => 'a', 'á' => 'a', 'â' => 'a', 'ã' => 'a', 'ä' => 'a', 'å' => 'a', 'æ' => 'ae', 'ç' => 'c',
|
||||
'è' => 'e', 'é' => 'e', 'ê' => 'e', 'ë' => 'e', 'ì' => 'i', 'í' => 'i', 'î' => 'i', 'ï' => 'i',
|
||||
'ð' => 'd', 'ñ' => 'n', 'ò' => 'o', 'ó' => 'o', 'ô' => 'o', 'õ' => 'o', 'ö' => 'o', 'ő' => 'o',
|
||||
'ø' => 'o', 'ù' => 'u', 'ú' => 'u', 'û' => 'u', 'ü' => 'u', 'ű' => 'u', 'ý' => 'y', 'þ' => 'th',
|
||||
'ÿ' => 'y',
|
||||
// Latin symbols
|
||||
'©' => '(c)',
|
||||
// Greek
|
||||
'Α' => 'A', 'Β' => 'B', 'Γ' => 'G', 'Δ' => 'D', 'Ε' => 'E', 'Ζ' => 'Z', 'Η' => 'H', 'Θ' => '8',
|
||||
'Ι' => 'I', 'Κ' => 'K', 'Λ' => 'L', 'Μ' => 'M', 'Ν' => 'N', 'Ξ' => '3', 'Ο' => 'O', 'Π' => 'P',
|
||||
'Ρ' => 'R', 'Σ' => 'S', 'Τ' => 'T', 'Υ' => 'Y', 'Φ' => 'F', 'Χ' => 'X', 'Ψ' => 'PS', 'Ω' => 'W',
|
||||
'Ά' => 'A', 'Έ' => 'E', 'Ί' => 'I', 'Ό' => 'O', 'Ύ' => 'Y', 'Ή' => 'H', 'Ώ' => 'W', 'Ϊ' => 'I',
|
||||
'Ϋ' => 'Y',
|
||||
'α' => 'a', 'β' => 'b', 'γ' => 'g', 'δ' => 'd', 'ε' => 'e', 'ζ' => 'z', 'η' => 'h', 'θ' => '8',
|
||||
'ι' => 'i', 'κ' => 'k', 'λ' => 'l', 'μ' => 'm', 'ν' => 'n', 'ξ' => '3', 'ο' => 'o', 'π' => 'p',
|
||||
'ρ' => 'r', 'σ' => 's', 'τ' => 't', 'υ' => 'y', 'φ' => 'f', 'χ' => 'x', 'ψ' => 'ps', 'ω' => 'w',
|
||||
'ά' => 'a', 'έ' => 'e', 'ί' => 'i', 'ό' => 'o', 'ύ' => 'y', 'ή' => 'h', 'ώ' => 'w', 'ς' => 's',
|
||||
'ϊ' => 'i', 'ΰ' => 'y', 'ϋ' => 'y', 'ΐ' => 'i',
|
||||
// Turkish
|
||||
'Ş' => 'S', 'İ' => 'I', 'Ç' => 'C', 'Ü' => 'U', 'Ö' => 'O', 'Ğ' => 'G',
|
||||
'ş' => 's', 'ı' => 'i', 'ç' => 'c', 'ü' => 'u', 'ö' => 'o', 'ğ' => 'g',
|
||||
// Russian
|
||||
'А' => 'A', 'Б' => 'B', 'В' => 'V', 'Г' => 'G', 'Д' => 'D', 'Е' => 'E', 'Ё' => 'Yo', 'Ж' => 'Zh',
|
||||
'З' => 'Z', 'И' => 'I', 'Й' => 'J', 'К' => 'K', 'Л' => 'L', 'М' => 'M', 'Н' => 'N', 'О' => 'O',
|
||||
'П' => 'P', 'Р' => 'R', 'С' => 'S', 'Т' => 'T', 'У' => 'U', 'Ф' => 'F', 'Х' => 'H', 'Ц' => 'C',
|
||||
'Ч' => 'Ch', 'Ш' => 'Sh', 'Щ' => 'Sh', 'Ъ' => '', 'Ы' => 'Y', 'Ь' => '', 'Э' => 'E', 'Ю' => 'Yu',
|
||||
'Я' => 'Ya',
|
||||
'а' => 'a', 'б' => 'b', 'в' => 'v', 'г' => 'g', 'д' => 'd', 'е' => 'e', 'ё' => 'yo', 'ж' => 'zh',
|
||||
'з' => 'z', 'и' => 'i', 'й' => 'j', 'к' => 'k', 'л' => 'l', 'м' => 'm', 'н' => 'n', 'о' => 'o',
|
||||
'п' => 'p', 'р' => 'r', 'с' => 's', 'т' => 't', 'у' => 'u', 'ф' => 'f', 'х' => 'h', 'ц' => 'c',
|
||||
'ч' => 'ch', 'ш' => 'sh', 'щ' => 'sh', 'ъ' => '', 'ы' => 'y', 'ь' => '', 'э' => 'e', 'ю' => 'yu',
|
||||
'я' => 'ya',
|
||||
// Ukrainian
|
||||
'Є' => 'Ye', 'І' => 'I', 'Ї' => 'Yi', 'Ґ' => 'G',
|
||||
'є' => 'ye', 'і' => 'i', 'ї' => 'yi', 'ґ' => 'g',
|
||||
// Czech
|
||||
'Č' => 'C', 'Ď' => 'D', 'Ě' => 'E', 'Ň' => 'N', 'Ř' => 'R', 'Š' => 'S', 'Ť' => 'T', 'Ů' => 'U',
|
||||
'Ž' => 'Z',
|
||||
'č' => 'c', 'ď' => 'd', 'ě' => 'e', 'ň' => 'n', 'ř' => 'r', 'š' => 's', 'ť' => 't', 'ů' => 'u',
|
||||
'ž' => 'z',
|
||||
// Polish
|
||||
'Ą' => 'A', 'Ć' => 'C', 'Ę' => 'e', 'Ł' => 'L', 'Ń' => 'N', 'Ó' => 'o', 'Ś' => 'S', 'Ź' => 'Z',
|
||||
'Ż' => 'Z',
|
||||
'ą' => 'a', 'ć' => 'c', 'ę' => 'e', 'ł' => 'l', 'ń' => 'n', 'ó' => 'o', 'ś' => 's', 'ź' => 'z',
|
||||
'ż' => 'z',
|
||||
// Latvian
|
||||
'Ā' => 'A', 'Č' => 'C', 'Ē' => 'E', 'Ģ' => 'G', 'Ī' => 'i', 'Ķ' => 'k', 'Ļ' => 'L', 'Ņ' => 'N',
|
||||
'Š' => 'S', 'Ū' => 'u', 'Ž' => 'Z',
|
||||
'ā' => 'a', 'č' => 'c', 'ē' => 'e', 'ģ' => 'g', 'ī' => 'i', 'ķ' => 'k', 'ļ' => 'l', 'ņ' => 'n',
|
||||
'š' => 's', 'ū' => 'u', 'ž' => 'z'
|
||||
);
|
||||
|
||||
$forn[] = utf8_encode("È"); $chg[] = "E";
|
||||
$forn[] = utf8_encode("É"); $chg[] = "E";
|
||||
$forn[] = utf8_encode("Ê"); $chg[] = "E";
|
||||
$forn[] = utf8_encode("Ë"); $chg[] = "E";
|
||||
|
||||
$forn[] = utf8_encode("Ó"); $chg[] = "O";
|
||||
$forn[] = utf8_encode("Ô"); $chg[] = "O";
|
||||
$forn[] = utf8_encode("Õ"); $chg[] = "O";
|
||||
$forn[] = utf8_encode("Ö"); $chg[] = "O";
|
||||
|
||||
$forn[] = utf8_encode("Ù"); $chg[] = "U";
|
||||
$forn[] = utf8_encode("Ú"); $chg[] = "U";
|
||||
$forn[] = utf8_encode("Û"); $chg[] = "U";
|
||||
$forn[] = utf8_encode("Ü"); $chg[] = "U";
|
||||
|
||||
$forn[] = utf8_encode("Í"); $chg[] = "I";
|
||||
$forn[] = utf8_encode("Á"); $chg[] = "A";
|
||||
$forn[] = utf8_encode("Ñ"); $chg[] = "N";
|
||||
|
||||
|
||||
$forn[] = utf8_encode("â"); $chg[] = "a";
|
||||
$forn[] = utf8_encode("ã"); $chg[] = "a";
|
||||
$forn[] = utf8_encode("ä"); $chg[] = "a";
|
||||
$forn[] = utf8_encode("å"); $chg[] = "a";
|
||||
$forn[] = utf8_encode("à"); $chg[] = "a";
|
||||
$forn[] = utf8_encode("á"); $chg[] = "a";
|
||||
|
||||
$forn[] = utf8_encode("ç"); $chg[] = "c";
|
||||
|
||||
$forn[] = utf8_encode("è"); $chg[] = "e";
|
||||
$forn[] = utf8_encode("é"); $chg[] = "e";
|
||||
$forn[] = utf8_encode("ê"); $chg[] = "e";
|
||||
$forn[] = utf8_encode("ë"); $chg[] = "e";
|
||||
|
||||
$forn[] = utf8_encode("ì"); $chg[] = "i";
|
||||
$forn[] = utf8_encode("í"); $chg[] = "i";
|
||||
$forn[] = utf8_encode("î"); $chg[] = "i";
|
||||
$forn[] = utf8_encode("ï"); $chg[] = "i";
|
||||
$forn[] = utf8_encode("î"); $chg[] = "i";
|
||||
|
||||
$forn[] = utf8_encode("ñ"); $chg[] = "n";
|
||||
|
||||
$forn[] = utf8_encode("ð"); $chg[] = "o";
|
||||
$forn[] = utf8_encode("ò"); $chg[] = "o";
|
||||
$forn[] = utf8_encode("ó"); $chg[] = "o";
|
||||
$forn[] = utf8_encode("ô"); $chg[] = "o";
|
||||
$forn[] = utf8_encode("õ"); $chg[] = "o";
|
||||
$forn[] = utf8_encode("ö"); $chg[] = "o";
|
||||
|
||||
$forn[] = utf8_encode("ü"); $chg[] = "u";
|
||||
$forn[] = utf8_encode("ú"); $chg[] = "u";
|
||||
$forn[] = utf8_encode("ù"); $chg[] = "u";
|
||||
$forn[] = utf8_encode("û"); $chg[] = "u";
|
||||
|
||||
$text = str_replace($forn,$chg,$text);
|
||||
|
||||
return $text;
|
||||
return str_replace(array_keys($char_map), $char_map, $text);
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user