phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.47,1.48

[Joe E. <joe...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv20676

Modified Files:
	stdlib.php 
Log Message:
Oops.  This is undoing a previous & unnecessary patch I didn't mean to check
in.



Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** stdlib.php	2001/12/02 01:59:23	1.47
--- stdlib.php	2001/12/02 02:52:37	1.48
***************
*** 174,178 ****
                                   'BAD URL -- remove all of <, >, "'));
        }
!       return Element('img', array('src' => $url, 'alt' => $alt, 'class' => 'wikiimage'));
     }
  
--- 174,178 ----
                                   'BAD URL -- remove all of <, >, "'));
        }
!       return Element('img', array('src' => $url, 'alt' => $alt));
     }
  

[phpwiki-checkins] CVS: phpwiki/lib WikiUser.php,1.3,1.4

[Joe E. <joe...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv17787

Modified Files:
	WikiUser.php 
Log Message:
A patch necessary to support plugin/UserPage.php.  The problem was that
WikiUser() was checking the http auth status and resetting the
session/cookie auth data on every single pageload, which made it impossible
for another auth solution to compete.  With this patch they both work.  Feel
free to refactor it.



Index: WikiUser.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUser.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** WikiUser.php	2001/11/29 18:03:59	1.3
--- WikiUser.php	2001/12/02 02:34:48	1.4
***************
*** 21,25 ****
          // Restore from cookie.
          $this->_restore();
!         
          if ($this->state == 'authorized' && $auth_mode == 'LOGIN') {
              // ...logout
--- 21,31 ----
          // Restore from cookie.
          $this->_restore();
! 
!         // don't check for HTTP auth if there's nothing to worry about
!         if (  $this->state == 'authorized' 
!               && $auth_mode != 'LOGIN' 
!               && $auth_mode != 'LOGOUT'  )
!             return;   
! 
          if ($this->state == 'authorized' && $auth_mode == 'LOGIN') {
              // ...logout

[phpwiki-checkins] CVS: phpwiki/lib/plugin UserPage.php,NONE,1.1

[Joe E. <joe...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory usw-pr-cvs1:/tmp/cvs-serv15777

Added Files:
	UserPage.php 
Log Message:
This is an alternative sign-in scheme that uses a Plugin page instead of
HTTP authentication.  This is just a first draft, but it works.  For now it
can exist side by side with the HTTP auth methods built into WikiUser.  To
set it up on your system, do this:

1) Create a new page called "UserPage" which contains:

        <?plugin UserPage?>

2) Modify your templates so that, if there is no one logged on, the various
edit buttons point to something like "${BROWSE}UserPage&edit=${PAGEURL}" (or
use a <?plugin-link UserPage?> tag) instead of "${ACTION}edit".  You can
replace the "SignOn" link with a link to UserPage, too.

UserPage is a copy of the "clublet" wikis sign-on scheme.  Check out
<http://why.clublet.com>.

Soon UserPage will also serve as a mechanism for setting hidden email
addresses and other UserPreferences.

KNOWN ISSUES
       needs gettext()ification
       UnknownWikiWord links still go directly to edit

COMING SOON
       email address collection
       distinction between new and returning users (based on Page metadata)




***** Error reading new file: [Errno 2] No such file or directory: 'UserPage.php'

[phpwiki-checkins] CVS: phpwiki/lib/plugin IncludePage.php,NONE,1.1

[Joe E. <joe...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory usw-pr-cvs1:/tmp/cvs-serv15419

Added Files:
	IncludePage.php 
Log Message:
My IncludePage plugin.  Docs at phpwiki:IncludePage.  A cheap substitute for
PageAlias, partial locks, and weblog summary pages.


***** Error reading new file: [Errno 2] No such file or directory: 'IncludePage.php'

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.46,1.47

[Joe E. <joe...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv13620/lib

Modified Files:
	stdlib.php 
Log Message:



Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** stdlib.php	2001/11/28 20:12:48	1.46
--- stdlib.php	2001/12/02 01:59:23	1.47
***************
*** 174,178 ****
                                   'BAD URL -- remove all of <, >, "'));
        }
!       return Element('img', array('src' => $url, 'alt' => $alt));
     }
  
--- 174,178 ----
                                   'BAD URL -- remove all of <, >, "'));
        }
!       return Element('img', array('src' => $url, 'alt' => $alt, 'class' => 'wikiimage'));
     }
  

[phpwiki-checkins] CVS: phpwiki/doc CREDITS,NONE,1.1 DBLIB.txt,NONE,1.1 INSTALL.flatfile,NONE,1.1 INSTALL.mysql,NONE,1.1 README.coding,NONE,1.1 HISTORY,NONE,1.1 INSTALL.mSQL,NONE,1.1 INSTALL.pgsql,NONE,1.1

[Steve W. <wai...@us...>]

Update of /cvsroot/phpwiki/phpwiki/doc
In directory usw-pr-cvs1:/tmp/cvs-serv908

Added Files:
	CREDITS DBLIB.txt INSTALL.flatfile INSTALL.mysql README.coding 
	HISTORY INSTALL.mSQL INSTALL.pgsql 
Log Message:
moved these from the root dir.


--- NEW FILE ---
!! The PhpWiki Development Team

Please report bugs to mailto:php...@li...

! Core team

;[ Steve Wainstead | mailto:sw...@pa... ] :
;: original author
;: chief in charge

;[ Arno Hollosi | mailto:aho...@ma... ] :
;: wrote the MySQL library, the templates, and the database schema
;: plus many other things too numerous to mention.

;[ Jeff Dairiki | mailto:da...@da... ] :
;: wrote the diff code
;: did a complete rewrite of PhpWiki using PHP classes.

;[ Aredridel Niothke | mailto:are...@nb... ] :
;: has started a flat file database for Phpwiki.


! Localization

;[ Jan Nieuwenhuizen | mailto:ja...@gn... ] :
;: built architecture to support internationalization
;: contributed Dutch translation

;[ Sandino Araico Sánchez | mailto:sa...@sa... ] :
;: contributed Spanish translation
;: Pablo added some updates

;[ Jon Åslund | mailto:d9...@na... ] :
;: contributed Swedish translation

; Arno : contributed German translation

;[ Marco Milanesi | mailto:kp...@ad... ] :
;: contributed the Italian translation

! Patches

;[Joel Uckelman | mailto:uck...@ia... ] :
;: ported the dbmlib.php to the new dba_* interface, which is the default in PHP 4.0.4 and later.

;[ Pablo Roca Rozas | mailto:pr...@cl... ] :
;: contributed a new logo image file and updated the Spanish translation

;[Scott R. Anderson | mailto: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

;[Jan Hidders | mailto:hi...@wi... ] :
;: has contributed a patch for dbmlib.php for the wikilinks stuff and page removal.

;[Antti Kaihola | mailto:aka...@si... ] :
;: patch for named internal links

;[Jeremie Kass | mailto:je...@um... ] :
;: contributed a patch so the logo is decided in the templates instead of being hardcoded.



------------

!! In the 1.0 series:

* John Jorgensen http://c2.com/cgi-bin/wiki?AnotherPhpWiki,
* Tim Voght http://c2.com/cgi-bin/wiki?TimVoght,
* Grant Morgan http://c2.com/cgi-bin/wiki?GrantMorgan,
* and especially Clifford A. Adams: http://c2.com/cgi-bin/wiki?CliffordAdams


***** Error reading new file: [Errno 2] No such file or directory: 'DBLIB.txt'
***** Error reading new file: [Errno 2] No such file or directory: 'INSTALL.flatfile'
***** Error reading new file: [Errno 2] No such file or directory: 'INSTALL.mysql'
--- NEW FILE ---
Here are the coding guidelines for PhpWiki.

! Follow the style of the PEAR Coding Standards: 
* http://www.php.net/manual/en/pear.standards.php
There's code snippets for configuring Emacs and Vim as well as several
other text editors.

! I18N: Using gettext()

String literals which end up making it into the HTML output should be wrapped
with a call to ''gettext()''.  This allows translations to be substituted when 
PhpWiki is run in non-english environments.

It is important that the argument of ''gettext()'' be a constant string
literal, in double quotes (").

 OKAY:  gettext("This is a message.");
 OKAY:  gettext ("Fazool."); 
 OKAY:  sprintf(gettext("Hello %s"), $name);

 BAD:   gettext('This will be ignored by xgettext.');
 BAD:   gettext("Howdy" . ", wazoo");
 BAD:   gettext("Hello $name");
 BAD:   define("MES", "howdy");  gettext(MES);

For editing files in Emacs, set indent-tabs-mode to nil. Some people
argue that it's better to use tabs and let people set their tab width,
but I think we're better off using just spaces because aligned
comments in the right region will not align correctly. For a detailed
argument see http://www.jwz.org/doc/tabs-vs-spaces.html.

Use php-mode as well. This is freely available on the net
(http://www.ontosys.com/src/php-mode.el). Put something like this
in your .emacs file:

 (load "your-path-to-lisp-files/php-mode")
 (setq auto-mode-alist
       (append '(
                 ("\\.php\\d?\\'" . php-mode)) auto-mode-alist))

so when you open .php files in Emacs it will start PHP mode
automatically.

There is another php-mode.el I have not tried:
http://sourceforge.net/projects/php-mode/

I'm sure Vim has a similar mode, if someone would let us know I'll add
it to this README.


--- NEW FILE ---
02/12/01 More Jeff's hacks:

* More CSS stuff.  I think it's neat.
* Added tables! And modified the footnote stuff a litte.
  See TextFormattingRules for details.
* Fixed bugs: including (I hope the two which
  Reini Urban <ru...@x-...> just reported.)  Also added
  Reini's patches to the README.  Thanks!


02/11/01 Jeff's hacks continue:

* User preferences can be stored in a cookie.  Currently the only user preference
  is the size of the textarea on the edit page.  See the UserPreferences wiki page.

* When a zip/file is uploaded, set the author to the user who does the upload
  (ie. the administrator).  Also enter the upload in RecentChanges.
* Don't load RecentChanges from zip or dir.  Only from file.

* Clean up error reporting.  Warning messages screw up header() and setcookie()
  operations, and also corrupt the zip dumps.  New function
  PostponeErrorMessages() allows one to postpone the reporting of selected warnings.

* Beginnings of CSS support.  Still in the ugly stage.

* More bug fixes.

02/11/01 Jeff's hacks continue:

* Moved user configuration stuff into index.php.  What was index.php is
  now in lib/main.php.

* Refactored the DB configuration variables.  There's one define() constant
  which specifies type database type, and one hash (used by all the 
  databases) which holds database, file, and server selection.
  The actual file/table names are now "hard-coded" into the individual
  database modules --- I have added the hook for setting a prefix
  to be applied to all file/table names.
  I think it's much cleaner, but let me know if you think otherwise.
  (I've only tested the dba and mysql backends.)
  
* Refactored the dump/load zip/directory stuff.  You can now upload zip-dumps
  or individual files from your local (client) machine.
  See PhpWikiAdministration.

* Fixed a bunch of bugs --- mostly the one's I introduced in my last big
  commit.

02/09/01 Jeff hack's again:

* Pagename in PATH_INFO support added.  This is configurable,
  cause, near as I can figure, if the php interpreter is run stand-alone
  in /cgi-bin there's no way to pass any useful PATH_INFO to it.
  (If a stand-alone php, in say /usr/local/bin, is used as a CGI interpreter,
  PATH_INFO will work, as long as php was configured with --enable-discard-path .)

  Along with this I refactored the semantics of all the query arguments to
  make them (IMHO) more consistent.

* Redid the administrator authentication stuff.  Eliminated admin.php ---
  all access is now through index.php.  (New file lib/userauth.php.)
  Still a little rough, but a big improvement, I think.  Hopefully this
  can be developed into a more general user identification scheme...

  Along with eliminating admin.php and the new auth scheme, completely
  refactored index.php.   It should be easy now to swap config.php and index.php.
  (I'll do that soon.)

* Continued cleaning out page reference stuff.

* Force archive of old page if author changes.  (Unless new author
  is admin.)
  
* More warning fixes in diff.php

* Refactored the semantics of the phpwiki: URL's.  
  See pgsrc/PhpWikiAdministration and pgsrc/MagicPhpWikiURLs
  for more information.

Bug fixes:
* Don't show signature image if $SignatureImg (in config.php) is left unset
* Bug fix: hang on full zip dump 
* Bug fix: hang on diff
* Bug fix: unzip failed on some old zip-dumps
* Bug fix: check for DB files in /tmp was broken
* Minor security fix: pagename must now be url-encoded
* Spelling fixes in pgsrc/*

1.2.0 02/01/01
* Support for PHP 4.0.4 (using the dba_* interface for DBM files),
  thanks to Joel Uckelman
* Swedish translation added, thanks to Jon Åslund
* dbmlib.php has all functions in mysql/postgresql, thanks to Jan Hidder
* German version updated
* Dutch translation updated
* Spanish version updated
* More robust support for flat file based Wiki (INSTALL.flatfile
  included)
* "named internal links," i.e. [wow | HomePage]
* New IF syntax added to templates
* New PhpWikiAdministration page added
* New term/defintion syntax (for <DT><DD> tags)
* Plenty of bug fixes

1.1.9 11/05/00: 
* Spanish language support added, thanks to Sandino Araico 
  Sánchez <sa...@sa...>
* German language support thanks to Arno Hollosi
* Postgresql version brought up to date (plus fixes from Sandino)
* Neil Brown contributed a patch Arno worked in to heavily modify
  lib/transform.php, much cleaner structure now
* Various page updates to English pages
* Schema update for mSQL
* Assorted E_NOTICE warnings fixed throughout (though still not done)
* URL no longer stored in page source of RecentChanges
* various bugs squashed

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
  functionality is there, thanks to Ari
* New zip file format for page dumps follows standard email format
* Removed tabs from all default pages
* Added whitespace padding to pages after they are serialized and
  written to the DBM file; this goes a long way towards fixing the
  memory leak problems for DBM-based Wikis.
* Numerous bug fixes, as always
* Some refactoring of the database interface

1.1.7 07/15/00: A lot was added since the 1.1.6b release. Diffs are
    the handiwork of Jeff Dairiki, though Arno wrote the second
    revision. Features and changes include:

* Page diffs, with color
* "MostPopular" page added which dynamically tracks most viewed pages
  (MySQL only so far)
* Admin functions: page dumps, page loads, Zip dumps, page locking
* MySQL, DBM, mSQL and Postgresql support all functional and appear stable
* Full HTML compliance in page output
* Tabless markup language introduced for <UL> and <OL>
* Fixed raw HTML exploit in [info] page
* Perl script included to reduce the size of a DBM file
* documentation updates
* page source updates
* gazillion feature enhancements and bug fixes, no doubt necessitating
  another gazillion feature enhancements and bug fixes ;-)

1.1.6b 06/27/00: The wrong wiki_config.php3 file was included in 1.1.6, 
and this release corrects that; also in my hurry, I included all the CVS
directories and files, and a test file. That stuff was left out.

1.1.6 06/26/00: Added templates, Postgresql support, mSQL support, new
database schema, new date storage format, an "info" link on all pages,
and introduced some new bugs (RecentChanges is broken ;-)

1.1.5 06/08/00: Here are the comments from the CVS logs:

fixed magic_quotes_gpc=1 bug for $pagename
fixed raw-HTML exploit for $pagename
fixed javascript: links exploit
Concurrent editing of pages is detected now - fixes LostUpdateProblem
(note: EditLinks is *not* treated this way yet)
search term is now preg_quote()'ed instead of chars removed
bugfix: UpdateRecentChanges didn't link names of new-style pages.
Fixed FindPage and search boxes
Added headings (!,!!,!!!), suppression of wiki linking (!WikiName), and linebreaks (%%%)
changed mySQL schema: column 'data' renamed 'hash' because 'dada' is a
reserved word. (update your tables!)

This release should work fine with the new linking scheme, but then
again, hey, it's beta!

1.1.4 05/11/00: I added the new linking
scheme, which largely follows the scheme of Wikic
(http://wiki.cs.uiuc.edu/RefactoringBrowser/Wiki+Syntax). Both "classic
Wiki" linking and the new linking are supported; you can now also link
things by using square brackets, like this:

[this is a page link]
[this is an external link | http://wcsb.org/]
[ftp://ftp.redhat.com/]

Reference links are still supported.

1.1.3 04/22/00: I rewrote UpdateRecentChanges completely; it's more
efficient now because it only loops over the lines once, and entries are
now newest-first instead of oldest-first.

1.1.2 04/20/00: I finally solved the problem once and for all (I hope!)
with loading pages into a brand new wiki. Vim allows you to change the
file formats so I wrote a two line ex script to convert all the pages to
dos format. (This gives them the CR/NL, unlike Un*x).

1.1.1 04/15/00: I changed the way Wiki markup is converted and 
displayed. Before pages were rendered line by line; now it accumulates
all the HTML in a variable and does one "echo" to display the page. 
While this might be a bit slower (it will use a little bit more memory)
this means PhpWiki can be modified so the HTML can be written to a file.
a whole PhpWiki site might either be served as static HTML, or
periodically exported to disk after a period of activity. This is the
secod beta (more or less) of the 1.1 release.

1.1.0 04/10/00: Support for MySQL added. Thanks to Arno Hollosi for 
his excellent work! He also provided patches to clean up the wiki_setup
procedure and fix rendering bugs with italics and bold text, amongst
others. Alister <al...@mi...> provided patches for arbitrary
numbers of reference links, fixing a rotten logic error on my part.
Removed "static" declarations to help the PHP4 porters.

1.03 03/21/00: Refactored index.php3 and wiki_display.php3, which 
had dbm function calls in them. Thanks to Christian Lindig
<li...@ga...> for pointing this out. This should make it
a little easier to port to a different database.

1.02 02/02/00: Disabled embedded HTML, due to security holes 
described in this CERT advisory: http://www.cert.org/advisories/CA-2000-02.html
You can re-enable it by removing the comment tags in wiki_display.php3.
Please be certain of what you are doing if you allow this!

1.01 02/01/11: Fixed bug where header rules (<hr>) were inserted
whenever four or more dashes occured; this only works if it starts the
line now. Thanks to Gerry Barksdale.

1.00 01/25/00: Changed the names of all files except index.php3; I
prefaced them all with "wiki_" to avoid collisions with other files 
that might be in the include path. Thanks to Grant Morgan for the 
suggestion. A few corrections to the default pages; I think the 
small rendering problems are due to Unix's lack of a carriage 
return.

0.99 01/20/00: Added a logic change suggested by Clifford Adams, 
where a copy is saved to the archive if the previous author was 
different. A different person that is. Fixed a rendering bug. This was
breaking: http://c2.com/cgi-bin/wiki followed by
http://c2.com/cgi-bin/wiki?PhpWiki on the same line. Because PHP only
can do *global* search and replace, the second URL was incompletely
swapped and linked. Using rsort() on the array of matches worked.
Added a patch from Grant Morgan for servers with magic_quotes_gpc set.

0.98 01/18/00: Added code to build the $ServerAddress dyanamically. Now,
PhpWiki will work as soon as it's untarred. No configuration should be
necessary.

0.97 01/16/00: Added a feature suggested by Clifford Adams. It stores
the author's remote address and disables the EditCopy the next time they
edit a page. Added <DL><DT><DD> support and debugged it. A new Wiki will
load a set of new pages, so the Wiki is ready to go out of the box.

0.96 01/15/00: Added EditCopy. This uses a second DBM file and could use
some more pounding. I also found a bug when two URL's appear on the same
line, like:
http://foo.com/ http://foo.com/WikiWikiWeb
In this case the second URL will not be linked correctly due to PHP's
replace-all-or-nothing regular expression functions.

0.95 01/04/00: Severe reworking of the list code (UL amd OL tags). I
added a stack class and "implemented recursion," which seemed the
logical way to accomplish nested tags. There are a couple of minor bugs
to work out, and I have to get DL tags working. I changed some constants
to define()'s instead. There are magic numbers in stdlib.php3 that
probably should be defined. I also used while() loops while doing
push/pop operations which also gives me the willies, but I put in bounds
checking.

0.94: 12/22/99 Mostly code cleanups; added code for waiting on the dbm
file if not available; added more comments. 

0.93: 12/21/99 Added full text search. Moved configuration code to a new
file, config.php3. Fixed another bug in RecentChanges. Page titles now
link to full search, which is a bit more useful. Added code to create a
new RecentChanges if none existed.

0.92: 12/20/99 Added REMOTE_HOST to RecentChanges edits; fixed a bug
where I typed in PUT instead of POST in editpage.php3; patched
RecentChanges so hopefully the lines won't get screwed up anymore.

0.91: 12/20/99 Fixed bug that occurred when creating new pages.

0.90: 12/19/99 Added user-defined links (i.e. [1], [2] etc) and embedded
images. This is the first beta release. Only an issue with second-level
lists remains, and a couple of other minor things.

0.81: 12/19/99 Fixed another wiki word linking issue. It arose from
having similar patterns in words in the same line.

0.80: 12/18/99 I'm bumping up the version to .8 because it's that close.
I finally solved the crucial linking problem, by reinventing how
classic Wiki does it ;-) URL's are first replaced with tokens, then Wiki
words are linked, then linked URL's are put back. I improved the code a
great deal for the differnet "modes" of display text; I have a function
maintain the mode, and whether end tags are needed or not.

0.07: 12/18/99 Fixed minor bug in preformatted/bulleted code output; fixed
reverse linking of page titles

0.06: 12/15/99: Added ChangeSpacesToTabs

0.05: 12/14/99: Added title searches, RecentChanges, fixed numerous bugs like
only trying to render valid page names, the last-edited-date, removed
the navigation toolbars, linked the new logo to HomePage, and a half
dozen other odd things. It's almost ready.

0.04: 12/12/99: Several additions to markup:
   italics 
   bold
   preformatted text
   unordered lists (one level only, tow levels breaks)

In addition, wiki links have been further debugged, but I still
haven't solved the problem with wiki-links inside URLs.
   
0.03: 12/4/99: Pages are now serialized arrays instead of text blobs. Some
markup rules have been implemented. HTML is escaped; Wiki linking works
but
undefined pages do not have the question mark after them (they look like
a regular link to a Wiki page.) URL's hyperlink and should accept most
legal
URL's.

0.02: 12/3/99: Basic page editing/saving/displaying is now working.

Prior to 0.02, there were no numbered releases, and in fact there
was only one release, so I guess that would be 0.01 :-)

***** Error reading new file: [Errno 2] No such file or directory: 'INSTALL.mSQL'
***** Error reading new file: [Errno 2] No such file or directory: 'INSTALL.pgsql'

[phpwiki-checkins] CVS: phpwiki CREDITS,1.12,NONE DBLIB.txt,1.10,NONE INSTALL.flatfile,1.5,NONE INSTALL.mysql,1.9,NONE README.coding,1.4,NONE HISTORY,1.18,NONE INSTALL.mSQL,1.5,NONE INSTALL.pgsql,1.9,NONE

[Steve W. <wai...@us...>]

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv724

Removed Files:
	CREDITS DBLIB.txt INSTALL.flatfile INSTALL.mysql README.coding 
	HISTORY INSTALL.mSQL INSTALL.pgsql 
Log Message:
Moved these into doc/.


--- CREDITS DELETED ---

--- DBLIB.txt DELETED ---

--- INSTALL.flatfile DELETED ---

--- INSTALL.mysql DELETED ---

--- README.coding DELETED ---

--- HISTORY DELETED ---

--- INSTALL.mSQL DELETED ---

--- INSTALL.pgsql DELETED ---

[phpwiki-checkins] CVS: phpwiki INSTALL,1.11,1.12

[Steve W. <wai...@us...>]

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv32356

Modified Files:
	INSTALL 
Log Message:
Updated some of the info; pointed to the doc/ directory for other files.


Index: INSTALL
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/INSTALL,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** INSTALL	2001/09/18 21:26:31	1.11
--- INSTALL	2001/12/01 21:55:57	1.12
***************
*** 1,6 ****
! 0. INSTALLATION
  
- PhpWiki requires PHP version 4.0.? or greater.
  
  Untar/gzip this file into the directory where you want it to live.
  That's it.
--- 1,23 ----
! REQUIREMENTS
! 
! PhpWiki requires PHP version 4.0.? or greater. 
! 
! Since version 1.3.0 of PhpWiki we have been using the DB.php from PEAR
! (a database absraction layer), so you need that installed/enabled
! too. See http://pear.php.net/ for more information.
! 
! You need the Perl regular expressions package compiled in; this is the
! default for PHP, so you probably have it. (If you don't you'll see an
! error like "function preg_replace() not defined.")
! 
! Below are the instructions for the "out of the box" installation,
! which uses DB files. If you are using a relational database like
! MySQL, see the INSTALL file for your database in the doc/ directory
! under the root of your PhpWiki installation.
  
  
+ 
+ 0. INSTALLATION
+ 
  Untar/gzip this file into the directory where you want it to live.
  That's it.
***************
*** 24,34 ****
  to leave it in /tmp. (Again, edit index.php). 
  
  For example, you create a subdirectory called "pages" in the wiki
  directory made when you untarred PhpWiki. Move the DBM files there.
! (FIXME: this is incorrect:)The files are called: wikipagesdb, wikiarchivedb, wikilinksdb,
! wikihottopicsdb, and wikihitcountdb. The files should already have proper
! rights and owners, as they were created by the web server. Otherwise
! change them accordingly so your web server can read/write the DBM
! files. (Note you must be root to move files created by the web server).
  
  Then you must ensure that the web server can access the "pages" directory
--- 41,54 ----
  to leave it in /tmp. (Again, edit index.php). 
  
+ (WARNING: on many systems, files in /tmp are subject to periodic
+ removal. We very strongly advise you to move the files to another
+ directory.)
+ 
  For example, you create a subdirectory called "pages" in the wiki
  directory made when you untarred PhpWiki. Move the DBM files there.
! The files should already have proper rights and owners, as they were
! created by the web server. Otherwise change them accordingly so your
! web server can read/write the DBM files. (Note you must be root to
! move files created by the web server).
  
  Then you must ensure that the web server can access the "pages" directory
***************
*** 52,55 ****
--- 72,76 ----
  2. ALLOWING EMBEDDED HTML
  
+ (This is not working in the 1.3 branch as of this writing.)
  PhpWiki ships with this featured disabled by default. According to CERT 
  (http://www.cert.org/advisories/CA-2000-02.html) malicious users can embed
***************
*** 65,78 ****
  Note that you should have the web server configured to allow index.php
  as the root document of a directory.
- 
- FIXME: obsolete. (PHP 3 won't work)
- This web application was written under PHP version 3.0.12 and 
- the latest build of PHP4. It's tested under the following systems:
- 
- MySQL + Debian
- mSQL + Red Hat 4.1  (FIXME: msql currently won't work)
- DBA or Postgresql on Red Hat 6.2
- 
- It reportedly works on Windows with Apache+PHP, which amazes me. 
  
  4. PATCHES
--- 86,89 ----

[phpwiki-checkins] CVS: phpwiki/pgsrc TextFormattingRules,1.15,1.16

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv15158/phpwiki/pgsrc

Modified Files:
	TextFormattingRules 
Log Message:
Added example of alternate text for inline image.

Index: TextFormattingRules
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TextFormattingRules,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** TextFormattingRules	2001/09/18 18:20:59	1.15
--- TextFormattingRules	2001/12/01 14:53:41	1.16
***************
*** 1,90 ****
! ! Paragraphs
! 
! * Don't indent paragraphs
! * Words wrap and fill as needed
! * Use blank lines as separators
! * Four or more minus signs make a horizontal rule
! * %%''''% makes a linebreak (in headings and lists too)
! 
! 
! ! Lists
! 
! * asterisk for first level
! ** asterisk-asterisk for second level, etc.
! * Use * for bullet lists, # for numbered lists (mix at will)
! * semicolon-term-colon-definition for definition lists:
! ;term here:definition here, as in the <DL><DT><DD> list
! * One line for each item
! * Other leading whitespace signals preformatted text, changes font.
! 
! ! Headings
! 
! * '!' at the start of a line makes a small heading
! * '!!' at the start of a line makes a medium heading 
! * '!!!' at the start of a line makes a large heading
! 
! ! Fonts
! 
! * Indent with one or more spaces to use a monospace font:
! 
!  This is in monospace
! This is not
! 
! !Indented Paragraphs
! 
! * semicolon-colon -- works like <BLOCKQUOTE>
! 
! ;: this is an indented block of text
! 
! ! Emphasis
! 
! * Use doubled single-quotes ('____') for emphasis (usually ''italics'')
! * Use doubled underscores (_''''_) for strong emphasis (usually __bold__)
! * Mix them at will: __''bold italics''__
! * ''Emphasis'' can be used ''multiple'' times within a line, but ''cannot'' cross line boundaries:
! 
! ''this
! will not work''
! 
! ! References
! * 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 | HomePage]
! * You can suppress linking to old-style references and URIs by preceding the word with a '!', e.g. !NotLinkedAsWikiName, !http://not.linked.to/
! * You can create footnotes by using [[1], [[2], [[3], ... like this here [1]. See footnote for counterpart.  (If the [[ is in the first column, it is a footnote ''definition'' rather than a footnote ''reference'' [1].)
! * 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/
! * URLs ending with .png, .gif, or .jpg are inlined if in square brackets, by themselves: [http://phpwiki.sourceforge.net/phpwiki/images/png.png]
! 
! ! Tables
! 
! * Simple tables are available.  A table row is introduced by a __|__ in the first column.  It is best described by example:
!       ||  _''''_Name_''''_               |v _''''_Cost_''''_   |v _''''_Notes_''''_
!       | _''''_First_''''_   | _''''_Last_''''_
!       |> Jeff       |< Dairiki   |^  Cheap     |< Not worth it
!       |> Marco      |< Polo      | Cheaper     |< Not available
! ;: will generate
! ||  __Name__               |v __Cost__   |v __Notes__
! | __First__   | __Last__
! |> Jeff       |< Dairiki   |^  Cheap     |< Not worth it
! |> Marco      |< Polo      | Cheaper     |< Not available
! 
! ;: Note that multiple __|__'s lead to spanned columns, and __v__'s can be used to span rows.  A __>__ generates a right justified column, __<__ a left justified column and __^__ a centered column (which is the default.)
! 
! 
! ! HTML Mark-Up Language
! 
! * Don't bother
! * < and > are themselves
! * The & characters will not work
! * If you really must use HTML, your system administrator can enable this feature. Start each line with a bar (|). Note that this feature is disabled by default.
! 
! ! More detail than you want to know
! 
! See [MagicPhpWikiURLs] for gory details on how to write
! various kind of wiki maintainance links.
! 
! -----
! 
! Footnotes:
! 
! [1] By using [[1] a second time (in the first column) the footnote itself is ''defined''.  You may refer to a footnote as many times as you want, but you may only define it once on the page.  Note the the [[1] in the footnote links back to the first reference, if there are multiple references there will be +'s after the [[1] which will link to the other references.  (References which come ''after'' the footnote ''definition'' will not be linked to.)
--- 1,182 ----
! ! Paragraphs
! 
! 
! 
! * Don't indent paragraphs
! 
! * Words wrap and fill as needed
! 
! * Use blank lines as separators
! 
! * Four or more minus signs make a horizontal rule
! 
! * %%''''% makes a linebreak (in headings and lists too)
! 
! 
! 
! 
! 
! ! Lists
! 
! 
! 
! * asterisk for first level
! 
! ** asterisk-asterisk for second level, etc.
! 
! * Use * for bullet lists, # for numbered lists (mix at will)
! 
! * semicolon-term-colon-definition for definition lists:
! 
! ;term here:definition here, as in the <DL><DT><DD> list
! 
! * One line for each item
! 
! * Other leading whitespace signals preformatted text, changes font.
! 
! 
! 
! ! Headings
! 
! 
! 
! * '!' at the start of a line makes a small heading
! 
! * '!!' at the start of a line makes a medium heading 
! 
! * '!!!' at the start of a line makes a large heading
! 
! 
! 
! ! Fonts
! 
! 
! 
! * Indent with one or more spaces to use a monospace font:
! 
! 
! 
!  This is in monospace
! 
! This is not
! 
! 
! 
! !Indented Paragraphs
! 
! 
! 
! * semicolon-colon -- works like <BLOCKQUOTE>
! 
! 
! 
! ;: this is an indented block of text
! 
! 
! 
! ! Emphasis
! 
! 
! 
! * Use doubled single-quotes ('____') for emphasis (usually ''italics'')
! 
! * Use doubled underscores (_''''_) for strong emphasis (usually __bold__)
! 
! * Mix them at will: __''bold italics''__
! 
! * ''Emphasis'' can be used ''multiple'' times within a line, but ''cannot'' cross line boundaries:
! 
! 
! 
! ''this
! 
! will not work''
! 
! 
! 
! ! References
! 
! * 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 | HomePage]
! 
! * You can suppress linking to old-style references and URIs by preceding the word with a '!', e.g. !NotLinkedAsWikiName, !http://not.linked.to/
! 
! * You can create footnotes by using [[1], [[2], [[3], ... like this here [1]. See footnote for counterpart.  (If the [[ is in the first column, it is a footnote ''definition'' rather than a footnote ''reference'' [1].)
! 
! * 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/
! 
! * URLs ending with .png, .gif, or .jpg are inlined if in square brackets, by themselves: [http://phpwiki.sourceforge.net/phpwiki/images/png.png]
! * Provide alternate text for inlined images using a bar(|) [Burn all GIFs!|http://phpwiki.sourceforge.net/phpwiki/images/png.png]
! 
! 
! 
! 
! ! Tables
! 
! 
! 
! * Simple tables are available.  A table row is introduced by a __|__ in the first column.  It is best described by example:
! 
!       ||  _''''_Name_''''_               |v _''''_Cost_''''_   |v _''''_Notes_''''_
! 
!       | _''''_First_''''_   | _''''_Last_''''_
! 
!       |> Jeff       |< Dairiki   |^  Cheap     |< Not worth it
! 
!       |> Marco      |< Polo      | Cheaper     |< Not available
! 
! ;: will generate
! 
! ||  __Name__               |v __Cost__   |v __Notes__
! 
! | __First__   | __Last__
! 
! |> Jeff       |< Dairiki   |^  Cheap     |< Not worth it
! 
! |> Marco      |< Polo      | Cheaper     |< Not available
! 
! 
! 
! ;: Note that multiple __|__'s lead to spanned columns, and __v__'s can be used to span rows.  A __>__ generates a right justified column, __<__ a left justified column and __^__ a centered column (which is the default.)
! 
! 
! 
! 
! 
! ! HTML Mark-Up Language
! 
! 
! 
! * Don't bother
! 
! * < and > are themselves
! 
! * The & characters will not work
! 
! * If you really must use HTML, your system administrator can enable this feature. Start each line with a bar (|). Note that this feature is disabled by default.
! 
! 
! 
! ! More detail than you want to know
! 
! 
! 
! See [MagicPhpWikiURLs] for gory details on how to write
! 
! various kind of wiki maintainance links.
! 
! 
! 
! -----
! 
! 
! 
! Footnotes:
! 
! 
! 
! [1] By using [[1] a second time (in the first column) the footnote itself is ''defined''.  You may refer to a footnote as many times as you want, but you may only define it once on the page.  Note the the [[1] in the footnote links back to the first reference, if there are multiple references there will be +'s after the [[1] which will link to the other references.  (References which come ''after'' the footnote ''definition'' will not be linked to.)
! 

[phpwiki-checkins] CVS: phpwiki/locale/de/templates editpage.html,1.7,1.8

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/de/templates
In directory usw-pr-cvs1:/tmp/cvs-serv14878/phpwiki/locale/de/templates

Modified Files:
	editpage.html 
Log Message:
minor changes to TextFormattingRules
additional German translations

Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/templates/editpage.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** editpage.html	2001/04/07 17:13:28	1.7
--- editpage.html	2001/12/01 14:51:06	1.8
***************
*** 1,57 ****
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
  <html>
  <head>
  <!-- phpwiki source:
! ###RCS_IDS###
  -->
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! ###ROBOTS_META###
! <base href="###BASE_URL###">
! <title>Edit: ###SPLIT_PAGE###</title>
! <link rel="stylesheet" title="phpwiki" href="###CSS_URL###" type="text/css">
  </head>
  
! <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
! <form class="wikiaction" method="POST" action="###BROWSE_PAGE###">
! <h1><a class="wikilink" href="###BROWSE###StartSeite"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a>
! <span="wikiword">###PAGE###</span> editieren
! <input type="submit" value=" Speichern "></h1>
! 
! <textarea name="content"
!           rows="###EDIT_AREA_HEIGHT###"
!           cols="###EDIT_AREA_WIDTH###"
!           wrap="virtual">###CONTENT###</textarea>
! <br>
! ###IF:MINOR_EDIT_CHECKBOX###
!   ###MINOR_EDIT_CHECKBOX### Geringf&uuml;gige &Auml;nderung, alte Version nicht archivieren. 
!   <br>
! ###ENDIF:MINOR_EDIT_CHECKBOX###
! <input type="checkbox" name="convert" value="tabs" >
! Ich kann keine Tabulatoren verwenden.
! Bitte <a class="wikilink" href="###BROWSE###KonvertiereLeerzeichenZuTabs"><span class="wikiword">KonvertiereLeerzeichenZuTabs</span></a>
! für mich, wenn ich speichere.
! <p>You can change the size of the editing area.
! See <a class="wikilink" href="###BROWSE###UserPreferences"><span class="wikiword">UserPreferences</span></a>.</p>
! <p><a class="wikilink" href="###BROWSE###GuterStil"><span class="wikiword">GuterStil</span></a>: Tips fürs Editieren.</p>
  
! ###IF COPY###<br><a class="wikiaction" href="###ACTION###edit&amp;version=archive">EditiereArchivSeite</a> vom vorhergenden Autor.
  
! <hr noshade>
  <small>
! <b>Emphasis:</b> '' for italics, __ for bold, ''__ for both
! <br><b>Lists:</b> * for bullet lists, # for numbered lists, ''; term : definition'' for definition lists
! <br><b>References:</b> JoinCapitalizedWords or use square brackets for a [page link] or URL [http://cool.wiki.int/].
! <br><b>Footnotes:</b> Use [1],[2],[3],... 
! <br><b>Preventing linking:</b> Avoid linking with "!":
! !DoNotHyperlink, name links like [[text | URL] (double up on the "[")
! <br><b>Misc:</b>"!", "!!", "!!!" make headings,
! "%%%" makes a linebreak, "- - - -" makes a horizontal rule
! <br>more on
! <a class="wikilink" href="###BROWSE###TextFormattingRules"><b><span class="wikiword">TextFormattingRules</span></b></a>
  </small>
  
! <input type="hidden" name="action" value="save">
! <input type="hidden" name="pagename" value="###PAGE###">
! <input type="hidden" name="editversion" value="###VERSION###">
  </form>
  </body>
--- 1,111 ----
! <?php echo "<?xml version='1.0' encoding='ISO-8859-1'?>\n"; ?>
! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
!   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html>
  <head>
  <!-- phpwiki source:
! $Id$
! ${RCS_IDS}
  -->
! <base href="${BASE_URL}" />
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
! <meta name="robots" content="noindex,nofollow" />
! <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css" />
! 
! <title>${SPLIT_PAGE} $_("Editieren") </title>
  </head>
+ 
+ <body>
+ <div><a class="wikilink"
+         href="${BROWSE}HomePage"
+         ><img src="${LOGO}" border="0" align="right"
+ 	     alt="[phpwiki]" width="50" height="50" /></a></div>
+ <h1>
+ <a href="${BROWSE}${PAGEURL}" 
+         class="wikilink"><span class="wikiword">${PAGE}</span></a> $_("Editieren")
+ </h1>
+ 
+ <?php if (!empty($PREVIEW_CONTENT)) { ?>
+   <p><strong>$_("Preview only!  Changes not saved.")</strong></p>
+   <div class="wikitext">${PREVIEW_CONTENT}</div>
+   <hr class="ignore" noshade />
+ <?php } ?>
+ 
+ <?php if (!$IS_CURRENT) { ?>
+   <p><strong>$_("Warning: You are editing an old revision.")
+         $_("Saving this page will overwrite the current version.")</strong></p>
+   <hr class="ignore" noshade />
+ <?php } ?>
  
! <?php /*
!  * FIXME: Hack! 
!  * The URL used for the form action parameter is bogus.
!  * This is needed, otherwise the redirect to the real browser
!  * page won't work with some browsers (NS4).  (NS4 won't accept
!  * a redirect from a page to itself.)
!  */ ?>
  
! <form method="post" action="${BROWSE}EditPage">
! <textarea class="wikiedit"
!           name="content"
!           rows="${EDIT_AREA_HEIGHT}"
!           cols="${EDIT_AREA_WIDTH}"
!           wrap="virtual">$FORMVARS[content]</textarea>
  
! <div class="toolbar" style="text-align: center;">
!   $_("Der Auszug: ")<input type="text" class="wikitext"
!                        name="summary" value="$FORMVARS[summary]" size="50" />
! </div>
! <table class="toolbar" width="100%"
!        cellpadding="0" cellspacing="0" border="0"><tr valign="baseline">
!   <td>
!     <input type="checkbox" name="minor_edit" value="checked" $FORMVARS[minor_edit] />
!     Geringf&uuml;gige &Auml;nderung, alte Version nicht archivieren.
!   </td>
!   <td align="center">
!     <input type="submit" class="button" name="preview" value=_("Vorschauen") />
!     | <input type="submit" class="button" value=_("Speichern") />
!   </td>
!   <td align="right">
!     <?php if ($user->is_authenticated()) { ?>
!       $_("Du bist als") <?php echo LinkWikiWord($USERID); ?> $_("eingemeldet.")
!     <?php } else { ?>
!       $_("Der Autor wird als") <i>${USERID}</i> aufgenommen.
!     <?php } ?>
!   </td>
! </tr></table>
! <p style="clear: both; padding: 2ex 0ex 0ex;">
!   $_("You can change the size of the editing area in")
!   <?php echo LinkExistingWikiWord(_("UserPreferences")); ?>.
!   <?php echo LinkExistingWikiWord(_("GuterStil")) ?> lesen: Tips f&uuml;rs Editieren.
! </p>
! <hr noshade="noshade" />
  <small>
! <?php echo LinkExistingWikiWord(_("TextFormatierungsRegeln")) ?><br>
! <b>$_("Hervorhebung:")</b>
!   '' $_("für kursiv"),
!   __ $_("für starke Betonung"),
!   ''__ $_("für fett u. kursiv")
! <br /><b>$_("Listen:")</b>
!   * $_("für Ebenen"), #
!               $_("für numerierte Listen"),
!   ''; $_("Das Wort") : $_("Die Wortbestimmung")'' $_("für glossarähnliche Listen")
! <br /><b>$_("Querverweise:")</b>
!   $_("GroßbuchstabenZusammensetzen oder den Namen in eckige Klammern einschließen [ein Link] oder URL [http://cool.wiki.int/].")
! <br /><b>$_("Fußnoten:")</b>
!    $_("Benutze [1],[2],[3],...")
! <br /><b>$_("Das Erstellen eines Links verhindern:")</b>
!    $_("das Wort mit ein '!' beginnen: !NichtLinken,")
!    $_("Links so angeben: [[Text | URL] (zweimal '[')")
! <br /><b>$_("Verschiedenes:")</b>
!    "!", "!!", "!!!" $_("für Überschriften"),
!    "%%%" $_("makes a linebreak"),
!    "- - - -" $_("eine Linie zu zeichen.")
  </small>
  
! <input type="hidden" name="action" value="save" />
! <input type="hidden" name="pagename" value="$FORMVARS[pagename]" />
! <input type="hidden" name="editversion" value="$FORMVARS[editversion]" />
! <input type="hidden" name="version" value="$FORMVARS[version]" />
  </form>
  </body>

[phpwiki-checkins] CVS: phpwiki/locale/sv/templates editpage.html,1.4,1.5

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/sv/templates
In directory usw-pr-cvs1:/tmp/cvs-serv14773/phpwiki/locale/sv/templates

Modified Files:
	editpage.html 
Log Message:
minor changes to TextFormatting reference

Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/sv/templates/editpage.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** editpage.html	2001/04/07 17:13:29	1.4
--- editpage.html	2001/12/01 14:50:20	1.5
***************
*** 37,40 ****
--- 37,41 ----
  <hr noshade>
  <small>
+ <?php echo LinkExistingWikiWord(_("Textformateringsregler")) ?><br>
  <b>Markering:</b> '' för lutande, __ för fet, ''__ för både och
  <br><b>Listor:</b> * för punktlistor, # för numrerade listor, ''; term : definition'' för definitionslistor
***************
*** 44,49 ****
  <br><b>Blandat:</b>"!", "!!", "!!!" skapar rubriker,
  "%%%" skapar radbrytning, "- - - -" skapar en horisontell linje
- <br>mer information på
- <a class="wikilink" href="###BROWSE###Textformateringsregler"><b><span class="wikiword">Textformateringsregler</span></b></a>
  </small>
  
--- 45,48 ----

[phpwiki-checkins] CVS: phpwiki/locale/nl/templates editpage.html,1.9,1.10

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/nl/templates
In directory usw-pr-cvs1:/tmp/cvs-serv14716/phpwiki/locale/nl/templates

Modified Files:
	editpage.html 
Log Message:
minor changes to TextFormatting reference

Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/templates/editpage.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** editpage.html	2001/05/31 17:46:58	1.9
--- editpage.html	2001/12/01 14:50:06	1.10
***************
*** 40,43 ****
--- 40,44 ----
  <hr noshade>
  <small>
+ <?php echo LinkExistingWikiWord(_("TekstFormatteringsRegels")) ?><br>
  <b>Nadruk:</b> '' voor schuin, __ voor vet, ''__ voor beide.
  <br><b>Lijsten:</b> * voor punt lijsten, # voor genummerde lijsten, ''; Term : Definitie'' voor definitie lijsten.
***************
*** 47,53 ****
  <br><b>Allerlei:</b>"!", "!!", "!!!" maak koppen,
  "%%%" maak regelbreuk, "- - - -" maak horizontale lijn
- <br>meer op
- <a class="wikilink" href="###BROWSE###TekstFormatteringsRegels">
- <b><span class="wikiword">TekstFormatteringsRegels</span>.</b></a>
  </small>
  
--- 48,51 ----

[phpwiki-checkins] CVS: phpwiki/locale/it/templates editpage.html,1.2,1.3

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/it/templates
In directory usw-pr-cvs1:/tmp/cvs-serv14637/phpwiki/locale/it/templates

Modified Files:
	editpage.html 
Log Message:
minor changes to TextFormatting reference

Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/it/templates/editpage.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** editpage.html	2001/05/21 17:28:44	1.2
--- editpage.html	2001/12/01 14:49:56	1.3
***************
*** 39,42 ****
--- 39,43 ----
  <hr noshade>
  <small>
+ <?php echo LinkExistingWikiWord(_("RegoleDiFormattazioneDelTestoTextFormattingRules")) ?><br>
  <b>Enfasi:</b> '' per corsivo, __ per grassetto, ''__ per entrambi
  <br><b>Liste:</b> * per liste puntate, # per liste numerate, ''; term : definition'' per liste di definizioni
***************
*** 48,53 ****
  "%%%" va a capo, "- - - -" crea una linea orizzontale, usa "[" con "[["
  per le sequenze di escape
- <br>altre informazioni su
- <a class="wikilink" href="###BROWSE###RegoleDiFormattazioneDelTesto"><b><span class="wikiword">RegoleDiFormattazioneDelTestoTextFormattingRules</span></b></a>
  </small>
  
--- 49,52 ----

[phpwiki-checkins] CVS: phpwiki/locale/es/templates editpage.html,1.7,1.8

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/es/templates
In directory usw-pr-cvs1:/tmp/cvs-serv14611/phpwiki/locale/es/templates

Modified Files:
	editpage.html 
Log Message:
minor changes to TextFormatting reference

Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/templates/editpage.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** editpage.html	2001/04/07 17:13:28	1.7
--- editpage.html	2001/12/01 14:49:42	1.8
***************
*** 1,59 ****
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
! <html>
! <head>
! <!-- phpwiki source:
! ###RCS_IDS###
! -->
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! ###ROBOTS_META###
! <base href="###BASE_URL###">
! <title>Edit: ###SPLIT_PAGE###</title>
! <link rel="stylesheet" title="phpwiki" href="###CSS_URL###" type="text/css">
! </head>
! 
! <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
! <form class="wikiaction" method="POST" action="###BROWSE_PAGE###">
! <h1><a class="wikilink" href="###BROWSE###PáginaPrincipal"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a>
! Editar <span="wikiword">###PAGE###</span>
! <input type="submit" value=" Save "></h1>
! 
! <textarea name="content"
!           rows="###EDIT_AREA_HEIGHT###"
!           cols="###EDIT_AREA_WIDTH###"
!           wrap="virtual">###CONTENT###</textarea>
! <br>
! ###IF:MINOR_EDIT_CHECKBOX###
!   ###MINOR_EDIT_CHECKBOX### Esto es un cambio pequeño, no archiva la versión anterior.
!   <br>
! ###ENDIF:MINOR_EDIT_CHECKBOX###
! <input type="checkbox" name="convert" value="tabs" >
! No puedo escribir tabulaciones.
! Por favor <a class="wikilink" href="###BROWSE###ConvierteEspaciosEnTabs"><span class="wikiword">ConvierteEspaciosEnTabs</span></a>
! al guardar.
! <p>You can change the size of the editing area.
! See <a class="wikilink" href="###BROWSE###UserPreferences"><span class="wikiword">UserPreferences</span></a>.</p>
! <p><a class="wikilink" href="###BROWSE###BuenEstilo"><span class="wikiword">BuenEstilo</span></a> tips para editar.</p>
! 
! ###IF COPY###<br><a class="wikiaction" href="###ACTION###edit&amp;version=archive">EditarCopia</a> De un autor previo
! 
!   <hr noshade>
!   <small> <b>&Eacute;nfasis:</b> '' para it&aacute;licas, __ para bold, ''__ 
!   para ambos <br>
!   <b>Listas:</b> * para listas de balazos, # para listas numeradas, ''; term : definición'' 
!   para listas de definiciones <br>
!   <b>Referencias:</b> UnirPalabrasEnMay&uacute;sculas o usar corchetes para una 
!   [enlace hacia una p&aacute;gina] o URL [http://cool.wiki.int/]. <br>
!   <b>Anotaciones:</b> Use [1],[2],[3],...<br>
!   <b>Preveción enlazar:</b> Evite hacer enlaces 
!   con "!": !NoHiperEnlaces. Enlaces con nombres como [[text | URL] (doble "[")<br>
!   <b>Varios:</b>"!", "!!", "!!!" para hacer t&iacute;tulos,
!   "%%%" hace un salto de l&iacute;nea, "- - - -" Hace una linea horizontal<br>
!   M&aacute;s en <a href="###BROWSE###ReglasDeFormatoDeTexto"><b>ReglasDeFormatoDeTexto</b></a> 
!   </small> 
! 
! <input type="hidden" name="action" value="save">
! <input type="hidden" name="pagename" value="###PAGE###">
! <input type="hidden" name="editversion" value="###VERSION###">
! </form>
! </body>
! </html>
--- 1,116 ----
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
! 
! <html>
! 
! <head>
! 
! <!-- phpwiki source:
! 
! ###RCS_IDS###
! 
! -->
! 
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! 
! ###ROBOTS_META###
! 
! <base href="###BASE_URL###">
! 
! <title>Edit: ###SPLIT_PAGE###</title>
! 
! <link rel="stylesheet" title="phpwiki" href="###CSS_URL###" type="text/css">
! 
! </head>
! 
! 
! 
! <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
! 
! <form class="wikiaction" method="POST" action="###BROWSE_PAGE###">
! 
! <h1><a class="wikilink" href="###BROWSE###PáginaPrincipal"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a>
! 
! Editar <span="wikiword">###PAGE###</span>
! 
! <input type="submit" value=" Save "></h1>
! 
! 
! 
! <textarea name="content"
! 
!           rows="###EDIT_AREA_HEIGHT###"
! 
!           cols="###EDIT_AREA_WIDTH###"
! 
!           wrap="virtual">###CONTENT###</textarea>
! 
! <br>
! 
! ###IF:MINOR_EDIT_CHECKBOX###
! 
!   ###MINOR_EDIT_CHECKBOX### Esto es un cambio pequeño, no archiva la versión anterior.
! 
!   <br>
! 
! ###ENDIF:MINOR_EDIT_CHECKBOX###
! 
! <input type="checkbox" name="convert" value="tabs" >
! 
! No puedo escribir tabulaciones.
! 
! Por favor <a class="wikilink" href="###BROWSE###ConvierteEspaciosEnTabs"><span class="wikiword">ConvierteEspaciosEnTabs</span></a>
! 
! al guardar.
! 
! <p>You can change the size of the editing area.
! 
! See <a class="wikilink" href="###BROWSE###UserPreferences"><span class="wikiword">UserPreferences</span></a>.</p>
! 
! <p><a class="wikilink" href="###BROWSE###BuenEstilo"><span class="wikiword">BuenEstilo</span></a> tips para editar.</p>
! 
! 
! 
! ###IF COPY###<br><a class="wikiaction" href="###ACTION###edit&amp;version=archive">EditarCopia</a> De un autor previo
! 
! 
! 
!   <hr noshade>
! 
!   <small><?php echo LinkExistingWikiWord(_("ReglasDeFormatoDeTexto")) ?></br> <b>&Eacute;nfasis:</b> '' para it&aacute;licas, __ para bold, ''__ 
! 
!   para ambos <br>
! 
!   <b>Listas:</b> * para listas de balazos, # para listas numeradas, ''; term : definición'' 
! 
!   para listas de definiciones <br>
! 
!   <b>Referencias:</b> UnirPalabrasEnMay&uacute;sculas o usar corchetes para una 
! 
!   [enlace hacia una p&aacute;gina] o URL [http://cool.wiki.int/]. <br>
! 
!   <b>Anotaciones:</b> Use [1],[2],[3],...<br>
! 
!   <b>Preveción enlazar:</b> Evite hacer enlaces 
! 
!   con "!": !NoHiperEnlaces. Enlaces con nombres como [[text | URL] (doble "[")<br>
! 
!   <b>Varios:</b>"!", "!!", "!!!" para hacer t&iacute;tulos,
! 
!   "%%%" hace un salto de l&iacute;nea, "- - - -" Hace una linea horizontal 
! 
!   </small> 
! 
! 
! 
! <input type="hidden" name="action" value="save">
! 
! <input type="hidden" name="pagename" value="###PAGE###">
! 
! <input type="hidden" name="editversion" value="###VERSION###">
! 
! </form>
! 
! </body>
! 
! </html>
! 

[phpwiki-checkins] CVS: phpwiki/locale/po sv.po,1.7,1.8

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/po
In directory usw-pr-cvs1:/tmp/cvs-serv31551/phpwiki/locale/po

Modified Files:
	sv.po 
Log Message:
Moved hyperlink in delete-page confirmation to clarify.

Index: sv.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/sv.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** sv.po	2001/11/29 03:09:29	1.7
--- sv.po	2001/12/01 13:07:43	1.8
***************
*** 182,187 ****
  #: ../lib/removepage.php:8
  #, fuzzy, c-format
! msgid "Click <a href=\"%s\">here</a> to remove the page now."
! msgstr "Klicka %shär%s för att ta bort sidan nu."
  
  #: ../lib/removepage.php:12
--- 182,187 ----
  #: ../lib/removepage.php:8
  #, fuzzy, c-format
! msgid "Click here to <a href=\"%s\">remove the page now</a>."
! msgstr "Klicka shär för <a href=\"%s\">att ta bort sidan nu</a>."
  
  #: ../lib/removepage.php:12

[phpwiki-checkins] CVS: phpwiki/locale/po phpwiki.pot,1.13,1.14

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/po
In directory usw-pr-cvs1:/tmp/cvs-serv31522/phpwiki/locale/po

Modified Files:
	phpwiki.pot 
Log Message:
Moved hyperlink in delete-page confirmation to clarify.

Index: phpwiki.pot
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/phpwiki.pot,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** phpwiki.pot	2001/11/29 03:09:29	1.13
--- phpwiki.pot	2001/12/01 13:07:37	1.14
***************
*** 178,182 ****
  #: ../lib/removepage.php:8
  #, c-format
! msgid "Click <a href=\"%s\">here</a> to remove the page now."
  msgstr ""
  
--- 178,182 ----
  #: ../lib/removepage.php:8
  #, c-format
! msgid "Click here to <a href=\"%s\">remove the page now</a>."
  msgstr ""
  

[phpwiki-checkins] CVS: phpwiki/locale/po nl.po,1.14,1.15

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/po
In directory usw-pr-cvs1:/tmp/cvs-serv31485/phpwiki/locale/po

Modified Files:
	nl.po 
Log Message:
Moved hyperlink in delete-page confirmation to clarify.

Index: nl.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/nl.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** nl.po	2001/11/29 03:09:29	1.14
--- nl.po	2001/12/01 13:07:24	1.15
***************
*** 189,194 ****
  #: ../lib/removepage.php:8
  #, c-format
! msgid "Click <a href=\"%s\">here</a> to remove the page now."
! msgstr "Klik <a href=\"%s\">hier</a> om de pagina nu te verwijderen."
  
  #: ../lib/removepage.php:12
--- 189,194 ----
  #: ../lib/removepage.php:8
  #, c-format
! msgid "Click here to <a href=\"%s\">remove the page now</a>."
! msgstr "Klik hier om <a href=\"%s\">de pagina nu te verwijderen</a>."
  
  #: ../lib/removepage.php:12

[phpwiki-checkins] CVS: phpwiki/locale/po it.po,1.4,1.5

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/po
In directory usw-pr-cvs1:/tmp/cvs-serv31451/phpwiki/locale/po

Modified Files:
	it.po 
Log Message:
Moved hyperlink in delete-page confirmation to clarify.

Index: it.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/it.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** it.po	2001/11/29 03:09:29	1.4
--- it.po	2001/12/01 13:07:09	1.5
***************
*** 184,189 ****
  #: ../lib/removepage.php:8
  #, fuzzy, c-format
! msgid "Click <a href=\"%s\">here</a> to remove the page now."
! msgstr "Per rimuovere la pagina clicca %squa%s"
  
  #: ../lib/removepage.php:12
--- 184,189 ----
  #: ../lib/removepage.php:8
  #, fuzzy, c-format
! msgid "Click here to <a href=\"%s\">remove the page now</a>."
! msgstr "Per <a href=\"%s\">rimuovere la pagina</a> clicca qua."
  
  #: ../lib/removepage.php:12

[phpwiki-checkins] CVS: phpwiki/locale/po es.po,1.11,1.12

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/po
In directory usw-pr-cvs1:/tmp/cvs-serv31391/phpwiki/locale/po

Modified Files:
	es.po 
Log Message:
Moved hyperlink in delete-page confirmation to clarify.

Index: es.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/es.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** es.po	2001/11/29 03:01:43	1.11
--- es.po	2001/12/01 13:06:55	1.12
***************
*** 1,12 ****
! # es.po -- PhpWiki's spanish language file
! # Copyright (C) 2000 Sandino Araico Sánchez <sa...@sa...>.
! # Sandino Araico Sánchez <sa...@sa...>, 2000.
! #
! # ultima modificación por Pablo Roca (pr...@cl...)
! #
! # Don't change the format of the first three lines,
! # the TP robot wants them like this (I hope).
! #
! #
  #, fuzzy
  msgid ""
--- 1,12 ----
! # es.po -- PhpWiki's spanish language file
! # Copyright (C) 2000 Sandino Araico Sánchez <sa...@sa...>.
! # Sandino Araico Sánchez <sa...@sa...>, 2000.
! #
! # ultima modificación por Pablo Roca (pr...@cl...)
! #
! # Don't change the format of the first three lines,
! # the TP robot wants them like this (I hope).
! #
! #
  #, fuzzy
  msgid ""
***************
*** 187,192 ****
  #: ../lib/removepage.php:8
  #, fuzzy, c-format
! msgid "Click <a href=\"%s\">here</a> to remove the page now."
! msgstr "Haga Click <a href=\"%s\">aquí</a> para borrar la página ahora"
  
  #: ../lib/removepage.php:12
--- 187,192 ----
  #: ../lib/removepage.php:8
  #, fuzzy, c-format
! msgid "Click here to <a href=\"%s\">remove the page now</a>."
! msgstr "Haga Click aqui para <a href=\"%s\">borrar la página ahora</a>."
  
  #: ../lib/removepage.php:12
***************
*** 615,701 ****
  msgstr "ReglasDeFormatoDeTexto"
  
! # lib/diff.php:997
  #~ msgid "Current page:"
  #~ msgstr "Página actual:"
  
! # lib/diff.php:1015
  #~ msgid "Archived page:"
  #~ msgstr "Página archivada:"
  
! # lib/editpage.php:19
  #~ msgid "Copy of %s"
  #~ msgstr "Copia de %s"
  
! # lib/fullsearch.php:15
  #~ msgid "Searching for \"%s\" ....."
  #~ msgstr "Buscando \"%s\" ..."
  
! # lib/fullsearch.php:45
  #~ msgid "%d matches found in %d pages."
  #~ msgstr "%d veces encontrado en %d páginas."
  
! # lib/fullsearch.php:48
  #~ msgid "Full Text Search Results"
  #~ msgstr "Resultados de la búsqueda en el texto completo"
  
! # lib/stdlib.php:384 lib/stdlib.php:445
  #~ msgid "RecentChanges"
  #~ msgstr "CambiosRecientes"
  
! # lib/msql.php:29 lib/mysql.php:36
  #~ msgid "Cannot establish connection to database, giving up."
  #~ msgstr ""
  #~ "No se puede establecer conexión con la base de datos, me doy por vencido."
  
! # lib/msql.php:31 lib/msql.php:37
  #~ msgid "Error message: %s"
  #~ msgstr "Mensaje de error: %s"
  
! # lib/msql.php:35 lib/mysql.php:42
  #~ msgid "Cannot open database %s, giving up."
  #~ msgstr "No se puede abrir la base de datos %s , me doy por vencido."
  
! # lib/msql.php:210 lib/msql.php:286
  #~ msgid "Insert/update failed: %s"
  #~ msgstr "Inserción/Actualización falló: %s"
  
! # lib/msql.php:221 lib/msql.php:296
  #~ msgid "Delete on %s failed: %s"
  #~ msgstr "Eliminación en %s falló: %s"
  
! # lib/msql.php:237 lib/msql.php:312
  #~ msgid "Insert into %s failed: %s"
  #~ msgstr "Inserción en %s falló: %s"
  
! # lib/mysql.php:38 lib/mysql.php:44 lib/mysql.php:118 lib/mysql.php:158
  #~ msgid "MySQL error: %s"
  #~ msgstr "Error de MySQL: %s"
  
! # lib/mysql.php:116
  #~ msgid "Error writing page '%s'"
  #~ msgstr "Error al escribir la página `%s'"
  
! # lib/mysql.php:156
  #~ msgid "Cannot delete '%s' from table '%s'"
  #~ msgstr "No se puede borrar '%s' de la tabla '%s'"
  
! # lib/pageinfo.php:36
  #~ msgid "Page name '%s' is not in the database"
  #~ msgstr "El nombre de la página `%s' no está en la base de datos"
  
! # lib/pageinfo.php:21
  #, fuzzy
  #~ msgid "Show the page source"
  #~ msgstr "Mostrar el código fuente de la página y referencias"
  
! # lib/pageinfo.php:70
  #~ msgid "Archived version"
  #~ msgstr "Versión archivada:"
  
! # lib/pageinfo.php:26 lib/pageinfo.php:75
  #~ msgid "PageInfo"
  #~ msgstr "InformacionDeLaPagina"
  
! # lib/fullsearch.php:48
  #, fuzzy
  #~ msgid "Title Search Results"
--- 615,701 ----
  msgstr "ReglasDeFormatoDeTexto"
  
! # lib/diff.php:997
  #~ msgid "Current page:"
  #~ msgstr "Página actual:"
  
! # lib/diff.php:1015
  #~ msgid "Archived page:"
  #~ msgstr "Página archivada:"
  
! # lib/editpage.php:19
  #~ msgid "Copy of %s"
  #~ msgstr "Copia de %s"
  
! # lib/fullsearch.php:15
  #~ msgid "Searching for \"%s\" ....."
  #~ msgstr "Buscando \"%s\" ..."
  
! # lib/fullsearch.php:45
  #~ msgid "%d matches found in %d pages."
  #~ msgstr "%d veces encontrado en %d páginas."
  
! # lib/fullsearch.php:48
  #~ msgid "Full Text Search Results"
  #~ msgstr "Resultados de la búsqueda en el texto completo"
  
! # lib/stdlib.php:384 lib/stdlib.php:445
  #~ msgid "RecentChanges"
  #~ msgstr "CambiosRecientes"
  
! # lib/msql.php:29 lib/mysql.php:36
  #~ msgid "Cannot establish connection to database, giving up."
  #~ msgstr ""
  #~ "No se puede establecer conexión con la base de datos, me doy por vencido."
  
! # lib/msql.php:31 lib/msql.php:37
  #~ msgid "Error message: %s"
  #~ msgstr "Mensaje de error: %s"
  
! # lib/msql.php:35 lib/mysql.php:42
  #~ msgid "Cannot open database %s, giving up."
  #~ msgstr "No se puede abrir la base de datos %s , me doy por vencido."
  
! # lib/msql.php:210 lib/msql.php:286
  #~ msgid "Insert/update failed: %s"
  #~ msgstr "Inserción/Actualización falló: %s"
  
! # lib/msql.php:221 lib/msql.php:296
  #~ msgid "Delete on %s failed: %s"
  #~ msgstr "Eliminación en %s falló: %s"
  
! # lib/msql.php:237 lib/msql.php:312
  #~ msgid "Insert into %s failed: %s"
  #~ msgstr "Inserción en %s falló: %s"
  
! # lib/mysql.php:38 lib/mysql.php:44 lib/mysql.php:118 lib/mysql.php:158
  #~ msgid "MySQL error: %s"
  #~ msgstr "Error de MySQL: %s"
  
! # lib/mysql.php:116
  #~ msgid "Error writing page '%s'"
  #~ msgstr "Error al escribir la página `%s'"
  
! # lib/mysql.php:156
  #~ msgid "Cannot delete '%s' from table '%s'"
  #~ msgstr "No se puede borrar '%s' de la tabla '%s'"
  
! # lib/pageinfo.php:36
  #~ msgid "Page name '%s' is not in the database"
  #~ msgstr "El nombre de la página `%s' no está en la base de datos"
  
! # lib/pageinfo.php:21
  #, fuzzy
  #~ msgid "Show the page source"
  #~ msgstr "Mostrar el código fuente de la página y referencias"
  
! # lib/pageinfo.php:70
  #~ msgid "Archived version"
  #~ msgstr "Versión archivada:"
  
! # lib/pageinfo.php:26 lib/pageinfo.php:75
  #~ msgid "PageInfo"
  #~ msgstr "InformacionDeLaPagina"
  
! # lib/fullsearch.php:48
  #, fuzzy
  #~ msgid "Title Search Results"
***************
*** 708,752 ****
  #~ msgstr "(primer dia de este Wiki)"
  
! # lib/stdlib.php:207 lib/stdlib.php:215
  #~ msgid "Search"
  #~ msgstr "Buscar"
  
! # admin.php:55
  #~ msgid "Function not yet implemented."
  #~ msgstr "Función todaví no implementada"
  
! # lib/config.php:162
  #~ msgid "templates/browse.html"
  #~ msgstr "locale/es/templates/browse.html"
  
! # lib/config.php:163
  #~ msgid "templates/editpage.html"
  #~ msgstr "locale/es/templates/editpage.html"
  
! # lib/config.php:164
  #~ msgid "templates/editlinks.html"
  #~ msgstr "locale/es/templates/editlinks.html"
  
! # lib/config.php:165
  #~ msgid "templates/message.html"
  #~ msgstr "locale/es/templates/message.html"
  
! # lib/config.php:181
  #~ msgid "./pgsrc"
  #~ msgstr "locale/es/pgsrc"
  
! # lib/editpage.php:23
  #~ msgid "No page name passed into editpage!"
  #~ msgstr "No se há pasado nombre de página a editarpagina"
  
! # lib/pageinfo.php:9
  #~ msgid "Enter a page name"
  #~ msgstr "Escriba un nombre de página"
  
! # lib/pageinfo.php:10 lib/stdlib.php:239
  #~ msgid "Go"
  #~ msgstr "Aceptar"
  
! # lib/setupwiki.php:21
  #~ msgid "Inserting page %s, version %s from %s"
  #~ msgstr "Insertando página %s, versión %s de %s"
--- 708,752 ----
  #~ msgstr "(primer dia de este Wiki)"
  
! # lib/stdlib.php:207 lib/stdlib.php:215
  #~ msgid "Search"
  #~ msgstr "Buscar"
  
! # admin.php:55
  #~ msgid "Function not yet implemented."
  #~ msgstr "Función todaví no implementada"
  
! # lib/config.php:162
  #~ msgid "templates/browse.html"
  #~ msgstr "locale/es/templates/browse.html"
  
! # lib/config.php:163
  #~ msgid "templates/editpage.html"
  #~ msgstr "locale/es/templates/editpage.html"
  
! # lib/config.php:164
  #~ msgid "templates/editlinks.html"
  #~ msgstr "locale/es/templates/editlinks.html"
  
! # lib/config.php:165
  #~ msgid "templates/message.html"
  #~ msgstr "locale/es/templates/message.html"
  
! # lib/config.php:181
  #~ msgid "./pgsrc"
  #~ msgstr "locale/es/pgsrc"
  
! # lib/editpage.php:23
  #~ msgid "No page name passed into editpage!"
  #~ msgstr "No se há pasado nombre de página a editarpagina"
  
! # lib/pageinfo.php:9
  #~ msgid "Enter a page name"
  #~ msgstr "Escriba un nombre de página"
  
! # lib/pageinfo.php:10 lib/stdlib.php:239
  #~ msgid "Go"
  #~ msgstr "Aceptar"
  
! # lib/setupwiki.php:21
  #~ msgid "Inserting page %s, version %s from %s"
  #~ msgstr "Insertando página %s, versión %s de %s"

[phpwiki-checkins] CVS: phpwiki/locale/po de.po,1.12,1.13

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/po
In directory usw-pr-cvs1:/tmp/cvs-serv31332/phpwiki/locale/po

Modified Files:
	de.po 
Log Message:
Moved hyperlink in delete-page confirmation to clarify.

Index: de.po
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/po/de.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** de.po	2001/11/29 03:01:44	1.12
--- de.po	2001/12/01 13:06:41	1.13
***************
*** 180,185 ****
  #: ../lib/removepage.php:8
  #, fuzzy, c-format
! msgid "Click <a href=\"%s\">here</a> to remove the page now."
! msgstr "Klicke <a href=\"%s\">hier</a> um die Seite jetzt zu löschen."
  
  #: ../lib/removepage.php:12
--- 180,185 ----
  #: ../lib/removepage.php:8
  #, fuzzy, c-format
! msgid "Click here to <a href=\"%s\">remove the page now</a>."
! msgstr "Klicke hier um <a href=\"%s\">die Seite jetzt zu löschen</a>."
  
  #: ../lib/removepage.php:12

[phpwiki-checkins] CVS: phpwiki/locale/nl/LC_MESSAGES phpwiki.php,1.13,1.14

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES
In directory usw-pr-cvs1:/tmp/cvs-serv31278/phpwiki/locale/nl/LC_MESSAGES

Modified Files:
	phpwiki.php 
Log Message:
Moved hyperlink in delete-page confirmation to clarify.

Index: phpwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/LC_MESSAGES/phpwiki.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** phpwiki.php	2001/11/29 03:09:29	1.13
--- phpwiki.php	2001/12/01 13:06:27	1.14
***************
*** 13,18 ****
  $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["Click <a href=\"%s\">here</a> to remove the page now."] =
!    "Klik <a href=\"%s\">hier</a> om de pagina nu te verwijderen.";
  $locale["Complete."] =
     "Klaar.";
--- 13,18 ----
  $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["Click here to <a href=\"%s\">remove the page now</a>."] =
!    "Klik hier om <a href=\"%s\">de pagina nu te verwijderen</a>.";
  $locale["Complete."] =
     "Klaar.";

[phpwiki-checkins] CVS: phpwiki/lib removepage.php,1.1,1.2

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv31198/phpwiki/lib

Modified Files:
	removepage.php 
Log Message:
Moved hyperlink in delete-page confirmation to clarify.

Index: removepage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/removepage.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** removepage.php	2001/11/08 16:02:40	1.1
--- removepage.php	2001/12/01 13:06:13	1.2
***************
*** 6,14 ****
                      htmlspecialchars($pagename));
      $html .= "\n<P>";
!     $html .= sprintf(gettext ("Click <a href=\"%s\">here</a> to remove the page now."),
                       htmlspecialchars(WikiURL($pagename, array('action' => 'remove',
                                                                 'verify' => 'okay'))));
      $html .= "\n<P>";
!     $html .= gettext ("Otherwise press the \"Back\" button of your browser.");
  }
  else {
--- 6,14 ----
                      htmlspecialchars($pagename));
      $html .= "\n<P>";
!     $html .= sprintf(gettext ("Click here to <a href=\"%s\">remove the page now</a>."),
                       htmlspecialchars(WikiURL($pagename, array('action' => 'remove',
                                                                 'verify' => 'okay'))));
      $html .= "\n<P>";
!     $html .= gettext ("To cancel press the \"Back\" button of your browser.");
  }
  else {

[phpwiki-checkins] CVS: phpwiki/templates editpage.html,1.23,1.24

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv30131/phpwiki/templates

Modified Files:
	editpage.html 
Log Message:
minor rewording of TextFormatting reference

Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** editpage.html	2001/11/29 02:59:21	1.23
--- editpage.html	2001/12/01 13:01:45	1.24
***************
*** 76,85 ****
  </tr></table>
  <p style="clear: both; padding: 2ex 0ex 0ex;">
!   $_("You can change the size of the editing area.")
!   $_("See") <?php echo LinkExistingWikiWord(_("UserPreferences")); ?>.
!   $_("Also see") <?php echo LinkExistingWikiWord(_("GoodStyle")) ?> $_("tips for editing.")
  </p>
  <hr noshade="noshade" />
  <small>
  <b>$_("Emphasis:")</b>
    '' $_("for italics"),
--- 76,86 ----
  </tr></table>
  <p style="clear: both; padding: 2ex 0ex 0ex;">
!   $_("You can change the size of the editing area in")
!   <?php echo LinkExistingWikiWord(_("UserPreferences")); ?>.
!   $_("See") <?php echo LinkExistingWikiWord(_("GoodStyle")) ?> $_("tips for editing.")
  </p>
  <hr noshade="noshade" />
  <small>
+ <?php echo LinkExistingWikiWord(_("TextFormattingRules")) ?><br>
  <b>$_("Emphasis:")</b>
    '' $_("for italics"),
***************
*** 95,99 ****
     $_("Use [1],[2],[3],...")
  <br /><b>$_("Preventing linking:")</b>
!    $_("Avoid linking with '!': !DoNotHyperlink,")
     $_("name links like [[text | URL] (double up on the '[')")
  <br /><b>$_("Misc:")</b>
--- 96,100 ----
     $_("Use [1],[2],[3],...")
  <br /><b>$_("Preventing linking:")</b>
!    $_("Prefix with '!': !DoNotHyperlink,")
     $_("name links like [[text | URL] (double up on the '[')")
  <br /><b>$_("Misc:")</b>
***************
*** 101,106 ****
     "%%%" $_("makes a linebreak"),
     "- - - -" $_("makes a horizontal rule")
- <br />
- $_("more on") <?php echo LinkExistingWikiWord(_("TextFormattingRules")) ?>
  </small>
  
--- 102,105 ----

[phpwiki-checkins] CVS: phpwiki/lib/plugin text2png.php,NONE,1.1

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory usw-pr-cvs1:/tmp/cvs-serv5400/phpwiki/lib/plugin

Added Files:
	text2png.php 
Log Message:
New text2png WikiPlugin. Doesn't accept any arguments yet, just dumps a png image file in the same dir as index.php. Requires PHP to be compiled with support for GD version 1.6 or later.
<?plugin text2png ?>

--- NEW FILE ---
<?php // -*-php-*-

class WikiPlugin_text2png
extends WikiPlugin
{
    var $name = 'text2png';
    function getDefaultArguments() {
        return array('text'    => 'Hello WikiWorld!');
    }
   function run($args) {
        //FIXME: are quotes needed for the argument string text= or no?
        //FIXME: the next two lines aren't the correct way to extract a text argument for a WikiPlugin
        $args = &$this->args;
        $t = $args['text'];
        return $this->text2png($t);
        
//        return sprintf("<tt>%s %s</tt>", $salutation, $name);
    }

    function text2png($text) {
        //FIXME: once this accepts a text argument the next line should be removed
        $text="Hello WikiWorld!";
        
        $text or die ("?text string required");
        $im = @ImageCreate(150, 75) or die ("Cannot Initialize new GD image stream. PHP must be compiled with support for GD 1.6 or later to create png files.");

        $bg_color   = ImageColorAllocate($im, 255, 255, 255);
        $text_color = ImageColorAllocate($im, 50, 50, 200);
        $ttfont     = "/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts/LucidaSansRegular.ttf";

        ImageTTFText($im, 10, 0, 10, 30, $text_color, $ttfont, $text);
        ImageString($im, 2, 10, 40, $text, $text_color);

        // dump directly to browser:
        //        header("Content-type: image/png");
        //        ImagePng($im);

        // save to file:
        $filename = $text . ".png";
        $success = ImagePng($im, "../" . $filename);

        //FIXME: the link generated doesn't work. The image file is dumped in the same directory as index.php
        if($success = 1) {
            $s = "<p>png image saved as <a href=\"/$filename\">$filename</a>.</p>";
         } else {
            $s = "<p>Error creating png file.</p>";
        }  
        return $s;
    }
};

// For emacs users
// Local Variables:
// mode: php
// tab-width: 8
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
?>

[phpwiki-checkins] CVS: phpwiki/lib WikiUser.php,1.2,1.3 Request.php,1.3,1.4

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv31371/lib

Modified Files:
	WikiUser.php Request.php 
Log Message:
Fix bugs in access logging code.


Index: WikiUser.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUser.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** WikiUser.php	2001/11/26 22:37:29	1.2
--- WikiUser.php	2001/11/29 18:03:59	1.3
***************
*** 171,178 ****
        
          $this->_save();
          header('WWW-Authenticate: Basic realm="' . $this->realm . '"');
!         header("HTTP/1.0 401 Unauthorized");
!         if (ACCESS_LOG)
!             $LogEntry->status = 401;
          echo "<p>" . gettext ("You entered an invalid login or password.") . "\n";
          if (ALLOW_BOGO_LOGIN) {
--- 171,177 ----
        
          $this->_save();
+         $request = &$this->_request;
          header('WWW-Authenticate: Basic realm="' . $this->realm . '"');
!         $request->setStatus("HTTP/1.0 401 Unauthorized");
          echo "<p>" . gettext ("You entered an invalid login or password.") . "\n";
          if (ALLOW_BOGO_LOGIN) {

Index: Request.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Request.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Request.php	2001/11/17 16:39:08	1.3
--- Request.php	2001/11/29 18:03:59	1.4
***************
*** 6,10 ****
          
      function Request() {
- 
          $this->_fix_magic_quotes_gpc();
          $this->_fix_multipart_form_data();
--- 6,9 ----
***************
*** 26,30 ****
          $this->cookies = new Request_CookieVars;
  
!         $this->_log_entry = new Request_AccessLogEntry($this);
          
          $TheRequest = $this;
--- 25,30 ----
          $this->cookies = new Request_CookieVars;
  
!         if (ACCESS_LOG)
!             $this->_log_entry = & new Request_AccessLogEntry($this, ACCESS_LOG);
          
          $TheRequest = $this;
***************
*** 62,66 ****
      function redirect($url) {
          header("Location: $url");
!         $this->_log_entry->setStatus(302);
      }
  
--- 62,87 ----
      function redirect($url) {
          header("Location: $url");
!         if (isset($this->_log_entry))
!             $this->_log_entry->setStatus(302);
!     }
! 
!     function setStatus($status) {
!         if (preg_match('|^HTTP/.*?\s(\d+)|i', $status, $m)) {
!             header($status);
!             $status = $m[1];
!         }
!         else {
!             $status = (integer) $status;
!             $reasons = array('200' => 'OK',
!                              '302' => 'Found',
!                              '400' => 'Bad Request',
!                              '401' => 'Unauthorized',
!                              '403' => 'Forbidden',
!                              '404' => 'Not Found');
!             header(sprintf("HTTP/1.0 %d %s", $status, $reason[$status]));
!         }
! 
!         if (isset($this->_log_entry))
!             $this->_log_entry->setStatus($status);
      }
  
***************
*** 271,334 ****
  }
  
  class Request_AccessLogEntry
  {
!    function AccessLogEntry ($request) {
!       $this->host = $req->get('REMOTE_HOST');
!       $this->ident = $req->get('REMOTE_IDENT');
!       if (!$this->ident)
!           $this->ident = '-';
!       $this->user = '-';
!       $this->time = time();
!       $this->request = join(' ', array($req->get('REQUEST_METHOD'),
!                                        $req->get('REQUEST_URI'),
!                                        $req->get('SERVER_PROTOCOL')));
!       $this->status = 200;
!       $this->size = 0;
!       $this->referer = (string) $req->get('HTTP_REFERER');
!       $this->user_agent = (string) $req->get('HTTP_USER_AGENT');
!    }
! 
!    //
!    // Returns zone offset, like "-0800" for PST.
!    //
!    function _zone_offset () {
!       $offset = date("Z", $this->time);
!       if ($offset < 0)
!       {
! 	 $negoffset = "-";
! 	 $offset = -$offset;
!       }
!       $offhours = floor($offset / 3600);
!       $offmins = $offset / 60 - $offhours * 60;
!       return sprintf("%s%02d%02d", $negoffset, $offhours, $offmins);
!    }
!   
!    // Format time into NCSA format.
!    function _ncsa_time($time = false) {
!       if (!$time)
! 	 $time = time();
! 
!       return date("d/M/Y:H:i:s", $time) .
! 	 " " . $this->_zone_offset();
!    }
! 
!    function write($logfile) {
!       $entry = sprintf('%s %s %s [%s] "%s" %d %d "%s" "%s"',
! 		       $this->host, $this->ident, $this->user,
! 		       $this->_ncsa_time($this->time),
! 		       $this->request, $this->status, $this->size,
! 		       $this->referer, $this->user_agent);
!       
!       //Error log doesn't provide locking.
!       //error_log("$entry\n", 3, $logfile);
! 
!       // Alternate method 
!       if (($fp = fopen($logfile, "a")))
!       {
! 	 flock($fp, LOCK_EX);
! 	 fputs($fp, "$entry\n");
! 	 fclose($fp);
!       }
!    }
  }
  
--- 292,437 ----
  }
  
+ /**
+  * Create NCSA "combined" log entry for current request.
+  */
  class Request_AccessLogEntry
+ {
+     /**
+      * Constructor.
+      *
+      * The log entry will be automatically appended to the log file
+      * when the current request terminates.
+      *
+      * If you want to modify a Request_AccessLogEntry before it gets
+      * written (e.g. via the setStatus and setSize methods) you should
+      * use an '&' on the constructor, so that you're working with the
+      * original (rather than a copy) object.
+      *
+      * <pre>
+      *    $log_entry = & new Request_AccessLogEntry($req, "/tmp/wiki_access_log");
+      *    $log_entry->setStatus(401);
+      * </pre>
+      *
+      *
+      * @param $request object  Request object for current request.
+      * @param $logfile string  Log file name.
+      */
+     function Request_AccessLogEntry ($request, $logfile) {
+         $this->logfile = $logfile;
+         
+         $this->host = $request->get('REMOTE_HOST');
+         $this->ident = $request->get('REMOTE_IDENT');
+         if (!$this->ident)
+             $this->ident = '-';
+         $this->user = '-';        // FIXME: get logged-in user name
+         $this->time = time();
+         $this->request = join(' ', array($request->get('REQUEST_METHOD'),
+                                        $request->get('REQUEST_URI'),
+                                        $request->get('SERVER_PROTOCOL')));
+         $this->status = 200;
+         $this->size = 0;
+         $this->referer = (string) $request->get('HTTP_REFERER');
+         $this->user_agent = (string) $request->get('HTTP_USER_AGENT');
+ 
+         global $Request_AccessLogEntry_entries;
+         if (!isset($Request_AccessLogEntry_entries)) {
+             register_shutdown_function("Request_AccessLogEntry_shutdown_function");
+         }
+         $Request_AccessLogEntry_entries[] = &$this;
+     }
+ 
+     /**
+      * Set result status code.
+      *
+      * @param $status integer  HTTP status code.
+      */
+     function setStatus ($status) {
+         trigger_error("setStatus: $status", E_USER_WARNING);
+         
+         $this->status = $status;
+     }
+     
+     /**
+      * Set response size.
+      *
+      * @param $size integer
+      */
+     function setSize ($size) {
+         $this->size = $size;
+     }
+     
+     /**
+      * Get time zone offset.
+      *
+      * This is a static member function.
+      *
+      * @param $time integer Unix timestamp (defaults to current time).
+      * @return string Zone offset, e.g. "-0800" for PST.
+      */
+     function _zone_offset ($time = false) {
+         if (!$time)
+             $time = time();
+         $offset = date("Z", $time);
+         if ($offset < 0) {
+             $negoffset = "-";
+             $offset = -$offset;
+         }
+         $offhours = floor($offset / 3600);
+         $offmins = $offset / 60 - $offhours * 60;
+         return sprintf("%s%02d%02d", $negoffset, $offhours, $offmins);
+     }
+ 
+     /**
+      * Format time in NCSA format.
+      *
+      * This is a static member function.
+      *
+      * @param $time integer Unix timestamp (defaults to current time).
+      * @return string Formatted date & time.
+      */
+     function _ncsa_time($time = false) {
+         if (!$time)
+             $time = time();
+ 
+         return date("d/M/Y:H:i:s", $time) .
+             " " . $this->_zone_offset();
+     }
+ 
+     /**
+      * Write entry to log file.
+      */
+     function write() {
+         $entry = sprintf('%s %s %s [%s] "%s" %d %d "%s" "%s"',
+                          $this->host, $this->ident, $this->user,
+                          $this->_ncsa_time($this->time),
+                          $this->request, $this->status, $this->size,
+                          $this->referer, $this->user_agent);
+ 
+         //Error log doesn't provide locking.
+         //error_log("$entry\n", 3, $this->logfile);
+ 
+         // Alternate method 
+         if (($fp = fopen($this->logfile, "a"))) {
+             flock($fp, LOCK_EX);
+             fputs($fp, "$entry\n");
+             fclose($fp);
+         }
+     }
+ }
+ 
+ /**
+  * Shutdown callback.
+  *
+  * @access private
+  * @see Request_AccessLogEntry
+  */
+ function Request_AccessLogEntry_shutdown_function ()
  {
!     global $Request_AccessLogEntry_entries;
!     
!     foreach ($Request_AccessLogEntry_entries as $entry) {
!         $entry->write();
!     }
!     unset($Request_AccessLogEntry_entries);
  }