Index: trunk/CHANGELOG =================================================================== --- trunk/CHANGELOG (revision 441) +++ trunk/CHANGELOG (revision 442) @@ -36,6 +36,11 @@ 27-Dec-2006 Matthias Gallas # Fixed form modul stores empty records ------------------------------------- 2.6.6 ------------------------------------- +01-Apr-2007 Matthias Gallas +# Fixed issues with some languages when UTF8 is used. Removed all htmlentites + from the code (revoked changeset 396) and added new functions instead. Adapted the + search and the highlighting to use the new functions. With this changes WB can now + be used with charset UTF8 for all languages. 12-Mar-2007 Matthias Gallas + Added multilingual support to search 03-Mar-2007 Matthias Gallas Index: trunk/wb/search/search.php =================================================================== --- trunk/wb/search/search.php (revision 441) +++ trunk/wb/search/search.php (revision 442) @@ -28,6 +28,9 @@ exit(0); } +// Include the WB functions file +require_once(WB_PATH.'/framework/functions.php'); + // Check if search is enabled if(SHOW_SEARCH != true) { echo $TEXT['SEARCH'].' '.$TEXT['DISABLED']; @@ -55,13 +58,13 @@ // Double backslashes (mySQL needs doubly escaped backslashes in LIKE comparisons) $string = addslashes($wb->escape_backslashes($original_string)); // convert a copy of $string to HTML-ENTITIES - $string_entities=mb_convert_encoding($string, 'UTF-8', 'HTML-ENTITIES'); - $string_entities=htmlspecialchars($string_entities,ENT_QUOTES); - $string_entities=mb_convert_encoding($string_entities, 'HTML-ENTITIES', 'UTF-8'); + $string_entities = umlauts_to_entities($string); // and do some convertion to both require(WB_PATH.'/search/search_convert.php'); - $string=strtr($string,$string_conv); - $string_entities=strtr($string_entities,$string_entities_conv); + if(strcmp(DEFAULT_CHARSET, "iso-8859-1") == 0) { + $string=strtr($string,$string_conv_iso88591); + $string_entities=strtr($string_entities,$string_entities_conv_iso88591); + } $search_string = $string_entities; } else { $string = ''; @@ -181,9 +184,16 @@ $link = page_link($page['link']); //Add search string for highlighting - $sstring = implode(" ", array_merge($string,$string_entities)); - //$link = $link."?searchresult=1&sstring=".$sstring; - $link = $link."?searchresult=1&sstring=".urlencode($sstring); + if ($match!='exact') { + $sorted=array_merge($string,$string_entities); + sort($sorted); + $sstring = implode(" ", $sorted); + $link = $link."?searchresult=1&sstring=".urlencode($sstring); + } + else { + $sstring = strtr($string[0], " ", "_")." ".strtr($string_entities[0], " ","_"); + $link = $link."?searchresult=2&sstring=".urlencode($sstring); + } // Set vars to be replaced by values $vars = array('[LINK]', '[TITLE]', '[DESCRIPTION]', '[USERNAME]','[DISPLAY_NAME]','[DATE]','[TIME]','[TEXT_LAST_UPDATED_BY]','[TEXT_ON]'); @@ -268,9 +278,16 @@ $link = page_link($page[$fields['link']]); //Add search string for highlighting - $sstring = implode(" ", array_merge($string,$string_entities)); - //$link = $link."?searchresult=1&sstring=".$sstring; - $link = $link."?searchresult=1&sstring=".urlencode($sstring); + if ($match!='exact') { + $sorted=array_merge($string,$string_entities); + sort($sorted); + $sstring = implode(" ", $sorted); + $link = $link."?searchresult=1&sstring=".urlencode($sstring); + } + else { + $sstring = strtr($string[0], " ", "_")." ".strtr($string_entities[0], " ","_"); + $link = $link."?searchresult=2&sstring=".urlencode($sstring); + } // Set vars to be replaced by values $vars = array('[LINK]', '[TITLE]', '[DESCRIPTION]', '[USERNAME]','[DISPLAY_NAME]','[DATE]','[TIME]','[TEXT_LAST_UPDATED_BY]','[TEXT_ON]'); Index: trunk/wb/search/search_convert.php =================================================================== --- trunk/wb/search/search_convert.php (revision 441) +++ trunk/wb/search/search_convert.php (revision 442) @@ -33,7 +33,7 @@ } //for Xinha, (htmlarea) -$string_conv=array( +$string_conv_iso88591=array( "Š"=>"Š","š"=>"š","Œ"=>"Œ","œ"=>"œ","Ÿ"=>"Ÿ", ">"=>">","<"=>"<", "„"=>"„","•"=>"•","ˆ"=>"ˆ","Ν"=>"Ν","ν"=>"ν", @@ -61,7 +61,7 @@ ); //for fckeditor, (tiny_mce) -$string_entities_conv=array( +$string_entities_conv_iso88591=array( "Œ"=>"Œ","œ"=>"œ","Š"=>"Š","š"=>"š", "Ÿ"=>"Ÿ", "˜"=>"˜","ϒ"=>"ϒ","•"=>"•","™"=>"™", Index: trunk/wb/admin/pages/settings.php =================================================================== --- trunk/wb/admin/pages/settings.php (revision 441) +++ trunk/wb/admin/pages/settings.php (revision 442) @@ -76,8 +76,8 @@ $template->set_block('page', 'main_block', 'main'); $template->set_var(array( 'PAGE_ID' => $results_array['page_id'], - 'PAGE_TITLE' => (htmlentities($results_array['page_title'])), - 'MENU_TITLE' => (htmlentities($results_array['menu_title'])), + 'PAGE_TITLE' => ($results_array['page_title']), + 'MENU_TITLE' => ($results_array['menu_title']), 'DESCRIPTION' => ($results_array['description']), 'KEYWORDS' => ($results_array['keywords']), 'MODIFIED_BY' => $user['display_name'], @@ -249,7 +249,7 @@ for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - '; } $template->set_var(array( 'ID' => $page['page_id'], - 'TITLE' => ($title_prefix.htmlentities($page['page_title'])) + 'TITLE' => ($title_prefix.$page['page_title']) ) ); if($results_array['parent'] == $page['page_id']) { Index: trunk/wb/admin/pages/index.php =================================================================== --- trunk/wb/admin/pages/index.php (revision 441) +++ trunk/wb/admin/pages/index.php (revision 442) @@ -166,15 +166,15 @@ get_permission('pages_modify') == true AND $can_modify == true) { ?> - + - + - + @@ -462,7 +462,7 @@ for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - '; } $template->set_var(array( 'ID' => $page['page_id'], - 'TITLE' => ($title_prefix.htmlentities($page['page_title'])) + 'TITLE' => ($title_prefix.$page['page_title']) ) ); if($can_modify == true) { Index: trunk/wb/admin/pages/trash.php =================================================================== --- trunk/wb/admin/pages/trash.php (revision 441) +++ trunk/wb/admin/pages/trash.php (revision 442) @@ -141,21 +141,21 @@ get_permission('pages_modify') == true AND $can_modify == true AND $page['visibility'] != 'heading') { ?> - + '.(htmlentities($page['page_title'])).''; + echo ''.($page['page_title']).''; } ?> - + Index: trunk/wb/admin/pages/settings2.php =================================================================== --- trunk/wb/admin/pages/settings2.php (revision 441) +++ trunk/wb/admin/pages/settings2.php (revision 442) @@ -41,7 +41,9 @@ // Get values $page_title = $admin->add_slashes($admin->get_post_escaped('page_title')); +$page_title = my_htmlspecialchars($page_title); $menu_title = $admin->add_slashes($admin->get_post_escaped('menu_title')); +$menu_title = my_htmlspecialchars($menu_title); $description = $admin->add_slashes($admin->get_post('description')); $keywords = $admin->add_slashes($admin->get_post('keywords')); $parent = $admin->get_post('parent'); Index: trunk/wb/admin/pages/sections.php =================================================================== --- trunk/wb/admin/pages/sections.php (revision 441) +++ trunk/wb/admin/pages/sections.php (revision 442) @@ -138,7 +138,7 @@ : - + - - Index: trunk/wb/admin/pages/modify.php =================================================================== --- trunk/wb/admin/pages/modify.php (revision 441) +++ trunk/wb/admin/pages/modify.php (revision 442) @@ -60,7 +60,7 @@ $template->set_block('page', 'main_block', 'main'); $template->set_var(array( 'PAGE_ID' => $results_array['page_id'], - 'PAGE_TITLE' => (htmlentities($results_array['page_title'])), + 'PAGE_TITLE' => ($results_array['page_title']), 'MODIFIED_BY' => $user['display_name'], 'MODIFIED_BY_USERNAME' => $user['username'], 'MODIFIED_WHEN' => $modified_ts, Index: trunk/wb/admin/pages/add.php =================================================================== --- trunk/wb/admin/pages/add.php (revision 441) +++ trunk/wb/admin/pages/add.php (revision 442) @@ -33,6 +33,7 @@ // Get values $title = $admin->add_slashes($admin->get_post_escaped('title')); +$title = my_htmlspecialchars($title); $module = $admin->get_post('type'); $parent = $admin->get_post('parent'); $visibility = $admin->get_post('visibility'); Index: trunk/wb/framework/convert.php =================================================================== --- trunk/wb/framework/convert.php (revision 441) +++ trunk/wb/framework/convert.php (revision 442) @@ -25,8 +25,7 @@ /* Character Conversion file -This file helps convert possible error-causing -characters to equivalent non-error-causing ones +to convert some entities to there 7bit equivalents */ if(!defined('WB_URL')) { header('Location: ../index.php'); @@ -34,41 +33,234 @@ } $conversion_array = array( -'À'=>'A','�?'=>'A','Â'=>'A','Ã'=>'A','Ä'=>'Ae', 'Ä'=>'A', -'Ã…'=>'A','Ä€'=>'A','Ä„'=>'A','Ä‚'=>'A', 'Æ'=>'Ae', -'Ç'=>'C','Ć'=>'C','ÄŒ'=>'C','Ĉ'=>'C','ÄŠ'=>'C', -'ÄŽ'=>'D','�?'=>'D','�?'=>'D', -'È'=>'E','É'=>'E','Ê'=>'E','Ë'=>'E','Ä’'=>'E', -'Ę'=>'E','Äš'=>'E','Ä”'=>'E','Ä–'=>'E', -'Äœ'=>'G','Äž'=>'G','Ä '=>'G','Ä¢'=>'G', -'Ĥ'=>'H','Ħ'=>'H', -'ÃŒ'=>'I','�?'=>'I','ÃŽ'=>'I','�?'=>'I','Ī'=>'I', 'Ĩ'=>'I','Ĭ'=>'I','Ä®'=>'I','Ä°'=>'I', -'IJ'=>'IJ','Ä´'=>'J','Ķ'=>'K', -'�?'=>'K','Ľ'=>'K','Ĺ'=>'K','Ä»'=>'K','Ä¿'=>'K', -'Ñ'=>'N','Ń'=>'N','Ň'=>'N','Å…'=>'N','ÅŠ'=>'N', -'Ã’'=>'O','Ó'=>'O','Ô'=>'O','Õ'=>'O','Ö'=>'Oe', -'Ö'=>'Oe', 'Ø'=>'O','ÅŒ'=>'O','�?'=>'O','ÅŽ'=>'O', -'Å’'=>'OE', 'Å”'=>'R','Ř'=>'R','Å–'=>'R', -'Åš'=>'S','Å '=>'S','Åž'=>'S','Åœ'=>'S','Ș'=>'S', -'Ť'=>'T','Å¢'=>'T','Ŧ'=>'T','Èš'=>'T', -'Ù'=>'U','Ú'=>'U','Û'=>'U','Ãœ'=>'Ue','Ū'=>'U', -'Ü'=>'Ue', 'Å®'=>'U','Å°'=>'U','Ŭ'=>'U','Ũ'=>'U','Ų'=>'U', -'Å´'=>'W', '�?'=>'Y','Ŷ'=>'Y','Ÿ'=>'Y', 'Ź'=>'Z','Ž'=>'Z','Å»'=>'Z', -'Þ'=>'T','Þ'=>'T', 'à'=>'a','á'=>'a','â'=>'a','ã'=>'a','ä'=>'ae', -'ä'=>'ae', 'Ã¥'=>'a','�?'=>'a','Ä…'=>'a','ă'=>'a', -'æ'=>'ae', 'ç'=>'c','ć'=>'c','�?'=>'c','ĉ'=>'c','Ä‹'=>'c', -'�?'=>'d','Ä‘'=>'d','ð'=>'d', 'è'=>'e','é'=>'e','ê'=>'e','ë'=>'e','Ä“'=>'e', -'Ä™'=>'e','Ä›'=>'e','Ä•'=>'e','Ä—'=>'e', 'Æ’'=>'f', -'�?'=>'g','ÄŸ'=>'g','Ä¡'=>'g','Ä£'=>'g', 'Ä¥'=>'h','ħ'=>'h', -'ì'=>'i','í'=>'i','î'=>'i','ï'=>'i','Ä«'=>'i', 'Ä©'=>'i','Ä­'=>'i','į'=>'i','ı'=>'i', -'ij'=>'ij', 'ĵ'=>'j', 'Ä·'=>'k','ĸ'=>'k', 'Å‚'=>'l','ľ'=>'l','ĺ'=>'l','ļ'=>'l','Å€'=>'l', -'ñ'=>'n','Å„'=>'n','ň'=>'n','ņ'=>'n','ʼn'=>'n', 'Å‹'=>'n', -'ò'=>'o','ó'=>'o','ô'=>'o','õ'=>'o','ö'=>'oe', 'ö'=>'oe', -'ø'=>'o','�?'=>'o','Å‘'=>'o','�?'=>'o', 'Å“'=>'oe', 'Å•'=>'r','Å™'=>'r','Å—'=>'r', -'Å¡'=>'s', 'ù'=>'u','ú'=>'u','û'=>'u','ü'=>'ue','Å«'=>'u', 'ü'=>'ue', -'ů'=>'u','ű'=>'u','Å­'=>'u','Å©'=>'u','ų'=>'u', 'ŵ'=>'w', -'ý'=>'y','ÿ'=>'y','Å·'=>'y', 'ž'=>'z','ż'=>'z','ź'=>'z', 'þ'=>'t', 'ß'=>'ss', 'Å¿'=>'ss', -'ä'=>'ae', 'ö'=>'oe', 'ü'=>'ue', 'Ä'=>'Ae', 'Ö'=>'Oe', 'Ãœ'=>'Ue' + +//### LATIN +'Á'=>'A','á'=>'a','Â'=>'A','â'=>'a','Æ'=>'AE','æ'=>'ae','À'=>'A','à'=>'a','Å'=>'A','å'=>'a','Ã'=>'A','ã'=>'a','Ä'=>'AE','ä'=>'ae', +'Ç'=>'C','ç'=>'c', +'É'=>'E','é'=>'e','Ê'=>'E','ê'=>'e','È'=>'E','è'=>'e','Ë'=>'E','ë'=>'e', +'Í'=>'I','í'=>'i','Î'=>'I','î'=>'i','Ì'=>'I','ì'=>'i','Ï'=>'I','ï'=>'i', +'Ñ'=>'N','ñ'=>'n', +'Ó'=>'O','ó'=>'o','Ô'=>'O','ô'=>'o','Œ'=>'OE','œ'=>'oe','Ò'=>'O','ò'=>'o','Õ'=>'O','õ'=>'o','Ö'=>'OE','ö'=>'oe', +'Š'=>'S','š'=>'s', +'ß'=>'ss', +'Ú'=>'U','ú'=>'u','Û'=>'U','û'=>'u','Ù'=>'U','ù'=>'u','Ü'=>'UE','ü'=>'ue', +'Ý'=>'Y','ý'=>'y','Ÿ'=>'Y','ÿ'=>'y', +'Š'=>'S', +'Œ'=>'OE','œ'=>'oe', +'š'=>'s', +'Ÿ'=>'Y', +'©'=>'(c)','®'=>'(r)','Ð'=>'D','×'=>'x','Ø'=>'O','Þ'=>'TH','ð'=>'d','ø'=>'o','þ'=>'th', + +// latin extended-A +'Ā'=>'A','ā'=>'a','Ă'=>'A','ă'=>'a','Ą'=>'A','ą'=>'a', +'Ć'=>'C','ć'=>'c','Ĉ'=>'C','ĉ'=>'c','č'=>'c','Č'=>'C','ċ'=>'c','Ċ'=>'C', +'đ'=>'d','Đ'=>'D','ď'=>'d','Ď'=>'D', +'ē'=>'e','Ē'=>'E','Ĕ'=>'E','ĕ'=>'e','Ė'=>'E','ė'=>'e','Ę'=>'E','ę'=>'e','Ě'=>'E','ě'=>'e', +'Ĝ'=>'G','ĝ'=>'g','Ğ'=>'G','ğ'=>'g','Ġ'=>'G','ġ'=>'g','Ģ'=>'G','ģ'=>'g', +'Ĥ'=>'H','ĥ'=>'h','Ħ'=>'H','ħ'=>'h', +'Ĩ'=>'I','ĩ'=>'i','Ī'=>'I','ī'=>'i','Ĭ'=>'I','ĭ'=>'i','Į'=>'I','į'=>'i','İ'=>'I','ı'=>'i', +'IJ'=>'IJ','ij'=>'ij', +'Ĵ'=>'J','ĵ'=>'j', +'Ķ'=>'K','ķ'=>'k','ĸ'=>'k', +'Ĺ'=>'L','ĺ'=>'l','Ļ'=>'L','ļ'=>'l','Ľ'=>'L','ľ'=>'l','Ŀ'=>'L','ŀ'=>'l','Ł'=>'L','ł'=>'l', +'Ń'=>'N','ń'=>'n','Ņ'=>'N','ņ'=>'n','Ň'=>'N','ň'=>'n','ʼn'=>'n','Ŋ'=>'N','ŋ'=>'n', +'Ō'=>'O','ō'=>'o','Ŏ'=>'O','ŏ'=>'o','Ő'=>'O','ő'=>'o', +'Ŕ'=>'R','ŕ'=>'r','Ŗ'=>'R','ŗ'=>'r','Ř'=>'R','ř'=>'r', +'Ś'=>'S','ś'=>'s','Ŝ'=>'S','ŝ'=>'s','Ş'=>'S','ş'=>'s', +'Ţ'=>'T','ţ'=>'t','Ť'=>'T','ť'=>'t','Ŧ'=>'T','ŧ'=>'t', +'Ũ'=>'U','ũ'=>'u','Ū'=>'U','ū'=>'u','Ŭ'=>'U','ŭ'=>'u','Ů'=>'U','ů'=>'u','Ű'=>'U','ű'=>'u','Ų'=>'U','ų'=>'u', +'Ŵ'=>'W','ŵ'=>'w', +'Ŷ'=>'Y','ŷ'=>'y','Ÿ'=>'Y', +'Ź'=>'Z','ź'=>'z','Ż'=>'Z','ż'=>'z','Ž'=>'Z','ž'=>'z', +'ſ'=>'s', +'ff'=>'ff','fi'=>'fi','fl'=>'fl','ffi'=>'ffi','ffl'=>'ffl', +'ſt'=>'st', +'st'=>'st', +// latin extended-b +'ƀ'=>'b','Ɓ'=>'B','Ƃ'=>'B','ƃ'=>'b','Ƅ'=>'6','ƅ'=>'6', +'Ɔ'=>'O','Ƈ'=>'C','ƈ'=>'c','Ɖ'=>'D','Ɗ'=>'D','Ƌ'=>'D', +'ƌ'=>'d','ƍ'=>'d','Ǝ'=>'E','Ə'=>'e','Ɛ'=>'E','Ƒ'=>'F', +'ƒ'=>'f','Ɠ'=>'G','Ɣ'=>'G','ƕ'=>'hw','Ɩ'=>'I','Ɨ'=>'I', +'Ƙ'=>'K','ƙ'=>'k','ƚ'=>'l','ƛ'=>'l','Ɯ'=>'M','Ɲ'=>'N', +'ƞ'=>'n','Ɵ'=>'O','Ơ'=>'O','ơ'=>'o','Ƣ'=>'OI','ƣ'=>'oi', +'Ƥ'=>'P','ƥ'=>'p','Ʀ'=>'YR','Ƨ'=>'2','ƨ'=>'2','Ʃ'=>'ESH', +'ƪ'=>'esh','ƫ'=>'t','Ƭ'=>'T','ƭ'=>'t','Ʈ'=>'T','Ư'=>'U', +'ư'=>'u','Ʊ'=>'V','Ʋ'=>'v','Ƴ'=>'Y','ƴ'=>'y','Ƶ'=>'Z', +'ƶ'=>'z','Ʒ'=>'EZH','Ƹ'=>'EZH','ƹ'=>'ezh','ƺ'=>'ezh','ƻ'=>'2', +'Ƽ'=>'5','ƽ'=>'5','ƾ'=>'-','ƿ'=>'w','ǀ'=>'-','ǁ'=>'-', +'ǂ'=>'-','ǃ'=>'-','DŽ'=>'DZ','Dž'=>'DZ','dž'=>'dz','LJ'=>'LJ', +'Lj'=>'Lj','lj'=>'lj','NJ'=>'NJ','Nj'=>'Nj','nj'=>'nj','Ǎ'=>'A', +'ǎ'=>'a','Ǐ'=>'I','ǐ'=>'i','Ǒ'=>'O','ǒ'=>'o','Ǔ'=>'U', +'ǔ'=>'u','Ǖ'=>'U','ǖ'=>'u','Ǘ'=>'U','ǘ'=>'u','Ǚ'=>'U', +'ǚ'=>'u','Ǜ'=>'U','ǜ'=>'u','ǝ'=>'e','Ǟ'=>'A','ǟ'=>'a', +'Ǡ'=>'A','ǡ'=>'a','Ǣ'=>'AE','ǣ'=>'ae','Ǥ'=>'G','ǥ'=>'g', +'Ǧ'=>'G','ǧ'=>'g','Ǩ'=>'K','ǩ'=>'k','Ǫ'=>'O','ǫ'=>'o', +'Ǭ'=>'O','ǭ'=>'o','Ǯ'=>'EZH','ǯ'=>'ezh','ǰ'=>'j','DZ'=>'DZ', +'Dz'=>'Dz','dz'=>'dz','Ǵ'=>'G','ǵ'=>'g','Ƕ'=>'HW','Ƿ'=>'W', +'Ǹ'=>'N','ǹ'=>'n','Ǻ'=>'A','ǻ'=>'a','Ǽ'=>'AE','ǽ'=>'ae', +'Ǿ'=>'O','ǿ'=>'o','Ȁ'=>'A','ȁ'=>'a','Ȃ'=>'A','ȃ'=>'a', +'Ȅ'=>'E','ȅ'=>'e','Ȇ'=>'E','ȇ'=>'e','Ȉ'=>'I','ȉ'=>'i', +'Ȋ'=>'I','ȋ'=>'i','Ȍ'=>'O','ȍ'=>'o','Ȏ'=>'O','ȏ'=>'o', +'Ȑ'=>'R','ȑ'=>'r','Ȓ'=>'R','ȓ'=>'r','Ȕ'=>'U','ȕ'=>'u', +'Ȗ'=>'U','ȗ'=>'u','Ș'=>'S','ș'=>'s','Ț'=>'T','ț'=>'t', +'Ȝ'=>'Y','ȝ'=>'y','Ȟ'=>'H','ȟ'=>'h','Ƞ'=>'n','ȡ'=>'d', +'Ȣ'=>'OU','ȣ'=>'ou','Ȥ'=>'Z','ȥ'=>'z','Ȧ'=>'A','ȧ'=>'a', +'Ȩ'=>'E','ȩ'=>'e','Ȫ'=>'O','ȫ'=>'o','Ȭ'=>'O','ȭ'=>'o', +'Ȯ'=>'O','ȯ'=>'o','Ȱ'=>'O','ȱ'=>'o','Ȳ'=>'Y','ȳ'=>'y', +'ȴ'=>'l','ȵ'=>'n','ȶ'=>'t','ȷ'=>'j','ȸ'=>'db','ȹ'=>'qp', +'Ⱥ'=>'A','Ȼ'=>'C','ȼ'=>'c','Ƚ'=>'L','Ⱦ'=>'T','ȿ'=>'s', +'ɀ'=>'z','Ɂ'=>'-', +// latin extended additional +'Ḁ'=>'A','ḁ'=>'a', +'Ḃ'=>'B','ḃ'=>'b','Ḅ'=>'B','ḅ'=>'b','Ḇ'=>'B','ḇ'=>'b', +'Ḉ'=>'C','ḉ'=>'c', +'Ḋ'=>'D','ḋ'=>'d','Ḍ'=>'D','ḍ'=>'d','Ḏ'=>'D','ḏ'=>'d','Ḑ'=>'D','ḑ'=>'d','Ḓ'=>'D','ḓ'=>'d', +'Ḕ'=>'E','ḕ'=>'e','Ḗ'=>'E','ḗ'=>'e','Ḙ'=>'E','ḙ'=>'e','Ḛ'=>'E','ḛ'=>'e','Ḝ'=>'E','ḝ'=>'e', +'Ḟ'=>'F','ḟ'=>'f', +'Ḡ'=>'G','ḡ'=>'g', +'Ḣ'=>'H','ḣ'=>'h','Ḥ'=>'H','ḥ'=>'h','Ḧ'=>'H','ḧ'=>'h','Ḩ'=>'H','ḩ'=>'h','Ḫ'=>'H','ḫ'=>'h', +'Ḭ'=>'I','ḭ'=>'i','Ḯ'=>'I','ḯ'=>'i', +'Ḱ'=>'K','ḱ'=>'k','Ḳ'=>'K','ḳ'=>'k','Ḵ'=>'K','ḵ'=>'k', +'Ḷ'=>'L','ḷ'=>'l','Ḹ'=>'L','ḹ'=>'l','Ḻ'=>'L','ḻ'=>'l','Ḽ'=>'L','ḽ'=>'l', +'Ḿ'=>'M','ḿ'=>'m','Ṁ'=>'M','ṁ'=>'m','Ṃ'=>'M','ṃ'=>'m', +'Ṅ'=>'N','ṅ'=>'n','Ṇ'=>'N','ṇ'=>'n','Ṉ'=>'N','ṉ'=>'n','Ṋ'=>'N','ṋ'=>'n', +'Ṍ'=>'O','ṍ'=>'o','Ṏ'=>'O','ṏ'=>'o','Ṑ'=>'O','ṑ'=>'o','Ṓ'=>'O','ṓ'=>'o', +'Ṕ'=>'P','ṕ'=>'p','Ṗ'=>'P','ṗ'=>'p', +'Ṙ'=>'R','ṙ'=>'r','Ṛ'=>'R','ṛ'=>'r','Ṝ'=>'R','ṝ'=>'r','Ṟ'=>'R','ṟ'=>'r', +'Ṡ'=>'S','ṡ'=>'s','Ṣ'=>'S','ṣ'=>'s','Ṥ'=>'S','ṥ'=>'s','Ṧ'=>'S','ṧ'=>'s','Ṩ'=>'S','ṩ'=>'s', +'Ṫ'=>'T','ṫ'=>'t','Ṭ'=>'T','ṭ'=>'t','Ṯ'=>'T','ṯ'=>'t','Ṱ'=>'T','ṱ'=>'t', +'Ṳ'=>'U','ṳ'=>'u','Ṵ'=>'U','ṵ'=>'u','Ṷ'=>'U','ṷ'=>'u','Ṹ'=>'U','ṹ'=>'u','Ṻ'=>'U','ṻ'=>'u', +'Ṽ'=>'V','ṽ'=>'v','Ṿ'=>'V','ṿ'=>'v', +'Ẁ'=>'W','ẁ'=>'w','Ẃ'=>'W','ẃ'=>'w','Ẅ'=>'W','ẅ'=>'w','Ẇ'=>'W','ẇ'=>'w','Ẉ'=>'W','ẉ'=>'w', +'Ẋ'=>'X','ẋ'=>'x','Ẍ'=>'X','ẍ'=>'x', +'Ẏ'=>'Y','ẏ'=>'y', +'Ẑ'=>'Z','ẑ'=>'z','Ẓ'=>'Z','ẓ'=>'z','Ẕ'=>'Z','ẕ'=>'z', +'ẖ'=>'h', +'ẗ'=>'t', +'ẘ'=>'w', +'ẙ'=>'y', +'ẚ'=>'a', +'ẛ'=>'f', +'Ạ'=>'A','ạ'=>'a','Ả'=>'A','ả'=>'a','Ấ'=>'A','ấ'=>'a','Ầ'=>'A','ầ'=>'a','Ẩ'=>'A','ẩ'=>'a', +'Ẫ'=>'A','ẫ'=>'a','Ậ'=>'A','ậ'=>'a','Ắ'=>'A','ắ'=>'a','Ằ'=>'A','ằ'=>'a','Ẳ'=>'A','ẳ'=>'a','Ẵ'=>'A','ẵ'=>'a','Ặ'=>'A','ặ'=>'a', +'Ẹ'=>'E','ẹ'=>'e','Ẻ'=>'E','ẻ'=>'e','Ẽ'=>'E','ẽ'=>'e','Ế'=>'E','ế'=>'e','Ề'=>'E','ề'=>'e','Ể'=>'E','ể'=>'e','Ễ'=>'E','ễ'=>'e','Ệ'=>'E','ệ'=>'e', +'Ỉ'=>'I','ỉ'=>'i','Ị'=>'I','ị'=>'i', +'Ọ'=>'O','ọ'=>'o','Ỏ'=>'O','ỏ'=>'o','Ố'=>'O','ố'=>'o','Ồ'=>'O','ồ'=>'o','Ổ'=>'O','ổ'=>'o','Ỗ'=>'O','ỗ'=>'o', +'Ộ'=>'O','ộ'=>'o','Ớ'=>'O','ớ'=>'o','Ờ'=>'O','ờ'=>'o','Ở'=>'O','ở'=>'o','Ỡ'=>'O','ỡ'=>'o','Ợ'=>'O','ợ'=>'o', +'Ụ'=>'U','ụ'=>'u','Ủ'=>'U','ủ'=>'u','Ứ'=>'U','ứ'=>'u','Ừ'=>'U','ừ'=>'u','Ử'=>'U','ử'=>'u','Ữ'=>'U','ữ'=>'u','Ự'=>'U','ự'=>'u', +'Ỳ'=>'Y','ỳ'=>'y','Ỵ'=>'Y','ỵ'=>'y','Ỷ'=>'Y','ỷ'=>'y','Ỹ'=>'Y','ỹ'=>'y', + +//### CYRILLIC (transliteration following iso 9:1995) +'А'=>'A','а'=>'a', +'Ӑ'=>'A','ӑ'=>'a', +'Ӓ'=>'A','ӓ'=>'a', +'Ә'=>'A','ә'=>'a', +'Б'=>'B','б'=>'b', +'В'=>'V','в'=>'v', +'Г'=>'G','г'=>'g', +'Ґ'=>'G','ґ'=>'g', +'Ҕ'=>'G','ҕ'=>'g', +'Ғ'=>'G','ғ'=>'g', +'Д'=>'D','д'=>'d', +'Ђ'=>'D','ђ'=>'d', +'Ѓ'=>'G','ѓ'=>'g', +'Е'=>'E','е'=>'e', +'Ё'=>'E','ё'=>'e', +'Ӗ'=>'E','ӗ'=>'e', +'Є'=>'E','є'=>'e', +'Ҽ'=>'C','ҽ'=>'c', +'Ҿ'=>'C','ҿ'=>'c', +'Ж'=>'Z','ж'=>'z', +'Ӂ'=>'Z','ӂ'=>'z', +'Ӝ'=>'Z','ӝ'=>'z', +'Җ'=>'Z','җ'=>'z', +'З'=>'Z','з'=>'z', +'Ӟ'=>'Z','ӟ'=>'z', +'Ѕ'=>'Z','ѕ'=>'z', +'Ӡ'=>'Z','ӡ'=>'z', +'И'=>'I','и'=>'i', +'Ӥ'=>'I','ӥ'=>'i', +'І'=>'I','і'=>'i', +'Ї'=>'I','ї'=>'i', +'Й'=>'J','й'=>'j', +'Ј'=>'J','ј'=>'j', +'К'=>'K','к'=>'k', +'Қ'=>'K','қ'=>'k', +'Ҟ'=>'K','ҟ'=>'k', +'Л'=>'L','л'=>'l', +'Љ'=>'L','љ'=>'l', +'М'=>'M','м'=>'m', +'Н'=>'N','н'=>'n', +'Њ'=>'N','њ'=>'n', +'Ҥ'=>'N','ҥ'=>'n', +'Ң'=>'N','ң'=>'n', +'О'=>'O','о'=>'o', +'Ӧ'=>'O','ӧ'=>'o', +'Ө'=>'O','ө'=>'o', +'П'=>'P','п'=>'p', +'Ҧ'=>'P','ҧ'=>'p', +'Р'=>'R','р'=>'r', +'С'=>'S','с'=>'s', +'Ҫ'=>'C','ҫ'=>'c', +'Т'=>'T','т'=>'t', +'Ҭ'=>'T','ҭ'=>'t', +'Ћ'=>'C','ћ'=>'c', +'Ќ'=>'K','ќ'=>'k', +'У'=>'U','у'=>'u', +'Ў'=>'U','ў'=>'u', +'Ӱ'=>'U','ӱ'=>'u', +'Ӳ'=>'U','ӳ'=>'u', +'Ү'=>'U','ү'=>'u', +'Ф'=>'F','ф'=>'f', +'Х'=>'H','х'=>'h', +'Ҳ'=>'H','ҳ'=>'h', +'Һ'=>'H','һ'=>'h', +'Ц'=>'C','ц'=>'c', +'Ҵ'=>'C','ҵ'=>'c', +'Ч'=>'C','ч'=>'c', +'Ӵ'=>'C','ӵ'=>'c', +'Ҷ'=>'C','ҷ'=>'c', +'Џ'=>'D','џ'=>'d', +'Ш'=>'S','ш'=>'s', +'Щ'=>'S','щ'=>'s', +'Ы'=>'Y','ы'=>'y', +'Ӹ'=>'Y','ӹ'=>'y', +'Э'=>'E','э'=>'e', +'Ю'=>'U','ю'=>'u', +'Я'=>'A','я'=>'a', +'Ѣ'=>'E','ѣ'=>'e', +'Ѫ'=>'A','ѫ'=>'a', +'Ѳ'=>'F','ѳ'=>'f', +'Ѵ'=>'Y','ѵ'=>'y', +'Ҩ'=>'O','ҩ'=>'o', +// ? +'Ъ'=>'-', +'Ь'=>'-', +'Ӏ'=>'-', +'ь'=>'-', +'́'=>'', + +//### (new) GREEK (transcription following wikipedia: http://de.wikipedia.org/w/index.php?title=Wikipedia:Namenskonventionen/Neugriechisch&oldid=29601735 ) +// groups of two chars +'αι'=>'e','Αι'=>'E', +'ει'=>'i','Ει'=>'I', +'οι'=>'i','Οι'=>'I', +'ου'=>'ou','Ου'=>'Ou', +'αυ'=>'av','Αυ'=>'Av', +'ευ'=>'ev','Ευ'=>'Ev', +'ηυ'=>'iv','Ηυ'=>'Iv', +'μπ'=>'mp','Μπ'=>'B', +'ντ'=>'nt','Ντ'=>'D', +'τζ'=>'tz','Τζ'=>'Tz', +'γκ'=>'ng','Γκ'=>'G', +'γγ'=>'ng','Γγ'=>'Ng', +// single chars +'Ά'=>'A','Έ'=>'E','Ή'=>'I','Ί'=>'I','Ό'=>'O','Ύ'=>'Y','Ώ'=>'O','ΐ'=>'i', +'Α'=>'A','Β'=>'V','Γ'=>'G','Δ'=>'D','Ε'=>'E','Ζ'=>'Z','Η'=>'I','Θ'=>'Th','Ι'=>'I','Κ'=>'K','Λ'=>'L','Μ'=>'M','Ν'=>'N','Ξ'=>'X','Ο'=>'O','Π'=>'P','Ρ'=>'R','Σ'=>'S','Τ'=>'T','Υ'=>'Y','Φ'=>'F','Χ'=>'Ch','Ψ'=>'Ps','Ω'=>'O', +'Ϊ'=>'I','Ϋ'=>'Y','ά'=>'a','έ'=>'e','ή'=>'i','ί'=>'i','ΰ'=>'y', +'α'=>'a','β'=>'v','γ'=>'g','δ'=>'d','ε'=>'e','ζ'=>'z','η'=>'i','θ'=>'th','ι'=>'i','κ'=>'k','λ'=>'l','μ'=>'m','ν'=>'n','ξ'=>'x','ο'=>'o','π'=>'p','ρ'=>'r','ς'=>'s','σ'=>'s','τ'=>'t','υ'=>'y','φ'=>'f','χ'=>'ch','ψ'=>'ps','ω'=>'o', +'ϊ'=>'i','ϋ'=>'y','ό'=>'o','ύ'=>'y','ώ'=>'o','ϐ'=>'b','ϑ'=>'th','ϒ'=>'y','ϓ'=>'y','ϔ'=>'y' + ); ?> \ No newline at end of file Index: trunk/wb/framework/class.frontend.php =================================================================== --- trunk/wb/framework/class.frontend.php (revision 441) +++ trunk/wb/framework/class.frontend.php (revision 442) @@ -72,7 +72,7 @@ $content = @fread($handle, filesize($filename)); @fclose($handle); $this->preprocess($content); - header("Location: pages/intro.php"); // send intro.php as header to allow parsing of php statements + header("Location: pages/intro.php"); // send intro.php as header to allow parsing of php statements echo ($content); return false; } @@ -140,10 +140,10 @@ // Page ID define('PAGE_ID', $this->page['page_id']); // Page Title - define('PAGE_TITLE', htmlentities(($this->page['page_title']))); + define('PAGE_TITLE', $this->page['page_title']); $this->page_title=PAGE_TITLE; // Menu Title - $menu_title = htmlentities($this->page['menu_title']); + $menu_title = $this->page['menu_title']; if($menu_title != '') { define('MENU_TITLE', $menu_title); } else { @@ -354,7 +354,7 @@ $link = $this->page_link($page['link']); } // Create values - $values = array($class,'', '', htmlentities($page['menu_title']), htmlentities($page['page_title'])); + $values = array($class,'', '', $page['menu_title'], $page['page_title']); // Replace vars with value and print echo "\n".str_replace($vars, $values, $this->menu_item_template); // Generate sub-menu Index: trunk/wb/framework/frontend.functions.php =================================================================== --- trunk/wb/framework/frontend.functions.php (revision 441) +++ trunk/wb/framework/frontend.functions.php (revision 442) @@ -73,7 +73,7 @@ // filter meta-characters $string=preg_quote($string, '/'); if ($string!=$last_string ) { - $foo=preg_replace('/('.$string.')(?=[^>;]*(&|<))/iUS', '$1',$foo); + $foo=preg_replace('/((>|;)[^&<]*)('.$string.')(?=[^>;]*(&|<))/iUS', '$1$3',$foo); $last_string=$string; } } @@ -184,6 +184,11 @@ if (isset($_GET['searchresult']) AND is_numeric($_GET['searchresult']) ) { if (isset($_GET['sstring']) AND !empty($_GET['sstring']) ){ $arr_string = explode(" ", $_GET['sstring']); + if($_GET['searchresult'] == 2) { + // exact match + $arr_string[0] = strtr($arr_string[0], "_"," "); + $arr_string[1] = strtr($arr_string[1], "_"," "); + } ob_start(); //start output buffer require(WB_PATH.'/modules/'.$module.'/view.php'); $foo = ob_get_contents(); // put outputbuffer in $foo @@ -223,9 +228,9 @@ $query_menu=$database->query("SELECT menu_title,link FROM ".TABLE_PREFIX."pages WHERE page_id=$temp"); $page=$query_menu->fetchRow(); if ($links==true AND $temp!=$page_id) - echo ''.htmlentities($page['menu_title']).''; + echo ''.$page['menu_title'].''; else - echo htmlentities($page['menu_title']); + echo $page['menu_title']; } $counter++; } Index: trunk/wb/framework/functions.php =================================================================== --- trunk/wb/framework/functions.php (revision 441) +++ trunk/wb/framework/functions.php (revision 442) @@ -338,11 +338,107 @@ return $subs; } +// Function as replecement for php's htmlspecialchars() +function my_htmlspecialchars($string) { + $string = umlauts_to_entities($string); + $string = entities_to_umlauts($string); + return($string); +} + +// Function to get the DEFAULT_CHARSET +function get_wbcharset() { + $charset=strtoupper(DEFAULT_CHARSET); + if(strcmp($charset,"BIG5") == 0) { + $charset="BIG-5"; + } + return($charset); +} + +// Function to convert a string from $from- to $to-encoding, using mysql +function my_mysql_iconv($string, $from, $to) { + // keep current character set values: + $character_set_database = mysql_result(mysql_query("SELECT @@character_set_client"),0,0); + $character_set_results = mysql_result(mysql_query("SELECT @@character_set_results"),0,0); + $collation_results = mysql_result(mysql_query("SELECT @@collation_connection"),0,0); + mysql_query("SET character_set_client=$from"); + mysql_query("SET character_set_results=$to"); + mysql_query("SET collation_connection=utf8_unicode_ci"); + $string_escaped = mysql_real_escape_string($string); + $converted_string = mysql_result(mysql_query("SELECT '$string_escaped'"),0,0); + // restore previous character set values: + mysql_query("SET character_set_client=$character_set_database"); + mysql_query("SET character_set_results=$character_set_results"); + mysql_query("SET collation_connection=$collation_results"); + return $converted_string; +} + +// Function to convert a string from html-entities to umlauts +// and encode htmlspecialchars +function entities_to_umlauts($string) { + $charset = get_wbcharset(); + // there's no GB2312 or ISO-8859-11 encoding in php's mb_* functions + if (strcmp($charset,"GB2312") == 0) { + if(function_exists('iconv')) { + $string=mb_convert_encoding($string,'UTF-8','HTML-ENTITIES'); + $string=iconv("UTF-8","GB2312",$string); + } else { + $string=mb_convert_encoding($string,'UTF-8','HTML-ENTITIES'); + $string=my_mysql_iconv($string, 'utf8', 'gb2312'); + } + } elseif (strcmp($charset,"ISO-8859-11") == 0) { + if(function_exists('iconv')) { + $string=mb_convert_encoding($string,'UTF-8','HTML-ENTITIES'); + $string=iconv("UTF-8","ISO-8859-11",$string); + } else { + $string=mb_convert_encoding($string,'UTF-8','HTML-ENTITIES'); + $string=my_mysql_iconv($string, 'utf8', 'tis620'); + } + } else { + $string=mb_convert_encoding($string,$charset,'HTML-ENTITIES'); + } + $string=htmlspecialchars($string); + return($string); +} + +// Function to convert a string from umlauts to html-entities +// and encode htmlspecialchars +function umlauts_to_entities($string) { + $charset=get_wbcharset(); + // there's no GB2312 or ISO-8859-11 encoding in php's mb_* functions + if (strcmp($charset,"GB2312") == 0) { + if(function_exists('iconv')) { + $string=iconv("GB2312","UTF-8",$string); + $charset="UTF-8"; + } else { + $string=my_mysql_iconv($string, 'gb2312', 'utf8'); + $charset="UTF-8"; + } + } elseif (strcmp($charset,"ISO-8859-11") == 0) { + if(function_exists('iconv')) { + $string=iconv("ISO-8859-11","UTF-8",$string); + $charset="UTF-8"; + } else { + $string=my_mysql_iconv($string, 'tis620', 'utf8'); + $charset="UTF-8"; + } + } + $string=mb_convert_encoding($string,'HTML-ENTITIES',$charset); + $string=mb_convert_encoding($string,'UTF-8','HTML-ENTITIES'); + $string=htmlspecialchars($string,ENT_QUOTES); + $string=mb_convert_encoding($string,'HTML-ENTITIES','UTF-8'); + return($string); +} + +// translate any "latin" html-entities to their plain 7bit equivalents +function entities_to_7bit($string) { + require(WB_PATH.'/framework/convert.php'); + $string = strtr($string, $conversion_array); + return($string); +} + // Function to convert a page title to a page filename function page_filename($string) { - // First, translate any non-english characters to their english equivalents - require(WB_PATH.'/framework/convert.php'); - $string = strtr($string, $conversion_array); + $string = entities_to_7bit(umlauts_to_entities($string)); // Now replace spaces with page spcacer $string = str_replace(' ', PAGE_SPACER, $string); // Now remove all bad characters @@ -371,9 +467,7 @@ // Function to convert a desired media filename to a clean filename function media_filename($string) { - // First, translate any non-english characters to their english equivalents - require(WB_PATH.'/framework/convert.php'); - $string = strtr($string, $conversion_array); + $string = entities_to_7bit(umlauts_to_entities($string)); // Now remove all bad characters $bad = array( '\'', // '