Discussion:
[22847] standard/branches/user/mabe/zend_filter_entity/ library/Zend/Filter/Encode/Entity.php: user branch: entity filter: optimized converting internal utf-8 to output charset
mabe
2010-08-17 17:35:36 UTC
Permalink
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22847] standard/branches/user/mabe/zend_filter_entity/library/Zend/Filter/Encode/Entity.php: user branch: entity filter: optimized converting internal utf-8 to output charset</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22847</dd>
<dt>Author</dt> <dd>mabe</dd>
<dt>Date</dt> <dd>2010-08-17 10:35:36 -0700 (Tue, 17 Aug 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>user branch: entity filter: optimized converting internal utf-8 to output charset</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#standardbranchesusermabezend_filter_entitylibraryZendFilterEncodeEntityphp">standard/branches/user/mabe/zend_filter_entity/library/Zend/Filter/Encode/Entity.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardbranchesusermabezend_filter_entitylibraryZendFilterEncodeEntityphp"></a>
<div class="modfile"><h4>Modified: standard/branches/user/mabe/zend_filter_entity/library/Zend/Filter/Encode/Entity.php (22846 => 22847)</h4>
<pre class="diff"><span>
<span class="info">--- standard/branches/user/mabe/zend_filter_entity/library/Zend/Filter/Encode/Entity.php 2010-08-17 17:26:13 UTC (rev 22846)
+++ standard/branches/user/mabe/zend_filter_entity/library/Zend/Filter/Encode/Entity.php 2010-08-17 17:35:36 UTC (rev 22847)
</span><span class="lines">@@ -876,40 +876,37 @@
</span><span class="cx">
</span><span class="cx"> $strLen = strlen($utf8);
</span><span class="cx"> $outStr = '';
</span><del>- $buffer = '';
</del><span class="cx"> for ($ptr = 0; $ptr &lt; $strLen; $ptr++) {
</span><del>- $byte = $utf8[$ptr];
- $ord = ord($byte);
</del><ins>+ $char = $utf8[$ptr];
+ $ord = ord($char); </ins><span class="cx"> if ($ord &gt; 127) {
</span><span class="cx"> // Multibyte found (first byte!)
</span><span class="cx"> if ($ord &amp; 64) {
</span><span class="cx"> // The first byte must have the 7th bit set!
</span><del>- $buffer = $byte; // Add first byte
</del><span class="cx"> for ($i = 0; $i &lt; 8; $i++) { // For each byte in MB string
</span><span class="cx"> $ord = $ord &lt;&lt; 1; // Shift char left
</span><span class="cx"> if ($ord &amp; 128) { // 8th bit
</span><span class="cx"> // There are still bytes in sequence
</span><del>- $ptr++;
- $buffer.= $utf8[$ptr]; // Add the next byte
</del><ins>+ $char.= $utf8[ ++$ptr ]; // Add the next byte
</ins><span class="cx"> } else {
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $tmp = (string)@iconv('UTF-8', $iconvTo, $buffer);
- // \xEDconv feature //TRANSLIT//IGNORE convert not tranlitable characters to &quot;?&quot;
</del><ins>+ $tmp = (string)@iconv('UTF-8', $iconvTo, $char);
+ // iconv feature //TRANSLIT//IGNORE convert not tranlitable characters to &quot;?&quot; </ins><span class="cx"> if ($tmp === '' || $tmp === '?') { </span><del>- $outStr.= $this-&gt;_handleInvalidChar($buffer); </del><ins>+ $outStr.= $this-&gt;_handleInvalidChar($char); </ins><span class="cx"> } else { </span><span class="cx"> $outStr.= $tmp; </span><span class="cx"> } </span><span class="cx"> } else { </span><span class="cx"> // Invalid UTF-8 </span><del>- $outStr.= $this-&gt;_handleInvalidChar($byte); </del><ins>+ $outStr.= $this-&gt;_handleInvalidChar($char);
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> // ASCII (0 - 127)
</span><del>- $outStr.= $byte;
</del><ins>+ $outStr.= $char;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>

</body>
</html>

Loading...