You can subscribe to this list here.
2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(103) |
Jul
(105) |
Aug
(16) |
Sep
(16) |
Oct
(78) |
Nov
(36) |
Dec
(58) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2001 |
Jan
(100) |
Feb
(155) |
Mar
(84) |
Apr
(33) |
May
(22) |
Jun
(77) |
Jul
(36) |
Aug
(37) |
Sep
(183) |
Oct
(74) |
Nov
(235) |
Dec
(165) |
2002 |
Jan
(187) |
Feb
(183) |
Mar
(52) |
Apr
(10) |
May
(15) |
Jun
(19) |
Jul
(43) |
Aug
(90) |
Sep
(144) |
Oct
(144) |
Nov
(171) |
Dec
(78) |
2003 |
Jan
(113) |
Feb
(99) |
Mar
(80) |
Apr
(44) |
May
(35) |
Jun
(32) |
Jul
(34) |
Aug
(34) |
Sep
(30) |
Oct
(57) |
Nov
(97) |
Dec
(139) |
2004 |
Jan
(132) |
Feb
(223) |
Mar
(300) |
Apr
(221) |
May
(171) |
Jun
(286) |
Jul
(188) |
Aug
(107) |
Sep
(97) |
Oct
(106) |
Nov
(139) |
Dec
(125) |
2005 |
Jan
(200) |
Feb
(116) |
Mar
(68) |
Apr
(158) |
May
(70) |
Jun
(80) |
Jul
(55) |
Aug
(52) |
Sep
(92) |
Oct
(141) |
Nov
(86) |
Dec
(41) |
2006 |
Jan
(35) |
Feb
(62) |
Mar
(59) |
Apr
(52) |
May
(51) |
Jun
(61) |
Jul
(30) |
Aug
(36) |
Sep
(12) |
Oct
(4) |
Nov
(22) |
Dec
(34) |
2007 |
Jan
(49) |
Feb
(19) |
Mar
(37) |
Apr
(16) |
May
(9) |
Jun
(38) |
Jul
(17) |
Aug
(31) |
Sep
(16) |
Oct
(34) |
Nov
(4) |
Dec
(8) |
2008 |
Jan
(8) |
Feb
(16) |
Mar
(14) |
Apr
(6) |
May
(4) |
Jun
(5) |
Jul
(9) |
Aug
(36) |
Sep
(6) |
Oct
(3) |
Nov
(3) |
Dec
(3) |
2009 |
Jan
(14) |
Feb
(2) |
Mar
(7) |
Apr
(16) |
May
(2) |
Jun
(10) |
Jul
(1) |
Aug
(10) |
Sep
(11) |
Oct
(4) |
Nov
(2) |
Dec
|
2010 |
Jan
(1) |
Feb
|
Mar
(13) |
Apr
(11) |
May
(18) |
Jun
(44) |
Jul
(7) |
Aug
(2) |
Sep
(14) |
Oct
|
Nov
(6) |
Dec
|
2011 |
Jan
(2) |
Feb
(6) |
Mar
(3) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2012 |
Jan
(11) |
Feb
(3) |
Mar
(11) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(4) |
Dec
|
2013 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(8) |
Dec
(1) |
2015 |
Jan
(3) |
Feb
(2) |
Mar
|
Apr
(3) |
May
(1) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
2016 |
Jan
|
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2021 |
Jan
|
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(6) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
2022 |
Jan
(11) |
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(3) |
Dec
(3) |
2024 |
Jan
(7) |
Feb
(2) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2025 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Neil B. <ne...@cs...> - 2000-11-01 23:53:01
|
Hi, I would like comments on a couple of changes that I would like for handling of list items. I like using lists a lot, and it bothers me that a single list item must currently be entirely on one line. I find this particularly irksome when editing in the netscape <textarea wrap="virtual"> box, you cannot visually distinguish between a wrapped line and two lines where the second is not indented. So, I would prefer that list items could continue onto multiple lines. I have implemented a change that achieves this and it works quite well. When transform.php finds a line that starts with normal text, it just includes it in the current context. To terminate a list, you just need a blank line, and this feels quite natural. This change is not backwards compatible and would need to be considered carefully, but I think that it is for the good. After all, paragraphs can be continued on the next line, why not paragraphs within lists. My other change is along the same lines, but a bit more interesting. I would like to be able to have multiple paragraphs within a list item. I have implemented this by interpreting a single blank line as a paragraph break at the current level, and a double blank line as an end-of-list marker. This allows me to have multiple paragraphs in lists, but it has turned out in practice to be a bit awkward. It is easy to forget the two blank lines that are needed to end a list. My thought is to add a new markup which means "paragraph break at this level", and leave the blank line meaning "break out of any list context". The question is, what should the new markup be? 1/ ";;;" is currently line break, so maybe ";;;;" could be new-para, but it is kind of ugly 2/ "." on a line by itself or at the start of a line might be good as it is visually similar to the required concept: .A dot at the start of a line makes that line intent slightly. .This is just what happens at the start of a paragraph in some formating style. Does anyone know if there is any precedent in other wikis? Somewhat related to this, consider the lists in TextFormattingRules. They look like a nicely spaced unordered lists. But if you look at the generated html, you will find that there are not. That are actually sequences of singleton lists. If you chose to make them ordered lists, you would find that every item is number '1'. If we want to be able to provide nice spacing in lists, maybe defining "." as a local paragraph break would be a good way to achieve this. You comments appreciated, NeilBrown |
From: Arno H. <aho...@in...> - 2000-11-01 11:39:23
|
> On my system I have PHP set to show non-critical warning, like referring to > a variable before defining its value. > phpwiki emits a lot of these. I think it's better to remove the cause of these notices, instead of just suppressing them. Thus I fixed 99.9% of those warnings just now. Actually this revealed some serious errors, like e.g. $FieldSeparator not defined as "global" in some functions, or e.g. dbm not closing the dbm-files. > ini_set("error_reporting", ini_get("error_reporting") & 2039); > It is also php4 specific. I added "error_reporting(E_ALL ^ E_NOTICE)" to index.php which is useable for both php3 and php4. I suggest that everyone on this list removes "^ E_NOTICE" when testing phpwiki. > I'd like to suggest that on lines 30 and 33 of lib/config.php $REQUEST_URI > be replaced with $SCRIPT_NAME. The REQUEST_URI environment variable is Done. /Arno |
From: Steve W. <sw...@wc...> - 2000-10-31 20:08:47
|
...............................ooo0000ooo................................. Hear FM quality freeform radio through the Internet: http://wcsb.org/ home page: www.wcsb.org/~swain ---------- Forwarded message ---------- Date: Tue, 31 Oct 2000 21:43:09 +0200 From: Ori Folger <or...@co...> To: Steve Wainstead <sw...@wc...> Subject: another phpwiki 1.1.8 proposed change Hi On my system I have PHP set to show non-critical warning, like referring to a variable before defining its value. phpwiki emits a lot of these. The following line turns off these non-critical warnings: ini_set("error_reporting", ini_get("error_reporting") & 2039); It should be line 10 of index.php. It is also php4 specific. Ori Folger |
From: Steve W. <sw...@wc...> - 2000-10-31 20:08:09
|
I added two today in fact: # clean up config.php # bring the other databases in line with mysql.php Those two should not be that hard. Once that's done and debugged, there is not much left to do. also: # new logo -- it's bad form to use images that are larger than the space they fit into, as the logo does now. # update the wiki pages -- All the pages that are loaded by default should be looked at again. I noticed today that WikiWikiWeb says "this Wiki has no theme," which we should not presume. ReleaseNotes is out of date. A lot of the new markup syntax is not documented and there is still talk about tabs. Embedding images needs to be documented. (I think). # add a file called UPGRADE -- if people are upgrading to 1.1.8 or later they need to add tables to their databases. This was the source of one bug I was emailed about recently. Also they need to be warned about just running a commmand like: bash$ xxsql -db wiki < schemas/schema.foo which will wipe out their pages. # reread all other documentation # put docs in the Docs section on SF, maybe -- I know I like to read the INSTALL notes before I install something, and if they are online it's faster. Linking to them would be good enough since the documentation is all on SF in phpwiki/ anyhow. But that should be it. Mostly cleanup work. sw On Tue, 31 Oct 2000, Arno Hollosi wrote: > Subject says it all: > What needs to be done before we release 1.2.0? > > Many tasks/bugs listed at SF are post 1.2.0, no? > > Let me know what you think. > > /Arno > _______________________________________________ > Phpwiki-talk mailing list > Php...@li... > http://lists.sourceforge.net/mailman/listinfo/phpwiki-talk > ...............................ooo0000ooo................................. Hear FM quality freeform radio through the Internet: http://wcsb.org/ home page: www.wcsb.org/~swain |
From: Steve W. <sw...@wc...> - 2000-10-31 19:45:49
|
Hi Ori! Thanks for the idea... we'll probably implement it. sw On Tue, 31 Oct 2000, Ori Folger wrote: > Hi > > I'd like to suggest that on lines 30 and 33 of lib/config.php $REQUEST_URI > be replaced with $SCRIPT_NAME. The REQUEST_URI environment variable is > Apache specific and is not part of the CGI 1.1 standard > (http://hoohoo.ncsa.uiuc.edu/cgi/env.html). $SCRIPT_NAME works just as fine > and with all web servers. > > Ori > > ...............................ooo0000ooo................................. Hear FM quality freeform radio through the Internet: http://wcsb.org/ home page: www.wcsb.org/~swain |
From: Arno H. <aho...@in...> - 2000-10-31 19:29:50
|
Subject says it all: What needs to be done before we release 1.2.0? Many tasks/bugs listed at SF are post 1.2.0, no? Let me know what you think. /Arno |
From: Steve W. <sw...@wc...> - 2000-10-31 00:48:03
|
Nightly builds should now be available 2AM EDT every night. If this is not a good time (it seems to be between when I go to bed and Arno gets up) let me know. The nightly build will be at: ftp://phpwiki.sourceforge.net/pub/phpwiki/phpwiki.nightly.tar.gz http://phpwiki.sourceforge.net/nightly/phpwiki.nightly.tar.gz sw ...............................ooo0000ooo................................. Hear FM quality freeform radio through the Internet: http://wcsb.org/ home page: www.wcsb.org/~swain |
From: Steve W. <sw...@wc...> - 2000-10-30 00:01:37
|
Hello Donncha, thank you for the kind words! I cannot reproduce this. Did you upgrade an existing Wiki, or do a clean install (including a new database?) That would be most helpful. thx sw On Fri, 27 Oct 2000, Donncha O Caoimh wrote: > Hey Steve, > > Just noticed a little bug with the new version. > > The recent changes page links to index.php3 for the "diff" but only an > index.php exists. A symlink fixes it of course but thought you should > know. > > As ever, good stuff! > > Donncha. > ...............................ooo0000ooo................................. Hear FM quality freeform radio through the Internet: http://wcsb.org/ home page: www.wcsb.org/~swain |
From: Arno H. <aho...@in...> - 2000-10-26 15:14:28
|
> I am about to post the announcement for 1.1.8 on freshmeat.net, whcih > always brings a lot of new people, including people who erase pages. Ok, so I got tired of restoring FrontPage. I did it 4 times within 2 hours - now I have locked it. /Arno p.s. actually there's a loophole that allows editing a page without unlocking it. One might call it a bug - naaa :) |
From: Steve W. <sw...@wc...> - 2000-10-26 03:51:19
|
I am about to post the announcement for 1.1.8 on freshmeat.net, whcih always brings a lot of new people, including people who erase pages. For convenience I've made a FrontPageBackup (http://phpwiki.sourceforge.net/phpwiki/index.php?FrontPageBackup). I am going on a trip tomorrow morning and will be offline until Sunday night; please keep an eye on the site in case someone wipes out any pages (just keep checking RecentChanges). thx again sw ...............................ooo0000ooo................................. Hear FM quality freeform radio through the Internet: http://wcsb.org/ home page: www.wcsb.org/~swain |
From: Steve W. <sw...@wc...> - 2000-10-26 03:48:16
|
Tonight I mv'd the old phpwiki/ and installed a fresh copy of 1.1.8. I created an index.php3 to redirect to index.php. Could one of you double check my work, since I haven't written one in PHP before: <?php /* build the cgi data into a string */ $query = implode('&', $argv); /* Redirect browser to PHP web site */ header("Location: http://phpwiki.sourceforge.net/phpwiki/index.php?$query"); /* Make sure that code below does not get executed when we redirect. */ exit; ?> It's right out of the PHP manual (in function.header.html). I added the GET data string. thx sw ...............................ooo0000ooo................................. Hear FM quality freeform radio through the Internet: http://wcsb.org/ home page: www.wcsb.org/~swain |
From: Arno H. <aho...@in...> - 2000-10-25 14:58:08
|
Neil, > I would like to suggest the following patch (against current CVS) > less likely. To me, it makes the code a whole lot cleaner, but may I really like that one and have committed it already. Nicely done! Sometimes it seems we don't see the forrest because of the trees. /Arno |
From: Steve W. <sw...@wc...> - 2000-10-25 05:29:09
|
It's finally here, after three whole months! http://download.sourceforge.net/phpwiki/phpwiki-1.1.8.tar.gz ftp://phpwiki.sourceforge.net/pub/phpwiki/ From the HISTORY file: 1.1.8 10/25/00: * Internationalization, with support for Dutch, and an architecture to add more languages easily * Term/defintion tags updated to nest and use tabless markup * MostPopular works for all implementations, except flat files * Flat file database support; it's not yet complete but the basic Wiki functionality is there, thanks to Ari * New zip file format for page dumps follows standard email format * Removed tabs from all default pages * Added whitespace padding to pages after they are serialized and written to the DBM file; this goes a long way towards fixing the memory leak problems for DBM-based Wikis. * Numerous bug fixes, as always * Some refactoring of the database interface ...............................ooo0000ooo................................. Hear FM quality freeform radio through the Internet: http://wcsb.org/ home page: www.wcsb.org/~swain |
From: Neil B. <ne...@cs...> - 2000-10-25 02:05:17
|
On Tuesday October 24, aho...@in... wrote: > > > > I'll maybe have a quick look at these too... > > 7.And what about a WikiLink? and another WikiLink?WithSameStem on one line? > > 8.Other way around: WikiLink?WithSameStem plus WikiLink? > I would like to suggest the following patch (against current CVS) which takes a different approach which makes this sort of bug much less likely. To me, it makes the code a whole lot cleaner, but may it's just me. The basic approach is to cope the line up while matching rather than extracting strings and then searching for those strings. It also fixes a bug whereby ;WikiWord: definition there-of ;OtherWikiWord: other definition gets converted into bad html because the WikiWord gets converted into a full reference (containing a :) before the search for /^;+.*?:/ is done. I simple delay replacing the token until (nearly) the last moment. Let me know what yo think? NeilBrown Index: lib/transform.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v retrieving revision 1.4 diff -u -r1.4 transform.php --- lib/transform.php 2000/10/24 10:32:37 1.4 +++ lib/transform.php 2000/10/25 01:58:48 @@ -1,5 +1,23 @@ <!-- $Id: transform.php,v 1.4 2000/10/24 10:32:37 ahollosi Exp $ --> <?php + function tokenize($str, $pattern, &$orig, &$ntokens) { + global $FieldSeparator; + // Find any strings in $str that patch $pattern and + // store them in $tokens[], replacing them with a token + $new = ""; + while (preg_match("/^(.*?)($pattern)/", $str, $matches)) { + $linktoken = $FieldSeparator . $FieldSeparator . ($ntokens++) . $FieldSeparator; + $new .= $matches[1].$linktoken; + $orig[] = $matches[2]; + $str = substr($str, strlen($matches[0])); + } + $new .= $str; + return $new; + } + + + + // expects $pagehash and $html to be set // Set up inline links and images @@ -29,6 +47,7 @@ unset($tokens); unset($replacements); $ntokens = 0; + $replacements = array(); $tmpline = $pagehash["content"][$index]; @@ -54,70 +73,40 @@ ////////////////////////////////////////////////////////// // New linking scheme: links are in brackets. This will // emulate typical HTML linking as well as Wiki linking. + + // First need to protect [[. + $tmpline = tokenize($tmpline, "\[\[", $replacements, $ntokens); + - // match anything between brackets except only numbers - // trying: - $numBracketLinks = preg_match_all("/\[.+?\]/", $tmpline, $brktlinks); - /* On 12 Jul,2000 Jeff <da...@da...> adds: - * - * Simple sorting doesnt work, since (in ASCII) '[' comes between - * the upper- and lower-case characters. - * - * Using sort "[[Link] [Link]" will come out wrong, using - * rsort "[[link] [link]" will come out wrong. - * (An appropriate usort would work.) - * - * I've added a look-behind assertion to the preg_replace which, - * I think, fixes the problem. I only hope that all PHP versions - * support look-behind assertions.... - // sort instead of rsort or "[[link] [link]" will be rendered wrong. - sort($brktlinks[0]); - reset($brktlinks[0]); - */ - - for ($i = 0; $i < $numBracketLinks; $i++) { - $brktlink = preg_quote($brktlinks[0][$i]); - $linktoken = $FieldSeparator . $FieldSeparator . ++$ntokens . $FieldSeparator; - /* PS: - * If you're wondering about the double $FieldSeparator, - * consider what happens to (the admittedly sick): - * "[Link1] [Link2]1[Link3]" - * - * Answer: without the double field separator, it gets - * tokenized to "%1% %2%1%3%" (using % to represent $FieldSeparator), - * which will get munged as soon as '%1%' is substituted with it's - * final value. - */ - $tmpline = preg_replace("|(?<!\[)$brktlink|", - $linktoken, - $tmpline); - - $tokens[] = $linktoken; - $link = ParseAndLink($brktlinks[0][$i]); - $replacements[] = $link['link']; + // Now process the [\d+] links which are numeric references + $oldn = $ntokens; + $tmpline = tokenize($tmpline, "\[\d+\]", $replacements ,$ntokens); + while ($oldn < $ntokens) { + preg_match("/\[(\d+)\]/", $replacements[$oldn], $m); + $num = $m[1]; + if (! empty($embedded[$num])) { + $replacements[$oldn] = $embedded[$num]; + } + $oldn++; + } + // match anything else between brackets + + $oldn = $ntokens; + $tmpline = tokenize($tmpline, "\[.+?\]", $replacements, $ntokens); + while ($oldn < $ntokens) { + $link = ParseAndLink($replacements[$oldn]); + $replacements[$oldn] = $link['link']; + $oldn++; } ////////////////////////////////////////////////////////// // replace all URL's with tokens, so we don't confuse them // with Wiki words later. Wiki words in URL's break things. - - $hasURLs = preg_match_all("/\b($AllowedProtocols):[^\s\<\>\[\]\"'\(\)]*[^\s\<\>\[\]\"'\(\)\,\.\?]/", $tmpline, $urls); - // have to sort, otherwise errors creep in when the domain appears - // in two consecutive URL's on the same line, but the second is - // longer e.g. http://c2.com followed by http://c2.com/wiki - rsort($urls[0]); - reset($urls[0]); - - for ($i = 0; $i < $hasURLs; $i++) { - $inplaceURL = preg_quote($urls[0][$i]); - $URLtoken = $FieldSeparator . $FieldSeparator . ++$ntokens . $FieldSeparator; - $tmpline = preg_replace("|$inplaceURL|", - $URLtoken, - $tmpline); - - $tokens[] = $URLtoken; - $replacements[] = LinkURL($urls[0][$i]); + $tmpline = tokenize($tmpline, "\b($AllowedProtocols):[^\s\<\>\[\]\"'\(\)]*[^\s\<\>\[\]\"'\(\)\,\.\?]", $replacements, $ntokens); + while ($oldn < $ntokens) { + $replacements[$oldn] = LinkURL($replacements[$oldn]); + $oldn++; } // escape HTML metachars @@ -154,56 +143,20 @@ // Link Wiki words // Wikiwords preceeded by a '!' are not linked - if (preg_match_all("#!?\b(([A-Z][a-z]+){2,})\b#", - $tmpline, $link)) { - // uniq the list of matches - unset($hash); - for ($i = 0; $link[0][$i]; $i++) { - if(strstr($link[0][$i], '!')) // hashval sports a value - $hashval = "0000:".$link[0][$i]; // in front that guarantees - else // correct sorting - $hashval = sprintf("%04d:%s", 9876-strlen($link[0][$i]) - , $link[0][$i]); - $hash[$hashval] = 1; - } - - // all '!WikiName' entries are sorted first - ksort($hash); - while (list($realfile, $val) = each($hash)) { - $realfile = substr($realfile, 5); // get rid of sort value - $token = $FieldSeparator . $FieldSeparator . ++$ntokens . $FieldSeparator; - $tmpline = str_replace($realfile, $token, $tmpline); - - $tokens[] = $token; - if (strstr($realfile, '!')) { - $replacements[] = substr($realfile, 1); - } - elseif (IsWikiPage($dbi, $realfile)) { - $replacements[] = LinkExistingWikiWord($realfile); - } else { - $replacements[] = LinkUnknownWikiWord($realfile); - } - } + $oldn = $ntokens; + $tmpline = tokenize($tmpline, "!?\b(([A-Z][a-z]+){2,})\b", $replacements, $ntokens); + while ($oldn < $ntokens) { + $old = $replacements[$oldn]; + if (substr($old,0,1)=='!') { + $replacements[$oldn] = substr($old,1); + } elseif (IsWikiPage($dbi, $old)) { + $replacements[$oldn] = LinkExistingWikiWord($old); + } else { + $replacements[$oldn] = LinkUnknownWikiWord($old); + } + $oldn++; } - /////////////////////////////////////////////////////// - // Replace tokens - for ($i = 0; $i < $ntokens; $i++) - $tmpline = str_replace($tokens[$i], $replacements[$i], $tmpline); - - - // match and replace all user-defined links ([1], [2], [3]...) - preg_match_all("|\[(\d+)\]|", $tmpline, $match); - if (count($match[0])) { - for ($k = 0; $k < count($match[0]); $k++) { - if (! empty($embedded[$match[1][$k]])) { - $linkpattern = preg_quote($match[0][$k]); - $tmpline = preg_replace("|$linkpattern|", - $embedded[$match[1][$k]], - $tmpline); - } - } - } // HTML modes: pre, unordered/ordered lists, term/def (using TAB) if (preg_match("/(^\t+)(.*?)(:\t)(.*$)/", $tmpline, $matches)) { @@ -279,6 +232,11 @@ // it's ordinary output if nothing else $html .= SetHTMLOutputMode("", ZERO_DEPTH, 0); } + + /////////////////////////////////////////////////////// + // Replace tokens + for ($i = 0; $i < $ntokens; $i++) + $tmpline = str_replace($FieldSeparator.$FieldSeparator.$i.$FieldSeparator, $replacements[$i], $tmpline); $tmpline = str_replace("%%Search%%", $quick_search_box, $tmpline); $tmpline = str_replace("%%Fullsearch%%", $full_search_box, $tmpline); |
From: Steve W. <sw...@wc...> - 2000-10-24 20:01:12
|
The Adirondack Adventure Club has set up PhpWiki on top of mSQL (http://adirondackadventureclub.com/info/TheAdirondacks/). I helped the developer when he had problems with 1.1.7; I made a tarball called pre1.1.8 and posted it for him. He has the site up and running now, but reported there was a problem with gettext(). Unfortunately he did not elaborate. Text of our discussion is at http://phpwiki.sourceforge.net:80/phpwiki/index.php3?Known%20bugs%20in%201.1.6 (at the bottom). I asked him nicely to file a bug report. Unfortunately I cannot find his email address anywhere. (This is probably more exciting for me since I love to go hiking/camping in the Adirondack Mountains). sw ...............................ooo0000ooo................................. Hear FM quality freeform radio through the Internet: http://wcsb.org/ home page: www.wcsb.org/~swain |
From: Steve W. <sw...@wc...> - 2000-10-24 15:56:26
|
Yes, I like the idea a lot (the second one :-) I was going to put out 1.1.8 last night but was too busy; tonight for certain. I need to take one last look at the documentation and then make the tarball, and post to freshmeat.net, c2.com and the annoucement list (and anything else I can think of). 1.2 should be out in early November, and then we can throw out backwards compatibility once again and start on 1.3 :-) sw On Tue, 24 Oct 2000, Arno Hollosi wrote: > An idea that just struck me: > > why not release this version (or the next version in e.g. 2-4 weeks) as > version 1.2.0? > > We could put off major changes like db interface / transform until then, and > do some touch-up (e.g. documentation). phpwiki seems rather stable currently, > so why not give it a bigger userbase by releasing it as a stable version? > > Then we could define some goals for 1.4.x -- and slowly work our way torwards > 2.0.x :o) > > What do you think about it? > > Has anyone seen the "LikePages" feature on c2.com? I really like that > idea, e.g. http://www.c2.com/cgi/like?WhyEdit > > /Arno > _______________________________________________ > Phpwiki-talk mailing list > Php...@li... > http://lists.sourceforge.net/mailman/listinfo/phpwiki-talk > ...............................ooo0000ooo................................. Hear FM quality freeform radio through the Internet: http://wcsb.org/ home page: www.wcsb.org/~swain |
From: Steve W. <sw...@wc...> - 2000-10-24 15:51:03
|
On Tue, 24 Oct 2000, Arno Hollosi wrote: > Where the @$#! came this bug from? We've killed it a number of times already. > Anyway, I've fixed it for good now (a hack - but it has its merrits). My > solution limits WikiNames to 9876 characters, though. I hope that doesn't > disturb anyone :o) Too bad it's not shorter; WikiWords over 256 chars are a problem for the mSQL version. Ah, something for the task list! sw ...............................ooo0000ooo................................. Hear FM quality freeform radio through the Internet: http://wcsb.org/ home page: www.wcsb.org/~swain |
From: <ja...@gn...> - 2000-10-24 13:18:44
|
Hi, While testing the wikilink-stem bug, I found that savepage hadn't been translated, which in turn triggered a bug in the translate script. In the mean time, you fixed the bug too, so my fix is no in the patch, but I've included it here, just for good karma. Looks a bit simpler?) -- yours is probably more efficient. /* all '!WikiName' entries are sorted first longests links must come first */ function WikiLinkCompare ($l, $r) { $lc = $l[0]; $rc = $r[0]; $res = 0; if ($lc == $rc || ($lc != "!" && $rc != "!")) $res = - strcmp ($l, $r); else if ($lc == "!") $res = -1; else $res = 1; return $res; }; [...] uksort($hash, WikiLinkCompare); diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/lib/editpage.php ./lib/editpage.php --- ../phpwiki/lib/editpage.php Fri Oct 20 15:22:03 2000 +++ ./lib/editpage.php Tue Oct 24 11:55:27 2000 @@ -30,7 +30,7 @@ $html = "<p>"; $html .= gettext ("This page has been locked by the administrator and cannot be edited."); $html .= "\n<p>"; - $html .= gettext ("Sorry for the inconvinience."); + $html .= gettext ("Sorry for the inconvenience."); $html .= "\n"; GeneratePage('MESSAGE', $html, sprintf (gettext ("Problem while editing %s"), $pagename), 0); ExitWiki (""); diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/lib/savepage.php ./lib/savepage.php --- ../phpwiki/lib/savepage.php Thu Oct 19 23:36:50 2000 +++ ./lib/savepage.php Tue Oct 24 12:45:24 2000 @@ -10,22 +10,31 @@ function ConcurrentUpdates($pagename) { - $html = "<P>PhpWiki is unable to save your changes, because\n" . - "another user edited and saved the page while you\n" . - "were editing the page too. If saving proceeded now\n" . - "changes from the previous author would be lost.</P>\n" . - "<P>In order to recover from this situation follow these steps:\n" . - "<OL><LI>Use your browsers <B>Back</B> button to go back " . - "to the edit page.\n" . - "<LI>Copy your changes to the clipboard or to another temporary " . - "place (e.g. text editor).\n" . - "<LI><B>Reload</B> the page. You should now see the most current" . - " version of the page. Your changes are no longer there.\n" . - "<LI>Make changes to the file again. Paste your additions from " . - "the clipboard (or text editor).\n" . - "<LI>Press <B>Save</B> again.</OL>\n" . - "<P>Sorry for the inconvinience.</P>"; - GeneratePage('MESSAGE', $html, "Problem while updating $pagename", 0); + $html = "<P>"; + /* xgettext only knows about c/c++ line-continuation strings + is does not know about php's dot operator. + We want to translate this entire paragraph as one string, of course. + */ + $html .= gettext ("PhpWiki is unable to save your changes, because another user edited and saved the page while you were editing the page too. If saving proceeded now changes from the previous author would be lost."); + $html .= "</P>\n<P>"; + + $html .= gettext ("In order to recover from this situation follow these steps:"); + $html .= "\n<OL><LI>"; + $html .= gettext ("Use your browser's <b>Back</b> button to go back to the edit page."); + $html .= "\n<LI>"; + $html .= gettext ("Copy your changes to the clipboard or to another temporary place (e.g. text editor)."); + $html .= "\n<LI>"; + $html .= gettext ("<b>Reload</b> the page. You should now see the most current version of the page. Your changes are no longer there."); + $html .= "\n<LI>"; + $html .= gettext ("Make changes to the file again. Paste your additions from the clipboard (or text editor)."); + $html .= "\n<LI>"; + $html .= gettext ("Press <b>Save</b> again."); + $html .= "</OL>\n<P>"; + $html .= gettext ("Sorry for the inconvenience."); + $html .= "</P>"; + + GeneratePage('MESSAGE', $html, + sprintf (gettext ("Problem while updating %s"), $pagename), 0); exit; } Binary files ../phpwiki/locale/nl/LC_MESSAGES/phpwiki.mo and ./locale/nl/LC_MESSAGES/phpwiki.mo differ diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/locale/nl/LC_MESSAGES/phpwiki.php ./locale/nl/LC_MESSAGES/phpwiki.php --- ../phpwiki/locale/nl/LC_MESSAGES/phpwiki.php Tue Oct 24 12:59:46 2000 +++ ./locale/nl/LC_MESSAGES/phpwiki.php Tue Oct 24 15:07:25 2000 @@ -1,4 +1,5 @@ <?php + $locale["./pgsrc"] = "locale/nl/pgsrc"; $locale["templates/browse.html"] = @@ -9,14 +10,6 @@ "locale/nl/templates/editlinks.html"; $locale["templates/message.html"] = "locale/nl/templates/message.html"; -$locale["WikiDiff::apply: line count mismatch: %s != %s"] = - ""; -$locale["WikiDiff::_check: failed"] = - ""; -$locale["WikiDiff::_check: edit sequence is non-optimal"] = - ""; -$locale["WikiDiff Okay: LCS = %s"] = - ""; $locale["Current page:"] = "Huidige pagina:"; $locale["version %s"] = @@ -42,8 +35,8 @@ $locale["No page name passed into editpage!"] = "Geen paginanaam doorgegeven aan veranderpagina"; $locale["This page has been locked by the administrator and cannot be edited."] = - ""; -$locale["Sorry for the inconvinience."] = + "Deze pagina is afgesloten door de beheerder en kan niet veranderd worden."; +$locale["Sorry for the inconvenience."] = "Excuses voor het ongemak."; $locale["Problem while editing %s"] = "Probleem tijdens veranderen %s"; @@ -83,6 +76,22 @@ "Actuele versie:"; $locale["Archived version"] = "Gearchiveerde versie:"; +$locale["PhpWiki is unable to save your changes, because another user edited and saved the page while you were editing the page too. If saving proceeded now changes from the previous author would be lost."] = + "PhpWiki kan je veranderingen niet bewaren, want een andere gebruiker\nheeft de pagina veranderd terwijl jij de pagina ook aan het veranderen\nwas. Als bewaren nu doorgang zou vinden, zouden de veranderingen van\nde vorige auteur verloren gaan."; +$locale["In order to recover from this situation follow these steps:"] = + "Om uit deze benarde situatie te geraken, volg je deze stappen:"; +$locale["Use your browser's <b>Back</b> button to go back to the edit page."] = + "Gebruik de <b>Terug</b> knop van je bladeraar om terug te gaan naar de verander tekst pagina."; +$locale["Copy your changes to the clipboard or to another temporary place (e.g. text editor)."] = + "Kopiëer je veranderingen naar het klipbord of een andere tijdelijke plaats (bijv. een tekst editor)."; +$locale["<b>Reload</b> the page. You should now see the most current version of the page. Your changes are no longer there."] = + "<b>Reload</b> de pagina. Je zou nu de meest recente versie van de pagina moeten zien. Jouw veranderingen staan er nu niet meer."; +$locale["Make changes to the file again. Paste your additions from the clipboard (or text editor)."] = + "Breng je veranderingen aan de pagina opnieuw aan. Plak je toevoeginen van het klipbord (of tekst editor)."; +$locale["Press <b>Save</b> again."] = + "Druk opnieuw op <b>Bewaar</b>."; +$locale["Problem while updating %s"] = + "Probleem tijdens veranderen van %s"; $locale["Thank you for editing %s."] = "Bedankt voor het veranderen van %s."; $locale["Your careful attention to detail is much appreciated."] = @@ -97,8 +106,5 @@ "%d beste uitgaande koppelingen:"; $locale["%d most popular nearby:"] = "%d meest gevraagde in de buurt:"; -$locale["Stack bounds exceeded in SetHTMLOutputMode"] = - ""; -$locale["RecentChanges"] = - "RecenteVeranderingen"; -?> + +;?> diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/locale/nl/templates/editpage.html ./locale/nl/templates/editpage.html --- ../phpwiki/locale/nl/templates/editpage.html Sun Oct 22 19:12:49 2000 +++ ./locale/nl/templates/editpage.html Tue Oct 24 15:06:25 2000 @@ -16,7 +16,7 @@ <br> <input type="checkbox" name="convert" value="tabs" > -Ik kan geen tabs typen. +Ik kan geen tabs tiepen. <a href="###SCRIPTURL###?VertaalSpatiesNaarTabs">VertaalSpatiesNaarTabs</a> voor mij als ik bewaar. <p><a href="###SCRIPTURL###?GoedeStijl">GoedeStijl</a> tips for diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/locale/po/nl.po ./locale/po/nl.po --- ../phpwiki/locale/po/nl.po Tue Oct 24 12:59:46 2000 +++ ./locale/po/nl.po Tue Oct 24 15:07:25 2000 @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: phpwiki 1.1.7\n" -"POT-Creation-Date: 2000-10-24 12:00+0200\n" +"POT-Creation-Date: 2000-10-24 15:07+0200\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -117,8 +117,8 @@ msgstr "" "Deze pagina is afgesloten door de beheerder en kan niet veranderd worden." -#: lib/editpage.php:33 -msgid "Sorry for the inconvinience." +#: lib/editpage.php:33 lib/savepage.php:33 +msgid "Sorry for the inconvenience." msgstr "Excuses voor het ongemak." #: lib/editpage.php:35 @@ -140,7 +140,7 @@ msgid "Full Text Search Results" msgstr "Volledige tekst zoek resultaten" -#: lib/msql.php:29 lib/mysql.php:33 +#: lib/msql.php:29 lib/mysql.php:42 msgid "Cannot establish connection to database, giving up." msgstr "Kan verbinding naar data base niet tot stand brengen, geef op." @@ -149,7 +149,7 @@ msgid "Error message: %s" msgstr "Foutboodschap: %s" -#: lib/msql.php:35 lib/mysql.php:39 +#: lib/msql.php:35 lib/mysql.php:48 #, c-format msgid "Cannot open database %s, giving up." msgstr "Kan data base %s niet openen, geef op." @@ -169,12 +169,12 @@ msgid "Insert into %s failed: %s" msgstr "Insert in %s gefaald: %s" -#: lib/mysql.php:35 lib/mysql.php:41 lib/mysql.php:115 +#: lib/mysql.php:44 lib/mysql.php:50 lib/mysql.php:124 #, c-format msgid "MySQL error: %s" msgstr "MySQL fout: %s" -#: lib/mysql.php:113 +#: lib/mysql.php:122 #, c-format msgid "Error writing page '%s'" msgstr "Fout bij schrijven pagina `%s'" @@ -208,12 +208,66 @@ msgid "Archived version" msgstr "Gearchiveerde versie:" -#: lib/savepage.php:60 +#: lib/savepage.php:18 +msgid "" +"PhpWiki is unable to save your changes, because another user edited and " +"saved the page while you were editing the page too. If saving proceeded now " +"changes from the previous author would be lost." +msgstr "" +"PhpWiki kan je veranderingen niet bewaren, want een andere gebruiker\n" +"heeft de pagina veranderd terwijl jij de pagina ook aan het veranderen\n" +"was. Als bewaren nu doorgang zou vinden, zouden de veranderingen van\n" +"de vorige auteur verloren gaan." + +#: lib/savepage.php:21 +msgid "In order to recover from this situation follow these steps:" +msgstr "Om uit deze benarde situatie te geraken, volg je deze stappen:" + +#: lib/savepage.php:23 +msgid "Use your browser's <b>Back</b> button to go back to the edit page." +msgstr "" +"Gebruik de <b>Terug</b> knop van je bladeraar om terug te gaan naar de " +"verander tekst pagina." + +#: lib/savepage.php:25 +msgid "" +"Copy your changes to the clipboard or to another temporary place (e.g. text " +"editor)." +msgstr "" +"Kopiëer je veranderingen naar het klipbord of een andere tijdelijke plaats " +"(bijv. een tekst editor)." + +#: lib/savepage.php:27 +msgid "" +"<b>Reload</b> the page. You should now see the most current version of the " +"page. Your changes are no longer there." +msgstr "" +"<b>Reload</b> de pagina. Je zou nu de meest recente versie van de pagina " +"moeten zien. Jouw veranderingen staan er nu niet meer." + +#: lib/savepage.php:29 +msgid "" +"Make changes to the file again. Paste your additions from the clipboard (or " +"text editor)." +msgstr "" +"Breng je veranderingen aan de pagina opnieuw aan. Plak je toevoeginen van " +"het klipbord (of tekst editor)." + +#: lib/savepage.php:31 +msgid "Press <b>Save</b> again." +msgstr "Druk opnieuw op <b>Bewaar</b>." + +#: lib/savepage.php:37 +#, c-format +msgid "Problem while updating %s" +msgstr "Probleem tijdens veranderen van %s" + +#: lib/savepage.php:69 #, c-format msgid "Thank you for editing %s." msgstr "Bedankt voor het veranderen van %s." -#: lib/savepage.php:90 +#: lib/savepage.php:99 msgid "Your careful attention to detail is much appreciated." msgstr "Je zorgvuldige aandacht voor detail wordt erg gewaardeerd." @@ -222,29 +276,29 @@ msgid "Inserting page %s, version %s from %s" msgstr "Voeg pagina %s toe, versie %s van %s" -#: lib/stdlib.php:36 +#: lib/stdlib.php:37 msgid "WikiFatalError" msgstr "WikiFataleFout" -#: lib/stdlib.php:53 +#: lib/stdlib.php:54 #, c-format msgid "%d best incoming links:" msgstr "%d beste inkomende koppelingen:" -#: lib/stdlib.php:63 +#: lib/stdlib.php:64 #, c-format msgid "%d best outgoing links:" msgstr "%d beste uitgaande koppelingen:" -#: lib/stdlib.php:74 +#: lib/stdlib.php:75 #, c-format msgid "%d most popular nearby:" msgstr "%d meest gevraagde in de buurt:" -#: lib/stdlib.php:288 +#: lib/stdlib.php:289 msgid "Stack bounds exceeded in SetHTMLOutputMode" msgstr "" -#: lib/stdlib.php:343 lib/stdlib.php:406 +#: lib/stdlib.php:344 lib/stdlib.php:407 msgid "RecentChanges" msgstr "RecenteVeranderingen" diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/locale/po/phpwiki.pot ./locale/po/phpwiki.pot --- ../phpwiki/locale/po/phpwiki.pot Tue Oct 24 12:59:46 2000 +++ ./locale/po/phpwiki.pot Tue Oct 24 15:07:25 2000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-10-24 12:00+0200\n" +"POT-Creation-Date: 2000-10-24 15:07+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -110,8 +110,8 @@ msgid "This page has been locked by the administrator and cannot be edited." msgstr "" -#: lib/editpage.php:33 -msgid "Sorry for the inconvinience." +#: lib/editpage.php:33 lib/savepage.php:33 +msgid "Sorry for the inconvenience." msgstr "" #: lib/editpage.php:35 @@ -133,7 +133,7 @@ msgid "Full Text Search Results" msgstr "" -#: lib/msql.php:29 lib/mysql.php:33 +#: lib/msql.php:29 lib/mysql.php:42 msgid "Cannot establish connection to database, giving up." msgstr "" @@ -142,7 +142,7 @@ msgid "Error message: %s" msgstr "" -#: lib/msql.php:35 lib/mysql.php:39 +#: lib/msql.php:35 lib/mysql.php:48 #, c-format msgid "Cannot open database %s, giving up." msgstr "" @@ -162,12 +162,12 @@ msgid "Insert into %s failed: %s" msgstr "" -#: lib/mysql.php:35 lib/mysql.php:41 lib/mysql.php:115 +#: lib/mysql.php:44 lib/mysql.php:50 lib/mysql.php:124 #, c-format msgid "MySQL error: %s" msgstr "" -#: lib/mysql.php:113 +#: lib/mysql.php:122 #, c-format msgid "Error writing page '%s'" msgstr "" @@ -201,12 +201,54 @@ msgid "Archived version" msgstr "" -#: lib/savepage.php:60 +#: lib/savepage.php:18 +msgid "" +"PhpWiki is unable to save your changes, because another user edited and " +"saved the page while you were editing the page too. If saving proceeded now " +"changes from the previous author would be lost." +msgstr "" + +#: lib/savepage.php:21 +msgid "In order to recover from this situation follow these steps:" +msgstr "" + +#: lib/savepage.php:23 +msgid "Use your browser's <b>Back</b> button to go back to the edit page." +msgstr "" + +#: lib/savepage.php:25 +msgid "" +"Copy your changes to the clipboard or to another temporary place (e.g. text " +"editor)." +msgstr "" + +#: lib/savepage.php:27 +msgid "" +"<b>Reload</b> the page. You should now see the most current version of the " +"page. Your changes are no longer there." +msgstr "" + +#: lib/savepage.php:29 +msgid "" +"Make changes to the file again. Paste your additions from the clipboard (or " +"text editor)." +msgstr "" + +#: lib/savepage.php:31 +msgid "Press <b>Save</b> again." +msgstr "" + +#: lib/savepage.php:37 +#, c-format +msgid "Problem while updating %s" +msgstr "" + +#: lib/savepage.php:69 #, c-format msgid "Thank you for editing %s." msgstr "" -#: lib/savepage.php:90 +#: lib/savepage.php:99 msgid "Your careful attention to detail is much appreciated." msgstr "" @@ -215,29 +257,29 @@ msgid "Inserting page %s, version %s from %s" msgstr "" -#: lib/stdlib.php:36 +#: lib/stdlib.php:37 msgid "WikiFatalError" msgstr "" -#: lib/stdlib.php:53 +#: lib/stdlib.php:54 #, c-format msgid "%d best incoming links:" msgstr "" -#: lib/stdlib.php:63 +#: lib/stdlib.php:64 #, c-format msgid "%d best outgoing links:" msgstr "" -#: lib/stdlib.php:74 +#: lib/stdlib.php:75 #, c-format msgid "%d most popular nearby:" msgstr "" -#: lib/stdlib.php:288 +#: lib/stdlib.php:289 msgid "Stack bounds exceeded in SetHTMLOutputMode" msgstr "" -#: lib/stdlib.php:343 lib/stdlib.php:406 +#: lib/stdlib.php:344 lib/stdlib.php:407 msgid "RecentChanges" msgstr "" diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/locale/translate.sh ./locale/translate.sh --- ../phpwiki/locale/translate.sh Mon Oct 23 03:19:09 2000 +++ ./locale/translate.sh Tue Oct 24 15:01:43 2000 @@ -30,9 +30,41 @@ msgfmt -o $locale/phpwiki.mo $po awk -- ' - BEGIN { print ("<?php") } - /^msgid ""/ { getline; next } - /^msgid "/ { msgid = substr ($0, 7); print ("$locale[" msgid "] ="); next } - /^msgstr "/ { msgstr = substr ($0, 8); print (" " msgstr ";"); next } - END { print ("?>") }' $po > $locale/phpwiki.php +BEGIN { + msgid=""; msgstr=""; + print ("<?php\n"); +} +/^msgid ""/ { + if (msgid && str) + print ("$locale[\"" msgid "\"] =\n \"" str "\";"); + str=""; + next; +} +/^msgid "/ { #"{ + if (msgid && str) + print ("$locale[\"" msgid "\"] =\n \"" str "\";"); + str = substr ($0, 8, length ($0) - 8); + msgstr=""; +} +/^msgstr ""/ { + msgid=str; + str=""; + next; +} +/^msgstr "/ { #"{ + msgid=str; + str = substr ($0, 9, length ($0) - 9); + next; +} +/^"/ { #"{ + str = (str substr ($0, 2, length ($0) - 2)); + next; +} +END { + if (mgsid && str) + print ("$locale[\"" msgid "\"] =\n \"" str "\";"); + print ("\n;?>"); +} + +' $po > $locale/phpwiki.php done -- Jan Nieuwenhuizen <ja...@gn...> | GNU LilyPond - The music typesetter http://www.xs4all.nl/~jantien | http://www.lilypond.org |
From: Arno H. <aho...@in...> - 2000-10-24 10:37:02
|
infopage translations committed. > I'll maybe have a quick look at these too... > 7.And what about a WikiLink? and another WikiLink?WithSameStem on one line? > 8.Other way around: WikiLink?WithSameStem plus WikiLink? Where the @$#! came this bug from? We've killed it a number of times already. Anyway, I've fixed it for good now (a hack - but it has its merrits). My solution limits WikiNames to 9876 characters, though. I hope that doesn't disturb anyone :o) Test cases added to TestPage as well. /Arno |
From: <ja...@gn...> - 2000-10-24 07:49:41
|
Hi Arno, I'll maybe have a quick look at these too... 7.And what about a WikiLink? and another WikiLink?WithSameStem on one line? 8.Other way around: WikiLink?WithSameStem plus WikiLink? diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/lib/pageinfo.php ./lib/pageinfo.php --- ../phpwiki/lib/pageinfo.php Thu Oct 19 23:36:50 2000 +++ ./lib/pageinfo.php Mon Oct 23 03:48:39 2000 @@ -6,16 +6,20 @@ } $encname = htmlspecialchars($info); + $enter .= gettext ("Enter a page name"); + $go = gettext ("Go"); $html = "<form action=\"$ScriptUrl\" METHOD=GET>\n" . "<input name=\"info\" value=\"$encname\">" . - " Enter a page name\n" . - "<input type=submit value=Go><br>\n" . + " $enter\n" . + "<input type=submit value=$go><br>\n" . "<input type=checkbox name=showpagesource"; if ($showpagesource == "on") { $html .= " checked"; } - $html .= "> Show the page source and references\n</form>\n"; + $html .= "> "; + $html .= gettext ("Show the page source and references"); + $html .= "\n</form>\n"; // don't bother unless we were asked if (! $info) { @@ -29,7 +33,8 @@ $pagehash = RetrievePage($dbi, $name, $pagestore); if ($pagehash == -1) { - $table = "Page name '$name' is not in the database<br>\n"; + $table = sprintf (gettext ("Page name '%s' is not in the database"), + $name) . "\n"; } else { $table = "<table border=1 bgcolor=white>\n"; @@ -55,11 +60,15 @@ return $table; } - $html .= "<P><B>Current version</B></p>"; + $html .= "<P><B>"; + $html .= gettext ("Current version"); + $html .= "</B></p>"; // $dbi = OpenDataBase($WikiPageStore); --- done by index.php $html .= ViewPageProps($info, $WikiPageStore); - $html .= "<P><B>Archived version</B></p>"; + $html .= "<P><B>"; + $html .= gettext ("Archived version"); + $html .= "</B></p>"; // $dbi = OpenDataBase($ArchivePageStore); $html .= ViewPageProps($info, $ArchivePageStore); Binary files ../phpwiki/locale/nl/LC_MESSAGES/phpwiki.mo and ./locale/nl/LC_MESSAGES/phpwiki.mo differ diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/locale/nl/LC_MESSAGES/phpwiki.php ./locale/nl/LC_MESSAGES/phpwiki.php --- ../phpwiki/locale/nl/LC_MESSAGES/phpwiki.php Fri Oct 20 15:22:03 2000 +++ ./locale/nl/LC_MESSAGES/phpwiki.php Tue Oct 24 09:34:18 2000 @@ -69,8 +69,20 @@ "MySQL fout: %s"; $locale["Error writing page '%s'"] = "Fout bij schrijven pagina `%s'"; +$locale["Enter a page name"] = + "Geef de naam van een pagina"; +$locale["Go"] = + "Ga"; +$locale["Show the page source and references"] = + "Toon de bron tekst en de koppelingen van de pagina"; $locale["PageInfo"] = "PaginaInfo"; +$locale["Page name '%s' is not in the database"] = + "Pagina naam `%s' staat niet in de data base"; +$locale["Current version"] = + "Actuele versie:"; +$locale["Archived version"] = + "Gearchiveerde versie:"; $locale["Thank you for editing %s."] = "Bedankt voor het veranderen van %s."; $locale["Your careful attention to detail is much appreciated."] = diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/locale/po/nl.po ./locale/po/nl.po --- ../phpwiki/locale/po/nl.po Fri Oct 20 15:22:04 2000 +++ ./locale/po/nl.po Tue Oct 24 09:34:18 2000 @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: phpwiki 1.1.7\n" -"POT-Creation-Date: 2000-10-20 13:43+0200\n" +"POT-Creation-Date: 2000-10-24 09:34+0200\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -24,19 +24,19 @@ msgid "./pgsrc" msgstr "locale/nl/pgsrc" -#: lib/config.php:168 +#: lib/config.php:174 msgid "templates/browse.html" msgstr "locale/nl/templates/browse.html" -#: lib/config.php:169 +#: lib/config.php:175 msgid "templates/editpage.html" msgstr "locale/nl/templates/editpage.html" -#: lib/config.php:170 +#: lib/config.php:176 msgid "templates/editlinks.html" msgstr "locale/nl/templates/editlinks.html" -#: lib/config.php:171 +#: lib/config.php:177 msgid "templates/message.html" msgstr "locale/nl/templates/message.html" @@ -140,7 +140,7 @@ msgid "Full Text Search Results" msgstr "Volledige tekst zoek resultaten" -#: lib/msql.php:29 lib/mysql.php:33 +#: lib/msql.php:29 lib/mysql.php:42 msgid "Cannot establish connection to database, giving up." msgstr "Kan verbinding naar data base niet tot stand brengen, geef op." @@ -149,7 +149,7 @@ msgid "Error message: %s" msgstr "Foutboodschap: %s" -#: lib/msql.php:35 lib/mysql.php:39 +#: lib/msql.php:35 lib/mysql.php:48 #, c-format msgid "Cannot open database %s, giving up." msgstr "Kan data base %s niet openen, geef op." @@ -169,19 +169,44 @@ msgid "Insert into %s failed: %s" msgstr "Insert in %s gefaald: %s" -#: lib/mysql.php:35 lib/mysql.php:41 lib/mysql.php:115 +#: lib/mysql.php:44 lib/mysql.php:50 lib/mysql.php:124 #, c-format msgid "MySQL error: %s" msgstr "MySQL fout: %s" -#: lib/mysql.php:113 +#: lib/mysql.php:122 #, c-format msgid "Error writing page '%s'" msgstr "Fout bij schrijven pagina `%s'" -#: lib/pageinfo.php:22 lib/pageinfo.php:66 +#: lib/pageinfo.php:9 +msgid "Enter a page name" +msgstr "Geef de naam van een pagina" + +#: lib/pageinfo.php:10 +msgid "Go" +msgstr "Ga" + +#: lib/pageinfo.php:21 +msgid "Show the page source and references" +msgstr "Toon de bron tekst en de koppelingen van de pagina" + +#: lib/pageinfo.php:26 lib/pageinfo.php:75 msgid "PageInfo" msgstr "PaginaInfo" + +#: lib/pageinfo.php:36 +#, c-format +msgid "Page name '%s' is not in the database" +msgstr "Pagina naam `%s' staat niet in de data base" + +#: lib/pageinfo.php:64 +msgid "Current version" +msgstr "Actuele versie:" + +#: lib/pageinfo.php:70 +msgid "Archived version" +msgstr "Gearchiveerde versie:" #: lib/savepage.php:60 #, c-format diff -urN --exclude=CVS --exclude=*~ --exclude=#* ../phpwiki/locale/po/phpwiki.pot ./locale/po/phpwiki.pot --- ../phpwiki/locale/po/phpwiki.pot Fri Oct 20 15:22:04 2000 +++ ./locale/po/phpwiki.pot Tue Oct 24 09:34:18 2000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-10-20 13:43+0200\n" +"POT-Creation-Date: 2000-10-24 09:34+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -18,19 +18,19 @@ msgid "./pgsrc" msgstr "" -#: lib/config.php:168 +#: lib/config.php:174 msgid "templates/browse.html" msgstr "" -#: lib/config.php:169 +#: lib/config.php:175 msgid "templates/editpage.html" msgstr "" -#: lib/config.php:170 +#: lib/config.php:176 msgid "templates/editlinks.html" msgstr "" -#: lib/config.php:171 +#: lib/config.php:177 msgid "templates/message.html" msgstr "" @@ -133,7 +133,7 @@ msgid "Full Text Search Results" msgstr "" -#: lib/msql.php:29 lib/mysql.php:33 +#: lib/msql.php:29 lib/mysql.php:42 msgid "Cannot establish connection to database, giving up." msgstr "" @@ -142,7 +142,7 @@ msgid "Error message: %s" msgstr "" -#: lib/msql.php:35 lib/mysql.php:39 +#: lib/msql.php:35 lib/mysql.php:48 #, c-format msgid "Cannot open database %s, giving up." msgstr "" @@ -162,18 +162,43 @@ msgid "Insert into %s failed: %s" msgstr "" -#: lib/mysql.php:35 lib/mysql.php:41 lib/mysql.php:115 +#: lib/mysql.php:44 lib/mysql.php:50 lib/mysql.php:124 #, c-format msgid "MySQL error: %s" msgstr "" -#: lib/mysql.php:113 +#: lib/mysql.php:122 #, c-format msgid "Error writing page '%s'" msgstr "" -#: lib/pageinfo.php:22 lib/pageinfo.php:66 +#: lib/pageinfo.php:9 +msgid "Enter a page name" +msgstr "" + +#: lib/pageinfo.php:10 +msgid "Go" +msgstr "" + +#: lib/pageinfo.php:21 +msgid "Show the page source and references" +msgstr "" + +#: lib/pageinfo.php:26 lib/pageinfo.php:75 msgid "PageInfo" +msgstr "" + +#: lib/pageinfo.php:36 +#, c-format +msgid "Page name '%s' is not in the database" +msgstr "" + +#: lib/pageinfo.php:64 +msgid "Current version" +msgstr "" + +#: lib/pageinfo.php:70 +msgid "Archived version" msgstr "" #: lib/savepage.php:60 -- Jan Nieuwenhuizen <ja...@gn...> | GNU LilyPond - The music typesetter http://www.xs4all.nl/~jantien | http://www.lilypond.org |
From: Arno H. <aho...@in...> - 2000-10-23 22:09:19
|
An idea that just struck me: why not release this version (or the next version in e.g. 2-4 weeks) as version 1.2.0? We could put off major changes like db interface / transform until then, and do some touch-up (e.g. documentation). phpwiki seems rather stable currently, so why not give it a bigger userbase by releasing it as a stable version? Then we could define some goals for 1.4.x -- and slowly work our way torwards 2.0.x :o) What do you think about it? Has anyone seen the "LikePages" feature on c2.com? I really like that idea, e.g. http://www.c2.com/cgi/like?WhyEdit /Arno |
From: Arno H. <aho...@in...> - 2000-10-23 21:18:33
|
> I think my testing is almost done then; if you can confirm that a clean > checkout of PhpWiki installs cleanly on MySQL then we should be ready to > release the tarball. Worked. Green light from my side. Things to mention in the ReleaseNotes/HISTORY or wherever: - locale stuff - zip support - lines now stored without trailing \r - if e.g. pre sports extra lines, just hit edit/save and the problem is corrected. - db_filesystem: new way to store pages (immature) - with mySQL: related pages possible - with mySQL: pages have a score now (related to how many pages link to them) - tab-less syntax > > Is there a specific reason why you removed the credits page, Steve? > It was way behind, and no longer being maintained, so to speak. I can > reinstate if you wish; I just need to be disciplined enough to update it > whenever someone like Jan comes along and makes a significant > contribution. I think CREDITS is a nice feature for those who contribute casually. After all, an entry in CREDITS is all they could ask for. There's not that much update to do. Maybe restructure it a little bit: Head: Steve Core team: Jeff, Ari, me Translations: Jan Patches/suggestions: Jeremie Kass, Neil Brown, ?maybe: Bug reports: .... Something like that, you get the general idea. /Arno p.s. I just made a minor commit to pgsrc/ReleaseNotes -- do an update Steve, before you start changing it. pp.s. phpwiki-checkins works for me now. |
From: Steve W. <sw...@wc...> - 2000-10-23 19:09:11
|
Update on CVS checkins mailing list: I've signed up twice for phpwiki-checkins, but only the second one got me a confirmation email, to which I replied but I still haven't been validated. When I check in a file I now get: [swain@localhost phpwiki]$ cvs commit DBLIB.txt wai...@cv...'s password: Checking in DBLIB.txt; /cvsroot/phpwiki/phpwiki/DBLIB.txt,v <-- DBLIB.txt new revision: 1.7; previous revision: 1.6 done Mailing php...@li...... Generating notification message... Generating notification message... done. But so far nothing has come through, so I'm giving it a day (we've seen SF have mailer problems in the past) before I bug the help desk. sw ...............................ooo0000ooo................................. Hear FM quality freeform radio through the Internet: http://wcsb.org/ home page: www.wcsb.org/~swain |
From: Steve W. <sw...@wc...> - 2000-10-23 18:35:19
|
On Mon, 23 Oct 2000, Arno Hollosi wrote: > Is there a specific reason why you removed the credits page, Steve? It was way behind, and no longer being maintained, so to speak. I can reinstate if you wish; I just need to be disciplined enough to update it whenever someone like Jan comes along and makes a significant contribution. sw ...............................ooo0000ooo................................. Hear FM quality freeform radio through the Internet: http://wcsb.org/ home page: www.wcsb.org/~swain |
From: Arno H. <aho...@in...> - 2000-10-23 17:11:01
|
Tab-less syntax should be complete now. I added nested definition lists, and ul/ol lists can be mixed now. Is there a specific reason why you removed the credits page, Steve? /Arno |