diff options
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/html.php | 8 | ||||
| -rw-r--r-- | inc/template.php | 10 | ||||
| -rw-r--r-- | inc/utf8.php | 29 |
3 files changed, 37 insertions, 10 deletions
diff --git a/inc/html.php b/inc/html.php index a9135e155..9ec6049ef 100644 --- a/inc/html.php +++ b/inc/html.php @@ -277,7 +277,7 @@ function html_search(){ //show progressbar print '<div align="center">'; - print '<script language="JavaScript" type="text/javascript">'; + print '<script language="javascript" type="text/javascript" charset="utf-8">'; print 'showLoadBar();'; print '</script>'; print '<br /></div>'; @@ -317,7 +317,7 @@ function html_search(){ } //hide progressbar - print '<script language="JavaScript" type="text/javascript">'; + print '<script language="javascript" type="text/javascript" charset="utf-8">'; print 'hideLoadBar();'; print '</script>'; } @@ -846,7 +846,7 @@ function html_edit($text=null,$include='edit'){ //FIXME: include needed? <tr> <td class="toolbar" colspan="2"> <?if($wr){?> - <script language="JavaScript" type="text/javascript"> + <script language="javascript" type="text/javascript" charset="utf-8"> <?/* sets changed to true when previewed */?> textChanged = <? ($pr) ? print 'true' : print 'false' ?>; @@ -907,7 +907,7 @@ function html_edit($text=null,$include='edit'){ //FIXME: include needed? <?}?> </td> <td align="right"> - <script type="text/javascript"> + <script language="javascript" type="text/javascript" charset="utf-8"> showSizeCtl(); <?if($wr){?> init_locktimer(<?=$conf['locktime']-60?>,'<?=$lang['willexpire']?>'); diff --git a/inc/template.php b/inc/template.php index 035bfbdc1..bc2bc561b 100644 --- a/inc/template.php +++ b/inc/template.php @@ -166,23 +166,23 @@ function tpl_metaheaders(){ } // include some JavaScript language strings - ptln('<script language="JavaScript" type="text/javascript">',$it); + ptln('<script language="javascript" type="text/javascript" charset="utf-8">',$it); ptln(" var alertText = '".$lang['qb_alert']."'",$it); ptln(" var notSavedYet = '".$lang['notsavedyet']."'",$it); ptln(" var DOKU_BASE = '".DOKU_BASE."'",$it); ptln('</script>',$it); // load the default JavaScript files - ptln('<script language="JavaScript" type="text/javascript" src="'. + ptln('<script language="javascript" type="text/javascript" charset="utf-8" src="'. DOKU_BASE.'lib/scripts/script.js"></script>',$it); - ptln('<script language="JavaScript" type="text/javascript" src="'. + ptln('<script language="javascript" type="text/javascript" charset="utf-8" src="'. DOKU_BASE.'lib/scripts/tw-sack.js"></script>',$it); - ptln('<script language="JavaScript" type="text/javascript" src="'. + ptln('<script language="javascript" type="text/javascript" charset="utf-8" src="'. DOKU_BASE.'lib/scripts/ajax.js"></script>',$it); // load spellchecker script if wanted if($conf['spellchecker'] && ($ACT=='edit' || $ACT=='preview')){ - ptln('<script language="JavaScript" type="text/javascript" src="'. + ptln('<script language="javascript" type="text/javascript" charset="utf-8" src="'. DOKU_BASE.'lib/scripts/spellcheck.js"></script>',$it); } diff --git a/inc/utf8.php b/inc/utf8.php index 70b16f1a5..7d0f0a266 100644 --- a/inc/utf8.php +++ b/inc/utf8.php @@ -190,7 +190,7 @@ function utf8_ltrim($str,$charlist=''){ } /** - * Unicode aware replacement for ltrim() + * Unicode aware replacement for rtrim() * * @author Andreas Gohr <andi@splitbrain.org> * @see rtrim() @@ -342,6 +342,33 @@ function utf8_strpos($haystack, $needle,$offset=0) { } /** + * Encodes UTF-8 characters to HTML entities + * + * @author <vpribish at shopping dot com> + * @link http://www.php.net/manual/en/function.utf8-decode.php + */ +function utf8_tohtml ($str) { + $ret = ''; + $max = strlen($str); + $last = 0; // keeps the index of the last regular character + for ($i=0; $i<$max; $i++) { + $c = $str{$i}; + $c1 = ord($c); + if ($c1>>5 == 6) { // 110x xxxx, 110 prefix for 2 bytes unicode + $ret .= substr($str, $last, $i-$last); // append all the regular characters we've passed + $c1 &= 31; // remove the 3 bit two bytes prefix + $c2 = ord($str{++$i}); // the next byte + $c2 &= 63; // remove the 2 bit trailing byte prefix + $c2 |= (($c1 & 3) << 6); // last 2 bits of c1 become first 2 of c2 + $c1 >>= 2; // c1 shifts 2 to the right + $ret .= '&#' . ($c1 * 100 + $c2) . ';'; // this is the fastest string concatenation + $last = $i+1; + } + } + return $ret . substr($str, $last, $i); // append the last batch of regular characters +} + +/** * This function returns any UTF-8 encoded text as a list of * Unicode values: * |