Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv4426/lib
Modified Files:
Tag: release-1_2-branch
config.php diff.php display.php savepage.php stdlib.php
ziplib.php
Log Message:
Propagate bug fixes from MAIN CVS branch into the stable release branch.
I have not added Arno's new transform.php code.
Should we? (Is it functionally equivalent to the old code?)
Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C2 -r1.24 -r1.24.2.1
*** config.php 2001年01月31日 07:38:10 1.24
--- config.php 2001年02月08日 18:28:31 1.24.2.1
***************
*** 136,140 ****
// logo image (path relative to index.php)
$logo = "images/wikibase.png";
! // signature image which is shown after saving an edited page
$SignatureImg = "images/signature.png";
--- 136,142 ----
// logo image (path relative to index.php)
$logo = "images/wikibase.png";
!
! // Signature image which is shown after saving an edited page
! // If this is left blank (or unset), the signature will be omitted.
$SignatureImg = "images/signature.png";
***************
*** 232,238 ****
if (defined('WIKI_ADMIN') && !empty($AdminUrl))
$ScriptUrl = $AdminUrl;
-
- $LogoImage = "<img src=\"$logo\" border=0 ALT=\"[PhpWiki!]\">";
- $LogoImage = "<a href=\"$ScriptUrl\">$LogoImage</a>";
$FieldSeparator = "263円";
--- 234,237 ----
Index: diff.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/diff.php,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** diff.php 2000年11月01日 11:31:41 1.4
--- diff.php 2001年02月08日 18:28:31 1.4.2.1
***************
*** 9,12 ****
--- 9,18 ----
//
+ // FIXME: possibly remove assert()'s for production version?
+
+ // PHP3 does not have assert()
+ define('USE_ASSERTS', function_exists('assert'));
+
+
/**
* Class used internally by WikiDiff to actually compute the diffs.
***************
*** 35,38 ****
--- 41,45 ----
$n_from = sizeof($from_lines);
$n_to = sizeof($to_lines);
+ $endskip = 0;
// Ignore trailing and leading matching lines.
***************
*** 72,82 ****
$xlines[] = $line;
if ( ($this->xchanged[$x] = empty($yhash[$line])) )
! continue; // fixme? what happens to yhash/xhash when
! // there are two identical lines??
$this->xv[] = $line;
$this->xind[] = $x;
}
-
// Find the LCS.
$this->_compareseq(0, sizeof($this->xv), 0, sizeof($this->yv));
--- 79,87 ----
$xlines[] = $line;
if ( ($this->xchanged[$x] = empty($yhash[$line])) )
! continue;
$this->xv[] = $line;
$this->xind[] = $x;
}
// Find the LCS.
$this->_compareseq(0, sizeof($this->xv), 0, sizeof($this->yv));
***************
*** 95,107 ****
while ($x < $n_from || $y < $n_to)
{
! /*
! if ( ($y == $n_to && !$this->xchanged[$x])
! || ($x == $n_from && !$this->ychanged[$y]) )
! die("assertion error");
! */
// Skip matching "snake".
$x0 = $x;
$ncopy = 0;
while ( $x < $n_from && $y < $n_to
&& !$this->xchanged[$x] && !$this->ychanged[$y])
--- 100,110 ----
while ($x < $n_from || $y < $n_to)
{
! USE_ASSERTS && assert($y < $n_to || $this->xchanged[$x]);
! USE_ASSERTS && assert($x < $n_from || $this->ychanged[$y]);
// Skip matching "snake".
$x0 = $x;
$ncopy = 0;
+
while ( $x < $n_from && $y < $n_to
&& !$this->xchanged[$x] && !$this->ychanged[$y])
***************
*** 134,138 ****
}
}
! if (!empty($endskip))
$this->edits[] = $endskip;
}
--- 137,141 ----
}
}
! if ($endskip != 0)
$this->edits[] = $endskip;
}
***************
*** 196,200 ****
{
$k = $this->_lcs_pos($y);
! //if (!$k) die('assertion "!$k" failed');
$ymids[$k] = $ymids[$k-1];
break;
--- 199,203 ----
{
$k = $this->_lcs_pos($y);
! USE_ASSERTS && assert($k > 0);
$ymids[$k] = $ymids[$k-1];
break;
***************
*** 204,208 ****
if ($y > $this->seq[$k-1])
{
! //if ($y >= $this->seq[$k]) die('assertion failed');
// Optimization: this is a common case:
// next match is just replacing previous match.
--- 207,211 ----
if ($y > $this->seq[$k-1])
{
! USE_ASSERTS && assert($y < $this->seq[$k]);
// Optimization: this is a common case:
// next match is just replacing previous match.
***************
*** 214,218 ****
{
$k = $this->_lcs_pos($y);
! //if (!$k) die('assertion "!$k" failed');
$ymids[$k] = $ymids[$k-1];
}
--- 217,221 ----
{
$k = $this->_lcs_pos($y);
! USE_ASSERTS && assert($k > 0);
$ymids[$k] = $ymids[$k-1];
}
***************
*** 254,258 ****
}
! //if ($ypos == $this->seq[$end]) die("assertion failure");
$this->in_seq[$this->seq[$end]] = false;
--- 257,261 ----
}
! USE_ASSERTS && assert($ypos != $this->seq[$end]);
$this->in_seq[$this->seq[$end]] = false;
***************
*** 329,333 ****
*
* We do something when a run of changed lines include a
! * line at one end and have an excluded, identical line at the other.
* We are free to choose which identical line is included.
* `compareseq' usually chooses the one at the beginning,
--- 332,336 ----
*
* We do something when a run of changed lines include a
! * line at one end and has an excluded, identical line at the other.
* We are free to choose which identical line is included.
* `compareseq' usually chooses the one at the beginning,
***************
*** 341,345 ****
--- 344,352 ----
$i = 0;
$j = 0;
+
+ USE_ASSERTS && assert('sizeof($lines) == sizeof($changed)');
$len = sizeof($lines);
+ $other_len = sizeof($other_changed);
+
while (1)
{
***************
*** 347,356 ****
* Scan forwards to find beginning of another run of changes.
* Also keep track of the corresponding point in the other file.
*/
! while ($i < $len && $changed[$i] == 0)
{
! while ($other_changed[$j++])
! continue;
! $i++;
}
--- 354,374 ----
* Scan forwards to find beginning of another run of changes.
* Also keep track of the corresponding point in the other file.
+ *
+ * Throughout this code, $i and $j are adjusted together so that
+ * the first $i elements of $changed and the first $j elements
+ * of $other_changed both contain the same number of zeros
+ * (unchanged lines).
+ * Furthermore, $j is always kept so that $j == $other_len or
+ * $other_changed[$j] == false.
*/
! while ($j < $other_len && $other_changed[$j])
! $j++;
!
! while ($i < $len && ! $changed[$i])
{
! USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]');
! $i++; $j++;
! while ($j < $other_len && $other_changed[$j])
! $j++;
}
***************
*** 361,368 ****
// Find the end of this run of changes.
! while (isset($changed[++$i]))
continue;
- while ($other_changed[$j])
- $j++;
do
--- 379,384 ----
// Find the end of this run of changes.
! while (++$i < $len && $changed[$i])
continue;
do
***************
*** 379,390 ****
* This merges with previous changed regions.
*/
! while ($start && $lines[$start - 1] == $lines[$i - 1])
{
$changed[--$start] = 1;
$changed[--$i] = false;
! while ($changed[$start - 1])
$start--;
while ($other_changed[--$j])
continue;
}
--- 395,408 ----
* This merges with previous changed regions.
*/
! while ($start > 0 && $lines[$start - 1] == $lines[$i - 1])
{
$changed[--$start] = 1;
$changed[--$i] = false;
! while ($start > 0 && $changed[$start - 1])
$start--;
+ USE_ASSERTS && assert('$j > 0');
while ($other_changed[--$j])
continue;
+ USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]');
}
***************
*** 394,398 ****
* CORRESPONDING == LEN means no such point has been found.
*/
! $corresponding = empty($other_changed[$j - 1]) ? $len : $i;
/*
--- 412,416 ----
* CORRESPONDING == LEN means no such point has been found.
*/
! $corresponding = $j < $other_len ? $i : $len;
/*
***************
*** 403,414 ****
* the changed region is moved forward as far as possible.
*/
! while ($i != $len && $lines[$start] == $lines[$i])
{
$changed[$start++] = false;
$changed[$i++] = 1;
! while ($changed[$i])
$i++;
! while ($other_changed[++$j])
$corresponding = $i;
}
}
--- 421,439 ----
* the changed region is moved forward as far as possible.
*/
! while ($i < $len && $lines[$start] == $lines[$i])
{
$changed[$start++] = false;
$changed[$i++] = 1;
! while ($i < $len && $changed[$i])
$i++;
!
! USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]');
! $j++;
! if ($j < $other_len && $other_changed[$j])
! {
$corresponding = $i;
+ while ($j < $other_len && $other_changed[$j])
+ $j++;
+ }
}
}
***************
*** 423,428 ****
--- 448,455 ----
$changed[--$start] = 1;
$changed[--$i] = 0;
+ USE_ASSERTS && assert('$j > 0');
while ($other_changed[--$j])
continue;
+ USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]');
}
}
***************
*** 482,486 ****
{ // Was an add, turn it into a delete.
$nadd = sizeof($edit);
! if ($nadd == 0) die("assertion error");
$edit = -$nadd;
}
--- 509,513 ----
{ // Was an add, turn it into a delete.
$nadd = sizeof($edit);
! USE_ASSERTS && assert ($nadd > 0);
$edit = -$nadd;
}
Index: display.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/display.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** display.php 2000年12月30日 21:09:13 1.5
--- display.php 2001年02月08日 18:28:31 1.5.2.1
***************
*** 7,12 ****
// if it wasn't this file would not have been included
! if (!empty($argv[0])) {
! $pagename = rawurldecode($argv[0]);
} else {
$pagename = gettext("FrontPage");
--- 7,15 ----
// if it wasn't this file would not have been included
! if (empty($QUERY_STRING) && isset($argv[0]))
! $QUERY_STRING = $argv[0];
!
! if (isset($QUERY_STRING) && preg_match('/^[-+%\w]+$/', $QUERY_STRING)) {
! $pagename = urldecode($QUERY_STRING);
} else {
$pagename = gettext("FrontPage");
Index: savepage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/savepage.php,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -r1.7 -r1.7.2.1
*** savepage.php 2001年01月04日 18:30:32 1.7
--- savepage.php 2001年02月08日 18:28:31 1.7.2.1
***************
*** 178,183 ****
// fixme: no test for flat file db system
! if ($WikiPageStore == "/tmp/wikidb") {
! $html .= "<P><B>Warning: the Wiki DBM file still lives in the " .
"/tmp directory. Please read the INSTALL file and move " .
"the DBM file to a permanent location or risk losing " .
--- 178,183 ----
// fixme: no test for flat file db system
! if (isset($DBMdir) && preg_match('@^/tmp\b@', $DBMdir)) {
! $html .= "<P><B>Warning: the Wiki DB files still live in the " .
"/tmp directory. Please read the INSTALL file and move " .
"the DBM file to a permanent location or risk losing " .
***************
*** 185,189 ****
}
! $html .= "<P><img src=\"$SignatureImg\"></P><hr noshade><P>";
include('lib/transform.php');
--- 185,192 ----
}
! if (!empty($SignatureImg))
! $html .= "<P><img src=\"$SignatureImg\"></P>\n";
!
! $html .= "<hr noshade><P>";
include('lib/transform.php');
Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C2 -r1.21 -r1.21.2.1
*** stdlib.php 2001年01月15日 12:32:57 1.21
--- stdlib.php 2001年02月08日 18:28:31 1.21.2.1
***************
*** 4,9 ****
Standard functions for Wiki functionality
ExitWiki($errormsg)
! LinkExistingWikiWord($wikiword)
! LinkUnknownWikiWord($wikiword)
LinkURL($url, $linktext)
LinkImage($url, $alt)
--- 4,9 ----
Standard functions for Wiki functionality
ExitWiki($errormsg)
! LinkExistingWikiWord($wikiword, $linktext)
! LinkUnknownWikiWord($wikiword, $linktext)
LinkURL($url, $linktext)
LinkImage($url, $alt)
Index: ziplib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/ziplib.php,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** ziplib.php 2001年01月01日 23:13:32 1.2
--- ziplib.php 2001年02月08日 18:28:31 1.2.2.1
***************
*** 672,676 ****
if ($encoding == 'quoted-printable')
$data = QuotedPrintableDecode($data);
! else if ($encoding && $encoding == 'binary')
die("Unknown encoding type: $encoding");
--- 672,676 ----
if ($encoding == 'quoted-printable')
$data = QuotedPrintableDecode($data);
! else if ($encoding && $encoding != 'binary')
die("Unknown encoding type: $encoding");