BugTrack2/343 Replace 'htmlspecialchars' by 'htmlsc'

[pukiwiki/pukiwiki.git] / lib / diff.php

diff --git a/lib/diff.php b/lib/diff.php
index 65d5b79..0535062 100644 (file)
--- a/lib/diff.php
+++ b/lib/diff.php
@@ -1,8 +1,8 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: diff.php,v 1.6 2005/12/10 12:23:24 henoheno Exp $
+// $Id: diff.php,v 1.10 2011/01/25 15:01:01 henoheno Exp $
 // Copyright (C)
-//   2003-2005 PukiWiki Developers Team
+//   2003-2005, 2007 PukiWiki Developers Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
 //
@@ -18,6 +18,18 @@ function do_diff($strlines1, $strlines2)
        return $str;
 }
 
+// Visualize diff-style-text to text-with-CSS
+//   '+Added'   => '<span added>Added</span>'
+//   '-Removed' => '<span removed>Removed</span>'
+//   ' Nothing' => 'Nothing'
+function diff_style_to_css($str = '')
+{
+       // Cut diff markers ('+' or '-' or ' ')
+       $str = preg_replace('/^\-(.*)$/m', '<span class="diff_removed">$1</span>', $str);
+       $str = preg_replace('/^\+(.*)$/m', '<span class="diff_added"  >$1</span>', $str);
+       return preg_replace('/^ (.*)$/m',  '$1', $str);
+}
+
 // Merge helper (when it conflicts)
 function do_update_diff($pagestr, $poststr, $original)
 {
@@ -35,8 +47,8 @@ function do_update_diff($pagestr, $poststr, $original)
 
        if (PKWK_DIFF_SHOW_CONFLICT_DETAIL) {
                global $do_update_diff_table;
-
-               $do_update_diff_table = <<<EOD
+               $table = array();
+               $table[] = <<<EOD
 <p>l : between backup data and stored page data.<br />
  r : between backup data and your post data.</p>
 <table class="style_table">
@@ -48,29 +60,32 @@ function do_update_diff($pagestr, $poststr, $original)
 EOD;
                $tags = array('th', 'th', 'td');
                foreach ($arr as $_obj) {
-                       $do_update_diff_table .= '<tr>';
+                       $table[] = ' <tr>';
                        $params = array($_obj->get('left'), $_obj->get('right'), $_obj->text());
-                       foreach ($params as $key=>$text) {
-                               $text = htmlspecialchars($text);
-                               if (trim($text) == '') $text = '&nbsp;';
-                               $do_update_diff_table .= '<' . $tags[$key] .
-                                       ' class="style_' . $tags[$key] . '">' . $text .
+                       foreach ($params as $key => $text) {
+                               $text = htmlsc(rtrim($text));
+                               if (empty($text)) $text = '&nbsp;';
+                               $table[] = 
+                                       '  <' . $tags[$key] . ' class="style_' . $tags[$key] . '">' .
+                                       $text .
                                        '</' . $tags[$key] . '>';
                        }
-                       $do_update_diff_table .= '</tr>' . "\n";
+                       $table[] = ' </tr>';
                }
-               $do_update_diff_table .= '</table>' . "\n";
+               $table[] =  '</table>';
+
+               $do_update_diff_table = implode("\n", $table) . "\n";
+               unset($table);
        }
 
-       $body = '';
+       $body = array();
        foreach ($arr as $_obj) {
-               if ($_obj->get('left') != '-' && $_obj->get('right') != '-')
-                       $body .= $_obj->text();
+               if ($_obj->get('left') != '-' && $_obj->get('right') != '-') {
+                       $body[] = $_obj->text();
+               }
        }
 
-       $auto = 1;
-
-       return array(rtrim($body) . "\n", $auto);
+       return array(rtrim(implode('', $body)) . "\n", 1);
 }
 
 
@@ -171,7 +186,7 @@ class line_diff
                        }
                        $fp[$delta] = $this->snake($delta, $fp[$delta - 1], $fp[$delta + 1]);
                        if ($fp[$delta] >= $this->n) {
-                               $this->pos = $this->path[$delta]; // ·ÐÏ©¤ò·èÄê
+                               $this->pos = $this->path[$delta]; // 経路を決定
                                return;
                        }
                }
@@ -186,13 +201,13 @@ class line_diff
                        $_k = $k + 1;
                        $y = $y2;
                }
-               $this->path[$k] = $this->path[$_k];// ¤³¤³¤Þ¤Ç¤Î·ÐÏ©¤ò¥³¥Ô¡¼
+               $this->path[$k] = $this->path[$_k];// ã\81\93ã\81\93ã\81¾ã\81§ã\81®çµ\8cè·¯ã\82\92ã\82³ã\83\94ã\83¼
                $x = $y - $k;
                while ((($x + 1) < $this->m) && (($y + 1) < $this->n)
                        and $this->arr1[$x + 1]->compare($this->arr2[$y + 1]))
                {
                        ++$x; ++$y;
-                       $this->path[$k][] = array('x'=>$x, 'y'=>$y); // ·ÐÏ©¤òÄɲÃ
+                       $this->path[$k][] = array('x'=>$x, 'y'=>$y); // 経路を追加
                }
                return $y;
        }
@@ -200,7 +215,7 @@ class line_diff
        function toArray()
        {
                $arr = array();
-               if ($this->reverse) { // ¸È©¤Ê¡Ä
+               if ($this->reverse) { // 姑息な…
                        $_x = 'y'; $_y = 'x'; $_m = $this->n; $arr1 =& $this->arr2; $arr2 =& $this->arr1;
                } else {
                        $_x = 'x'; $_y = 'y'; $_m = $this->m; $arr1 =& $this->arr1; $arr2 =& $this->arr2;