phpwiki-checkins Mailing List for PhpWiki (Page 534)

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11835/pgsrc
Modified Files:
	FindPage 
Log Message:
more sophisticated search: match individual words, also excluding words possible
Index: FindPage
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/FindPage,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** FindPage	2000年11月06日 16:14:43	1.4
--- FindPage	2000年11月18日 13:50:35	1.5
***************
*** 13,14 ****
--- 13,20 ----
 
 %%Fullsearch%%
+ 
+ ------
+ Separate words with a space. All words have to match.
+ %%%To exclude words prepend a '-'.
+ %%%Example: 'wiki text -php' looks for all pages containing the words 'wiki'
+ __and__ 'text', but __not__ containing the word 'php'.

Update of /cvsroot/phpwiki/phpwiki
In directory slayer.i.sourceforge.net:/tmp/cvs-serv20859
Modified Files:
	CREDITS 
Log Message:
Added Scott to the credits for patches.
Index: CREDITS
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/CREDITS,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** CREDITS	2000年11月06日 16:31:43	1.5
--- CREDITS	2000年11月17日 03:04:46	1.6
***************
*** 36,39 ****
--- 36,42 ----
 ! Patches
 
+ ;[Scott R. Anderson | sr...@di... ] :
+ ;: contributed a patch to allow authorized users' names to appear in RecentChanges.
+ 
 ;[Neil Brown | mailto:ne...@cs... ] :
 ;: has contributed numerous useful patches e.g. nested definition lists

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv20423
Modified Files:
	config.php 
Log Message:
Patch from "Scott R. Anderson" <sr...@di...> which allows the use 
of $PHP_AUTH_USER if it's set; i.e. if a user is logged in their name
will appear in RecentChanges instead of REMOTE_HOST or REMOTE_ADDR.
Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** config.php	2000年11月13日 14:54:08	1.16
--- config.php	2000年11月17日 03:01:26	1.17
***************
*** 205,208 ****
--- 205,220 ----
 $FieldSeparator = "263円";
 
+ if (isset($PHP_AUTH_USER)) {
+ $remoteuser = $PHP_AUTH_USER;
+ } else {
+ 
+ // 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'));
+ }
+ 
+ 
 // Apache won't show REMOTE_HOST unless the admin configured it
 // properly. We'll be nice and see if it's there.

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv618/lib
Modified Files:
	stdlib.php 
Log Message:
fix for ExtractWikiPageLinks(): didn't care for '[[' escapes and thus detected invalid links
Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** stdlib.php	2000年11月11日 12:15:35	1.11
--- stdlib.php	2000年11月16日 08:52:51	1.12
***************
*** 528,532 ****
 for($l = 0; $l < $numlines; $l++)
 {
! $line = $content[$l];
 	 $numBracketLinks = preg_match_all("/\[\s*(.+?)\s*\]/", $line, $brktlinks);
 	 for ($i = 0; $i < $numBracketLinks; $i++) {
--- 528,532 ----
 for($l = 0; $l < $numlines; $l++)
 {
! $line = str_replace('[[', ' ', $content[$l]); // remove escaped '['
 	 $numBracketLinks = preg_match_all("/\[\s*(.+?)\s*\]/", $line, $brktlinks);
 	 for ($i = 0; $i < $numBracketLinks; $i++) {

Update of /cvsroot/phpwiki/phpwiki/locale/de/templates
In directory slayer.i.sourceforge.net:/tmp/cvs-serv20177/templates
Modified Files:
	browse.html 
Log Message:
corrected title link
Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/templates/browse.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** browse.html	2000年11月13日 11:22:09	1.2
--- browse.html	2000年11月13日 21:52:52	1.3
***************
*** 7,11 ****
 <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
 <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
! <a href="###SCRIPTURL###?related=###PAGEURL###">###PAGE###</a></h1>
 ###IF:ADMIN###<FORM ACTION="###SCRIPTURL###" METHOD=POST>
 ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Seite freigeben</a>]
--- 7,11 ----
 <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
 <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
! <a href="###SCRIPTURL###?full=###PAGEURL###">###PAGE###</a></h1>
 ###IF:ADMIN###<FORM ACTION="###SCRIPTURL###" METHOD=POST>
 ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Seite freigeben</a>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv1589
Modified Files:
	config.php mysql.php 
Log Message:
added config options for all mysql table names
Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** config.php	2000年11月08日 15:40:00	1.15
--- config.php	2000年11月13日 14:54:08	1.16
***************
*** 51,54 ****
--- 51,57 ----
 $WikiPageStore = "wiki";
 $ArchivePageStore = "archive";
+ $WikiLinksStore = "wikilinks";
+ $WikiScoreStore = "wikiscore";
+ $HitCountStore = "hitcount";
 $mysql_server = 'localhost';
 $mysql_user = 'root';
Index: mysql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/mysql.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** mysql.php	2000年11月09日 02:57:51	1.5
--- mysql.php	2000年11月13日 14:54:08	1.6
***************
*** 149,153 ****
 
 function RemovePage($dbi, $pagename) {
! global $WikiPageStore, $ArchivePageStore;
 
 $pagename = addslashes($pagename);
--- 149,154 ----
 
 function RemovePage($dbi, $pagename) {
! global $WikiPageStore, $ArchivePageStore
! global $WikiLinksStore, $HitCountStore, $WikiScoreStore;
 
 $pagename = addslashes($pagename);
***************
*** 162,173 ****
 ExitWiki(sprintf($msg, $pagename, $ArchivePageStore, mysql_error()));
 
! if (!mysql_query("delete from wikilinks where frompage='$pagename'", $dbi['dbc']))
! ExitWiki(sprintf($msg, $pagename, 'wikilinks', mysql_error()));
 
! if (!mysql_query("delete from hitcount where pagename='$pagename'", $dbi['dbc']))
! ExitWiki(sprintf($msg, $pagename, 'hitcount', mysql_error()));
 
! if (!mysql_query("delete from wikiscore where pagename='$pagename'", $dbi['dbc']))
! ExitWiki(sprintf($msg, $pagename, 'wikiscore', mysql_error()));
 }
 
--- 163,174 ----
 ExitWiki(sprintf($msg, $pagename, $ArchivePageStore, mysql_error()));
 
! if (!mysql_query("delete from $WikiLinksStore where frompage='$pagename'", $dbi['dbc']))
! ExitWiki(sprintf($msg, $pagename, $WikiLinksStore, mysql_error()));
 
! if (!mysql_query("delete from $HitCountStore where pagename='$pagename'", $dbi['dbc']))
! ExitWiki(sprintf($msg, $pagename, $HitCountStore, mysql_error()));
 
! if (!mysql_query("delete from $WikiScoreStore where pagename='$pagename'", $dbi['dbc']))
! ExitWiki(sprintf($msg, $pagename, $WikiScoreStore, mysql_error()));
 }
 
***************
*** 175,182 ****
 function IncreaseHitCount($dbi, $pagename)
 {
! $res = mysql_query("update hitcount set hits=hits+1 where pagename='$pagename'", $dbi['dbc']);
 
 if (!mysql_affected_rows($dbi['dbc'])) {
! 	 $res = mysql_query("insert into hitcount (pagename, hits) values ('$pagename', 1)", $dbi['dbc']);
 }
 
--- 176,185 ----
 function IncreaseHitCount($dbi, $pagename)
 {
! global $HitCountStore;
 
+ $res = mysql_query("update $HitCountStore set hits=hits+1 where pagename='$pagename'", $dbi['dbc']);
+ 
 if (!mysql_affected_rows($dbi['dbc'])) {
! 	 $res = mysql_query("insert into $HitCountStore (pagename, hits) values ('$pagename', 1)", $dbi['dbc']);
 }
 
***************
*** 186,190 ****
 function GetHitCount($dbi, $pagename)
 {
! $res = mysql_query("select hits from hitcount where pagename='$pagename'", $dbi['dbc']);
 if (mysql_num_rows($res))
 $hits = mysql_result($res, 0);
--- 189,195 ----
 function GetHitCount($dbi, $pagename)
 {
! global $HitCountStore;
! 
! $res = mysql_query("select hits from $HitCountStore where pagename='$pagename'", $dbi['dbc']);
 if (mysql_num_rows($res))
 $hits = mysql_result($res, 0);
***************
*** 235,239 ****
 
 function InitMostPopular($dbi, $limit) {
! $res = mysql_query("select * from hitcount order by hits desc, pagename limit $limit", $dbi["dbc"]);
 
 return $res;
--- 240,245 ----
 
 function InitMostPopular($dbi, $limit) {
! global $HitCountStore;
! $res = mysql_query("select * from $HitCountStore order by hits desc, pagename limit $limit", $dbi["dbc"]);
 
 return $res;
***************
*** 248,252 ****
 
 function GetAllWikiPageNames($dbi) {
! $res = mysql_query("select pagename from wiki", $dbi["dbc"]);
 $rows = mysql_num_rows($res);
 for ($i = 0; $i < $rows; $i++) {
--- 254,259 ----
 
 function GetAllWikiPageNames($dbi) {
! global $WikiPageStore;
! $res = mysql_query("select pagename from $WikiPageStore", $dbi["dbc"]);
 $rows = mysql_num_rows($res);
 for ($i = 0; $i < $rows; $i++) {
***************
*** 262,267 ****
 // takes a page name, returns array of scored incoming and outgoing links
 function GetWikiPageLinks($dbi, $pagename) {
 $pagename = addslashes($pagename);
! $res = mysql_query("select topage, score from wikilinks, wikiscore where topage=pagename and frompage='$pagename' order by score desc, topage");
 $rows = mysql_num_rows($res);
 for ($i = 0; $i < $rows; $i++) {
--- 269,276 ----
 // takes a page name, returns array of scored incoming and outgoing links
 function GetWikiPageLinks($dbi, $pagename) {
+ global $WikiLinksStore, $WikiScoreStore, $HitCountStore;
+ 
 $pagename = addslashes($pagename);
! $res = mysql_query("select topage, score from $WikiLinksStore, $WikiScoreStore where topage=pagename and frompage='$pagename' order by score desc, topage");
 $rows = mysql_num_rows($res);
 for ($i = 0; $i < $rows; $i++) {
***************
*** 270,274 ****
 }
 
! $res = mysql_query("select frompage, score from wikilinks, wikiscore where frompage=pagename and topage='$pagename' order by score desc, frompage");
 $rows = mysql_num_rows($res);
 for ($i = 0; $i < $rows; $i++) {
--- 279,283 ----
 }
 
! $res = mysql_query("select frompage, score from $WikiLinksStore, $WikiScoreStore where frompage=pagename and topage='$pagename' order by score desc, frompage");
 $rows = mysql_num_rows($res);
 for ($i = 0; $i < $rows; $i++) {
***************
*** 277,281 ****
 }
 
! $res = mysql_query("select distinct pagename, hits from wikilinks, hitcount where (frompage=pagename and topage='$pagename') or (topage=pagename and frompage='$pagename') order by hits desc, pagename");
 $rows = mysql_num_rows($res);
 for ($i = 0; $i < $rows; $i++) {
--- 286,290 ----
 }
 
! $res = mysql_query("select distinct pagename, hits from $WikiLinksStore, $HitCountStore where (frompage=pagename and topage='$pagename') or (topage=pagename and frompage='$pagename') order by hits desc, pagename");
 $rows = mysql_num_rows($res);
 for ($i = 0; $i < $rows; $i++) {
***************
*** 291,298 ****
 // the $linklist is an array where the keys are the page names
 function SetWikiPageLinks($dbi, $pagename, $linklist) {
 $frompage = addslashes($pagename);
 
 // first delete the old list of links
! mysql_query("delete from wikilinks where frompage='$frompage'",
 		$dbi["dbc"]);
 
--- 300,309 ----
 // the $linklist is an array where the keys are the page names
 function SetWikiPageLinks($dbi, $pagename, $linklist) {
+ global $WikiLinksStore, $WikiScoreStore;
+ 
 $frompage = addslashes($pagename);
 
 // first delete the old list of links
! mysql_query("delete from $WikiLinksStore where frompage='$frompage'",
 		$dbi["dbc"]);
 
***************
*** 304,308 ****
 $topage = addslashes($topage);
 	 if($topage != $frompage) {
! mysql_query("insert into wikilinks (frompage, topage) " .
 "values ('$frompage', '$topage')", $dbi["dbc"]);
 	 }
--- 315,319 ----
 $topage = addslashes($topage);
 	 if($topage != $frompage) {
! mysql_query("insert into $WikiLinksStore (frompage, topage) " .
 "values ('$frompage', '$topage')", $dbi["dbc"]);
 	 }
***************
*** 310,315 ****
 
 // update pagescore
! mysql_query("delete from wikiscore", $dbi["dbc"]);
! mysql_query("insert into wikiscore select w1.topage, count(*) from wikilinks as w1, wikilinks as w2 where w2.topage=w1.frompage group by w1.topage", $dbi["dbc"]);
 }
 
--- 321,326 ----
 
 // update pagescore
! mysql_query("delete from $WikiScoreStore", $dbi["dbc"]);
! mysql_query("insert into $WikiScoreStore select w1.topage, count(*) from $WikiLinksStore as w1, $WikiLinksStore as w2 where w2.topage=w1.frompage group by w1.topage", $dbi["dbc"]);
 }
 

Update of /cvsroot/phpwiki/phpwiki/locale/po
In directory slayer.i.sourceforge.net:/tmp/cvs-serv7595/po
Modified Files:
	de.po es.po nl.po phpwiki.pot 
Log Message:
new run of translate.sh / updated templates
Index: de.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/de.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** de.po	2000年11月13日 10:37:32	1.2
--- de.po	2000年11月13日 11:22:10	1.3
***************
*** 7,11 ****
 msgstr ""
 "Project-Id-Version: phpwiki 1.1.8\n"
! "POT-Creation-Date: 2000年11月02日 22:18+0100\n"
 "PO-Revision-Date: 2000年10月31日 02:23+0200\n"
 "Last-Translator: Arno Hollosi <aho...@ma...>\n"
--- 7,11 ----
 msgstr ""
 "Project-Id-Version: phpwiki 1.1.8\n"
! "POT-Creation-Date: 2000年11月13日 12:30+0100\n"
 "PO-Revision-Date: 2000年10月31日 02:23+0200\n"
 "Last-Translator: Arno Hollosi <aho...@ma...>\n"
***************
*** 15,35 ****
 "Content-Transfer-Encoding: 8bit\n"
 
! #: lib/config.php:148
 msgid "templates/browse.html"
 msgstr "locale/de/templates/browse.html"
 
! #: lib/config.php:149
 msgid "templates/editpage.html"
 msgstr "locale/de/templates/editpage.html"
 
! #: lib/config.php:150
 msgid "templates/editlinks.html"
 msgstr "locale/de/templates/editlinks.html"
 
! #: lib/config.php:151
 msgid "templates/message.html"
 msgstr "locale/de/templates/message.html"
 
! #: lib/config.php:167
 msgid "./pgsrc"
 msgstr "locale/de/pgsrc"
--- 15,66 ----
 "Content-Transfer-Encoding: 8bit\n"
 
! #: admin.php:26
! msgid "You entered an invalid login or password."
! msgstr "Du hast ein ungültiges Login oder Passwort eingegeben."
! 
! #: admin.php:47
! #, c-format
! msgid "You are about to remove '%s' permanently!"
! msgstr "Du bist im Begriff '%s' permanent zu löschen!"
! 
! #: admin.php:50
! #, c-format
! msgid "Click %shere%s to remove the page now."
! msgstr "Klicke %shier%s um die Seite jetzt zu löschen."
! 
! #: admin.php:53
! msgid "Otherwise press the \"Back\" button of your browser."
! msgstr "Anderenfalls benütze die \"Zurück\" Funktion deines Browsers."
! 
! #: admin.php:55
! msgid "Function not yet implemented."
! msgstr "Funktion noch nicht implementiert."
! 
! #: admin.php:57 admin.php:65
! msgid "Remove page"
! msgstr "Seite löschen"
! 
! #: admin.php:63
! #, c-format
! msgid "Removed page '%s' succesfully."
! msgstr "Seite '%s' erfolgreich gelöscht."
! 
! #: lib/config.php:159
 msgid "templates/browse.html"
 msgstr "locale/de/templates/browse.html"
 
! #: lib/config.php:160
 msgid "templates/editpage.html"
 msgstr "locale/de/templates/editpage.html"
 
! #: lib/config.php:161
 msgid "templates/editlinks.html"
 msgstr "locale/de/templates/editlinks.html"
 
! #: lib/config.php:162
 msgid "templates/message.html"
 msgstr "locale/de/templates/message.html"
 
! #: lib/config.php:178
 msgid "./pgsrc"
 msgstr "locale/de/pgsrc"
***************
*** 136,140 ****
 msgstr "Volltext-Suchresultate"
 
! #: lib/msql.php:29 lib/mysql.php:33
 msgid "Cannot establish connection to database, giving up."
 msgstr "Kann Verbindung zu Datenbank nicht aufbauen - Abbruch."
--- 167,171 ----
 msgstr "Volltext-Suchresultate"
 
! #: lib/msql.php:29 lib/mysql.php:35
 msgid "Cannot establish connection to database, giving up."
 msgstr "Kann Verbindung zu Datenbank nicht aufbauen - Abbruch."
***************
*** 145,189 ****
 msgstr "Fehlermeldung: %s"
 
! #: lib/msql.php:35 lib/mysql.php:39
 #, c-format
 msgid "Cannot open database %s, giving up."
 msgstr "Kann Datenbank %s nicht öffnen - Abbruch."
 
! #: lib/msql.php:200 lib/msql.php:276
 #, c-format
 msgid "Insert/update failed: %s"
 msgstr "Einfügen/Verändern fehlgeschlagen: %s"
 
! #: lib/msql.php:211 lib/msql.php:286
 #, c-format
 msgid "Delete on %s failed: %s"
 msgstr "Löschen in %s fehlgeschlagen: %s"
 
! #: lib/msql.php:227 lib/msql.php:302
 #, c-format
 msgid "Insert into %s failed: %s"
 msgstr "Einfügen in %s fehlgeschlagen: %s"
 
! #: lib/mysql.php:35 lib/mysql.php:41 lib/mysql.php:115
 #, c-format
 msgid "MySQL error: %s"
 msgstr "MySQL Fehler: %s"
 
! #: lib/mysql.php:113
 #, c-format
 msgid "Error writing page '%s'"
 msgstr "Fehler beim Schreiben der Seite '%s'"
 
 #: 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
--- 176,225 ----
 msgstr "Fehlermeldung: %s"
 
! #: lib/msql.php:35 lib/mysql.php:41
 #, c-format
 msgid "Cannot open database %s, giving up."
 msgstr "Kann Datenbank %s nicht öffnen - Abbruch."
 
! #: lib/msql.php:210 lib/msql.php:286
 #, c-format
 msgid "Insert/update failed: %s"
 msgstr "Einfügen/Verändern fehlgeschlagen: %s"
 
! #: lib/msql.php:221 lib/msql.php:296
 #, c-format
 msgid "Delete on %s failed: %s"
 msgstr "Löschen in %s fehlgeschlagen: %s"
 
! #: lib/msql.php:237 lib/msql.php:312
 #, c-format
 msgid "Insert into %s failed: %s"
 msgstr "Einfügen in %s fehlgeschlagen: %s"
 
! #: lib/mysql.php:37 lib/mysql.php:43 lib/mysql.php:117 lib/mysql.php:156
 #, c-format
 msgid "MySQL error: %s"
 msgstr "MySQL Fehler: %s"
 
! #: lib/mysql.php:115
 #, c-format
 msgid "Error writing page '%s'"
 msgstr "Fehler beim Schreiben der Seite '%s'"
 
+ #: lib/mysql.php:154
+ #, c-format
+ msgid "Cannot delete '%s' from table '%s'"
+ msgstr "Kann nicht '%s' aus Tabelle '%s' löschen"
+ 
 #: lib/pageinfo.php:9
 msgid "Enter a page name"
! msgstr "Seitenname eingeben"
 
! #: lib/pageinfo.php:10 lib/stdlib.php:239
 msgid "Go"
! msgstr "Los"
 
 #: lib/pageinfo.php:21
 msgid "Show the page source and references"
! msgstr "Zeige den Seitenquelltext und die Verweise"
 
 #: lib/pageinfo.php:26 lib/pageinfo.php:75
***************
*** 194,198 ****
 #, c-format
 msgid "Page name '%s' is not in the database"
! msgstr ""
 
 #: lib/pageinfo.php:64
--- 230,234 ----
 #, c-format
 msgid "Page name '%s' is not in the database"
! msgstr "Seite '%s' ist nicht in der Datenbank"
 
 #: lib/pageinfo.php:64
***************
*** 212,223 ****
 "changes from the previous author would be lost."
 msgstr ""
 
 #: lib/savepage.php:20
 msgid "In order to recover from this situation follow these steps:"
! msgstr ""
 
 #: lib/savepage.php:22
 msgid "Use your browser's <b>Back</b> button to go back to the edit page."
 msgstr ""
 
 #: lib/savepage.php:24
--- 248,265 ----
 "changes from the previous author would be lost."
 msgstr ""
+ "PhpWiki kann deine Veränderungen nicht speichern, da ein andererBenützer die "
+ "Seite verändert und gespeichert hat, während du diese Seiteeditiert hast. "
+ "Wenn die Seite jetzt gespeichert werden würde, dann würdendie Veränderungen "
+ "des anderen Benützers verloren gehen."
 
 #: lib/savepage.php:20
 msgid "In order to recover from this situation follow these steps:"
! msgstr "Um diese Situation zu korrigieren folge bitte den folgenden Schritten:"
 
 #: lib/savepage.php:22
 msgid "Use your browser's <b>Back</b> button to go back to the edit page."
 msgstr ""
+ "Benütze die <b>Zurück</b> Funktion deines Browsers um zur Editierseitezu "
+ "gelangen."
 
 #: lib/savepage.php:24
***************
*** 226,229 ****
--- 268,273 ----
 "editor)."
 msgstr ""
+ "Kopiere deine Veränderungen in die Zwischenablage oder an einen "
+ "anderentemporären Platz (z.B. einen Texteditor)"
 
 #: lib/savepage.php:26
***************
*** 232,235 ****
--- 276,281 ----
 "page. Your changes are no longer there."
 msgstr ""
+ "<b>Aktualisiere</b> die Seite. Du solltest jetzt die neueste Versionder "
+ "Seite sehen. Deine Veränderungen sind verschwunden."
 
 #: lib/savepage.php:28
***************
*** 238,245 ****
 "text editor)."
 msgstr ""
 
 #: lib/savepage.php:30
 msgid "Press <b>Save</b> again."
! msgstr ""
 
 #: lib/savepage.php:36
--- 284,293 ----
 "text editor)."
 msgstr ""
+ "Editiere die Seite erneut. Kopiere deine Veränderungen aus derZwischenablage "
+ "(oder aus dem Texteditor)"
 
 #: lib/savepage.php:30
 msgid "Press <b>Save</b> again."
! msgstr "Drücke nochmal <b>Speichern</b>"
 
 #: lib/savepage.php:36
***************
*** 281,293 ****
 msgstr "Die %d meistbesuchten Seiten in der Nähe:"
 
! #: lib/stdlib.php:186 lib/stdlib.php:194
 msgid "Search"
! msgstr ""
 
! #: lib/stdlib.php:295
 msgid "Stack bounds exceeded in SetHTMLOutputMode"
 msgstr "Interner Fehler: Stackgrenze in SetHTMLOutputMode überschritten."
 
! #: lib/stdlib.php:349 lib/stdlib.php:412
 msgid "RecentChanges"
 msgstr "FrischeSeiten"
--- 329,341 ----
 msgstr "Die %d meistbesuchten Seiten in der Nähe:"
 
! #: lib/stdlib.php:207 lib/stdlib.php:215
 msgid "Search"
! msgstr "Suche"
 
! #: lib/stdlib.php:330
 msgid "Stack bounds exceeded in SetHTMLOutputMode"
 msgstr "Interner Fehler: Stackgrenze in SetHTMLOutputMode überschritten."
 
! #: lib/stdlib.php:384 lib/stdlib.php:447
 msgid "RecentChanges"
 msgstr "FrischeSeiten"
Index: es.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/es.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** es.po	2000年11月02日 21:15:33	1.1
--- es.po	2000年11月13日 11:22:10	1.2
***************
*** 11,15 ****
 msgstr ""
 "Project-Id-Version: phpwiki 1.1.8\n"
! "POT-Creation-Date: 2000年11月02日 22:18+0100\n"
 "PO-Revision-Date: 2000年10月27日 16:10-0500\n"
 "Last-Translator: Sandino Araico Sánchez <sa...@sa...>\n"
--- 11,15 ----
 msgstr ""
 "Project-Id-Version: phpwiki 1.1.8\n"
! "POT-Creation-Date: 2000年11月13日 12:30+0100\n"
 "PO-Revision-Date: 2000年10月27日 16:10-0500\n"
 "Last-Translator: Sandino Araico Sánchez <sa...@sa...>\n"
***************
*** 21,41 ****
 "From: <sa...@sa...>\n"
 
! #: lib/config.php:148
 msgid "templates/browse.html"
 msgstr "locale/es/templates/browse.html"
 
! #: lib/config.php:149
 msgid "templates/editpage.html"
 msgstr "locale/es/templates/editpage.html"
 
! #: lib/config.php:150
 msgid "templates/editlinks.html"
 msgstr "locale/es/templates/editlinks.html"
 
! #: lib/config.php:151
 msgid "templates/message.html"
 msgstr "locale/es/templates/message.html"
 
! #: lib/config.php:167
 msgid "./pgsrc"
 msgstr "locale/es/pgsrc"
--- 21,72 ----
 "From: <sa...@sa...>\n"
 
! #: admin.php:26
! msgid "You entered an invalid login or password."
! msgstr ""
! 
! #: admin.php:47
! #, c-format
! msgid "You are about to remove '%s' permanently!"
! msgstr ""
! 
! #: admin.php:50
! #, c-format
! msgid "Click %shere%s to remove the page now."
! msgstr ""
! 
! #: admin.php:53
! msgid "Otherwise press the \"Back\" button of your browser."
! msgstr ""
! 
! #: admin.php:55
! msgid "Function not yet implemented."
! msgstr ""
! 
! #: admin.php:57 admin.php:65
! msgid "Remove page"
! msgstr ""
! 
! #: admin.php:63
! #, c-format
! msgid "Removed page '%s' succesfully."
! msgstr ""
! 
! #: lib/config.php:159
 msgid "templates/browse.html"
 msgstr "locale/es/templates/browse.html"
 
! #: lib/config.php:160
 msgid "templates/editpage.html"
 msgstr "locale/es/templates/editpage.html"
 
! #: lib/config.php:161
 msgid "templates/editlinks.html"
 msgstr "locale/es/templates/editlinks.html"
 
! #: lib/config.php:162
 msgid "templates/message.html"
 msgstr "locale/es/templates/message.html"
 
! #: lib/config.php:178
 msgid "./pgsrc"
 msgstr "locale/es/pgsrc"
***************
*** 145,149 ****
 msgstr "Resultados de la búsqueda en el texto completo"
 
! #: lib/msql.php:29 lib/mysql.php:33
 msgid "Cannot establish connection to database, giving up."
 msgstr ""
--- 176,180 ----
 msgstr "Resultados de la búsqueda en el texto completo"
 
! #: lib/msql.php:29 lib/mysql.php:35
 msgid "Cannot establish connection to database, giving up."
 msgstr ""
***************
*** 156,194 ****
 msgstr "Mensaje de error: %s"
 
! #: lib/msql.php:35 lib/mysql.php:39
 #, c-format
 msgid "Cannot open database %s, giving up."
 msgstr "No puedo abrir la base de datos %s me doy por vencido."
 
! #: lib/msql.php:200 lib/msql.php:276
 #, c-format
 msgid "Insert/update failed: %s"
 msgstr "Inserci&oacute;n/actualizaci&oacute;n fall&oacute;: %s"
 
! #: lib/msql.php:211 lib/msql.php:286
 #, c-format
 msgid "Delete on %s failed: %s"
 msgstr "Eliminaci&oacute;n en %s fall&oacute;: %s"
 
! #: lib/msql.php:227 lib/msql.php:302
 #, c-format
 msgid "Insert into %s failed: %s"
 msgstr "Inserci&oacute;n en %s fall&oacute;: %s"
 
! #: lib/mysql.php:35 lib/mysql.php:41 lib/mysql.php:115
 #, c-format
 msgid "MySQL error: %s"
 msgstr "Error de MySQL: %s"
 
! #: lib/mysql.php:113
 #, c-format
 msgid "Error writing page '%s'"
 msgstr "Error al escribir la p&aacute;gina `%s'"
 
 #: lib/pageinfo.php:9
 msgid "Enter a page name"
 msgstr "Escriba un nombre de p&aacute;gina"
 
! #: lib/pageinfo.php:10
 msgid "Go"
 msgstr "Aceptar"
--- 187,230 ----
 msgstr "Mensaje de error: %s"
 
! #: lib/msql.php:35 lib/mysql.php:41
 #, c-format
 msgid "Cannot open database %s, giving up."
 msgstr "No puedo abrir la base de datos %s me doy por vencido."
 
! #: lib/msql.php:210 lib/msql.php:286
 #, c-format
 msgid "Insert/update failed: %s"
 msgstr "Inserci&oacute;n/actualizaci&oacute;n fall&oacute;: %s"
 
! #: lib/msql.php:221 lib/msql.php:296
 #, c-format
 msgid "Delete on %s failed: %s"
 msgstr "Eliminaci&oacute;n en %s fall&oacute;: %s"
 
! #: lib/msql.php:237 lib/msql.php:312
 #, c-format
 msgid "Insert into %s failed: %s"
 msgstr "Inserci&oacute;n en %s fall&oacute;: %s"
 
! #: lib/mysql.php:37 lib/mysql.php:43 lib/mysql.php:117 lib/mysql.php:156
 #, c-format
 msgid "MySQL error: %s"
 msgstr "Error de MySQL: %s"
 
! #: lib/mysql.php:115
 #, c-format
 msgid "Error writing page '%s'"
 msgstr "Error al escribir la p&aacute;gina `%s'"
 
+ #: lib/mysql.php:154
+ #, c-format
+ msgid "Cannot delete '%s' from table '%s'"
+ msgstr ""
+ 
 #: lib/pageinfo.php:9
 msgid "Enter a page name"
 msgstr "Escriba un nombre de p&aacute;gina"
 
! #: lib/pageinfo.php:10 lib/stdlib.php:239
 msgid "Go"
 msgstr "Aceptar"
***************
*** 290,302 ****
 msgstr "%d las m&aacute;s populares:"
 
! #: lib/stdlib.php:186 lib/stdlib.php:194
 msgid "Search"
 msgstr ""
 
! #: lib/stdlib.php:295
 msgid "Stack bounds exceeded in SetHTMLOutputMode"
 msgstr "L&iacute;mites de la pila excedidos en SetHTMLOutputMode"
 
! #: lib/stdlib.php:349 lib/stdlib.php:412
 msgid "RecentChanges"
 msgstr "CambiosRecientes"
--- 326,338 ----
 msgstr "%d las m&aacute;s populares:"
 
! #: lib/stdlib.php:207 lib/stdlib.php:215
 msgid "Search"
 msgstr ""
 
! #: lib/stdlib.php:330
 msgid "Stack bounds exceeded in SetHTMLOutputMode"
 msgstr "L&iacute;mites de la pila excedidos en SetHTMLOutputMode"
 
! #: lib/stdlib.php:384 lib/stdlib.php:447
 msgid "RecentChanges"
 msgstr "CambiosRecientes"
Index: nl.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/nl.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** nl.po	2000年11月02日 21:15:33	1.5
--- nl.po	2000年11月13日 11:22:10	1.6
***************
*** 11,15 ****
 msgstr ""
 "Project-Id-Version: phpwiki 1.1.7\n"
! "POT-Creation-Date: 2000年11月02日 22:18+0100\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年11月13日 12:30+0100\n"
 "PO-Revision-Date: 2000年09月30日 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
***************
*** 21,41 ****
 "From: <ja...@gn...>\n"
 
! #: lib/config.php:148
 msgid "templates/browse.html"
 msgstr "locale/nl/templates/browse.html"
 
! #: lib/config.php:149
 msgid "templates/editpage.html"
 msgstr "locale/nl/templates/editpage.html"
 
! #: lib/config.php:150
 msgid "templates/editlinks.html"
 msgstr "locale/nl/templates/editlinks.html"
 
! #: lib/config.php:151
 msgid "templates/message.html"
 msgstr "locale/nl/templates/message.html"
 
! #: lib/config.php:167
 msgid "./pgsrc"
 msgstr "locale/nl/pgsrc"
--- 21,72 ----
 "From: <ja...@gn...>\n"
 
! #: admin.php:26
! msgid "You entered an invalid login or password."
! msgstr ""
! 
! #: admin.php:47
! #, c-format
! msgid "You are about to remove '%s' permanently!"
! msgstr ""
! 
! #: admin.php:50
! #, c-format
! msgid "Click %shere%s to remove the page now."
! msgstr ""
! 
! #: admin.php:53
! msgid "Otherwise press the \"Back\" button of your browser."
! msgstr ""
! 
! #: admin.php:55
! msgid "Function not yet implemented."
! msgstr ""
! 
! #: admin.php:57 admin.php:65
! msgid "Remove page"
! msgstr ""
! 
! #: admin.php:63
! #, c-format
! msgid "Removed page '%s' succesfully."
! msgstr ""
! 
! #: lib/config.php:159
 msgid "templates/browse.html"
 msgstr "locale/nl/templates/browse.html"
 
! #: lib/config.php:160
 msgid "templates/editpage.html"
 msgstr "locale/nl/templates/editpage.html"
 
! #: lib/config.php:161
 msgid "templates/editlinks.html"
 msgstr "locale/nl/templates/editlinks.html"
 
! #: lib/config.php:162
 msgid "templates/message.html"
 msgstr "locale/nl/templates/message.html"
 
! #: lib/config.php:178
 msgid "./pgsrc"
 msgstr "locale/nl/pgsrc"
***************
*** 141,145 ****
 msgstr "Volledige tekst zoek resultaten"
 
! #: lib/msql.php:29 lib/mysql.php:33
 msgid "Cannot establish connection to database, giving up."
 msgstr "Kan verbinding naar data base niet tot stand brengen, geef op."
--- 172,176 ----
 msgstr "Volledige tekst zoek resultaten"
 
! #: lib/msql.php:29 lib/mysql.php:35
 msgid "Cannot establish connection to database, giving up."
 msgstr "Kan verbinding naar data base niet tot stand brengen, geef op."
***************
*** 150,188 ****
 msgstr "Foutboodschap: %s"
 
! #: lib/msql.php:35 lib/mysql.php:39
 #, c-format
 msgid "Cannot open database %s, giving up."
 msgstr "Kan data base %s niet openen, geef op."
 
! #: lib/msql.php:200 lib/msql.php:276
 #, c-format
 msgid "Insert/update failed: %s"
 msgstr "Insert/update gefaald: %s"
 
! #: lib/msql.php:211 lib/msql.php:286
 #, c-format
 msgid "Delete on %s failed: %s"
 msgstr "Delete op %s gefaald: %s"
 
! #: lib/msql.php:227 lib/msql.php:302
 #, c-format
 msgid "Insert into %s failed: %s"
 msgstr "Insert in %s gefaald: %s"
 
! #: lib/mysql.php:35 lib/mysql.php:41 lib/mysql.php:115
 #, c-format
 msgid "MySQL error: %s"
 msgstr "MySQL fout: %s"
 
! #: lib/mysql.php:113
 #, c-format
 msgid "Error writing page '%s'"
 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"
--- 181,224 ----
 msgstr "Foutboodschap: %s"
 
! #: lib/msql.php:35 lib/mysql.php:41
 #, c-format
 msgid "Cannot open database %s, giving up."
 msgstr "Kan data base %s niet openen, geef op."
 
! #: lib/msql.php:210 lib/msql.php:286
 #, c-format
 msgid "Insert/update failed: %s"
 msgstr "Insert/update gefaald: %s"
 
! #: lib/msql.php:221 lib/msql.php:296
 #, c-format
 msgid "Delete on %s failed: %s"
 msgstr "Delete op %s gefaald: %s"
 
! #: lib/msql.php:237 lib/msql.php:312
 #, c-format
 msgid "Insert into %s failed: %s"
 msgstr "Insert in %s gefaald: %s"
 
! #: lib/mysql.php:37 lib/mysql.php:43 lib/mysql.php:117 lib/mysql.php:156
 #, c-format
 msgid "MySQL error: %s"
 msgstr "MySQL fout: %s"
 
! #: lib/mysql.php:115
 #, c-format
 msgid "Error writing page '%s'"
 msgstr "Fout bij schrijven pagina `%s'"
 
+ #: lib/mysql.php:154
+ #, c-format
+ msgid "Cannot delete '%s' from table '%s'"
+ msgstr ""
+ 
 #: lib/pageinfo.php:9
 msgid "Enter a page name"
 msgstr "Geef de naam van een pagina"
 
! #: lib/pageinfo.php:10 lib/stdlib.php:239
 msgid "Go"
 msgstr "Ga"
***************
*** 296,308 ****
 msgstr "%d meest gevraagde in de buurt:"
 
! #: lib/stdlib.php:186 lib/stdlib.php:194
 msgid "Search"
 msgstr ""
 
! #: lib/stdlib.php:295
 msgid "Stack bounds exceeded in SetHTMLOutputMode"
 msgstr ""
 
! #: lib/stdlib.php:349 lib/stdlib.php:412
 msgid "RecentChanges"
 msgstr "RecenteVeranderingen"
--- 332,344 ----
 msgstr "%d meest gevraagde in de buurt:"
 
! #: lib/stdlib.php:207 lib/stdlib.php:215
 msgid "Search"
 msgstr ""
 
! #: lib/stdlib.php:330
 msgid "Stack bounds exceeded in SetHTMLOutputMode"
 msgstr ""
 
! #: lib/stdlib.php:384 lib/stdlib.php:447
 msgid "RecentChanges"
 msgstr "RecenteVeranderingen"
Index: phpwiki.pot
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/phpwiki.pot,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** phpwiki.pot	2000年11月02日 21:15:33	1.5
--- phpwiki.pot	2000年11月13日 11:22:10	1.6
***************
*** 7,11 ****
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
! "POT-Creation-Date: 2000年11月02日 22:18+0100\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年11月13日 12:30+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
***************
*** 15,35 ****
 "Content-Transfer-Encoding: ENCODING\n"
 
! #: lib/config.php:148
 msgid "templates/browse.html"
 msgstr ""
 
! #: lib/config.php:149
 msgid "templates/editpage.html"
 msgstr ""
 
! #: lib/config.php:150
 msgid "templates/editlinks.html"
 msgstr ""
 
! #: lib/config.php:151
 msgid "templates/message.html"
 msgstr ""
 
! #: lib/config.php:167
 msgid "./pgsrc"
 msgstr ""
--- 15,66 ----
 "Content-Transfer-Encoding: ENCODING\n"
 
! #: admin.php:26
! msgid "You entered an invalid login or password."
! msgstr ""
! 
! #: admin.php:47
! #, c-format
! msgid "You are about to remove '%s' permanently!"
! msgstr ""
! 
! #: admin.php:50
! #, c-format
! msgid "Click %shere%s to remove the page now."
! msgstr ""
! 
! #: admin.php:53
! msgid "Otherwise press the \"Back\" button of your browser."
! msgstr ""
! 
! #: admin.php:55
! msgid "Function not yet implemented."
! msgstr ""
! 
! #: admin.php:57 admin.php:65
! msgid "Remove page"
! msgstr ""
! 
! #: admin.php:63
! #, c-format
! msgid "Removed page '%s' succesfully."
! msgstr ""
! 
! #: lib/config.php:159
 msgid "templates/browse.html"
 msgstr ""
 
! #: lib/config.php:160
 msgid "templates/editpage.html"
 msgstr ""
 
! #: lib/config.php:161
 msgid "templates/editlinks.html"
 msgstr ""
 
! #: lib/config.php:162
 msgid "templates/message.html"
 msgstr ""
 
! #: lib/config.php:178
 msgid "./pgsrc"
 msgstr ""
***************
*** 134,138 ****
 msgstr ""
 
! #: lib/msql.php:29 lib/mysql.php:33
 msgid "Cannot establish connection to database, giving up."
 msgstr ""
--- 165,169 ----
 msgstr ""
 
! #: lib/msql.php:29 lib/mysql.php:35
 msgid "Cannot establish connection to database, giving up."
 msgstr ""
***************
*** 143,181 ****
 msgstr ""
 
! #: lib/msql.php:35 lib/mysql.php:39
 #, c-format
 msgid "Cannot open database %s, giving up."
 msgstr ""
 
! #: lib/msql.php:200 lib/msql.php:276
 #, c-format
 msgid "Insert/update failed: %s"
 msgstr ""
 
! #: lib/msql.php:211 lib/msql.php:286
 #, c-format
 msgid "Delete on %s failed: %s"
 msgstr ""
 
! #: lib/msql.php:227 lib/msql.php:302
 #, c-format
 msgid "Insert into %s failed: %s"
 msgstr ""
 
! #: lib/mysql.php:35 lib/mysql.php:41 lib/mysql.php:115
 #, c-format
 msgid "MySQL error: %s"
 msgstr ""
 
! #: lib/mysql.php:113
 #, c-format
 msgid "Error writing page '%s'"
 msgstr ""
 
 #: lib/pageinfo.php:9
 msgid "Enter a page name"
 msgstr ""
 
! #: lib/pageinfo.php:10
 msgid "Go"
 msgstr ""
--- 174,217 ----
 msgstr ""
 
! #: lib/msql.php:35 lib/mysql.php:41
 #, c-format
 msgid "Cannot open database %s, giving up."
 msgstr ""
 
! #: lib/msql.php:210 lib/msql.php:286
 #, c-format
 msgid "Insert/update failed: %s"
 msgstr ""
 
! #: lib/msql.php:221 lib/msql.php:296
 #, c-format
 msgid "Delete on %s failed: %s"
 msgstr ""
 
! #: lib/msql.php:237 lib/msql.php:312
 #, c-format
 msgid "Insert into %s failed: %s"
 msgstr ""
 
! #: lib/mysql.php:37 lib/mysql.php:43 lib/mysql.php:117 lib/mysql.php:156
 #, c-format
 msgid "MySQL error: %s"
 msgstr ""
 
! #: lib/mysql.php:115
 #, c-format
 msgid "Error writing page '%s'"
 msgstr ""
 
+ #: lib/mysql.php:154
+ #, c-format
+ msgid "Cannot delete '%s' from table '%s'"
+ msgstr ""
+ 
 #: lib/pageinfo.php:9
 msgid "Enter a page name"
 msgstr ""
 
! #: lib/pageinfo.php:10 lib/stdlib.php:239
 msgid "Go"
 msgstr ""
***************
*** 277,289 ****
 msgstr ""
 
! #: lib/stdlib.php:186 lib/stdlib.php:194
 msgid "Search"
 msgstr ""
 
! #: lib/stdlib.php:295
 msgid "Stack bounds exceeded in SetHTMLOutputMode"
 msgstr ""
 
! #: lib/stdlib.php:349 lib/stdlib.php:412
 msgid "RecentChanges"
 msgstr ""
--- 313,325 ----
 msgstr ""
 
! #: lib/stdlib.php:207 lib/stdlib.php:215
 msgid "Search"
 msgstr ""
 
! #: lib/stdlib.php:330
 msgid "Stack bounds exceeded in SetHTMLOutputMode"
 msgstr ""
 
! #: lib/stdlib.php:384 lib/stdlib.php:447
 msgid "RecentChanges"
 msgstr ""

Update of /cvsroot/phpwiki/phpwiki/locale/nl/templates
In directory slayer.i.sourceforge.net:/tmp/cvs-serv7595/nl/templates
Modified Files:
	browse.html editpage.html 
Log Message:
new run of translate.sh / updated templates
Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/templates/browse.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** browse.html	2000年10月20日 11:42:53	1.2
--- browse.html	2000年11月13日 11:22:10	1.3
***************
*** 8,17 ****
 <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
 <a href="###SCRIPTURL###?full=###PAGEURL###">###PAGE###</a></h1>
 <P>
 ###CONTENT###
- 
 <hr noshade>
! <a href="###SCRIPTURL###?edit=###PAGEURL###">VeranderTekst</a>
! van deze pagina (laatste verandering ###LASTMODIFIED###
 [<a href="###SCRIPTURL###?info=###PAGEURL###">info</a>]
 [<a href="###SCRIPTURL###?diff=###PAGEURL###">diff</a>])
--- 8,27 ----
 <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
 <a href="###SCRIPTURL###?full=###PAGEURL###">###PAGE###</a></h1>
+ ###IF:ADMIN###<FORM ACTION="###SCRIPTURL###" METHOD=POST>
+ ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Unlock page</a>]
+ ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Lock page</a>]
+ - - 
+ [<a href="###SCRIPTURL###?remove=###PAGEURL###">Remove page</A>]
+ <hr noshade>
+ ###ENDIF:ADMIN###
 <P>
 ###CONTENT###
 <hr noshade>
! ###IF ADMIN###<a href="###SCRIPTURL###?edit=###PAGEURL###">VeranderTekst</a>
! ###IF:!ADMIN###
! ###IF LOCK###Page locked
! ###IF !LOCK###<a href="###SCRIPTURL###?edit=###PAGEURL###">VeranderTekst</a>
! ###ENDIF:!ADMIN###
! van deze pagina (laatste verandering ###LASTMODIFIED###
 [<a href="###SCRIPTURL###?info=###PAGEURL###">info</a>]
 [<a href="###SCRIPTURL###?diff=###PAGEURL###">diff</a>])
Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/templates/editpage.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** editpage.html	2000年10月26日 15:38:38	1.4
--- editpage.html	2000年11月13日 11:22:10	1.5
***************
*** 27,31 ****
 naar andere webservers.
 
! ###IFCOPY###<br><a href="###SCRIPTURL###?copy=###PAGEURL###">VeranderKopie</a> van vorige auteur.
 
 <hr noshade>
--- 27,31 ----
 naar andere webservers.
 
! ###IF COPY###<br><a href="###SCRIPTURL###?copy=###PAGEURL###">VeranderKopie</a> van vorige auteur.
 
 <hr noshade>

Update of /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES
In directory slayer.i.sourceforge.net:/tmp/cvs-serv7595/nl/LC_MESSAGES
Modified Files:
	phpwiki.mo phpwiki.php 
Log Message:
new run of translate.sh / updated templates
Index: phpwiki.mo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES/phpwiki.mo,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
Binary files /tmp/cvsMvcqwP and /tmp/cvsUZUvRu differ
Index: phpwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES/phpwiki.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** phpwiki.php	2000年11月02日 21:15:33	1.6
--- phpwiki.php	2000年11月13日 11:22:10	1.7
***************
*** 107,110 ****
--- 107,112 ----
 $locale["%d most popular nearby:"] =
 "%d meest gevraagde in de buurt:";
+ $locale["RecentChanges"] =
+ "RecenteVeranderingen";
 
 ;?>

Update of /cvsroot/phpwiki/phpwiki/locale/es/LC_MESSAGES
In directory slayer.i.sourceforge.net:/tmp/cvs-serv7595/es/LC_MESSAGES
Modified Files:
	phpwiki.mo phpwiki.php 
Log Message:
new run of translate.sh / updated templates
Index: phpwiki.mo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/LC_MESSAGES/phpwiki.mo,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
Binary files /tmp/cvsPPxaKu and /tmp/cvskC5anP differ
Index: phpwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/LC_MESSAGES/phpwiki.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** phpwiki.php	2000年11月02日 21:15:33	1.1
--- phpwiki.php	2000年11月13日 11:22:10	1.2
***************
*** 103,106 ****
--- 103,108 ----
 $locale["Stack bounds exceeded in SetHTMLOutputMode"] =
 "Límites de la pila excedidos en SetHTMLOutputMode";
+ $locale["RecentChanges"] =
+ "CambiosRecientes";
 
 ;?>

Update of /cvsroot/phpwiki/phpwiki/locale/de/templates
In directory slayer.i.sourceforge.net:/tmp/cvs-serv7595/de/templates
Modified Files:
	browse.html editpage.html 
Log Message:
new run of translate.sh / updated templates
Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/templates/browse.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** browse.html	2000年11月02日 21:15:32	1.1
--- browse.html	2000年11月13日 11:22:09	1.2
***************
*** 8,16 ****
 <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
 <a href="###SCRIPTURL###?related=###PAGEURL###">###PAGE###</a></h1>
 <P>
 ###CONTENT###
 <hr noshade>
! <a href="###SCRIPTURL###?edit=###PAGEURL###">TextEditieren</a>
! (Seite zuletzt am ###LASTMODIFIED### verändert)
 [<a href="###SCRIPTURL###?info=###PAGEURL###">Info</a>]
 [<a href="###SCRIPTURL###?diff=###PAGEURL###">Diff</a>])
--- 8,27 ----
 <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
 <a href="###SCRIPTURL###?related=###PAGEURL###">###PAGE###</a></h1>
+ ###IF:ADMIN###<FORM ACTION="###SCRIPTURL###" METHOD=POST>
+ ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Seite freigeben</a>]
+ ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Seite sperren</a>]
+ - - 
+ [<a href="###SCRIPTURL###?remove=###PAGEURL###">Seite l&ouml;schen</A>]
+ <hr noshade>
+ ###ENDIF:ADMIN###
 <P>
 ###CONTENT###
 <hr noshade>
! ###IF ADMIN###<a href="###SCRIPTURL###?edit=###PAGEURL###">TextEditieren</a>
! ###IF:!ADMIN###
! ###IF LOCK###Page locked
! ###IF !LOCK###<a href="###SCRIPTURL###?edit=###PAGEURL###">TextEditieren</a>
! ###ENDIF:!ADMIN###
! (Seite zuletzt am ###LASTMODIFIED### verändert)
 [<a href="###SCRIPTURL###?info=###PAGEURL###">Info</a>]
 [<a href="###SCRIPTURL###?diff=###PAGEURL###">Diff</a>])
Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/templates/editpage.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** editpage.html	2000年11月02日 21:15:32	1.1
--- editpage.html	2000年11月13日 11:22:09	1.2
***************
*** 27,31 ****
 <a href="###SCRIPTURL###?links=###PAGEURL###">EditiereVerweise</a> zu anderen Webseiten.
 
! ###IFCOPY###<br><a href="###SCRIPTURL###?copy=###PAGEURL###">EditiereArchivSeite</a> vom vorhergenden Autor.
 
 <hr noshade>
--- 27,31 ----
 <a href="###SCRIPTURL###?links=###PAGEURL###">EditiereVerweise</a> zu anderen Webseiten.
 
! ###IF COPY###<br><a href="###SCRIPTURL###?copy=###PAGEURL###">EditiereArchivSeite</a> vom vorhergenden Autor.
 
 <hr noshade>

Update of /cvsroot/phpwiki/phpwiki/locale
In directory slayer.i.sourceforge.net:/tmp/cvs-serv7595
Modified Files:
	translate.sh 
Log Message:
new run of translate.sh / updated templates
Index: translate.sh
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/translate.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** translate.sh	2000年11月13日 11:01:15	1.6
--- translate.sh	2000年11月13日 11:22:08	1.7
***************
*** 19,23 ****
 ALL_LINGUAS="nl es de"
 
! xgettext -L C++ -o locale/po/phpwiki.pot lib/*php
 podir=locale/po
 for i in $ALL_LINGUAS; do
--- 19,23 ----
 ALL_LINGUAS="nl es de"
 
! xgettext -L C++ -o locale/po/phpwiki.pot admin.php lib/*php
 podir=locale/po
 for i in $ALL_LINGUAS; do

Update of /cvsroot/phpwiki/phpwiki/locale/es/templates
In directory slayer.i.sourceforge.net:/tmp/cvs-serv7595/es/templates
Modified Files:
	browse.html editpage.html 
Log Message:
new run of translate.sh / updated templates
Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/templates/browse.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** browse.html	2000年11月02日 21:15:33	1.1
--- browse.html	2000年11月13日 11:22:10	1.2
***************
*** 8,17 ****
 <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
 <a href="###SCRIPTURL###?full=###PAGEURL###">###PAGE###</a></h1>
 <P>
 ###CONTENT###
 
 <hr noshade>
! <a href="###SCRIPTURL###?edit=###PAGEURL###">EditarElTexto</a>
! de esta página (editada por última vez ###LASTMODIFIED###
 [<a href="###SCRIPTURL###?info=###PAGEURL###">info</a>]
 [<a href="###SCRIPTURL###?diff=###PAGEURL###">diff</a>])
--- 8,28 ----
 <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
 <a href="###SCRIPTURL###?full=###PAGEURL###">###PAGE###</a></h1>
+ ###IF:ADMIN###<FORM ACTION="###SCRIPTURL###" METHOD=POST>
+ ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Unlock page</a>]
+ ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Lock page</a>]
+ - - 
+ [<a href="###SCRIPTURL###?remove=###PAGEURL###">Remove page</A>]
+ <hr noshade>
+ ###ENDIF:ADMIN###
 <P>
 ###CONTENT###
 
 <hr noshade>
! ###IF ADMIN###<a href="###SCRIPTURL###?edit=###PAGEURL###">EditarElTexto</a>
! ###IF:!ADMIN###
! ###IF LOCK###Page locked
! ###IF !LOCK###<a href="###SCRIPTURL###?edit=###PAGEURL###">EditarElTexto</a>
! ###ENDIF:!ADMIN###
! de esta página (editada por última vez ###LASTMODIFIED###
 [<a href="###SCRIPTURL###?info=###PAGEURL###">info</a>]
 [<a href="###SCRIPTURL###?diff=###PAGEURL###">diff</a>])
Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/templates/editpage.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** editpage.html	2000年11月02日 21:15:33	1.1
--- editpage.html	2000年11月13日 11:22:10	1.2
***************
*** 25,29 ****
 <a href="###SCRIPTURL###?links=###PAGEURL###">EditarLigas</a> a otros servidores.
 
! ###IFCOPY###<br><a href="###SCRIPTURL###?copy=###PAGEURL###">EditarCopia</a> De un autor previo
 
 <hr noshade>
--- 25,29 ----
 <a href="###SCRIPTURL###?links=###PAGEURL###">EditarLigas</a> a otros servidores.
 
! ###IF COPY###<br><a href="###SCRIPTURL###?copy=###PAGEURL###">EditarCopia</a> De un autor previo
 
 <hr noshade>

Update of /cvsroot/phpwiki/phpwiki/locale
In directory slayer.i.sourceforge.net:/tmp/cvs-serv5367
Modified Files:
	translate.sh 
Log Message:
fixed bug which omitted last string in */LC_MESSAGE/phpwiki.php
Index: translate.sh
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/translate.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** translate.sh	2000年11月02日 21:15:30	1.5
--- translate.sh	2000年11月13日 11:01:15	1.6
***************
*** 62,66 ****
 }
 END {
! if (mgsid && str)
 print ("$locale[\"" msgid "\"] =\n \"" str "\";");
 print ("\n;?>");
--- 62,66 ----
 }
 END {
! if (msgid && str)
 print ("$locale[\"" msgid "\"] =\n \"" str "\";");
 print ("\n;?>");

Update of /cvsroot/phpwiki/phpwiki
In directory slayer.i.sourceforge.net:/tmp/cvs-serv4998
Modified Files:
	admin.php 
Log Message:
localized remove function
Index: admin.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/admin.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** admin.php	2000年11月09日 16:29:10	1.4
--- admin.php	2000年11月13日 10:59:27	1.5
***************
*** 24,28 ****
 Header("WWW-Authenticate: Basic realm=\"PhpWiki\"");
 Header("HTTP/1.0 401 Unauthorized");
! echo "You entered an invalid login or password.\n";
 exit;
 }
--- 24,28 ----
 Header("WWW-Authenticate: Basic realm=\"PhpWiki\"");
 Header("HTTP/1.0 401 Unauthorized");
! echo gettext ("You entered an invalid login or password.");
 exit;
 }
***************
*** 45,56 ****
 $remove = stripslashes($remove);
 if (function_exists('RemovePage')) {
! $html .= "You are about to remove '" . htmlspecialchars($remove)
! 	 . "' permanently!<P>Click <A HREF=\"$ScriptUrl?removeok="
! 	 . rawurlencode($remove) . "\">here</A> to remove the page now."
! 	 . "<P>Otherwise press the \"Back\" button of your browser.";
 } else {
! $html = "Function not yet implemented.";
 }
! GeneratePage('MESSAGE', $html, 'Remove page', 0);
 ExitWiki('');
 } elseif (isset($removeok)) {
--- 45,59 ----
 $remove = stripslashes($remove);
 if (function_exists('RemovePage')) {
! $html .= sprintf(gettext ("You are about to remove '%s' permanently!"), htmlspecialchars($remove));
! 	 $html .= "\n<P>";
! 	 $url = rawurlencode($remove);
! 	 $html .= sprintf(gettext ("Click %shere%s to remove the page now."),
! 		 "<A HREF=\"$ScriptUrl?removeok=$url\">", "</A>");
! 	 $html .= "\n<P>";
! 	 $html .= gettext ("Otherwise press the \"Back\" button of your browser.");
 } else {
! $html = gettext ("Function not yet implemented.");
 }
! GeneratePage('MESSAGE', $html, gettext ("Remove page"), 0);
 ExitWiki('');
 } elseif (isset($removeok)) {
***************
*** 58,63 ****
 	 $removeok = stripslashes($removeok);
 RemovePage($dbi, $removeok);
! $html = "Removed page '".htmlspecialchars($removeok)."' successfully.'";
! GeneratePage('MESSAGE', $html, 'Removed page', 0);
 ExitWiki('');
 }
--- 61,67 ----
 	 $removeok = stripslashes($removeok);
 RemovePage($dbi, $removeok);
! $html = sprintf(gettext ("Removed page '%s' succesfully."),
! 		 htmlspecialchars($removeok));
! GeneratePage('MESSAGE', $html, gettext ("Remove page"), 0);
 ExitWiki('');
 }

Update of /cvsroot/phpwiki/phpwiki/locale/po
In directory slayer.i.sourceforge.net:/tmp/cvs-serv2001
Modified Files:
	de.po 
Log Message:
fixed errors pointed out by Markus Guske
Index: de.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/de.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** de.po	2000年11月02日 21:15:33	1.1
--- de.po	2000年11月13日 10:37:32	1.2
***************
*** 21,33 ****
 #: lib/config.php:149
 msgid "templates/editpage.html"
! msgstr "locale/de/editpage.html"
 
 #: lib/config.php:150
 msgid "templates/editlinks.html"
! msgstr "locale/de/editlinks.html"
 
 #: lib/config.php:151
 msgid "templates/message.html"
! msgstr "locale/de/message.html"
 
 #: lib/config.php:167
--- 21,33 ----
 #: lib/config.php:149
 msgid "templates/editpage.html"
! msgstr "locale/de/templates/editpage.html"
 
 #: lib/config.php:150
 msgid "templates/editlinks.html"
! msgstr "locale/de/templates/editlinks.html"
 
 #: lib/config.php:151
 msgid "templates/message.html"
! msgstr "locale/de/templates/message.html"
 
 #: lib/config.php:167
***************
*** 291,293 ****
 #: lib/stdlib.php:349 lib/stdlib.php:412
 msgid "RecentChanges"
! msgstr "JuengsteVeraenderungen"
--- 291,293 ----
 #: lib/stdlib.php:349 lib/stdlib.php:412
 msgid "RecentChanges"
! msgstr "FrischeSeiten"

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv28925/lib
Modified Files:
	stdlib.php 
Log Message:
bugfix in ExtractWikiPageLinks for [text|WikiPage]
Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** stdlib.php	2000年11月08日 16:52:00	1.10
--- stdlib.php	2000年11月11日 12:15:35	1.11
***************
*** 532,536 ****
 	 for ($i = 0; $i < $numBracketLinks; $i++) {
 	 $link = ParseAndLink($brktlinks[0][$i]);
! 	 if($link['type'] == 'wiki' || $link['type'] == 'wiki-unknown')
 	 $wikilinks[$brktlinks[1][$i]] = 1;
 
--- 532,537 ----
 	 for ($i = 0; $i < $numBracketLinks; $i++) {
 	 $link = ParseAndLink($brktlinks[0][$i]);
! 	 if ($link['type'] == 'wiki' || $link['type'] == 'wiki-unknown'
! 		|| $link['type'] == 'wiki-named')
 	 $wikilinks[$brktlinks[1][$i]] = 1;
 

Update of /cvsroot/phpwiki/phpwiki/templates
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17320/templates
Modified Files:
	browse.html 
Log Message:
Added safety step for 'remove page' feature
Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** browse.html	2000年11月08日 15:49:15	1.8
--- browse.html	2000年11月09日 16:29:10	1.9
***************
*** 12,16 ****
 ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Lock page</a>]
 - - 
! [Remove page &gt;<a href="###SCRIPTURL###?remove=###PAGEURL###">.</A>&lt;]
 <hr noshade>
 ###ENDIF:ADMIN###
--- 12,16 ----
 ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Lock page</a>]
 - - 
! [<a href="###SCRIPTURL###?remove=###PAGEURL###">Remove page</A>]
 <hr noshade>
 ###ENDIF:ADMIN###

Update of /cvsroot/phpwiki/phpwiki
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17320
Modified Files:
	admin.php 
Log Message:
Added safety step for 'remove page' feature
Index: admin.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/admin.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** admin.php	2000年11月08日 16:48:34	1.3
--- admin.php	2000年11月09日 16:29:10	1.4
***************
*** 42,51 ****
 include ('admin/loadserial.php');
 } elseif (isset($remove)) {
 if (function_exists('RemovePage')) {
! 	 if (get_magic_quotes_gpc())
! 	 $remove = stripslashes($remove);
! 	 RemovePage($dbi, $remove);
! 	 $html = "Removed page '" . htmlspecialchars($remove)
! 		."' successfully.'";
 } else {
 $html = "Function not yet implemented.";
--- 42,52 ----
 include ('admin/loadserial.php');
 } elseif (isset($remove)) {
+ if (get_magic_quotes_gpc())
+ $remove = stripslashes($remove);
 if (function_exists('RemovePage')) {
! $html .= "You are about to remove '" . htmlspecialchars($remove)
! 	 . "' permanently!<P>Click <A HREF=\"$ScriptUrl?removeok="
! 	 . rawurlencode($remove) . "\">here</A> to remove the page now."
! 	 . "<P>Otherwise press the \"Back\" button of your browser.";
 } else {
 $html = "Function not yet implemented.";
***************
*** 53,57 ****
--- 54,66 ----
 GeneratePage('MESSAGE', $html, 'Remove page', 0);
 ExitWiki('');
+ } elseif (isset($removeok)) {
+ if (get_magic_quotes_gpc())
+ 	 $removeok = stripslashes($removeok);
+ RemovePage($dbi, $removeok);
+ $html = "Removed page '".htmlspecialchars($removeok)."' successfully.'";
+ GeneratePage('MESSAGE', $html, 'Removed page', 0);
+ ExitWiki('');
 }
+ 
 include('index.php');
 ?>

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv28324
Modified Files:
	mysql.php 
Log Message:
Updated the list of functions in the header comment.
Index: mysql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/mysql.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** mysql.php	2000年11月08日 15:40:56	1.4
--- mysql.php	2000年11月09日 02:57:51	1.5
***************
*** 3,21 ****
 /*
 Database functions:
- 
 OpenDataBase($dbname)
 CloseDataBase($dbi)
 RetrievePage($dbi, $pagename, $pagestore)
 InsertPage($dbi, $pagename, $pagehash)
! SaveCopyToArchive($dbi, $pagename, $pagehash) 
 IsWikiPage($dbi, $pagename)
 IsInArchive($dbi, $pagename)
 InitTitleSearch($dbi, $search)
! TitleSearchNextMatch($dbi, &$pos)
 InitFullSearch($dbi, $search)
! FullSearchNextMatch($dbi, &$pos)
! IncreaseHitCount($dbi, $pagename) 
! GetHitCount($dbi, $pagename) 
! InitMostPopular($dbi, $limit) 
 MostPopularNextMatch($dbi, $res)
 GetAllWikiPageNames($dbi)
--- 3,23 ----
 /*
 Database functions:
 OpenDataBase($dbname)
 CloseDataBase($dbi)
+ MakeDBHash($pagename, $pagehash)
+ MakePageHash($dbhash)
 RetrievePage($dbi, $pagename, $pagestore)
 InsertPage($dbi, $pagename, $pagehash)
! SaveCopyToArchive($dbi, $pagename, $pagehash)
 IsWikiPage($dbi, $pagename)
 IsInArchive($dbi, $pagename)
+ RemovePage($dbi, $pagename)
+ IncreaseHitCount($dbi, $pagename)
+ GetHitCount($dbi, $pagename)
 InitTitleSearch($dbi, $search)
! TitleSearchNextMatch($dbi, $res)
 InitFullSearch($dbi, $search)
! FullSearchNextMatch($dbi, $res)
! InitMostPopular($dbi, $limit)
 MostPopularNextMatch($dbi, $res)
 GetAllWikiPageNames($dbi)

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv27255
Modified Files:
	TestPage TextFormattingRules 
Log Message:
update for new syntax: !http and [named internal link|WikiPage]
Index: TestPage
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TestPage,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** TestPage	2000年10月24日 10:32:38	1.7
--- TestPage	2000年11月08日 17:07:32	1.8
***************
*** 67,85 ****
 ----
 __Link tests__
! # 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
 # Two consecutive links: http://phpwiki.sourceforge.net/ http://phpwiki.sourceforge.net/phpwiki/
- # And what about a WikiLink and another WikiLinkWithSameStem on one line?
- # Other way around: WikiLinkWithSameStem plus WikiLink
 # [PhpWiki on Sourceforge | http://phpwiki.sourceforge.net/]
 # [URL with a WikiWord | http://phpwiki.sourceforge.net/phpwiki/index.php?RecentChanges]
! # 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
--- 67,83 ----
 ----
 __Link tests__
! # normal: FrontPage
! # in brackets: [FrontPage] -- named: [the front page|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
 # Two consecutive links: http://phpwiki.sourceforge.net/ http://phpwiki.sourceforge.net/phpwiki/
 # [PhpWiki on Sourceforge | http://phpwiki.sourceforge.net/]
 # [URL with a WikiWord | http://phpwiki.sourceforge.net/phpwiki/index.php?RecentChanges]
! # Javascript: [boo! | javascript:alert('oops') ] (is now: named internal link)
 # 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 and this one neither !http://not.linked.to/.
 #* WikiName - WikiNameSameStem -- !!WikiName - !!WikiNameSameStem
 #* !!WikiName - !!WikiNameSameStem -- WikiName - WikiNameSameStem
Index: TextFormattingRules
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TextFormattingRules,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** TextFormattingRules	2000年11月06日 16:14:43	1.7
--- TextFormattingRules	2000年11月08日 17:07:32	1.8
***************
*** 51,56 ****
 * Hyperlinks to other pages within the Wiki are made by placing the page name in square brackets: [this is a page link] or UsingWikiWords (preferred)
 * Hyperlinks to external pages are done like this: [http://www.wcsb.org/]
! * You can name the links to the external pages by providing a name, a bar (|) and then the hyperlink: [PhpWiki home page | http://phpwiki.sourceforge.net/] 
! * You can suppress linking to old-style references by preceeding the word with a '!', e.g. !NotLinkedAsWikiName
 * [1], [2], [3], [4] refer to remote references. Click EditLinks on the edit form to enter URLs. These differ from the newer linking scheme; references are unique to a page.
 * Also, the old way of linking URL's is still supported: precede URLs with "http:", "ftp:" or "mailto:" to create links automatically as in: http://c2.com/
--- 51,56 ----
 * Hyperlinks to other pages within the Wiki are made by placing the page name in square brackets: [this is a page link] or UsingWikiWords (preferred)
 * Hyperlinks to external pages are done like this: [http://www.wcsb.org/]
! * You can name the links by providing a name, a bar (|) and then the hyperlink or pagename: [PhpWiki home page | http://phpwiki.sourceforge.net/] - [the front page | FrontPage]
! * You can suppress linking to old-style references and URIs by preceeding the word with a '!', e.g. !NotLinkedAsWikiName, !http://not.linked.to/
 * [1], [2], [3], [4] refer to remote references. Click EditLinks on the edit form to enter URLs. These differ from the newer linking scheme; references are unique to a page.
 * Also, the old way of linking URL's is still supported: precede URLs with "http:", "ftp:" or "mailto:" to create links automatically as in: http://c2.com/

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv25825
Modified Files:
	stdlib.php 
Log Message:
added named internal links e.g. [wow|FrontPage] -- patch idea from Antti Kaihola
Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** stdlib.php	2000年11月08日 15:40:00	1.9
--- stdlib.php	2000年11月08日 16:52:00	1.10
***************
*** 166,181 ****
 
 
! function LinkExistingWikiWord($wikiword) {
 global $ScriptUrl;
 $enc_word = rawurlencode($wikiword);
! $wikiword = htmlspecialchars($wikiword);
! return "<a href=\"$ScriptUrl?$enc_word\">$wikiword</a>";
 }
 
! function LinkUnknownWikiWord($wikiword) {
 global $ScriptUrl;
 $enc_word = rawurlencode($wikiword);
! $wikiword = htmlspecialchars($wikiword);
! return "<u>$wikiword</u><a href=\"$ScriptUrl?edit=$enc_word\">?</a>";
 }
 
--- 166,183 ----
 
 
! function LinkExistingWikiWord($wikiword, $linktext='') {
 global $ScriptUrl;
 $enc_word = rawurlencode($wikiword);
! if(empty($linktext))
! $linktext = htmlspecialchars($wikiword);
! return "<a href=\"$ScriptUrl?$enc_word\">$linktext</a>";
 }
 
! function LinkUnknownWikiWord($wikiword, $linktext='') {
 global $ScriptUrl;
 $enc_word = rawurlencode($wikiword);
! if(empty($linktext))
! $linktext = htmlspecialchars($wikiword);
! return "<u>$linktext</u><a href=\"$ScriptUrl?edit=$enc_word\">?</a>";
 }
 
***************
*** 466,470 ****
 $linkname = htmlspecialchars(trim($matches[1]));
 // assert proper URL's
! if (preg_match("#^($AllowedProtocols):#", $URL)) {
 if (preg_match("/($InlineImages)$/i", $URL)) {
 	 $link['type'] = 'image-named';
--- 468,475 ----
 $linkname = htmlspecialchars(trim($matches[1]));
 // assert proper URL's
! if (IsWikiPage($dbi, $URL)) {
! $link['type'] = 'wiki-named';
! $link['link'] = LinkExistingWikiWord($URL, $linkname);
! } elseif (preg_match("#^($AllowedProtocols):#", $URL)) {
 if (preg_match("/($InlineImages)$/i", $URL)) {
 	 $link['type'] = 'image-named';
***************
*** 478,484 ****
 	 $link['link'] = "<a href=\"$ScriptUrl$match[1]\">$linkname</a>";
 	 } else {
! $link['type'] = 'url-bad';
! $link['link'] = "<b><u>BAD URL -- links have to start with one" . 
! "of $AllowedProtocols followed by ':'</u></b>";
 }
 	 return $link;
--- 483,488 ----
 	 $link['link'] = "<a href=\"$ScriptUrl$match[1]\">$linkname</a>";
 	 } else {
! 	 $link['type'] = 'wiki-unknown-named';
! $link['link'] = LinkUnknownWikiWord($URL, $linkname);
 }
 	 return $link;

Update of /cvsroot/phpwiki/phpwiki
In directory slayer.i.sourceforge.net:/tmp/cvs-serv25451
Modified Files:
	admin.php 
Log Message:
fix for RemovePage when get_magic_quotes_gpc()==1
Index: admin.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/admin.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** admin.php	2000年11月08日 15:43:46	1.2
--- admin.php	2000年11月08日 16:48:34	1.3
***************
*** 43,46 ****
--- 43,48 ----
 } elseif (isset($remove)) {
 if (function_exists('RemovePage')) {
+ 	 if (get_magic_quotes_gpc())
+ 	 $remove = stripslashes($remove);
 	 RemovePage($dbi, $remove);
 	 $html = "Removed page '" . htmlspecialchars($remove)

Update of /cvsroot/phpwiki/phpwiki/templates
In directory slayer.i.sourceforge.net:/tmp/cvs-serv22811
Modified Files:
	README 
Log Message:
explained new ###IF### syntax
Index: README
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** README	2000年10月08日 18:12:14	1.2
--- README	2000年11月08日 16:19:01	1.3
***************
*** 47,50 ****
--- 47,83 ----
 
 
+ Conditional placeholders:
+ 
+ Placeholders that test a condition and depending on it include/omit
+ certain HTML. These placeholders may be nested. The general syntax
+ looks like this:
+ 
+ Line by line:
+ ###IF xxx###
+ 	If condition 'xxx' is false, this line is omitted.
+ ###IF !xxx###
+ 	If condition 'xxx' is true, this line is omitted.
+ Block:
+ ###IF:xxx### .... ###ENDIF:xxx###
+ 	If condition 'xxx' is false, then everything between the start
+ 	and end placeholder is omitted.
+ ###IF:!xxx### .... ###ENDIF:!xxx###
+ 	If condition 'xxx' is true, then everything between the start
+ and end placeholder is omitted.
+ 
+ Conditions to test:
+ 
+ COPY If page has a copy in the archive. Usually used to display/omit
+ 	the EditCopy link in the editpage template.
+ 
+ ADMIN	If the current user is an admin. Used in e.g. browse template
+ 	to display admin buttons at the top.
+ 
+ LOCK	If current page is locked and thus cannot be edited.
+ 
+ For examples see browse.html and editpage.html
+ 
+ 
+ 
 The following placeholders are not available for the 'MESSAGE' template:
 
***************
*** 64,74 ****
 	See hidden input field in EDITPAGE template for how to use it.
 
- ###IFCOPY###
- 	Special placeholder. Should only be used in EDITPAGE template.
- 	If EditCopy link should be shown, then ###IFCOPY### is ignored.
- 	If EditCopy should not be shown, the rest of the line is deleted.
 
- 
 Only for EditLinks:
 ###1###, ###2###, ....
 	Placeholder for references. Up to NUM_LINKS placeholders will be
--- 97,103 ----
 	See hidden input field in EDITPAGE template for how to use it.
 
 
 Only for EditLinks:
+ 
 ###1###, ###2###, ....
 	Placeholder for references. Up to NUM_LINKS placeholders will be
***************
*** 84,86 ****
 <head><title>PhpWiki Page: ###PAGE###</title></head>
 
! see default templates for more examples.
--- 113,115 ----
 <head><title>PhpWiki Page: ###PAGE###</title></head>
 
! See the default templates for more examples.

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv20461
Added Files:
	PhpWikiAdministration 
Log Message:
added admin page -- should be locked for normal users