You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(43) |
Nov
(73) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(34) |
Feb
(110) |
Mar
(24) |
Apr
(44) |
May
(37) |
Jun
(22) |
Jul
(20) |
Aug
(28) |
Sep
(50) |
Oct
(11) |
Nov
(132) |
Dec
(595) |
| 2002 |
Jan
(1099) |
Feb
(579) |
Mar
(63) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(125) |
Sep
(101) |
Oct
(25) |
Nov
(34) |
Dec
(47) |
| 2003 |
Jan
(82) |
Feb
(182) |
Mar
(71) |
Apr
(3) |
May
(1) |
Jun
(3) |
Jul
|
Aug
|
Sep
(14) |
Oct
(6) |
Nov
(124) |
Dec
(68) |
| 2004 |
Jan
(64) |
Feb
(191) |
Mar
(199) |
Apr
(298) |
May
(252) |
Jun
(426) |
Jul
(134) |
Aug
(13) |
Sep
(96) |
Oct
(75) |
Nov
(232) |
Dec
(171) |
| 2005 |
Jan
(205) |
Feb
(165) |
Mar
(8) |
Apr
(74) |
May
(21) |
Jun
(19) |
Jul
(37) |
Aug
(69) |
Sep
(141) |
Oct
(118) |
Nov
(31) |
Dec
(7) |
| 2006 |
Jan
(5) |
Feb
(10) |
Mar
(35) |
Apr
(24) |
May
(34) |
Jun
(29) |
Jul
(5) |
Aug
(38) |
Sep
(30) |
Oct
(37) |
Nov
(30) |
Dec
(86) |
| 2007 |
Jan
(414) |
Feb
(40) |
Mar
(18) |
Apr
(10) |
May
(66) |
Jun
(60) |
Jul
(105) |
Aug
(55) |
Sep
(64) |
Oct
(7) |
Nov
(11) |
Dec
(5) |
| 2008 |
Jan
(26) |
Feb
(28) |
Mar
(79) |
Apr
(34) |
May
(61) |
Jun
(24) |
Jul
(29) |
Aug
(160) |
Sep
(62) |
Oct
(70) |
Nov
(32) |
Dec
(14) |
| 2009 |
Jan
(140) |
Feb
(135) |
Mar
(153) |
Apr
(53) |
May
(24) |
Jun
(138) |
Jul
(90) |
Aug
(46) |
Sep
(72) |
Oct
(84) |
Nov
(32) |
Dec
(4) |
| 2010 |
Jan
(13) |
Feb
(7) |
Mar
(14) |
Apr
(55) |
May
(89) |
Jun
(131) |
Jul
(41) |
Aug
(38) |
Sep
(42) |
Oct
(11) |
Nov
(27) |
Dec
(54) |
| 2011 |
Jan
(127) |
Feb
(16) |
Mar
(71) |
Apr
(52) |
May
(32) |
Jun
(31) |
Jul
(4) |
Aug
|
Sep
(45) |
Oct
(26) |
Nov
(36) |
Dec
(10) |
| 2012 |
Jan
(23) |
Feb
(6) |
Mar
(13) |
Apr
(18) |
May
(1) |
Jun
(4) |
Jul
(3) |
Aug
(12) |
Sep
(57) |
Oct
(96) |
Nov
(163) |
Dec
(124) |
| 2013 |
Jan
(11) |
Feb
(17) |
Mar
(7) |
Apr
(48) |
May
(15) |
Jun
(29) |
Jul
(12) |
Aug
|
Sep
(9) |
Oct
|
Nov
|
Dec
(3) |
| 2014 |
Jan
(4) |
Feb
(1) |
Mar
(2) |
Apr
(1) |
May
(8) |
Jun
(90) |
Jul
(104) |
Aug
(12) |
Sep
(81) |
Oct
(139) |
Nov
(111) |
Dec
(64) |
| 2015 |
Jan
(46) |
Feb
(74) |
Mar
(56) |
Apr
(61) |
May
(3) |
Jun
(7) |
Jul
(11) |
Aug
(5) |
Sep
(15) |
Oct
(1) |
Nov
(1) |
Dec
(15) |
| 2016 |
Jan
(25) |
Feb
(33) |
Mar
(24) |
Apr
(4) |
May
(24) |
Jun
(3) |
Jul
(75) |
Aug
|
Sep
(2) |
Oct
(38) |
Nov
(4) |
Dec
(18) |
| 2017 |
Jan
(8) |
Feb
(1) |
Mar
(1) |
Apr
|
May
(14) |
Jun
|
Jul
(5) |
Aug
(9) |
Sep
|
Oct
(23) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
(9) |
Apr
(60) |
May
(1) |
Jun
|
Jul
(13) |
Aug
|
Sep
(11) |
Oct
|
Nov
|
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
(15) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
| 2021 |
Jan
(24) |
Feb
(33) |
Mar
(1) |
Apr
|
May
(1) |
Jun
(64) |
Jul
(71) |
Aug
(114) |
Sep
(82) |
Oct
(32) |
Nov
(76) |
Dec
(86) |
| 2022 |
Jan
(162) |
Feb
(41) |
Mar
(11) |
Apr
(9) |
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(7) |
| 2023 |
Jan
|
Feb
(1) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(25) |
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
|
| 2024 |
Jan
(7) |
Feb
(3) |
Mar
(3) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
|
Feb
(90) |
Mar
(19) |
Apr
|
May
(6) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
Update of /cvsroot/phpwiki/phpwiki/lib In directory slayer.i.sourceforge.net:/tmp/cvs-serv25045/lib Modified Files: config.php Log Message: fix for bug #117729 (fake author) Index: config.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** config.php 2000年10月28日 17:44:00 1.9 --- config.php 2000年10月30日 07:41:10 1.10 *************** *** 224,229 **** // Apache won't show REMOTE_HOST unless the admin configured it // properly. We'll be nice and see if it's there. ! empty($REMOTE_HOST) ? ! ($remoteuser = $REMOTE_ADDR) : ($remoteuser = $REMOTE_HOST); // constants used for HTML output. List tags like UL and --- 224,229 ---- // Apache won't show REMOTE_HOST unless the admin configured it // properly. We'll be nice and see if it's there. ! getenv('REMOTE_HOST') ? ($remoteuser = getenv('REMOTE_HOST')) ! : ($remoteuser = getenv('REMOTE_ADDR')); // constants used for HTML output. List tags like UL and
Update of /cvsroot/phpwiki/phpwiki/lib In directory slayer.i.sourceforge.net:/tmp/cvs-serv14355/lib Modified Files: config.php pgsql.php Log Message: pgsql patch (version7) from kb...@sa... Index: config.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** config.php 2000年10月25日 14:41:32 1.8 --- config.php 2000年10月28日 17:44:00 1.9 *************** *** 38,41 **** --- 38,42 ---- $LANG="C"; // (What should be the) Default: English // $LANG="nl"; // We all speak dutch, no? + // $LANG="es"; // We all speak spanish, no? if (!function_exists ('gettext')) { *************** *** 101,104 **** --- 102,108 ---- $WikiPageStore = "wiki"; // name of the table where pages are stored $ArchivePageStore = "archive"; // name of the table where pages are archived + $WikiLinksPageStore = "wikilinks"; + $HotTopicsPageStore = "hottopics"; + $HitCountPageStore = "hitcount"; $pg_dbhost = "localhost"; $pg_dbport = "5432"; Index: pgsql.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/pgsql.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** pgsql.php 2000年10月08日 17:33:26 1.1 --- pgsql.php 2000年10月28日 17:44:00 1.2 *************** *** 29,33 **** global $WikiDataBase, $pg_dbhost, $pg_dbport; ! $connectstring = "host=$pg_dbhost port=$pg_dbport dbname=$WikiDataBase"; if (!($dbc = pg_pconnect($connectstring))) { --- 29,35 ---- global $WikiDataBase, $pg_dbhost, $pg_dbport; ! $connectstring = $pg_dbhost?"host=$pg_dbhost ":""; ! $connectstring .= $pg_dbport?"pport=$pg_dbport ":""; ! $connectstring .= $WikiDataBase?"dbname=$WikiDataBase":""; if (!($dbc = pg_pconnect($connectstring))) { *************** *** 98,101 **** --- 100,109 ---- $pagehash["refs"] = serialize($pagehash["refs"]); + // Check for empty variables which can cause a sql error + if(empty($pagehash["created"])) + $pagehash["created"] = time(); + if(empty($pagehash["version"])) + $pagehash["version"] = 1; + // record the time of modification $pagehash["lastmodified"] = time(); *************** *** 237,242 **** function IsWikiPage($dbi, $pagename) { $pagename = addslashes($pagename); ! $query = "select count(*) from wiki where pagename='$pagename'"; $res = pg_exec($query); $array = pg_fetch_array($res, 0); --- 245,251 ---- function IsWikiPage($dbi, $pagename) { + global $WikiPageStore; $pagename = addslashes($pagename); ! $query = "select count(*) from $WikiPageStore where pagename='$pagename'"; $res = pg_exec($query); $array = pg_fetch_array($res, 0); *************** *** 246,251 **** function IsInArchive($dbi, $pagename) { $pagename = addslashes($pagename); ! $query = "select count(*) from archive where pagename='$pagename'"; $res = pg_exec($query); $array = pg_fetch_array($res, 0); --- 255,261 ---- function IsInArchive($dbi, $pagename) { + global $ArchivePageStore; $pagename = addslashes($pagename); ! $query = "select count(*) from $ArchivePageStore where pagename='$pagename'"; $res = pg_exec($query); $array = pg_fetch_array($res, 0); *************** *** 318,327 **** function IncreaseHitCount($dbi, $pagename) { ! ! $query = "update hitcount set hits=hits+1 where pagename='$pagename'"; $res = pg_exec($dbi['dbc'], $query); if (!pg_cmdtuples($res)) { ! $query = "insert into hitcount (pagename, hits) " . "values ('$pagename', 1)"; $res = pg_exec($dbi['dbc'], $query); --- 328,337 ---- function IncreaseHitCount($dbi, $pagename) { ! global $HitCountPageStore; ! $query = "update $HitCountPageStore set hits=hits+1 where pagename='$pagename'"; $res = pg_exec($dbi['dbc'], $query); if (!pg_cmdtuples($res)) { ! $query = "insert into $HitCountPageStore (pagename, hits) " . "values ('$pagename', 1)"; $res = pg_exec($dbi['dbc'], $query); *************** *** 332,337 **** function GetHitCount($dbi, $pagename) { ! ! $query = "select hits from hitcount where pagename='$pagename'"; $res = pg_exec($dbi['dbc'], $query); if (pg_cmdtuples($res)) { --- 342,347 ---- function GetHitCount($dbi, $pagename) { ! global $HitCountPageStore; ! $query = "select hits from $HitCountPageStore where pagename='$pagename'"; $res = pg_exec($dbi['dbc'], $query); if (pg_cmdtuples($res)) { *************** *** 348,355 **** function InitMostPopular($dbi, $limit) { ! global $pg_most_pop_ctr; $pg_most_pop_ctr = 0; ! $query = "select * from hitcount " . "order by hits desc, pagename limit $limit"; $res = pg_exec($dbi['dbc'], $query); --- 358,365 ---- function InitMostPopular($dbi, $limit) { ! global $pg_most_pop_ctr, $HitCountPageStore; $pg_most_pop_ctr = 0; ! $query = "select * from $HitCountPageStore " . "order by hits desc, pagename limit $limit"; $res = pg_exec($dbi['dbc'], $query); *************** *** 369,374 **** function GetAllWikiPageNames($dbi) { ! ! $res = pg_exec($dbi['dbc'], "select pagename from wiki"); $rows = pg_numrows($res); for ($i = 0; $i < $rows; $i++) { --- 379,384 ---- function GetAllWikiPageNames($dbi) { ! global $WikiPageStore; ! $res = pg_exec($dbi['dbc'], "select pagename from $WikiPageStore"); $rows = pg_numrows($res); for ($i = 0; $i < $rows; $i++) { *************** *** 380,388 **** //////////////////////////////////////// // functionality for the wikilinks table ! /* // takes a page name, returns array of links function GetWikiPageLinks($dbi, $pagename) { ! ! $query = "select frompage from wikilinks where topage='$pagename'"; $res = pg_exec($dbi['dbc'], $query); $rows = pg_numrows($res); --- 390,398 ---- //////////////////////////////////////// // functionality for the wikilinks table ! // takes a page name, returns array of links function GetWikiPageLinks($dbi, $pagename) { ! global $WikiLinksPageStore; ! $query = "select frompage from $WikiLinksPageStore where topage='$pagename'"; $res = pg_exec($dbi['dbc'], $query); $rows = pg_numrows($res); *************** *** 399,407 **** function SetWikiPageLinks($dbi, $pagename, $linklist) { ! $frompage = addslashes($pagename); // first delete the old list of links ! $query = "delete from wikilinks where frompage='$frompage'"; // echo "$query<br>\n"; $res = pg_exec($dbi['dbc'], $query); --- 409,417 ---- function SetWikiPageLinks($dbi, $pagename, $linklist) { ! global $WikiLinksPageStore; $frompage = addslashes($pagename); // first delete the old list of links ! $query = "delete from $WikiLinksPageStore where frompage='$frompage'"; // echo "$query<br>\n"; $res = pg_exec($dbi['dbc'], $query); *************** *** 415,419 **** while (list($topage, $count) = each($linklist)) { $topage = addslashes($topage); ! $query = "insert into wikilinks (frompage, topage) " . "values ('$frompage', '$topage')"; // echo "$query<br>\n"; --- 425,429 ---- while (list($topage, $count) = each($linklist)) { $topage = addslashes($topage); ! $query = "insert into $WikiLinksPageStore (frompage, topage) " . "values ('$frompage', '$topage')"; // echo "$query<br>\n"; *************** *** 421,425 **** } } ! */ ?> --- 431,435 ---- } } ! ?>
Update of /cvsroot/phpwiki/phpwiki/lib In directory slayer.i.sourceforge.net:/tmp/cvs-serv32762/lib Modified Files: savepage.php Log Message: fix: savepage didn't check FLAG_PAGE_LOCKED Index: savepage.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/savepage.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** savepage.php 2000年10月26日 15:38:38 1.3 --- savepage.php 2000年10月26日 15:47:51 1.4 *************** *** 15,26 **** We want to translate this entire paragraph as one string, of course. */ ! $html = "<P>" . 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.") . "</P>\n<P>" . ! gettext ("In order to recover from this situation follow these steps:") . "\n<OL><LI>" . ! gettext ("Use your browser's <b>Back</b> button to go back to the edit page.") . "\n<LI>" . ! gettext ("Copy your changes to the clipboard or to another temporary place (e.g. text editor).") . "\n<LI>" . ! gettext ("<b>Reload</b> the page. You should now see the most current version of the page. Your changes are no longer there.") . "\n<LI>" . ! gettext ("Make changes to the file again. Paste your additions from the clipboard (or text editor).") . "\n<LI>" . ! gettext ("Press <b>Save</b> again.") . "</OL>\n<P>" . ! gettext ("Sorry for the inconvenience.") ."</P>"; GeneratePage('MESSAGE', $html, --- 15,35 ---- We want to translate this entire paragraph as one string, of course. */ ! $html = "<P>"; ! $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, *************** *** 40,46 **** --- 49,63 ---- $newpage = 1; } else { + if (($pagehash['flags'] & FLAG_PAGE_LOCKED) && !$admin_edit) { + $html = "<p>" . gettext ("This page has been locked by the administrator and cannot be edited."); + $html .= "\n<p>" . gettext ("Sorry for the inconvenience."); + GeneratePage('MESSAGE', $html, sprintf (gettext ("Problem while editing %s"), $pagename), 0); + ExitWiki (""); + } + if(isset($editversion) && ($editversion != $pagehash["version"])) { ConcurrentUpdates($pagename); } + // archive it if it's a new author if ($pagehash["author"] != $remoteuser) {
Update of /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES In directory slayer.i.sourceforge.net:/tmp/cvs-serv31978/locale/nl/LC_MESSAGES Modified Files: phpwiki.mo phpwiki.php Log Message: another gettext() patch from Jan (fix plus translation of savepage) Index: phpwiki.mo =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES/phpwiki.mo,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 Binary files /tmp/cvssctTZT and /tmp/cvscXF5XF differ Index: phpwiki.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES/phpwiki.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** phpwiki.php 2000年10月24日 09:55:19 1.4 --- phpwiki.php 2000年10月26日 15:38:38 1.5 *************** *** 1,3 **** --- 1,4 ---- <?php + $locale["./pgsrc"] = "locale/nl/pgsrc"; *************** *** 10,21 **** $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:"; --- 11,14 ---- *************** *** 43,48 **** "Geen paginanaam doorgegeven aan veranderpagina"; $locale["This page has been locked by the administrator and cannot be edited."] = ! ""; ! $locale["Sorry for the inconvinience."] = "Excuses voor het ongemak."; $locale["Problem while editing %s"] = --- 36,41 ---- "Geen paginanaam doorgegeven aan veranderpagina"; $locale["This page has been locked by the administrator and cannot be edited."] = ! "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"] = *************** *** 84,87 **** --- 77,96 ---- $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."; *************** *** 98,104 **** $locale["%d most popular nearby:"] = "%d meest gevraagde in de buurt:"; ! $locale["Stack bounds exceeded in SetHTMLOutputMode"] = ! ""; ! $locale["RecentChanges"] = ! "RecenteVeranderingen"; ! ?> --- 107,110 ---- $locale["%d most popular nearby:"] = "%d meest gevraagde in de buurt:"; ! ! ;?>
Update of /cvsroot/phpwiki/phpwiki/locale/nl/templates In directory slayer.i.sourceforge.net:/tmp/cvs-serv31978/locale/nl/templates Modified Files: editpage.html Log Message: another gettext() patch from Jan (fix plus translation of savepage) Index: editpage.html =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/templates/editpage.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** editpage.html 2000年10月22日 13:30:58 1.3 --- editpage.html 2000年10月26日 15:38:38 1.4 *************** *** 17,21 **** <input type="checkbox" name="convert" value="tabs" > ! Ik kan geen tabs typen. <a href="###SCRIPTURL###?VertaalSpatiesNaarTabs">VertaalSpatiesNaarTabs</a> voor mij als ik bewaar. --- 17,21 ---- <input type="checkbox" name="convert" value="tabs" > ! Ik kan geen tabs tiepen. <a href="###SCRIPTURL###?VertaalSpatiesNaarTabs">VertaalSpatiesNaarTabs</a> voor mij als ik bewaar.
Update of /cvsroot/phpwiki/phpwiki/lib In directory slayer.i.sourceforge.net:/tmp/cvs-serv31978/lib Modified Files: editpage.php savepage.php Log Message: another gettext() patch from Jan (fix plus translation of savepage) Index: editpage.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/editpage.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** editpage.php 2000年10月20日 11:42:52 1.4 --- editpage.php 2000年10月26日 15:38:38 1.5 *************** *** 31,35 **** $html .= gettext ("This page has been locked by the administrator and cannot be edited."); $html .= "\n<p>"; ! $html .= gettext ("Sorry for the inconvinience."); $html .= "\n"; GeneratePage('MESSAGE', $html, sprintf (gettext ("Problem while editing %s"), $pagename), 0); --- 31,35 ---- $html .= gettext ("This page has been locked by the administrator and cannot be edited."); $html .= "\n<p>"; ! $html .= gettext ("Sorry for the inconvenience."); $html .= "\n"; GeneratePage('MESSAGE', $html, sprintf (gettext ("Problem while editing %s"), $pagename), 0); Index: savepage.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/savepage.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** savepage.php 2000年10月19日 21:36:50 1.2 --- savepage.php 2000年10月26日 15:38:38 1.3 *************** *** 11,30 **** 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); exit; } --- 11,29 ---- function ConcurrentUpdates($pagename) { ! /* 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 = "<P>" . 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.") . "</P>\n<P>" . ! gettext ("In order to recover from this situation follow these steps:") . "\n<OL><LI>" . ! gettext ("Use your browser's <b>Back</b> button to go back to the edit page.") . "\n<LI>" . ! gettext ("Copy your changes to the clipboard or to another temporary place (e.g. text editor).") . "\n<LI>" . ! gettext ("<b>Reload</b> the page. You should now see the most current version of the page. Your changes are no longer there.") . "\n<LI>" . ! gettext ("Make changes to the file again. Paste your additions from the clipboard (or text editor).") . "\n<LI>" . ! gettext ("Press <b>Save</b> again.") . "</OL>\n<P>" . ! gettext ("Sorry for the inconvenience.") ."</P>"; ! ! GeneratePage('MESSAGE', $html, ! sprintf (gettext ("Problem while updating %s"), $pagename), 0); exit; }
Update of /cvsroot/phpwiki/phpwiki/locale/po In directory slayer.i.sourceforge.net:/tmp/cvs-serv31978/locale/po Modified Files: nl.po phpwiki.pot Log Message: another gettext() patch from Jan (fix plus translation of savepage) Index: nl.po =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/po/nl.po,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** nl.po 2000年10月24日 09:55:19 1.3 --- nl.po 2000年10月26日 15:38:38 1.4 *************** *** 11,15 **** msgstr "" "Project-Id-Version: phpwiki 1.1.7\n" ! "POT-Creation-Date: 2000年10月24日 12:00+0200\n" "PO-Revision-Date: 2000年09月30日 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" --- 11,15 ---- msgstr "" "Project-Id-Version: phpwiki 1.1.7\n" ! "POT-Creation-Date: 2000年10月26日 17:45+0200\n" "PO-Revision-Date: 2000年09月30日 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" *************** *** 118,123 **** "Deze pagina is afgesloten door de beheerder en kan niet veranderd worden." ! #: lib/editpage.php:33 ! msgid "Sorry for the inconvinience." msgstr "Excuses voor het ongemak." --- 118,123 ---- "Deze pagina is afgesloten door de beheerder en kan niet veranderd worden." ! #: lib/editpage.php:33 lib/savepage.php:24 ! msgid "Sorry for the inconvenience." msgstr "Excuses voor het ongemak." *************** *** 209,218 **** msgstr "Gearchiveerde versie:" ! #: lib/savepage.php:60 #, c-format msgid "Thank you for editing %s." msgstr "Bedankt voor het veranderen van %s." ! #: lib/savepage.php:90 msgid "Your careful attention to detail is much appreciated." msgstr "Je zorgvuldige aandacht voor detail wordt erg gewaardeerd." --- 209,272 ---- msgstr "Gearchiveerde versie:" ! #: lib/savepage.php:17 ! 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:18 ! 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:19 ! 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:20 ! 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:21 ! 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:22 ! 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:23 ! msgid "Press <b>Save</b> again." ! msgstr "Druk opnieuw op <b>Bewaar</b>." ! ! #: lib/savepage.php:27 #, c-format + msgid "Problem while updating %s" + msgstr "Probleem tijdens veranderen van %s" + + #: lib/savepage.php:59 + #, c-format msgid "Thank you for editing %s." msgstr "Bedankt voor het veranderen van %s." ! #: lib/savepage.php:89 msgid "Your careful attention to detail is much appreciated." msgstr "Je zorgvuldige aandacht voor detail wordt erg gewaardeerd." *************** *** 241,250 **** msgid "%d most popular nearby:" msgstr "%d meest gevraagde in de buurt:" ! #: lib/stdlib.php:288 msgid "Stack bounds exceeded in SetHTMLOutputMode" msgstr "" ! #: lib/stdlib.php:343 lib/stdlib.php:406 msgid "RecentChanges" msgstr "RecenteVeranderingen" --- 295,308 ---- msgid "%d most popular nearby:" msgstr "%d meest gevraagde in de buurt:" + + #: lib/stdlib.php:186 lib/stdlib.php:194 + msgid "Search" + msgstr "" ! #: lib/stdlib.php:292 msgid "Stack bounds exceeded in SetHTMLOutputMode" msgstr "" ! #: lib/stdlib.php:347 lib/stdlib.php:410 msgid "RecentChanges" msgstr "RecenteVeranderingen" Index: phpwiki.pot =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/po/phpwiki.pot,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** phpwiki.pot 2000年10月24日 09:55:19 1.3 --- phpwiki.pot 2000年10月26日 15:38:38 1.4 *************** *** 7,11 **** msgstr "" "Project-Id-Version: PACKAGE VERSION\n" ! "POT-Creation-Date: 2000年10月24日 12:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" --- 7,11 ---- msgstr "" "Project-Id-Version: PACKAGE VERSION\n" ! "POT-Creation-Date: 2000年10月26日 17:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" *************** *** 111,116 **** msgstr "" ! #: lib/editpage.php:33 ! msgid "Sorry for the inconvinience." msgstr "" --- 111,116 ---- msgstr "" ! #: lib/editpage.php:33 lib/savepage.php:24 ! msgid "Sorry for the inconvenience." msgstr "" *************** *** 202,211 **** msgstr "" ! #: lib/savepage.php:60 #, c-format msgid "Thank you for editing %s." msgstr "" ! #: lib/savepage.php:90 msgid "Your careful attention to detail is much appreciated." msgstr "" --- 202,253 ---- msgstr "" ! #: lib/savepage.php:17 ! 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:18 ! msgid "In order to recover from this situation follow these steps:" ! msgstr "" ! ! #: lib/savepage.php:19 ! msgid "Use your browser's <b>Back</b> button to go back to the edit page." ! msgstr "" ! ! #: lib/savepage.php:20 ! msgid "" ! "Copy your changes to the clipboard or to another temporary place (e.g. text " ! "editor)." ! msgstr "" ! ! #: lib/savepage.php:21 ! 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:22 ! msgid "" ! "Make changes to the file again. Paste your additions from the clipboard (or " ! "text editor)." ! msgstr "" ! ! #: lib/savepage.php:23 ! msgid "Press <b>Save</b> again." ! msgstr "" ! ! #: lib/savepage.php:27 #, c-format + msgid "Problem while updating %s" + msgstr "" + + #: lib/savepage.php:59 + #, c-format msgid "Thank you for editing %s." msgstr "" ! #: lib/savepage.php:89 msgid "Your careful attention to detail is much appreciated." msgstr "" *************** *** 234,243 **** msgid "%d most popular nearby:" msgstr "" ! #: lib/stdlib.php:288 msgid "Stack bounds exceeded in SetHTMLOutputMode" msgstr "" ! #: lib/stdlib.php:343 lib/stdlib.php:406 msgid "RecentChanges" msgstr "" --- 276,289 ---- msgid "%d most popular nearby:" msgstr "" + + #: lib/stdlib.php:186 lib/stdlib.php:194 + msgid "Search" + msgstr "" ! #: lib/stdlib.php:292 msgid "Stack bounds exceeded in SetHTMLOutputMode" msgstr "" ! #: lib/stdlib.php:347 lib/stdlib.php:410 msgid "RecentChanges" msgstr ""
Update of /cvsroot/phpwiki/phpwiki/locale In directory slayer.i.sourceforge.net:/tmp/cvs-serv31978/locale Modified Files: translate.sh Log Message: another gettext() patch from Jan (fix plus translation of savepage) Index: translate.sh =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/translate.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** translate.sh 2000年10月22日 19:52:02 1.3 --- translate.sh 2000年10月26日 15:38:38 1.4 *************** *** 31,38 **** 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 done --- 31,70 ---- awk -- ' ! 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
Update of /cvsroot/phpwiki/phpwiki/lib In directory slayer.i.sourceforge.net:/tmp/cvs-serv13540/lib Modified Files: stdlib.php Log Message: fix: added "global $WikiNameRegexp" in ExtractWikiPageLinks() Index: stdlib.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** stdlib.php 2000年10月25日 14:48:29 1.5 --- stdlib.php 2000年10月26日 11:34:36 1.6 *************** *** 483,488 **** function ExtractWikiPageLinks($content) { ! $wikilinks = array(); $numlines = count($content); for($l = 0; $l < $numlines; $l++) --- 483,489 ---- function ExtractWikiPageLinks($content) { ! global $WikiNameRegexp; + $wikilinks = array(); $numlines = count($content); for($l = 0; $l < $numlines; $l++)
Update of /cvsroot/phpwiki/phpwiki/lib In directory slayer.i.sourceforge.net:/tmp/cvs-serv15307 Modified Files: stdlib.php Log Message: adapted to changes in transform.php Inline images now have an ALT tag Also, [name|http:image] uses name as ALT tag now RenderQuickSearch() and RenderFullSearch() create a submit button Index: stdlib.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** stdlib.php 2000年10月20日 11:42:52 1.4 --- stdlib.php 2000年10月25日 14:48:29 1.5 *************** *** 171,193 **** ! function LinkImage($url) { global $ScriptUrl; if(ereg("[<>\"]", $url)) { return "<b><u>BAD URL -- remove all of <, >, "</u></b>"; } ! return "<img src=\"$url\">"; } ! function RenderQuickSearch() { ! global $value, $ScriptUrl; ! $formtext = "<form action='$ScriptUrl'>\n<input type='text' size='40' name='search' value='$value'>\n</form>\n"; ! return $formtext; } ! function RenderFullSearch() { ! global $value, $ScriptUrl; ! $formtext = "<form action='$ScriptUrl'>\n<input type='text' size='40' name='full' value='$value'>\n</form>\n"; ! return $formtext; } --- 171,197 ---- ! function LinkImage($url, $alt="[External Image]") { global $ScriptUrl; if(ereg("[<>\"]", $url)) { return "<b><u>BAD URL -- remove all of <, >, "</u></b>"; } ! return "<img src=\"$url\" ALT=\"$alt\">"; } ! function RenderQuickSearch($value = "") { ! global $ScriptUrl; ! return "<form action=\"$ScriptUrl\">\n" . ! "<input type=text size=30 name=search value=\"$value\">\n" . ! "<input type=submit value=\"". gettext("Search") . ! "\"></form>\n"; } ! function RenderFullSearch($value = "") { ! global $ScriptUrl; ! return "<form action=\"$ScriptUrl\">\n" . ! "<input type=text size=30 name=full value=\"$value\">\n" . ! "<input type=submit value=\"". gettext("Search") . ! "\"></form>\n"; } *************** *** 385,392 **** } if($isnewpage) { ! $newpage[$k++] = "\t* [$pagename] (new) ..... $remoteuser\r"; } else { $diffurl = "$ScriptUrl?diff=" . rawurlencode($pagename); ! $newpage[$k++] = "\t* [$pagename] ([diff|$diffurl]) ..... $remoteuser\r"; } --- 389,396 ---- } if($isnewpage) { ! $newpage[$k++] = "* [$pagename] (new) ..... $remoteuser\r"; } else { $diffurl = "$ScriptUrl?diff=" . rawurlencode($pagename); ! $newpage[$k++] = "* [$pagename] ([diff|$diffurl]) ..... $remoteuser\r"; } *************** *** 410,414 **** function ParseAndLink($bracketlink) { ! global $dbi, $AllowedProtocols; // $bracketlink will start and end with brackets; in between --- 414,418 ---- function ParseAndLink($bracketlink) { ! global $dbi, $AllowedProtocols, $InlineImages; // $bracketlink will start and end with brackets; in between *************** *** 417,438 **** // strip brackets and leading space preg_match("/(\[\s*)(.+?)(\s*\])/", $bracketlink, $match); - $linkdata = $match[2]; - - // send back links that are only numbers (they are references) - if (preg_match("/^\d+$/", $linkdata)) { - $link['type'] = 'ref'; - $link['link'] = $bracketlink; - return $link; - } - - // send back escaped ([[) bracket sets - if (preg_match("/^\[/", $linkdata)) { - $link['type'] = 'none'; - $link['link'] = htmlspecialchars(substr($bracketlink, 1)); - return $link; - } - // match the contents ! preg_match("/([^|]+)(\|)?([^|]+)?/", $linkdata, $matches); --- 421,426 ---- // strip brackets and leading space preg_match("/(\[\s*)(.+?)(\s*\])/", $bracketlink, $match); // match the contents ! preg_match("/([^|]+)(\|)?([^|]+)?/", $match[2], $matches); *************** *** 445,450 **** // assert proper URL's if (preg_match("#^($AllowedProtocols):#", $URL)) { ! $link['type'] = 'url-named'; ! $link['link'] = "<a href=\"$URL\">$linkname</a>"; } else { $link['type'] = 'url-bad'; --- 433,443 ---- // assert proper URL's if (preg_match("#^($AllowedProtocols):#", $URL)) { ! if (preg_match("/($InlineImages)$/i", $URL)) { ! $link['type'] = 'image-named'; ! $link['link'] = LinkImage($URL, $linkname); ! } else { ! $link['type'] = 'url-named'; ! $link['link'] = "<a href=\"$URL\">$linkname</a>"; ! } } else { $link['type'] = 'url-bad'; *************** *** 466,471 **** } elseif (preg_match("#^($AllowedProtocols):#", $linkname)) { // if it's an image, embed it; otherwise, it's a regular link ! if (preg_match("/jpg$|png$|gif$/i", $linkname)) { ! $link['type'] = 'url-image'; $link['link'] = LinkImage($linkname); } else { --- 459,464 ---- } elseif (preg_match("#^($AllowedProtocols):#", $linkname)) { // if it's an image, embed it; otherwise, it's a regular link ! if (preg_match("/($InlineImages)$/i", $linkname)) { ! $link['type'] = 'image-simple'; $link['link'] = LinkImage($linkname); } else { *************** *** 506,512 **** } ! if (preg_match_all("#!?\b(([A-Z][a-z]+){2,})\b#", $line, $link)) { for ($i = 0; $link[0][$i]; $i++) { ! if(!strstr($link[0][$i], '!')) $wikilinks[$link[0][$i]]++; } --- 499,505 ---- } ! if (preg_match_all("/!?$WikiNameRegexp/", $line, $link)) { for ($i = 0; $link[0][$i]; $i++) { ! if($link[0][$i][0] <> '!') $wikilinks[$link[0][$i]]++; }
Update of /cvsroot/phpwiki/phpwiki/lib In directory slayer.i.sourceforge.net:/tmp/cvs-serv15148 Modified Files: transform.php Log Message: Heavy modification based on Neil Brown's tokenize() patch. Much cleaner structure now -- why didn't we see the obvious? Images of reference links [\d+] are inlined too now Index: transform.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** transform.php 2000年10月24日 10:32:37 1.4 --- transform.php 2000年10月25日 14:45:53 1.5 *************** *** 3,15 **** // expects $pagehash and $html to be set ! // Set up inline links and images for ($i = 1; $i < (NUM_LINKS + 1); $i++) { if (! empty($pagehash['refs'][$i])) { ! if (preg_match("/png$/i", $pagehash['refs'][$i])) { ! // embed PNG images ! $embedded[$i] = "<img src='" . $pagehash['refs'][$i] . "'>"; } else { ! // ordinary embedded link ! $embedded[$i] = "<a href='" . $pagehash['refs'][$i] . "'>[$i]</a>"; } } --- 3,33 ---- // expects $pagehash and $html to be set ! ! function tokenize($str, $pattern, &$orig, &$ntokens) { ! global $FieldSeparator; ! // Find any strings in $str that match $pattern and ! // store them in $tokens[], replacing them with a token ! // replaced strings are stored in $orig ! $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; ! } ! ! ! // Prepare replacements for references [\d+] for ($i = 1; $i < (NUM_LINKS + 1); $i++) { if (! empty($pagehash['refs'][$i])) { ! if (preg_match("/($InlineImages)$/i", $pagehash['refs'][$i])) { ! // embed images ! $embedded[$i] = LinkImage($pagehash['refs'][$i]); } else { ! // ordinary link ! $embedded[$i] = "<a href=\"" . $pagehash['refs'][$i] . "\">[$i]</a>"; } } *************** *** 24,28 **** - // Loop over all lines of the page and apply transformation rules for ($index = 0; $index < $numlines; $index++) { --- 42,45 ---- *************** *** 30,33 **** --- 47,51 ---- unset($replacements); $ntokens = 0; + $replacements = array(); $tmpline = $pagehash["content"][$index]; *************** *** 55,99 **** // New linking scheme: links are in brackets. This will // emulate typical HTML linking as well as Wiki linking. ! ! // 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']; } --- 73,100 ---- // New linking scheme: links are in brackets. This will // emulate typical HTML linking as well as Wiki linking. ! ! // First need to protect [[. ! $oldn = $ntokens; ! $tmpline = tokenize($tmpline, "\[\[", $replacements, $ntokens); ! while ($oldn < $ntokens) ! $replacements[$oldn++] = "["; ! ! // Now process the [\d+] links which are numeric references ! $oldn = $ntokens; ! $tmpline = tokenize($tmpline, "\[\s*\d+\s*\]", $replacements ,$ntokens); ! while ($oldn < $ntokens) { ! $num = (int)substr($replacements[$oldn], 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++; } *************** *** 102,133 **** // 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]); } // escape HTML metachars ! $tmpline = ereg_replace("[&]", "&", $tmpline); ! $tmpline = ereg_replace("[>]", ">", $tmpline); ! $tmpline = ereg_replace("[<]", "<", $tmpline); // four or more dashes to <hr> $tmpline = ereg_replace("^-{4,}", "<hr>", $tmpline); - // %%% are linebreaks $tmpline = str_replace("%%%", "<br>", $tmpline); --- 103,138 ---- // with Wiki words later. Wiki words in URL's break things. ! $tmpline = tokenize($tmpline, "\b($AllowedProtocols):[^\s<>\[\]\"'()]*[^\s<>\[\]\"'(),.?]", $replacements, $ntokens); ! while ($oldn < $ntokens) { ! $replacements[$oldn] = LinkURL($replacements[$oldn]); ! $oldn++; ! } ! ////////////////////////////////////////////////////////// ! // Link Wiki words ! // Wikiwords preceeded by a '!' are not linked ! $oldn = $ntokens; ! $tmpline = tokenize($tmpline, "!?$WikiNameRegexp", $replacements, $ntokens); ! while ($oldn < $ntokens) { ! $old = $replacements[$oldn]; ! if ($old[0] == '!') { ! $replacements[$oldn] = substr($old,1); ! } elseif (IsWikiPage($dbi, $old)) { ! $replacements[$oldn] = LinkExistingWikiWord($old); ! } else { ! $replacements[$oldn] = LinkUnknownWikiWord($old); ! } ! $oldn++; } // escape HTML metachars ! $tmpline = str_replace("&", "&", $tmpline); ! $tmpline = str_replace(">", ">", $tmpline); ! $tmpline = str_replace("<", "<", $tmpline); // four or more dashes to <hr> $tmpline = ereg_replace("^-{4,}", "<hr>", $tmpline); // %%% are linebreaks $tmpline = str_replace("%%%", "<br>", $tmpline); *************** *** 135,209 **** // bold italics $tmpline = preg_replace("|(''''')(.*?)(''''')|", ! "<strong><em>\2円</em></strong>", ! $tmpline); // bold $tmpline = preg_replace("|(''')(.*?)(''')|", ! "<strong>\2円</strong>", ! $tmpline); // bold $tmpline = preg_replace("|(__)(.*?)(__)|", ! "<strong>\2円</strong>", ! $tmpline); // italics $tmpline = preg_replace("|('')(.*?)('')|", ! "<em>\2円</em>", ! $tmpline); - // 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); - } - } - } - - /////////////////////////////////////////////////////// - // 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)) { --- 140,158 ---- // bold italics $tmpline = preg_replace("|(''''')(.*?)(''''')|", ! "<strong><em>\2円</em></strong>", $tmpline); // bold $tmpline = preg_replace("|(''')(.*?)(''')|", ! "<strong>\2円</strong>", $tmpline); // bold $tmpline = preg_replace("|(__)(.*?)(__)|", ! "<strong>\2円</strong>", $tmpline); // italics $tmpline = preg_replace("|('')(.*?)('')|", ! "<em>\2円</em>", $tmpline); // HTML modes: pre, unordered/ordered lists, term/def (using TAB) if (preg_match("/(^\t+)(.*?)(:\t)(.*$)/", $tmpline, $matches)) { *************** *** 285,291 **** $tmpline = str_replace("%%Mostpopular%%", $most_popular_list, $tmpline); $html .= "$tmpline\n"; } - $html .= SetHTMLOutputMode("", ZERO_DEPTH, 0); --- 234,246 ---- $tmpline = str_replace("%%Mostpopular%%", $most_popular_list, $tmpline); + /////////////////////////////////////////////////////// + // Replace tokens + + for ($i = 0; $i < $ntokens; $i++) + $tmpline = str_replace($FieldSeparator.$FieldSeparator.$i.$FieldSeparator, $replacements[$i], $tmpline); + + $html .= "$tmpline\n"; } $html .= SetHTMLOutputMode("", ZERO_DEPTH, 0);
Update of /cvsroot/phpwiki/phpwiki/lib In directory slayer.i.sourceforge.net:/tmp/cvs-serv14992 Modified Files: config.php Log Message: added $InlineImages and $WikiNameRegexp Index: config.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** config.php 2000年10月22日 19:33:35 1.7 --- config.php 2000年10月25日 14:41:32 1.8 *************** *** 186,189 **** --- 186,195 ---- $AllowedProtocols = "http|https|mailto|ftp|news|gopher"; + // URLs ending with the following extension should be inlined as images + $InlineImages = "png|jpg|gif"; + + // Perl regexp for WikiNames + $WikiNameRegexp = "\b([A-Z][a-z]+){2,}\b"; + // this defines how many page names to list when displaying // the MostPopular pages; i.e. setting this to 20 will show
Update of /cvsroot/phpwiki/phpwiki In directory slayer.i.sourceforge.net:/tmp/cvs-serv14954 Modified Files: index.php Log Message: set_magic_quotes_runtime(0) added (bug reported by Hawk Newton) Index: index.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/index.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** index.php 2000年10月11日 13:57:47 1.2 --- index.php 2000年10月25日 09:58:53 1.3 *************** *** 7,10 **** --- 7,12 ---- */ + set_magic_quotes_runtime(0); + include "lib/config.php"; include "lib/stdlib.php";
Update of /cvsroot/phpwiki/phpwiki In directory slayer.i.sourceforge.net:/tmp/cvs-serv21103 Modified Files: HISTORY Log Message: Updated for 1.1.8 Index: HISTORY =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/HISTORY,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** HISTORY 2000年10月08日 19:59:31 1.9 --- HISTORY 2000年10月25日 05:06:36 1.10 *************** *** 1,4 **** ! Executing ssh-askpass to query the password... ! 1.1.8 * MostPopular works for all implementations, except flat files * Flat file database support; it's not yet complete but the basic Wiki --- 1,6 ---- ! 1.1.8 10/25/00: ! * Internationalization, with support for Dutch, and an architecture ! to add more languages easily ! * Term/defintion tags updated to next 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 *************** *** 11,15 **** * Numerous bug fixes, as always * Some refactoring of the database interface - * 1.1.7 07/15/00: A lot was added since the 1.1.6b release. Diffs are --- 13,16 ----
Update of /cvsroot/phpwiki/phpwiki In directory slayer.i.sourceforge.net:/tmp/cvs-serv20499 Added Files: CREDITS Log Message: CREDITS is reborn!
Update of /cvsroot/phpwiki/phpwiki/pgsrc In directory slayer.i.sourceforge.net:/tmp/cvs-serv18342 Modified Files: RecentChanges Log Message: Updated the list of pages to include PhpWiki. Index: RecentChanges =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/RecentChanges,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** RecentChanges 2000年09月23日 15:06:27 1.12 --- RecentChanges 2000年10月25日 04:19:27 1.13 *************** *** 11,14 **** --- 11,15 ---- * [MoreAboutMechanics] * [MostPopular] + * [PhpWiki] * [RecentChanges] * [RecentVisitors]
Update of /cvsroot/phpwiki/phpwiki/pgsrc In directory slayer.i.sourceforge.net:/tmp/cvs-serv17908 Added Files: PhpWiki Log Message: Added a page to define the WikiWord "PhpWiki." --- NEW FILE --- You are using PhpWiki at this very moment. Incredible, ain't it? Visit our home page at http://phpwiki.sourceforge.net/ and see PhpWiki in action at http://phpwiki.sourceforge.net/phpwiki/.
Update of /cvsroot/phpwiki/phpwiki/lib In directory slayer.i.sourceforge.net:/tmp/cvs-serv6716/lib Modified Files: transform.php Log Message: killed the !WikiName,!WikiName,!WikiNameSameStem bug for good. -- added examples to TestPage Index: transform.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** transform.php 2000年10月23日 16:52:05 1.3 --- transform.php 2000年10月24日 10:32:37 1.4 *************** *** 160,165 **** unset($hash); for ($i = 0; $link[0][$i]; $i++) { ! // $realfile = $link[0][$i]; ! $hash[$link[0][$i]]++; } --- 160,169 ---- 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; } *************** *** 167,172 **** --- 171,178 ---- 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, '!')) {
Update of /cvsroot/phpwiki/phpwiki/pgsrc In directory slayer.i.sourceforge.net:/tmp/cvs-serv6716/pgsrc Modified Files: TestPage Log Message: killed the !WikiName,!WikiName,!WikiNameSameStem bug for good. -- added examples to TestPage Index: TestPage =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TestPage,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** TestPage 2000年10月23日 16:52:05 1.6 --- TestPage 2000年10月24日 10:32:38 1.7 *************** *** 31,34 **** --- 31,35 ---- ** l2 ---- + old lists * level 1 * l1 *************** *** 68,72 **** # FrontPage # [FrontPage] ! # Link in brackets: [http://phpwiki.sourceforge.net] # Link outside brackets: http://phpwiki.sourceforge.net/ # Link with Wiki word: http://phpwiki.sourceforge.net/phpwiki/index.php?FrontPage --- 69,73 ---- # FrontPage # [FrontPage] ! # Link in brackets: [http://phpwiki.sourceforge.net/] # Link outside brackets: http://phpwiki.sourceforge.net/ # Link with Wiki word: http://phpwiki.sourceforge.net/phpwiki/index.php?FrontPage *************** *** 78,88 **** # Javascript: [boo! | javascript:alert('oops') ] # A [[Link] produces a [Link] ! # A [Link] looks like this: [[link] # This is a [%%%] line break link - Also this page is [[not linked to], and this one is !NotLinkedTo. - ---- ! Markup tests: __underscores for bold__ --- 79,93 ---- # Javascript: [boo! | javascript:alert('oops') ] # A [[Link] produces a [Link] ! # A [Link] looks like this: [[Link] # This is a [%%%] line break link + # Also this page is [[not linked to], and this one is !NotLinkedTo. + #* WikiName - WikiNameSameStem -- !!WikiName - !!WikiNameSameStem + #* !!WikiName - !!WikiNameSameStem -- WikiName - WikiNameSameStem + #* WikiNameSameStem - WikiName -- !!WikiNameSameStem - !!WikiName + #* !!WikiNameSameStem - !!WikiName -- WikiNameSameStem - WikiName ---- ! Markup tests: ! __underscores for bold__ *************** *** 101,109 **** '''Bold and ''bold-italic''''' (also buggy) ! ! h1 !! h2 ! !!! h3 this is plain text with <br>%%% --- 106,114 ---- '''Bold and ''bold-italic''''' (also buggy) ! !!! h1 !! h2 ! ! h3 this is plain text with <br>%%% *************** *** 115,143 **** ---- ! preformatted text: __underscores for bold__ - '''quotes for bold''' - ''quotes for italic'' - __''underscores bold italic''__ - '''''five quotes bold italic''''' - ''''''six quotes'''''' ! ! ! h1 ! !! h2 ! ! !!! h3 ! this is plain text with <br>%%% a line break - look at the <a href="http://phpwiki.sourceforge.net/">markup language</a> - you cannot use &, < or > --- 120,137 ---- ---- ! Usage in preformatted text: __underscores for bold__ '''quotes for bold''' ''quotes for italic'' __''underscores bold italic''__ '''''five quotes bold italic''''' ''''''six quotes'''''' ! !!! h1 !! h2 ! ! h3 this is plain text with <br>%%% a line break look at the <a href="http://phpwiki.sourceforge.net/">markup language</a> you cannot use &, < or >
Update of /cvsroot/phpwiki/phpwiki/locale/po In directory slayer.i.sourceforge.net:/tmp/cvs-serv4518/locale/po Modified Files: phpwiki.pot nl.po Log Message: Jan added some gettext() for pageinfo.php Index: phpwiki.pot =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/po/phpwiki.pot,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** phpwiki.pot 2000年10月20日 11:42:53 1.2 --- phpwiki.pot 2000年10月24日 09:55:19 1.3 *************** *** 7,11 **** msgstr "" "Project-Id-Version: PACKAGE VERSION\n" ! "POT-Creation-Date: 2000年10月20日 13:43+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" --- 7,11 ---- msgstr "" "Project-Id-Version: PACKAGE VERSION\n" ! "POT-Creation-Date: 2000年10月24日 12:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" *************** *** 19,35 **** msgstr "" ! #: lib/config.php:168 msgid "templates/browse.html" msgstr "" ! #: lib/config.php:169 msgid "templates/editpage.html" msgstr "" ! #: lib/config.php:170 msgid "templates/editlinks.html" msgstr "" ! #: lib/config.php:171 msgid "templates/message.html" msgstr "" --- 19,35 ---- msgstr "" ! #: lib/config.php:174 msgid "templates/browse.html" msgstr "" ! #: lib/config.php:175 msgid "templates/editpage.html" msgstr "" ! #: lib/config.php:176 msgid "templates/editlinks.html" msgstr "" ! #: lib/config.php:177 msgid "templates/message.html" msgstr "" *************** *** 173,178 **** msgstr "" ! #: lib/pageinfo.php:22 lib/pageinfo.php:66 msgid "PageInfo" msgstr "" --- 173,203 ---- msgstr "" ! #: 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 "" Index: nl.po =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/po/nl.po,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** nl.po 2000年10月20日 11:42:53 1.2 --- nl.po 2000年10月24日 09:55:19 1.3 *************** *** 11,15 **** msgstr "" "Project-Id-Version: phpwiki 1.1.7\n" ! "POT-Creation-Date: 2000年10月20日 13:43+0200\n" "PO-Revision-Date: 2000年09月30日 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" --- 11,15 ---- msgstr "" "Project-Id-Version: phpwiki 1.1.7\n" ! "POT-Creation-Date: 2000年10月24日 12:00+0200\n" "PO-Revision-Date: 2000年09月30日 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" *************** *** 25,41 **** msgstr "locale/nl/pgsrc" ! #: lib/config.php:168 msgid "templates/browse.html" msgstr "locale/nl/templates/browse.html" ! #: lib/config.php:169 msgid "templates/editpage.html" msgstr "locale/nl/templates/editpage.html" ! #: lib/config.php:170 msgid "templates/editlinks.html" msgstr "locale/nl/templates/editlinks.html" ! #: lib/config.php:171 msgid "templates/message.html" msgstr "locale/nl/templates/message.html" --- 25,41 ---- msgstr "locale/nl/pgsrc" ! #: lib/config.php:174 msgid "templates/browse.html" msgstr "locale/nl/templates/browse.html" ! #: lib/config.php:175 msgid "templates/editpage.html" msgstr "locale/nl/templates/editpage.html" ! #: lib/config.php:176 msgid "templates/editlinks.html" msgstr "locale/nl/templates/editlinks.html" ! #: lib/config.php:177 msgid "templates/message.html" msgstr "locale/nl/templates/message.html" *************** *** 180,186 **** msgstr "Fout bij schrijven pagina `%s'" ! #: lib/pageinfo.php:22 lib/pageinfo.php:66 msgid "PageInfo" msgstr "PaginaInfo" #: lib/savepage.php:60 --- 180,211 ---- msgstr "Fout bij schrijven pagina `%s'" ! #: 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
Update of /cvsroot/phpwiki/phpwiki/lib In directory slayer.i.sourceforge.net:/tmp/cvs-serv4518/lib Modified Files: pageinfo.php Log Message: Jan added some gettext() for pageinfo.php Index: pageinfo.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/pageinfo.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** pageinfo.php 2000年10月19日 21:36:50 1.3 --- pageinfo.php 2000年10月24日 09:55:18 1.4 *************** *** 7,14 **** $encname = htmlspecialchars($info); $html = "<form action=\"$ScriptUrl\" METHOD=GET>\n" . "<input name=\"info\" value=\"$encname\">" . ! " Enter a page name\n" . ! "<input type=submit value=Go><br>\n" . "<input type=checkbox name=showpagesource"; --- 7,16 ---- $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\n" . ! "<input type=submit value=$go><br>\n" . "<input type=checkbox name=showpagesource"; *************** *** 16,20 **** $html .= " checked"; } ! $html .= "> Show the page source and references\n</form>\n"; // don't bother unless we were asked --- 18,24 ---- $html .= " checked"; } ! $html .= "> "; ! $html .= gettext ("Show the page source and references"); ! $html .= "\n</form>\n"; // don't bother unless we were asked *************** *** 30,34 **** $pagehash = RetrievePage($dbi, $name, $pagestore); if ($pagehash == -1) { ! $table = "Page name '$name' is not in the database<br>\n"; } else { --- 34,39 ---- $pagehash = RetrievePage($dbi, $name, $pagestore); if ($pagehash == -1) { ! $table = sprintf (gettext ("Page name '%s' is not in the database"), ! $name) . "\n"; } else { *************** *** 56,64 **** } ! $html .= "<P><B>Current version</B></p>"; // $dbi = OpenDataBase($WikiPageStore); --- done by index.php $html .= ViewPageProps($info, $WikiPageStore); ! $html .= "<P><B>Archived version</B></p>"; // $dbi = OpenDataBase($ArchivePageStore); $html .= ViewPageProps($info, $ArchivePageStore); --- 61,73 ---- } ! $html .= "<P><B>"; ! $html .= gettext ("Current version"); ! $html .= "</B></p>"; // $dbi = OpenDataBase($WikiPageStore); --- done by index.php $html .= ViewPageProps($info, $WikiPageStore); ! $html .= "<P><B>"; ! $html .= gettext ("Archived version"); ! $html .= "</B></p>"; // $dbi = OpenDataBase($ArchivePageStore); $html .= ViewPageProps($info, $ArchivePageStore);
Update of /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES In directory slayer.i.sourceforge.net:/tmp/cvs-serv4518/locale/nl/LC_MESSAGES Modified Files: phpwiki.mo phpwiki.php Log Message: Jan added some gettext() for pageinfo.php Index: phpwiki.mo =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES/phpwiki.mo,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 Binary files /tmp/cvswfnqnD and /tmp/cvseuhHB6 differ Index: phpwiki.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES/phpwiki.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** phpwiki.php 2000年10月20日 11:42:52 1.3 --- phpwiki.php 2000年10月24日 09:55:19 1.4 *************** *** 70,75 **** --- 70,87 ---- $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.";
Update of /cvsroot/phpwiki/phpwiki/pgsrc In directory slayer.i.sourceforge.net:/tmp/cvs-serv28257/pgsrc Modified Files: ReleaseNotes Log Message: corrected h1,h2,h3 markup example Index: ReleaseNotes =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/ReleaseNotes,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** ReleaseNotes 2000年06月23日 03:20:01 1.4 --- ReleaseNotes 2000年10月23日 20:55:24 1.5 *************** *** 6,12 **** Postgresql support has been added and the markup language is evolving, now allowing ! !<h1> !!<h2> ! !!!<h3> tags and __a new way to make text bold__, and of course the [new linking scheme]. --- 6,12 ---- Postgresql support has been added and the markup language is evolving, now allowing ! !!!<h1> !!<h2> ! !<h3> tags and __a new way to make text bold__, and of course the [new linking scheme].
Update of /cvsroot/phpwiki/phpwiki/lib In directory slayer.i.sourceforge.net:/tmp/cvs-serv26582/lib Modified Files: transform.php Log Message: New: tabless definition lists (even nested): ;Term:definition And: ul,ol list types can be mixed - we only look at the last character. Changes e.g. from "**#*" to "###*" go unnoticed. and wouldn't make a difference to the HTML layout anyway. Index: transform.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** transform.php 2000年10月11日 14:08:56 1.2 --- transform.php 2000年10月23日 16:52:05 1.3 *************** *** 200,204 **** } ! // HTML modes: pre, unordered/ordered lists, term/def if (preg_match("/(^\t+)(.*?)(:\t)(.*$)/", $tmpline, $matches)) { // this is a dictionary list item --- 200,204 ---- } ! // HTML modes: pre, unordered/ordered lists, term/def (using TAB) if (preg_match("/(^\t+)(.*?)(:\t)(.*$)/", $tmpline, $matches)) { // this is a dictionary list item *************** *** 210,214 **** $tmpline .= "<dd>" . $matches[4]; - // oops, the \d needed to be \d+, thanks al...@mi... } elseif (preg_match("/(^\t+)(\*|\d+|#)/", $tmpline, $matches)) { // this is part of a list --- 210,213 ---- *************** *** 224,249 **** // tabless markup for unordered and ordered lists ! // first, unordered lists: one or more astericks at the ! // start of a line indicate a <UL> block ! ! } elseif (preg_match("/^([*]+)/", $tmpline, $matches)) { // this is part of an unordered list $numtabs = strlen($matches[1]); $listtag = "ul"; ! $tmpline = preg_replace("/^([*]+)/", "", $tmpline); $html .= SetHTMLOutputMode($listtag, SINGLE_DEPTH, $numtabs); $html .= "<li>"; ! // second, ordered lists <OL> ! } elseif (preg_match("/^([#]+)/", $tmpline, $matches)) { // this is part of an ordered list $numtabs = strlen($matches[1]); $listtag = "ol"; ! $tmpline = preg_replace("/^([#]+)/", "", $tmpline); $html .= SetHTMLOutputMode($listtag, SINGLE_DEPTH, $numtabs); $html .= "<li>"; --- 223,259 ---- // tabless markup for unordered and ordered lists + // list types can be mixed, so we only look at the last + // character. Changes e.g. from "**#*" to "###*" go unnoticed. + // and wouldn't make a difference to the HTML layout anyway. ! // unordered lists <UL>: "*" ! } elseif (preg_match("/^([#*]*\*)[^#]/", $tmpline, $matches)) { // this is part of an unordered list $numtabs = strlen($matches[1]); $listtag = "ul"; ! $tmpline = preg_replace("/^([#*]*\*)/", "", $tmpline); $html .= SetHTMLOutputMode($listtag, SINGLE_DEPTH, $numtabs); $html .= "<li>"; ! // ordered lists <OL>: "#" ! } elseif (preg_match("/^([#*]*\#)/", $tmpline, $matches)) { // this is part of an ordered list $numtabs = strlen($matches[1]); $listtag = "ol"; ! $tmpline = preg_replace("/^([#*]*\#)/", "", $tmpline); $html .= SetHTMLOutputMode($listtag, SINGLE_DEPTH, $numtabs); $html .= "<li>"; + + // definition lists <DL>: ";text:text" + } elseif (preg_match("/(^;+)(.*?):(.*$)/", $tmpline, $matches)) { + // this is a dictionary list item + $numtabs = strlen($matches[1]); + $html .= SetHTMLOutputMode("dl", SINGLE_DEPTH, $numtabs); + $tmpline = ''; + if(trim($matches[2])) + $tmpline = "<dt>" . $matches[2]; + $tmpline .= "<dd>" . $matches[3];
Update of /cvsroot/phpwiki/phpwiki/pgsrc In directory slayer.i.sourceforge.net:/tmp/cvs-serv26582/pgsrc Modified Files: TestPage Log Message: New: tabless definition lists (even nested): ;Term:definition And: ul,ol list types can be mixed - we only look at the last character. Changes e.g. from "**#*" to "###*" go unnoticed. and wouldn't make a difference to the HTML layout anyway. Index: TestPage =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TestPage,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** TestPage 2000年10月20日 11:42:52 1.5 --- TestPage 2000年10月23日 16:52:05 1.6 *************** *** 1,5 **** ! New lists: asterisks and hash marks * bullet * l1 --- 1,5 ---- ! New lists: asterisks, hash marks, and ";text:def" * bullet * l1 *************** *** 10,15 **** #two #three ! *****l5 ! ***l3 *l1 preformatted text --- 10,30 ---- #two #three ! ;Term1:definition1.1 ! ;: defintion1.2 ! ;Term2 :defintion2 ! ;; Term3:defintion3 ! ;;;Term4: definition4 ! ;;; : defintion4.2 ! ;;; Term5 : defintion5 ! ! Mixed: ! *ul1 ! *#ul1-ol1 ! *#ul1-ol2 ! *#*ul1-ol2-ul1 ! *#*ul1-ol2-ul2 ! *#**ul1-ol2-ul2-ul1 ! *#**ul1-ol2-ul2-ul1 ! *l1 preformatted text