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

[phpwiki-checkins] CVS: phpwiki/locale/de/pgsrc EditiereText,NONE,1.1 FrischeSeiten,NONE,1.1 GaesteBuch,NONE,1.1 GuterStil,NONE,1.1 KonvertiereLeerzeichenZuTabs,NONE,1.1 MeistBesucht,NONE,1.1 PhpWiki,NONE,1.1 SandKiste,NONE,1.1 SeiteFinden,NONE,1.1 SeitenErzeugen,NONE,1.1 StartSeite,NONE,1.1 TextFormatierungsRegeln,NONE,1.1 WabiSabi,NONE,1.1 WieManWikiBenutzt,NONE,1.1 WikiTechnik,NONE,1.1 WikiWikiWeb,NONE,1.1

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/de/pgsrc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19863/de/pgsrc

Added Files:
	EditiereText FrischeSeiten GaesteBuch GuterStil 
	KonvertiereLeerzeichenZuTabs MeistBesucht PhpWiki SandKiste 
	SeiteFinden SeitenErzeugen StartSeite TextFormatierungsRegeln 
	WabiSabi WieManWikiBenutzt WikiTechnik WikiWikiWeb 
Log Message:
Spanish pages by Sandino Araico Sánchez <sa...@sa...>
Initial set of German pages by me (Arno)


--- NEW FILE ---
All pages (except search results) have an EditText link at the bottom. You can edit the page you are reading by clicking that link.

--- NEW FILE ---
The most recently changed pages are listed below.

____Day one (first day for this Wiki)
* [SeitenErzeugen]
* [KonvertiereLeerzeichenZuTabs]
* [EditText]
* [SeiteFinden]
* [StartSeite]
* [GuterStil]
* [WieManWikiBenutzt]
* [WikiTechnik]
* [MeistBesucht]
* [PhpWiki]
* [FrischeSeiten]
* [GaesteBuch]
* [ReleaseNotes]
* [SandKiste]
* [SteveWainstead]
* [TestPage]
* [TextFormatierungsRegeln]
* [WabiSabi]
* [WikiWikiWeb]

Quick page search:
%%Search%%
----



--- NEW FILE ---
Sign and date your name below!

Jeff Dairiki, Arno Hollosi, SteveWainstead, Php Wiki authors



--- NEW FILE ---
"Young writers often suppose that style is a garnish for the meat of 
prose, a sauce by which a dull dish is made palatable. Style has no such 
separate entity; it is nondetachable, unfilterable. The beginner should 
approach style warily, realizing that it is himself he is approaching, no 
other; and he should begin by turning resolutely away from all devices 
that are popularly believed to indicate style--all mannerisms, tricks, 
adornments. The approach to style is by way of plainness, simplicity, 
orderliness, sincerity." 

--Strunk and White, "The Elements of Style"

''And thus an American textbook, typical required reading for 10th-grade English students, unknowingly extols some virtues of WabiSabi''
--scummings

--- NEW FILE ---
VariousBrowsers have trouble with the tab character used in the TextFormatierungsRegeln.  If you can't type a tab, or, if you are fixing up a page written by someone who didn't type tabs, then you should have us convert spans of spaces to tabs for you.  You request space to tab conversion with the checkbox that appears near the bottom of EditText and EditCopy pages.  It looks something like this...

 [[o] I can't type tabs.  Please KonvertiereLeerzeichenZuTabs for me when I save.

A span of spaces must be at least '''three''' spaces long to be recognized 
as a tab.  Use multiples of '''eight''' spaces to make multiple tabs. 
Each span of eight spaces will convert to one tab.  If the  
last span comes up a little short, that's ok, as long as  
there are at least three spaces in the last (only) span.

'''Check your work.'''  This sort of heuristic can lead to  
unexpected results. 
-----
[Maintenance note:  This page is seen when the user clicks on the 
"KonvertiereLeerzeichenZuTabs" link on any edit screen.  It describes what happens  
when you ask the system to do this, why you would want it to, and ways to 
avoid the spaces-instead-of-tabs problem.]



--- NEW FILE ---
The 20 most popular pages of this wiki:
(hitcount, pagename)

%%Mostpopular%%

--- NEW FILE ---
You are using PhpWiki at this very moment. Incredible, ain't it?

Visit our home page at http://phpwiki.sourceforge.net/ and see PhpWiki
in action at http://phpwiki.sourceforge.net/phpwiki/.



--- NEW FILE ---
You can try out Wiki in here.

Have fun :-)


--- NEW FILE ---
Here are some good starting points for browsing.

	* WieManWikiBenutzt gives you the quick lowdown on Wiki markup.
	* FrischeSeiten recorded automatically
	* WikiTechnik of browsing and editing on this server



Here's a title search.   Try something like ''wiki'' 
or ''sandwich''.

%%Search%%

Use the following for a full text search. This takes a few seconds. The results will show all lines on a given page that contain a match.

%%Fullsearch%%




--- NEW FILE ---
To add a new page to Wiki, all you have to do is come up with a meaningful title, capatalize all the words and StringThemTogetherLikeThis. Wiki automagically recognizes it as a hyperlink.

Then you can go ahead and ClickTheQuestionMark at the end of your new hyperlink, and the Wiki will give you a window for making the new page.

If you wish to add documents with complex markup to the Wiki, you might be better off providing a URL to it than trying to add the text of the document here, like so:

 PhpWiki project homepage: http://wcsb.org/~swain/php/wiki/

The Wiki does not support HTML tags (see TextFormatierungsRegeln).  <tags>They will just render like text.</tags> Wiki is meant to be as simple as possible to encourage use.

Note that there is a feature that your system administrator can enable to allow embedded HTML, but there are security risks involved.

--- NEW FILE ---
*What is a WikiWikiWeb? A description of this application.
*Learn WieManWikiBenutzt and learn about SeitenErzeugen.
*Use the SandKiste page to experiment with Wiki pages.
*Please sign your name in GaesteBuch.
*See FrischeSeiten for the latest page additions and changes.
*Find out which pages are MeistBesucht.
*Read the ReleaseNotes



--- NEW FILE ---
'''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'''

* asterick for first level
** asterick-asterick for second level, etc.
* Use * for bullet lists, # for numbered lists (mix at will)
* tab-Term:-tab Definition for definition lists
* 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'''
''(Quotes)''

* tab-space-:-tab -- often used (with emphasis) for quotations.


'''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 to the external pages by providing a name, a bar (|) and then the hyperlink: [Steve's home page | http://wcsb.org/~swain/]  
* 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/
* URLs ending with .png, or .jpg are inlined if in square brackets, by themselves: [http://phpwiki.sourceforge.net/phpwiki/png.png]


'''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.



--- NEW FILE ---
Since wabi-sabi represents a comprehensive Japanese world view or aesthetic system, it is difficult to explain precisely in western terms.  According to Leonard Koren, wabi-sabi is the most conspicuous and characteristic feature of what we think of as traditional Japanese beauty and it "occupies roughly the same position in the Japanese pantheon of aesthetic values as do the Greek ideals of beauty and perfection in the West."

Wabi-sabi is a beauty of things imperfect, impermanent, and incomplete.

It is the beauty of things modest and humble.

It is the beauty of things unconventional.

The concepts of wabi-sabi correlate with the concepts of Zen Buddhism, as the first Japanese involved with wabi-sabi were tea masters, priests, and monks who practiced Zen. Zen Buddhism originated in India, traveled to China in the 6th century, and was first introduced in Japan around the 12th century. Zen emphasizes "direct, intuitive insight into transcendental truth beyond all intellectual conception." At the core of wabi- sabi is the importance of transcending ways of looking and thinking about things/existence.

	*All things are impermanent
	*All things are imperfect
	*All things are incomplete 

Material characteristics of wabi-sabi:

	*suggestion of natural process
	*irregular
	*intimate
	*unpretentious
	*earthy
	*simple

For more about wabi-sabi, see
http://www.art.unt.edu/ntieva/artcurr/japan/wabisabi.htm


--- NEW FILE ---
''"Wiki wiki"'' means "quick" in Hawai'ian.

'''All you really need to know is:'''

	* To edit any page click on the Edit Text link at the bottom of
the page. You should do that right now, and read the source code of this
page. It will make more sense.
	* You get italics by surrounding words with two single quotes on
either side ''like this''.
	* You get '''bold text''' by using three quotes on either side.
	* And, '''''bold italics''''' with five.
	* You get bullets by using a tab and an asterick *
	* If you use Windows, you can't use your tab key. It's Bill Gates's fault. But you can check the little box that says Convert Spaces To Tabs. You can type a bunch of spaces and the Wiki will recognize them as a tab.
	* To have plain monospaced font, indent with a space:

 this is a poem 
 about monospacing
 nothing rhymes with poem
 nothing rhymes with monospacing

	* You can seperate paragraphs with an extra blank line. Example:

I am a paragraph.

I am a paragraph too. We're just very small paragraphs.


	* You can get horizontal rules with four or more dashes like this:
----
	* To create hyperlinks you just capitalize the words and string them together. Let's say you want to create a page about how Steve Wainstead eats worms. All you have to do is capitalize each word and string them together like this: SteveWainsteadEatsWorms. If the page does not exist yet a question mark appears after the link, inviting you to create the page: ThisPageShouldNotExist. (And please don't ruin the example by creating one.) 
	* To link to pages outside the Wiki, you can just type in the URL and Wiki will link it for you: http://www.nytimes.com/
* To put images in, just provide the hyperlink in brackets like this: [[http://www.yourhost.yourdomain/images/picture.png]. Image URLs not in brackets will just appear as hyperlinks to the image.
	* Now you are ready to begin SeitenErzeugen.

----
A WikiWikiWeb is meant to be fast and easy to edit. It has very simple markup that you can read about in TextFormatierungsRegeln.

--- NEW FILE ---
PhpWiki is written in the server-side scripting language PHP, available from http://www.php.net/. PHP resembles C and Perl in its syntax, and functions much like ASP, EmbPerl or JSP.

PhpWiki consists of a dozen or so files of mixed PHP and HTML. The web pages that make up a WikiWikiWeb based on PHP live in a DBM file with backup copies of previous versions of pages stored in a second DBM file.

Every time a user hits the site the page requested is pulled from the DBM and rendered on the fly. The user only ever requests the file index.php, which then decides which other php files to include.

Links to pages in the wiki are automatically linked: PhpWiki. This might be the single most compelling aspect of a wiki, the ability to add pages simply by linking to them. The next most compelling thing is how easily external URL's link:
	# http://www.wcsb.org/
	# ftp://ftp.redhat.com/
	# news://news.mozilla.org/

Combined with one namespace and a simple markup, a Wiki exhibits many of the characteristics of WabiSabi.

PhpWiki is licensed under the Gnu General Public license, which you should be able to see here: http://www.gnu.org/copyleft/gpl.txt.




--- NEW FILE ---
A WikiWikiWeb is a site where everyone can collaborate on the content. The most well-known and widely used Wiki is the Portland Pattern Repository at http://c2.com/cgi-bin/wiki?WikiWikiWeb.

I found these statements there particularly relevant:

''The point is to make the EditText form simple and the SeiteFinden search fast.''

''In addition to being quick, this site also aspires to Zen ideals generally labeled WabiSabi. Zen finds beauty in the imperfect and ephemeral. When it comes down to it, that's all you need.''

You can say hello on GaesteBuch, or read about WieManWikiBenutzt and SeitenErzeugen. Currently this Wiki has no "theme" for discussion, so go ahead and play with it and have fun!

--SteveWainstead

[phpwiki-checkins] CVS: phpwiki/locale/de/LC_MESSAGES phpwiki.mo,NONE,1.1 phpwiki.php,NONE,1.1

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19863/de/LC_MESSAGES

Added Files:
	phpwiki.mo phpwiki.php 
Log Message:
Spanish pages by Sandino Araico Sánchez <sa...@sa...>
Initial set of German pages by me (Arno)


--- NEW FILE ---
Þ•












--- NEW FILE ---
<?php

$locale["templates/browse.html"] =
   "locale/de/templates/browse.html";
$locale["templates/editpage.html"] =
   "locale/de/editpage.html";
$locale["templates/editlinks.html"] =
   "locale/de/editlinks.html";
$locale["templates/message.html"] =
   "locale/de/message.html";
$locale["./pgsrc"] =
   "locale/de/pgsrc";
$locale["Current page:"] =
   "Aktuelle Seite:";
$locale["version %s"] =
   "Version %s";
$locale["last modified on %s"] =
   "zuletzt verändert am %s";
$locale["by %s"] =
   "von %s";
$locale["None"] =
   "Keine";
$locale["Archived page:"] =
   "Archivierte Seite:";
$locale["Versions are identical"] =
   "Versionen sind identisch";
$locale["Diff of %s."] =
   "Diff von %s.";
$locale["FrontPage"] =
   "StartSeite";
$locale["Describe %s here."] =
   "Beschreibe %s hier.";
$locale["Copy of %s"] =
   "Kopie von %s";
$locale["No page name passed into editpage!"] =
   "Kein Seitenname an EditierSeite übergeben!";
$locale["This page has been locked by the administrator and cannot be edited."] =
   "Diese Seite wurde vom Administrator gesperrt und kann nicht editiert werden.";
$locale["Sorry for the inconvenience."] =
   "Entschuldigung für die Unannehmlichkeiten.";
$locale["Problem while editing %s"] =
   "Problem während dem Editieren von %s";
$locale["Searching for \"%s\" ....."] =
   "Suche nach \"%s\" .....";
$locale["%d matches found in %d pages."] =
   "%d Treffer in %d Seiten.";
$locale["Full Text Search Results"] =
   "Volltext-Suchresultate";
$locale["Cannot establish connection to database, giving up."] =
   "Kann Verbindung zu Datenbank nicht aufbauen - Abbruch.";
$locale["Error message: %s"] =
   "Fehlermeldung: %s";
$locale["Cannot open database %s, giving up."] =
   "Kann Datenbank %s nicht öffnen - Abbruch.";
$locale["Insert/update failed: %s"] =
   "Einfügen/Verändern fehlgeschlagen: %s";
$locale["Delete on %s failed: %s"] =
   "Löschen in %s fehlgeschlagen: %s";
$locale["Insert into %s failed: %s"] =
   "Einfügen in %s fehlgeschlagen: %s";
$locale["MySQL error: %s"] =
   "MySQL Fehler: %s";
$locale["Error writing page '%s'"] =
   "Fehler beim Schreiben der Seite '%s'";
$locale["PageInfo"] =
   "SeitenInfo";
$locale["Current version"] =
   "Aktuelle Seite:";
$locale["Archived version"] =
   "Archivierte Seite:";
$locale["Problem while updating %s"] =
   "Problem während dem Editieren von %s";
$locale["Thank you for editing %s."] =
   "Danke für das Editieren von %s.";
$locale["Your careful attention to detail is much appreciated."] =
   "Deine besondere Aufmerksamkeit für Details wird sehr geschätzt.";
$locale["Inserting page %s, version %s from %s"] =
   "Füge Seite %s ein, Version %s vom %s";
$locale["WikiFatalError"] =
   "FatalerWikiFehler";
$locale["%d best incoming links:"] =
   "Die %d besten hereinkommenden Links:";
$locale["%d best outgoing links:"] =
   "Die %d besten hinausgehenden Links:";
$locale["%d most popular nearby:"] =
   "Die %d meistbesuchten Seiten in der Nähe:";
$locale["Stack bounds exceeded in SetHTMLOutputMode"] =
   "Interner Fehler: Stackgrenze in SetHTMLOutputMode überschritten.";

;?>

[phpwiki-checkins] CVS: phpwiki/locale translate.sh,1.4,1.5

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19863

Modified Files:
	translate.sh 
Log Message:
Spanish pages by Sandino Araico Sánchez <sa...@sa...>
Initial set of German pages by me (Arno)


Index: translate.sh
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/translate.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** translate.sh	2000/10/26 15:38:38	1.4
--- translate.sh	2000/11/02 21:15:30	1.5
***************
*** 17,21 ****
  fi
  
! ALL_LINGUAS=nl
  
  xgettext -L C++ -o locale/po/phpwiki.pot lib/*php
--- 17,21 ----
  fi
  
! ALL_LINGUAS="nl es de"
  
  xgettext -L C++ -o locale/po/phpwiki.pot lib/*php

[phpwiki-checkins] CVS: phpwiki/locale/de/templates - New directory

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/de/templates
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19523/locale/de/templates

Log Message:
Directory /cvsroot/phpwiki/phpwiki/locale/de/templates added to the repository

[phpwiki-checkins] CVS: phpwiki/locale/de/pgsrc - New directory

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/de/pgsrc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19523/locale/de/pgsrc

Log Message:
Directory /cvsroot/phpwiki/phpwiki/locale/de/pgsrc added to the repository

[phpwiki-checkins] CVS: phpwiki/locale/de - New directory

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/de
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19523/locale/de

Log Message:
Directory /cvsroot/phpwiki/phpwiki/locale/de added to the repository

[phpwiki-checkins] CVS: phpwiki/locale/de/LC_MESSAGES - New directory

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19523/locale/de/LC_MESSAGES

Log Message:
Directory /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES added to the repository

[phpwiki-checkins] CVS: phpwiki/locale/es/templates - New directory

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/es/templates
In directory slayer.i.sourceforge.net:/tmp/cvs-serv10333/locale/es/templates

Log Message:
Directory /cvsroot/phpwiki/phpwiki/locale/es/templates added to the repository

[phpwiki-checkins] CVS: phpwiki/locale/es - New directory

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/es
In directory slayer.i.sourceforge.net:/tmp/cvs-serv10333/locale/es

Log Message:
Directory /cvsroot/phpwiki/phpwiki/locale/es added to the repository

[phpwiki-checkins] CVS: phpwiki/locale/es/LC_MESSAGES - New directory

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/es/LC_MESSAGES
In directory slayer.i.sourceforge.net:/tmp/cvs-serv10333/locale/es/LC_MESSAGES

Log Message:
Directory /cvsroot/phpwiki/phpwiki/locale/es/LC_MESSAGES added to the repository

[phpwiki-checkins] CVS: phpwiki/locale/es/pgsrc - New directory

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/es/pgsrc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv10333/locale/es/pgsrc

Log Message:
Directory /cvsroot/phpwiki/phpwiki/locale/es/pgsrc added to the repository

[phpwiki-checkins] CVS: phpwiki/schemas schema.psql,1.4,1.5

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

Update of /cvsroot/phpwiki/phpwiki/schemas
In directory slayer.i.sourceforge.net:/tmp/cvs-serv10902

Modified Files:
	schema.psql 
Log Message:
Added "drop table wikiscore;"

Index: schema.psql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/schemas/schema.psql,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** schema.psql	2000/11/02 04:06:21	1.4
--- schema.psql	2000/11/02 04:34:41	1.5
***************
*** 6,9 ****
--- 6,10 ----
  drop table hottopics;
  drop table hitcount;
+ drop table wikiscore;
  
  CREATE TABLE wiki (

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

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

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv10176

Modified Files:
	pgsql.php 
Log Message:
Incoming, outgoing, and most popular top 5's appear to work now.

Index: pgsql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/pgsql.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgsql.php	2000/11/02 03:05:20	1.3
--- pgsql.php	2000/11/02 04:23:59	1.4
***************
*** 11,14 ****
--- 11,15 ----
        SaveCopyToArchive($dbi, $pagename, $pagehash) 
        IsWikiPage($dbi, $pagename)
+       IsInArchive($dbi, $pagename)
        InitTitleSearch($dbi, $search)
        TitleSearchNextMatch($dbi, $res)
***************
*** 19,22 ****
--- 20,24 ----
        InitMostPopular($dbi, $limit)
        MostPopularNextMatch($dbi, $res)
+       GetAllWikiPageNames($dbi)
        GetWikiPageLinks($dbi, $pagename)
        SetWikiPageLinks($dbi, $pagename, $linklist)
***************
*** 84,92 ****
     function InsertPage($dbi, $pagename, $pagehash) {
        $pagename = addslashes($pagename);
- //      echo "<p>dbi in InsertPage: '$dbi' '$dbi[table]' '$dbi[dbc]'<p>";
  
        // update the wikilinks table
! //      UpdateWikiLinks($dbi, $pagename, implode(" ",$pagehash['content']));
  
        // prepare the content for storage
        if (!isset($pagehash["pagename"]))
--- 86,95 ----
     function InsertPage($dbi, $pagename, $pagehash) {
        $pagename = addslashes($pagename);
  
        // update the wikilinks table
!       $linklist = ExtractWikiPageLinks($pagehash['content']);
!       SetWikiPageLinks($dbi, $pagename, $linklist);
  
+ 
        // prepare the content for storage
        if (!isset($pagehash["pagename"]))
***************
*** 203,251 ****
  
  
-    function UpdateWikiLinks($dbi, $pagename, $pagetext) {
- 
-       global $AllowedProtocols;
-       // extract all links from the page, both [] and OldStyle
- 
-       // this is [bracketlinks]
-       $numBracketLinks = preg_match_all("/\[.+?\]/s", $pagetext, $brktlinks);
- 
-       // this is OldSchoolLinking
-       $numWikiLinks = preg_match_all("#!?\b(([A-Z][a-z]+){2,})\b#",
-                          $pagetext, $wikilinks);
- 
-       for ($x = 0; $x < $numWikiLinks; $x++) {
-          if (preg_match("/^!/", $wikilinks[0][$x]))
-             continue;
-          $alllinks[$wikilinks[0][$x]]++;
- //echo "MATCH: ", $wikilinks[0][$x], "<P>\n";
- //echo "assigned ", $alllinks[$wikilinks[0][$x]], " ", $wikilinks[0][$x], " <br>\n";
-       }
- 
-       for ($x = 0; $x < $numBracketLinks; $x++) {
-          // skip escaped bracket sets [[like this]
-          if (preg_match("/^\[\[/", $brktlinks[0][$x]))
-             continue;
-          // skip anything with an allowed protocol
-          if (preg_match("/$AllowedProtocols/", $brktlinks[0][$x]))
-             continue;
- 
- 
-          $alllinks[$brktlinks[0][$x]]++;
- 
- //echo "MATCH: ", $brktlinks[0][$x], "<P>\n";
- //echo "assigned ", $alllinks[$brktlinks[0][$x]], " ", $brktlinks[0][$x], " <br>\n";
-       }
- 
-       // call the right function to update the table
-       SetWikiPageLinks($dbi, $pagename, $alllinks);
- 
-    }
- 
- 
     function IsWikiPage($dbi, $pagename) {
        global $WikiPageStore;   	
        $pagename = addslashes($pagename);
!       $query = "select count(*) from $WikiPageStore where pagename='$pagename'";
        $res = pg_exec($query);
        $array = pg_fetch_array($res, 0);
--- 206,214 ----
  
  
     function IsWikiPage($dbi, $pagename) {
        global $WikiPageStore;   	
        $pagename = addslashes($pagename);
!       $query = "select count(*) from $WikiPageStore " .
!                "where pagename='$pagename'";
        $res = pg_exec($query);
        $array = pg_fetch_array($res, 0);
***************
*** 257,261 ****
  	 global $ArchivePageStore;
        $pagename = addslashes($pagename);
!       $query = "select count(*) from $ArchivePageStore where pagename='$pagename'";
        $res = pg_exec($query);
        $array = pg_fetch_array($res, 0);
--- 220,225 ----
  	 global $ArchivePageStore;
        $pagename = addslashes($pagename);
!       $query = "select count(*) from $ArchivePageStore " .
!                "where pagename='$pagename'";
        $res = pg_exec($query);
        $array = pg_fetch_array($res, 0);
***************
*** 274,278 ****
        $query = "select pagename from $dbi[table] where lower(pagename) " .
                 "like '%$search%' order by pagename";
! //      echo "search query: $query<br>\n";
        $res = pg_exec($dbi["dbc"], $query);
  
--- 238,242 ----
        $query = "select pagename from $dbi[table] where lower(pagename) " .
                 "like '%$search%' order by pagename";
!       //echo "search query: $query<br>\n";
        $res = pg_exec($dbi["dbc"], $query);
  
***************
*** 394,405 ****
     function GetWikiPageLinks($dbi, $pagename) {
        global $WikiLinksPageStore;
!       $query = "select frompage from $WikiLinksPageStore where topage='$pagename'";
!       $res = pg_exec($dbi['dbc'], $query);
        $rows = pg_numrows($res);
        for ($i = 0; $i < $rows; $i++) {
! 	 $pages[$i] = pg_result($res, $i, "frompage");
        }
!       return $pages;
!       
     }
  
--- 358,386 ----
     function GetWikiPageLinks($dbi, $pagename) {
        global $WikiLinksPageStore;
!       $pagename = addslashes($pagename);
! 
!       $res = pg_exec("select topage, score from wikilinks, wikiscore where topage=pagename and frompage='$pagename' order by score desc, topage");
        $rows = pg_numrows($res);
        for ($i = 0; $i < $rows; $i++) {
! 	 $out = pg_fetch_array($res, $i);
! 	 $links['out'][] = array($out['topage'], $out['score']);
        }
! 
!       $res = pg_exec("select frompage, score from wikilinks, wikiscore where frompage=pagename and topage='$pagename' order by score desc, frompage");
!       $rows = pg_numrows($res);
!       for ($i = 0; $i < $rows; $i++) {
! 	 $out = pg_fetch_array($res, $i);
! 	 $links['in'][] = array($out['frompage'], $out['score']);
!       }
! 
!       $res = pg_exec("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 = pg_numrows($res);
!       for ($i = 0; $i < $rows; $i++) {
! 	 $out = pg_fetch_array($res, $i);
! 	 $links['popular'][] = array($out['pagename'], $out['hits']);
!       }
! 
!       return $links;
! 
     }
  
***************
*** 414,418 ****
        // first delete the old list of links
        $query = "delete from $WikiLinksPageStore where frompage='$frompage'";
! //      echo "$query<br>\n";
        $res = pg_exec($dbi['dbc'], $query);
  
--- 395,399 ----
        // first delete the old list of links
        $query = "delete from $WikiLinksPageStore where frompage='$frompage'";
!       //echo "$query<br>\n";
        $res = pg_exec($dbi['dbc'], $query);
  
***************
*** 425,433 ****
        while (list($topage, $count) = each($linklist)) {
           $topage = addslashes($topage);
!          $query = "insert into $WikiLinksPageStore (frompage, topage) " .
!                   "values ('$frompage', '$topage')";
! //         echo "$query<br>\n";
!          $res = pg_exec($dbi['dbc'], $query);
        }
     }
  
--- 406,420 ----
        while (list($topage, $count) = each($linklist)) {
           $topage = addslashes($topage);
!          if ($topage != $frompage) {
!             $query = "insert into $WikiLinksPageStore (frompage, topage) " .
!                      "values ('$frompage', '$topage')";
!             //echo "$query<br>\n";
!             $res = pg_exec($dbi['dbc'], $query);
!          }
        }
+       // update pagescore
+       pg_exec("delete from wikiscore");
+       pg_exec("insert into wikiscore select w1.topage, count(*) from wikilinks as w1, wikilinks as w2 where w2.topage=w1.frompage group by w1.topage");
+ 
     }
  

[phpwiki-checkins] CVS: phpwiki/schemas schema.psql,1.3,1.4

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

Update of /cvsroot/phpwiki/phpwiki/schemas
In directory slayer.i.sourceforge.net:/tmp/cvs-serv9132

Modified Files:
	schema.psql 
Log Message:
Added the wikiscore table; stripped out the grant statements that gave
me access to all postgresql databases worldwide ;-)

Index: schema.psql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/schemas/schema.psql,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** schema.psql	2000/06/20 04:39:16	1.3
--- schema.psql	2000/11/02 04:06:21	1.4
***************
*** 49,52 ****
--- 49,59 ----
          );
  
+ CREATE TABLE wikiscore (
+         pagename VARCHAR(100) NOT NULL,
+         score INT NOT NULL DEFAULT 0,
+         PRIMARY KEY (pagename)
+         );
+ 
+ 
  GRANT ALL ON wiki TO nobody;
  GRANT ALL ON archive TO nobody;
***************
*** 54,61 ****
  GRANT ALL ON hottopics TO nobody;
  GRANT ALL ON hitcount TO nobody;
  
- GRANT ALL ON wiki TO swain;
- GRANT ALL ON archive TO swain;
- GRANT ALL ON wikilinks TO swain;
- GRANT ALL ON hottopics TO swain;
- GRANT ALL ON hitcount TO swain;
--- 61,64 ----
  GRANT ALL ON hottopics TO nobody;
  GRANT ALL ON hitcount TO nobody;
+ GRANT ALL ON wikiscore TO nobody;
  

[phpwiki-checkins] CVS: phpwiki/pgsrc TextFormattingRules,1.4,1.5

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

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv8949

Modified Files:
	TextFormattingRules 
Log Message:
Corrected the URL to the example image.

Index: TextFormattingRules
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TextFormattingRules,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** TextFormattingRules	2000/10/23 12:53:01	1.4
--- TextFormattingRules	2000/11/02 04:03:54	1.5
***************
*** 52,56 ****
  * [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/
! * URLs ending with .png, or .jpg are inlined if in square brackets, by themselves: [http://phpwiki.sourceforge.net/phpwiki/png.png]
  
  
--- 52,56 ----
  * [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/
! * URLs ending with .png, or .jpg are inlined if in square brackets, by themselves: [http://phpwiki.sourceforge.net/phpwiki/images/png.png]
  
  

[phpwiki-checkins] CVS: phpwiki/lib pgsql.php,1.2,1.3

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

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv5435

Modified Files:
	pgsql.php 
Log Message:
Fixed typo: "port" was spelled "pport". Probably from the last
patch.



Index: pgsql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/pgsql.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** pgsql.php	2000/10/28 17:44:00	1.2
--- pgsql.php	2000/11/02 03:05:20	1.3
***************
*** 30,34 ****
  
        $connectstring = $pg_dbhost?"host=$pg_dbhost ":"";
! 	 $connectstring .= $pg_dbport?"pport=$pg_dbport ":"";
  	 $connectstring .= $WikiDataBase?"dbname=$WikiDataBase":"";
  
--- 30,34 ----
  
        $connectstring = $pg_dbhost?"host=$pg_dbhost ":"";
! 	 $connectstring .= $pg_dbport?"port=$pg_dbport ":"";
  	 $connectstring .= $WikiDataBase?"dbname=$WikiDataBase":"";
  

[phpwiki-checkins] CVS: phpwiki index.php,1.3,1.4

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki
In directory slayer.i.sourceforge.net:/tmp/cvs-serv24731

Modified Files:
	index.php 
Log Message:
fixed E_NOTICE warnings


Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** index.php	2000/10/25 09:58:53	1.3
--- index.php	2000/11/01 11:31:40	1.4
***************
*** 8,11 ****
--- 8,12 ----
  
     set_magic_quotes_runtime(0);
+    error_reporting(E_ALL ^ E_NOTICE);   // remove E_NOTICE for debugging
  
     include "lib/config.php";
***************
*** 17,41 ****
  
     // Allow choice of submit buttons to determine type of search:
!    if ($searchtype == 'full')
        $full = $searchstring;
!    elseif ($searchstring)       // default to title search
        $search = $searchstring;
  
!    if ($edit) {
        $admin_edit = 0;
        include "lib/editpage.php";
!    } elseif ($links) {
        include "lib/editlinks.php";
!    } elseif ($copy) {
        include "lib/editpage.php";
!    } elseif ($search) {
        include "lib/search.php";
!    } elseif ($full) {
        include "lib/fullsearch.php";
!    } elseif ($post) {
        include "lib/savepage.php";
!    } elseif ($info) {
        include "lib/pageinfo.php";
!    } elseif ($diff) {
        include "lib/diff.php";
     } else {
--- 18,42 ----
  
     // Allow choice of submit buttons to determine type of search:
!    if (isset($searchtype) && ($searchtype == 'full'))
        $full = $searchstring;
!    elseif (isset($searchstring))     // default to title search
        $search = $searchstring;
  
!    if (isset($edit)) {
        $admin_edit = 0;
        include "lib/editpage.php";
!    } elseif (isset($links)) {
        include "lib/editlinks.php";
!    } elseif (isset($copy)) {
        include "lib/editpage.php";
!    } elseif (isset($search)) {
        include "lib/search.php";
!    } elseif (isset($full)) {
        include "lib/fullsearch.php";
!    } elseif (isset($post)) {
        include "lib/savepage.php";
!    } elseif (isset($info)) {
        include "lib/pageinfo.php";
!    } elseif (isset($diff)) {
        include "lib/diff.php";
     } else {

[phpwiki-checkins] CVS: phpwiki/lib dbmlib.php,1.2,1.3 diff.php,1.3,1.4 display.php,1.3,1.4 editpage.php,1.5,1.6 pageinfo.php,1.4,1.5 savepage.php,1.4,1.5 stdlib.php,1.7,1.8

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv24731/lib

Modified Files:
	dbmlib.php diff.php display.php editpage.php pageinfo.php 
	savepage.php stdlib.php 
Log Message:
fixed E_NOTICE warnings


Index: dbmlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/dbmlib.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** dbmlib.php	2000/10/19 22:25:45	1.2
--- dbmlib.php	2000/11/01 11:31:41	1.3
***************
*** 31,47 ****
        global $WikiDB; // hash of all the DBM file names
  
-       ksort($WikiDB);
        reset($WikiDB);
- 
        while (list($key, $file) = each($WikiDB)) {
           while (($dbi[$key] = @dbmopen($file, "c")) < 1) {
              if ($numattempts > MAX_DBM_ATTEMPTS) {
                 ExitWiki("Cannot open database '$key' : '$file', giving up.");
              }
-             $numattempts++;
              sleep(1);
           }
        }
- 
        return $dbi;
     }
--- 31,44 ----
        global $WikiDB; // hash of all the DBM file names
  
        reset($WikiDB);
        while (list($key, $file) = each($WikiDB)) {
           while (($dbi[$key] = @dbmopen($file, "c")) < 1) {
+             $numattempts++;
              if ($numattempts > MAX_DBM_ATTEMPTS) {
                 ExitWiki("Cannot open database '$key' : '$file', giving up.");
              }
              sleep(1);
           }
        }
        return $dbi;
     }
***************
*** 49,57 ****
  
     function CloseDataBase($dbi) {
- 
-       ksort($dbi);
        reset($dbi);
        while (list($dbmfile, $dbihandle) = each($dbi)) {
!          dbmclose($dbi[$dbihandle]);
        }
        return;
--- 46,52 ----
  
     function CloseDataBase($dbi) {
        reset($dbi);
        while (list($dbmfile, $dbihandle) = each($dbi)) {
!          dbmclose($dbihandle);
        }
        return;
***************
*** 202,212 ****
     }
  
-    function cmp($a,$b) {   
-        if ($a == $b) return 0;
-        return ($a > $b) ? -1 : 1;
-    }
  
     function InitMostPopular($dbi, $limit) {
- 
        // iterate through the whole dbm file for hit counts
        // sort the results highest to lowest, and return 
--- 197,202 ----
***************
*** 214,218 ****
  
        $pagename = dbmfirstkey($dbi['hitcount']);
- 
        $res[$pagename] = dbmfetch($dbi['hitcount'], $pagename);
  
--- 204,207 ----
***************
*** 222,226 ****
        }
  
!       uasort($res, cmp);
        return($res);
     }
--- 211,215 ----
        }
  
!       arsort($res);
        return($res);
     }
***************
*** 241,245 ****
              "pagename" => $pagename
           );
!          $dbm_mostpopular_cntr++;
           return $nextpage;
        } else {
--- 230,234 ----
              "pagename" => $pagename
           );
!          // $dbm_mostpopular_cntr++;
           return $nextpage;
        } else {

Index: diff.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/diff.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** diff.php	2000/10/20 11:42:52	1.3
--- diff.php	2000/11/01 11:31:41	1.4
***************
*** 29,32 ****
--- 29,33 ----
  {
    var $edits;	// List of editing operation to convert XV to YV.
+   var $xv = array(), $yv = array();
  
    function _WikiDiffEngine ($from_lines, $to_lines)
***************
*** 50,53 ****
--- 51,57 ----
  	$n_to -= $skip;
  
+ 	$xlines = array();
+ 	$ylines = array();
+ 
  	// Ignore lines which do not exist in both files.
  	for ($x = 0; $x < $n_from; $x++)
***************
*** 57,61 ****
  	    $line = $to_lines[$y + $skip];
  	    $ylines[] = $line;
! 	    if ( ($this->ychanged[$y] = ! $xhash[$line]) )
  		continue;
  	    $yhash[$line] = 1;
--- 61,65 ----
  	    $line = $to_lines[$y + $skip];
  	    $ylines[] = $line;
! 	    if ( ($this->ychanged[$y] = empty($xhash[$line])) )
  		continue;
  	    $yhash[$line] = 1;
***************
*** 67,72 ****
  	    $line = $from_lines[$x + $skip];
  	    $xlines[] = $line;
! 	    if ( ($this->xchanged[$x] = ! $yhash[$line]) )
! 		continue;
  	    $this->xv[] = $line;
  	    $this->xind[] = $x;
--- 71,77 ----
  	    $line = $from_lines[$x + $skip];
  	    $xlines[] = $line;
! 	    if ( ($this->xchanged[$x] = empty($yhash[$line])) )
! 		continue;	// fixme? what happens to yhash/xhash when
! 				// there are two identical lines??
  	    $this->xv[] = $line;
  	    $this->xind[] = $x;
***************
*** 98,101 ****
--- 103,107 ----
  	    // Skip matching "snake".
  	    $x0 = $x;
+ 	    $ncopy = 0;
  	    while ( $x < $n_from && $y < $n_to
  	            && !$this->xchanged[$x] && !$this->ychanged[$y])
***************
*** 110,113 ****
--- 116,120 ----
  	    // Find deletes.
  	    $x0 = $x;
+ 	    $ndelete = 0;
  	    while ($x < $n_from && $this->xchanged[$x])
  	      {
***************
*** 127,131 ****
  	      }
  	  }
! 	if ($endskip)
  	    $this->edits[] = $endskip;
        }
--- 134,138 ----
  	      }
  	  }
! 	if (!empty($endskip))
  	    $this->edits[] = $endskip;
        }
***************
*** 354,358 ****
  
  	    // Find the end of this run of changes.
! 	    while ($changed[++$i])
  		continue;
  	    while ($other_changed[$j])
--- 361,365 ----
  
  	    // Find the end of this run of changes.
! 	    while (isset($changed[++$i]))
  		continue;
  	    while ($other_changed[$j])
***************
*** 387,391 ****
  		 * CORRESPONDING == LEN means no such point has been found.
  		 */
! 		$corresponding = $other_changed[$j - 1] ? $i : $len;
  
  		/*
--- 394,398 ----
  		 * CORRESPONDING == LEN means no such point has been found.
  		 */
! 		$corresponding = empty($other_changed[$j - 1]) ? $len : $i;
  
  		/*
***************
*** 794,797 ****
--- 801,805 ----
    function _format ($edits, $from_lines)
        {
+ 	$html = '';
  	$x = 0; $y = 0;
  	$xlim = sizeof($from_lines);
***************
*** 807,811 ****
  	      {
  		$ncopy = 0;
! 		if (!$hunk)
  		  {
  		    // Start of an output hunk. 
--- 815,819 ----
  	      {
  		$ncopy = 0;
! 		if (empty($hunk))
  		  {
  		    // Start of an output hunk. 
***************
*** 836,840 ****
  
  	    $next = next($edits);
! 	    if ($hunk)
  	      {
  		if ( !$next || $ncopy > 2 * $this->context_lines)
--- 844,848 ----
  
  	    $next = next($edits);
! 	    if (!empty($hunk))
  	      {
  		if ( !$next || $ncopy > 2 * $this->context_lines)
***************
*** 887,890 ****
--- 895,899 ----
    function _emit_lines($lines,  $prefix, $color)
        {
+ 	$html = '';
  	reset($lines);
  	while (list ($junk, $line) = each($lines))
***************
*** 914,925 ****
  	for (reset($hunks); $hunk = current($hunks); next($hunks))
  	  {
! 	    if ($lines = $hunk['c'])
! 		$html .= $this->_emit_lines($lines,
  		                            $this->context_prefix, '#ffffff');
! 	    if ($lines = $hunk['d'])
! 		$html .= $this->_emit_lines($lines,
  		                            $this->deletes_prefix, '#ccffcc');
! 	    if ($lines = $hunk['a'])
! 		$html .= $this->_emit_lines($lines,
  		                            $this->adds_prefix, '#ffcccc');
  	  }
--- 923,934 ----
  	for (reset($hunks); $hunk = current($hunks); next($hunks))
  	  {
! 	    if (!empty($hunk['c']))
! 		$html .= $this->_emit_lines($hunk['c'],
  		                            $this->context_prefix, '#ffffff');
! 	    if (!empty($hunk['d']))
! 		$html .= $this->_emit_lines($hunk['d'],
  		                            $this->deletes_prefix, '#ccffcc');
! 	    if (!empty($hunk['a']))
! 		$html .= $this->_emit_lines($hunk['a'],
  		                            $this->adds_prefix, '#ffcccc');
  	  }
***************
*** 990,999 ****
    if (is_array($wiki)) {
        $html .= "<td>";
!       $html .= sprintf(gettext ("version %s"), $wiki[version]);
        $html .= "</td><td>";
        $html .= sprintf(gettext ("last modified on %s"),
  	date($datetimeformat, $wiki['lastmodified']));
        $html .= "</td><td>";
!       $html .= sprintf (gettext ("by %s"), $wiki[author]);
        $html .= "</td>";
    } else {
--- 999,1008 ----
    if (is_array($wiki)) {
        $html .= "<td>";
!       $html .= sprintf(gettext ("version %s"), $wiki['version']);
        $html .= "</td><td>";
        $html .= sprintf(gettext ("last modified on %s"),
  	date($datetimeformat, $wiki['lastmodified']));
        $html .= "</td><td>";
!       $html .= sprintf (gettext ("by %s"), $wiki['author']);
        $html .= "</td>";
    } else {
***************
*** 1008,1017 ****
    if (is_array($archive)) {
        $html .= "<td>";
!       $html .= sprintf(gettext ("version %s"), $archive[version]);
        $html .= "</td><td>";
        $html .= sprintf(gettext ("last modified on %s"),
  	date($datetimeformat, $archive['lastmodified']));
        $html .= "</td><td>";
!       $html .= sprintf(gettext ("by %s"), $archive[author]);
        $html .= "</td>";
    } else {
--- 1017,1026 ----
    if (is_array($archive)) {
        $html .= "<td>";
!       $html .= sprintf(gettext ("version %s"), $archive['version']);
        $html .= "</td><td>";
        $html .= sprintf(gettext ("last modified on %s"),
  	date($datetimeformat, $archive['lastmodified']));
        $html .= "</td><td>";
!       $html .= sprintf(gettext ("by %s"), $archive['author']);
        $html .= "</td>";
    } else {

Index: display.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/display.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** display.php	2000/10/19 21:36:50	1.3
--- display.php	2000/11/01 11:31:41	1.4
***************
*** 9,13 ****
     // if it wasn't this file would not have been included
  
!    if ($argv[0]) {
        $pagename = rawurldecode($argv[0]);
     } else { 
--- 9,13 ----
     // if it wasn't this file would not have been included
  
!    if (!empty($argv[0])) {
        $pagename = rawurldecode($argv[0]);
     } else { 

Index: editpage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/editpage.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** editpage.php	2000/10/26 15:38:38	1.5
--- editpage.php	2000/11/01 11:31:41	1.6
***************
*** 38,42 ****
  
        $textarea = implode("\n", $pagehash["content"]);
!       if ($copy) {
  	 // $cdbi = OpenDataBase($WikiPageStore);
  	 $currentpage = RetrievePage($dbi, $pagename, $WikiPageStore);
--- 38,42 ----
  
        $textarea = implode("\n", $pagehash["content"]);
!       if (isset($copy)) {
  	 // $cdbi = OpenDataBase($WikiPageStore);
  	 $currentpage = RetrievePage($dbi, $pagename, $WikiPageStore);

Index: pageinfo.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/pageinfo.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pageinfo.php	2000/10/24 09:55:18	1.4
--- pageinfo.php	2000/11/01 11:31:41	1.5
***************
*** 7,11 ****
  
     $encname = htmlspecialchars($info);
!    $enter .= gettext ("Enter a page name");
     $go = gettext ("Go");
     $html = "<form action=\"$ScriptUrl\" METHOD=GET>\n" .
--- 7,11 ----
  
     $encname = htmlspecialchars($info);
!    $enter = gettext ("Enter a page name");
     $go = gettext ("Go");
     $html = "<form action=\"$ScriptUrl\" METHOD=GET>\n" .
***************
*** 15,19 ****
  	   "<input type=checkbox name=showpagesource";
  
!    if ($showpagesource == "on") {
        $html .= " checked";
     }
--- 15,19 ----
  	   "<input type=checkbox name=showpagesource";
  
!    if (isset($showpagesource) && ($showpagesource == "on")) {
        $html .= " checked";
     }
***************
*** 30,34 ****
     function ViewpageProps($name, $pagestore)
     {
!       global $dbi, $showpagesource, $datetimeformat;
  
        $pagehash = RetrievePage($dbi, $name, $pagestore);
--- 30,34 ----
     function ViewpageProps($name, $pagestore)
     {
!       global $dbi, $showpagesource, $datetimeformat, $FieldSeparator;
  
        $pagehash = RetrievePage($dbi, $name, $pagestore);

Index: savepage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/savepage.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** savepage.php	2000/10/26 15:47:51	1.4
--- savepage.php	2000/11/01 11:31:41	1.5
***************
*** 86,90 ****
  
        // convert spaces to tabs at user request
!       if ($convert) {
           $pagehash["content"] = CookSpaces($pagehash["content"]);      
        }
--- 86,90 ----
  
        // convert spaces to tabs at user request
!       if (isset($convert)) {
           $pagehash["content"] = CookSpaces($pagehash["content"]);      
        }

Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** stdlib.php	2000/10/31 19:23:03	1.7
--- stdlib.php	2000/11/01 11:31:41	1.8
***************
*** 88,92 ****
     {
        global $ScriptUrl, $AllowedProtocols, $templates;
!       global $datetimeformat, $dbi, $logo;
  
        if (!is_array($hash))
--- 88,92 ----
     {
        global $ScriptUrl, $AllowedProtocols, $templates;
!       global $datetimeformat, $dbi, $logo, $FieldSeparator;
  
        if (!is_array($hash))
***************
*** 133,137 ****
        }
  
!       if ($hash['copy']) {
  	 $page = str_replace("#$FieldSeparator#IFCOPY#$FieldSeparator#",
  			'', $page);
--- 133,137 ----
        }
  
!       if (isset($hash['copy'])) {
  	 $page = str_replace("#$FieldSeparator#IFCOPY#$FieldSeparator#",
  			'', $page);
***************
*** 216,220 ****
  
     class Stack {
!       var $items;
        var $size = 0;
  
--- 216,220 ----
  
     class Stack {
!       var $items = array();
        var $size = 0;
  
***************
*** 238,242 ****
  
        function top() {
!          return $this->items[$this->size - 1];
        }  
  
--- 238,245 ----
  
        function top() {
!          if($this->size)
!             return $this->items[$this->size - 1];
!          else
!             return '';
        }  
  
***************
*** 396,400 ****
        // copy the rest of the page into the new array
        $pagename = preg_quote($pagename);
!       for (; $i < ($numlines + 1); $i++) {
           // skip previous entry for $pagename
           if (preg_match("|\[$pagename\]|", $recentchanges["content"][$i])) {
--- 399,403 ----
        // copy the rest of the page into the new array
        $pagename = preg_quote($pagename);
!       for (; $i < $numlines; $i++) {
           // skip previous entry for $pagename
           if (preg_match("|\[$pagename\]|", $recentchanges["content"][$i])) {
***************
*** 493,497 ****
  	    $link = ParseAndLink($brktlinks[0][$i]);
  	    if($link['type'] == 'wiki' || $link['type'] == 'wiki-unknown')
! 	       $wikilinks[$brktlinks[1][$i]]++;
  
              $brktlink = preg_quote($brktlinks[0][$i]);
--- 496,500 ----
  	    $link = ParseAndLink($brktlinks[0][$i]);
  	    if($link['type'] == 'wiki' || $link['type'] == 'wiki-unknown')
! 	       $wikilinks[$brktlinks[1][$i]] = 1;
  
              $brktlink = preg_quote($brktlinks[0][$i]);
***************
*** 500,506 ****
  
           if (preg_match_all("/!?$WikiNameRegexp/", $line, $link)) {
!             for ($i = 0; $link[0][$i]; $i++) {
                 if($link[0][$i][0] <> '!')
!                   $wikilinks[$link[0][$i]]++;
  	    }
           }
--- 503,509 ----
  
           if (preg_match_all("/!?$WikiNameRegexp/", $line, $link)) {
!             for ($i = 0; isset($link[0][$i]); $i++) {
                 if($link[0][$i][0] <> '!')
!                   $wikilinks[$link[0][$i]] = 1;
  	    }
           }

[phpwiki-checkins] CVS: phpwiki/lib config.php,1.13,1.14

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv19625/lib

Modified Files:
	config.php 
Log Message:
use $SCRIPT_NAME instead of $REQUEST_URI
removed $ServerAddress - not used anywhere (simplifies $ScriptUrl="" case)
added ALT tag to logo image


Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** config.php	2000/10/31 20:24:30	1.13
--- config.php	2000/11/01 10:24:58	1.14
***************
*** 89,93 ****
     // Miscellanious
  
!    // logo image
     $logo = "images/wikibase.png";
     // signature image which is shown after saving an edited page
--- 89,93 ----
     // Miscellanious
  
!    // logo image (path relative to index.php)
     $logo = "images/wikibase.png";
     // signature image which is shown after saving an edited page
***************
*** 180,194 ****
  
     if (empty($ScriptUrl)) {
!       if (preg_match("#(.*?)([^/]*$)#", $REQUEST_URI, $matches)) {
! 	 $ServerAddress = "http://$SERVER_NAME:$SERVER_PORT" . $matches[1];
!       } else {
! 	 $ServerAddress = "http://$SERVER_NAME:$SERVER_PORT$REQUEST_URI";
!       }
!       $ScriptName = basename($HTTP_SERVER_VARS["PHP_SELF"]);
!       $ScriptUrl = $ServerAddress . $ScriptName;
     }
  
!    $LogoImage = "<img src='${ServerAddress}$logo' border='0'>";
!    $LogoImage = "<a href='$ScriptUrl'>$LogoImage</a>";
  
     $FieldSeparator = "\263";
--- 180,188 ----
  
     if (empty($ScriptUrl)) {
!       $ScriptUrl = "http://$SERVER_NAME:$SERVER_PORT$SCRIPT_NAME";
     }
  
!    $LogoImage = "<img src=\"$logo\" border=0 ALT=\"[PhpWiki!]\">";
!    $LogoImage = "<a href=\"$ScriptUrl\">$LogoImage</a>";
  
     $FieldSeparator = "\263";

[phpwiki-checkins] CVS: phpwiki/lib config.php,1.12,1.13

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv24035

Modified Files:
	config.php 
Log Message:
restructured config.php completely -- hope this is more readable / useable

Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** config.php	2000/10/31 17:07:08	1.12
--- config.php	2000/10/31 20:24:30	1.13
***************
*** 5,50 ****
     rcs_id('$Id$');
  
!    /*
!       Constants and settings. Edit the values below for
!       your site. You need two image files, a banner and 
!       a signature. The dbm file MUST be writable by the
!       web server or this won't work. If you configure your
!       server to allow index.php as an index file, you 
!       can just give the URL without the script name.
!    */
! 
!    // If you need to access your Wiki from assorted locations and
!    // you use DHCP, this setting might work for you:
! 
!    //$ServerAddress = "http:";
! 
!    // It works quite well thanks to relative URIs. (Yes, that's just
!    // 'http:'). If find that you want an explicit address (recommended), 
!    // you can set one yourself by changing and uncommenting:
  
!    //$ServerAddress = "http://your.hostname.org/phpwiki/";
  
!    // Or you could use the if/else statement below to deduce
!    // the $ServerAddress dynamically. (Default)
  
!    if (preg_match("#(.*?)([^/]*$)#", $REQUEST_URI, $matches)) {
!       $ServerAddress = "http://$SERVER_NAME:$SERVER_PORT" . $matches[1];
!    } else {
!       $ServerAddress = "http://$SERVER_NAME:$SERVER_PORT$REQUEST_URI";
!    }
  
!    //  Select your language here
!  
!    $LANG="C"; // (What should be the) Default: English
!    // $LANG="nl";  // We all speak dutch, no?
!    // $LANG="es";  // We all speak spanish, no?
  
     if (!function_exists ('gettext')) {
        $lcfile = "locale/$LANG/LC_MESSAGES/phpwiki.php";
!       if(file_exists($lcfile)) {
!          include($lcfile);
!       } else {
!          $locale = array();
!       }
  
        function gettext ($text) { 
--- 5,133 ----
     rcs_id('$Id$');
  
!    /////////////////////////////////////////////////////////////////////
!    // Constants and settings. Edit the values below for your site.
  
!    // URL of index.php e.g. http://yoursite.com/phpwiki/index.php
!    // you can leave this empty - it will be calculated automatically
!    $ScriptUrl = "";
! 
!    //  Select your language - default language "C": English
!    // other languages available: Dutch "nl", Spanish "es"
!    $LANG="C";
! 
!    /////////////////////////////////////////////////////////////////////
!    // Database section
!    // set your database here and edit the according section below
!    $WhichDatabase = 'dbm'; // use one of "dbm", "mysql", "pgsql", "msql",
! 			   // or "file"
!    
!    // DBM settings (default)
!    if ($WhichDatabase == 'dbm') {
!       $DBMdir = "/tmp";
!       $WikiPageStore = "wiki";
!       $ArchivePageStore = "archive";
!       $WikiDB['wiki']      = "$DBMdir/wikipagesdb";
!       $WikiDB['archive']   = "$DBMdir/wikiarchivedb";
!       $WikiDB['wikilinks'] = "$DBMdir/wikilinksdb";
!       $WikiDB['hottopics'] = "$DBMdir/wikihottopicsdb";
!       $WikiDB['hitcount']  = "$DBMdir/wikihitcountdb";
!       // try this many times if the dbm is unavailable
!       define("MAX_DBM_ATTEMPTS", 20);
!       include "lib/dbmlib.php";
! 
!    // MySQL settings -- see INSTALL.mysql for details on using MySQL
!    } elseif ($WhichDatabase == 'mysql') {
!       $WikiPageStore = "wiki";
!       $ArchivePageStore = "archive";
!       $mysql_server = 'localhost';
!       $mysql_user = 'root';
!       $mysql_pwd = '';
!       $mysql_db = 'wiki';
!       include "lib/mysql.php";
! 
!    // PostgreSQL settings -- see INSTALL.pgsql for more details
!    } elseif ($WhichDatabase == 'pgsql') {
!       $pg_dbhost    = "localhost";
!       $pg_dbport    = "5432";
!       $WikiDataBase  = "wiki"; // name of the database in Postgresql
!       $WikiPageStore = "wiki";
!       $ArchivePageStore = "archive";
!       $WikiLinksPageStore = "wikilinks";
!       $HotTopicsPageStore = "hottopics";
!       $HitCountPageStore = "hitcount";
!       include "lib/pgsql.php";
! 
!    // MiniSQL (mSQL) settings -- see INSTALL.msql for details on using mSQL
!    } elseif ($WhichDatabase == 'msql') {
!       $msql_db = "wiki";
!       $WikiPageStore = array();
!       $ArchivePageStore = array();
!       $WikiPageStore['table']         = "wiki";
!       $WikiPageStore['page_table']    = "wikipages";
!       $ArchivePageStore['table']      = "archive";
!       $ArchivePageStore['page_table'] = "archivepages";
!       // should be the same as wikipages.line
!       define("MSQL_MAX_LINE_LENGTH", 128);
!       include "lib/msql.php";
  
!    // Filesystem DB settings
!    } elseif ($WhichDatabase == 'file') {
!       $DBdir = "/tmp/wiki";
!       $WikiPageStore = "wiki";
!       $ArchivePageStore = "archive";
!       $WikiDB['wiki']      = "$DBdir/pages";
!       $WikiDB['archive']   = "$DBdir/archive";
!       $WikiDB['wikilinks'] = "$DBdir/links";
!       $WikiDB['hottopics'] = "$DBdir/hottopics";
!       $WikiDB['hitcount']  = "$DBdir/hitcount";
!       include "lib/db_filesystem.php";
  
!     } else die("Invalid '\$WhichDatabase' in lib/config.php"); 
! 
! 
!    /////////////////////////////////////////////////////////////////////
!    // Miscellanious
! 
!    // logo image
!    $logo = "images/wikibase.png";
!    // signature image which is shown after saving an edited page
!    $SignatureImg = "images/signature.png";
! 
!    // date & time formats used to display modification times, etc.
!    // formats are given as format strings to PHP date() function
!    $datetimeformat = "F j, Y";	// may contain time of day
!    $dateformat = "F j, Y";	// must not contain time
! 
!    // this defines how many page names to list when displaying
!    // the MostPopular pages; the default is to show the 20 most popular pages
!    define("MOST_POPULAR_LIST_LENGTH", 20);
! 
!    // this defines how many page names to list when displaying related pages
!    define("NUM_RELATED_PAGES", 5);
! 
!    // number of user-defined external references, i.e. "[1]"
!    define("NUM_LINKS", 12);
  
!    // allowed protocols for links - be careful not to allow "javascript:"
!    // within a named link [name|uri] one more protocol is defined: phpwiki
!    $AllowedProtocols = "http|https|mailto|ftp|news|gopher";
  
+    // URLs ending with the following extension should be inlined as images
+    $InlineImages = "png|jpg|gif";
+ 
+    // Perl regexp for WikiNames
+    // (?<!..) & (?!...) used instead of '\b' because \b matches '_' as well
+    $WikiNameRegexp = "(?<![A-Za-z0-9])([A-Z][a-z]+){2,}(?![A-Za-z0-9])";
+ 
+ 
+ 
+    /////////////////////////////////////////////////////////////////////
+    // Original pages and layout
+ 
+    // need to define localization function first -- skip this
     if (!function_exists ('gettext')) {
        $lcfile = "locale/$LANG/LC_MESSAGES/phpwiki.php";
!       if (file_exists($lcfile)) { include($lcfile); }
!       else { $locale = array(); }
  
        function gettext ($text) { 
***************
*** 59,163 ****
        textdomain ("phpwiki");
     }
  
!    // if you are using MySQL instead of a DBM to store your
!    // Wiki pages, use mysql.php instead of dbmlib.php
!    // See INSTALL.mysql for details on using MySQL
! 
!    // if you are using Postgressl instead of a DBM to store your
!    // Wiki pages, use pgsql.php instead of dbmlib.php
!    // See INSTALL.pgsql for details on using Postgresql
! 
!    // if you are using mSQL instead of a DBM to store your
!    // Wiki pages, use msql.php instead of dbmlib.php
!    // See INSTALL.mysql for details on using mSQL
! 
! 
!    // DBM settings (default)
!    include "lib/dbmlib.php";
!    $DBMdir = "/tmp";
!    $WikiPageStore = "wiki";
!    $ArchivePageStore = "archive";
!    $WikiDB['wiki']      = "$DBMdir/wikipagesdb";
!    $WikiDB['archive']   = "$DBMdir/wikiarchivedb";
!    $WikiDB['wikilinks'] = "$DBMdir/wikilinksdb";
!    $WikiDB['hottopics'] = "$DBMdir/wikihottopicsdb";
!    $WikiDB['hitcount']  = "$DBMdir/wikihitcountdb";
! 
! /*
!    // MySQL settings (thanks Arno Hollosi! <aho...@in...>)
!    // Comment out the lines above (for the DBM) if you use these
!    include "lib/mysql.php";
!    $WikiPageStore = "wiki";
!    $ArchivePageStore = "archive";
!    $mysql_server = 'localhost';
!    $mysql_user = 'root';
!    $mysql_pwd = '';
!    $mysql_db = 'wiki';
! */
! 
! /*
!    // PostgreSQL settings. 
!    include "lib/pgsql.php";
!    $WikiDataBase  = "wiki"; // name of the database in Postgresql
!    $WikiPageStore = "wiki"; // name of the table where pages are stored
!    $ArchivePageStore = "archive"; // name of the table where pages are archived
!    $WikiLinksPageStore = "wikilinks";
!    $HotTopicsPageStore = "hottopics";
!    $HitCountPageStore = "hitcount";
!    $pg_dbhost    = "localhost";
!    $pg_dbport    = "5432";
! */
! 
! 
! /*
!    // MiniSQL (mSQL) settings.
!    include "lib/msql.php";
!    $msql_db = "wiki";
!    // should be the same as wikipages.line
!    define("MSQL_MAX_LINE_LENGTH", 128);
!    $WikiPageStore = array();
!    $ArchivePageStore = array();
! 
!    $WikiPageStore['table']         = "wiki";
!    $WikiPageStore['page_table']    = "wikipages";
!    $ArchivePageStore['table']      = "archive";
!    $ArchivePageStore['page_table'] = "archivepages";
!    // end mSQL settings
! */
! 
! /*
!    // Filesystem DB settings
!    include "lib/db_filesystem.php";
!    $DBdir = "/tmp/wiki";
!    $WikiPageStore = "wiki";
!    $ArchivePageStore = "archive";
!    $WikiDB['wiki']      = "$DBdir/pages";
!    $WikiDB['archive']   = "$DBdir/archive";
!    $WikiDB['wikilinks'] = "$DBdir/links";
!    $WikiDB['hottopics'] = "$DBdir/hottopics";
!    $WikiDB['hitcount']  = "$DBdir/hitcount";
!    // End Filsystem Settings
! */
! 
  
!    /* WIKI_PGSRC
!     *
!     * This constant specifies the source for the initial page contents
      * of the Wiki.  The setting of WIKI_PGSRC only has effect when
      * the wiki is accessed for the first time (or after clearing the
!     * database.)
!     *
!     * The WIKI_PGSRC can either name a directory or a zip file.
      * In either case WIKI_PGSRC is scanned for files --- one file per page.
      *
-     * FIXME: this documentation needs to be clarified.
-     *
      * If the files appear to be MIME formatted messages, they are
      * scanned for application/x-phpwiki content-types.  Any suitable
      * content is added to the wiki.
-     *
      * The files can also be plain text files, in which case the page name
      * is taken from the file name.
      */
     define('WIKI_PGSRC', gettext("./pgsrc")); // Default (old) behavior.
     //define('WIKI_PGSRC', './wiki.zip'); // New style.
--- 142,168 ----
        textdomain ("phpwiki");
     }
+    // end of localization function
  
!    // Template files (filenames are relative to script position)
!    $templates = array(
!    	"BROWSE" =>    gettext("templates/browse.html"),
! 	"EDITPAGE" =>  gettext("templates/editpage.html"),
! 	"EDITLINKS" => gettext("templates/editlinks.html"),
! 	"MESSAGE" =>   gettext("templates/message.html")
! 	);
  
!    /* WIKI_PGSRC -- specifies the source for the initial page contents
      * of the Wiki.  The setting of WIKI_PGSRC only has effect when
      * the wiki is accessed for the first time (or after clearing the
!     * database.) WIKI_PGSRC can either name a directory or a zip file.
      * In either case WIKI_PGSRC is scanned for files --- one file per page.
      *
      * If the files appear to be MIME formatted messages, they are
      * scanned for application/x-phpwiki content-types.  Any suitable
      * content is added to the wiki.
      * The files can also be plain text files, in which case the page name
      * is taken from the file name.
      */
+ 
     define('WIKI_PGSRC', gettext("./pgsrc")); // Default (old) behavior.
     //define('WIKI_PGSRC', './wiki.zip'); // New style.
***************
*** 168,223 ****
     // DEFAULT_WIKI_PGSRC defines where the English pages reside 
     define('DEFAULT_WIKI_PGSRC', "./pgsrc");
-   
-    $ScriptName = "index.php";
- 
-    $SignatureImg = "images/signature.png";
-    $logo = "images/wikibase.png";
  
-    // Template files (filenames are relative to script position)
-    $templates = array(
-    	"BROWSE" =>    gettext("templates/browse.html"),
- 	"EDITPAGE" =>  gettext("templates/editpage.html"),
- 	"EDITLINKS" => gettext("templates/editlinks.html"),
- 	"MESSAGE" =>   gettext("templates/message.html")
- 	);
  
-    // date & time formats used to display modification times, etc.
-    // formats are given as format strings to PHP date() function
-    $datetimeformat = "F j, Y";	// may contain time of day
-    $dateformat = "F j, Y";	// must not contain time
  
-    // allowed protocols for links - be careful not to allow "javascript:"
-    // within a named link [name|uri] one more protocol is defined: phpwiki
-    // that phpwiki protocol must not be used below
-    $AllowedProtocols = "http|https|mailto|ftp|news|gopher";
- 
-    // URLs ending with the following extension should be inlined as images
-    $InlineImages = "png|jpg|gif";
- 
-    // Perl regexp for WikiNames
-    // (?<!..) & (?!...) used instead of '\b' because \b matches '_' as well
-    $WikiNameRegexp = "(?<![A-Za-z0-9])([A-Z][a-z]+){2,}(?![A-Za-z0-9])";
- 
-    // this defines how many page names to list when displaying
-    // the MostPopular pages; i.e. setting this to 20 will show
-    // the 20 most popular pages
-    define("MOST_POPULAR_LIST_LENGTH", 20);
- 
-    // this defines how many page names to list when displaying
-    // scored related pages
-    define("NUM_RELATED_PAGES", 5);
- 
-    // number of user-defined external links, i.e. "[1]"
-    define("NUM_LINKS", 12);
- 
-    // try this many times if the dbm is unavailable
-    define("MAX_DBM_ATTEMPTS", 20);
- 
- 
     //////////////////////////////////////////////////////////////////////
- 
     // you shouldn't have to edit anyting below this line
  
-    $ScriptUrl = $ServerAddress . $ScriptName;
     $LogoImage = "<img src='${ServerAddress}$logo' border='0'>";
     $LogoImage = "<a href='$ScriptUrl'>$LogoImage</a>";
--- 173,192 ----
     // DEFAULT_WIKI_PGSRC defines where the English pages reside 
     define('DEFAULT_WIKI_PGSRC', "./pgsrc");
  
  
  
     //////////////////////////////////////////////////////////////////////
     // you shouldn't have to edit anyting below this line
+ 
+    if (empty($ScriptUrl)) {
+       if (preg_match("#(.*?)([^/]*$)#", $REQUEST_URI, $matches)) {
+ 	 $ServerAddress = "http://$SERVER_NAME:$SERVER_PORT" . $matches[1];
+       } else {
+ 	 $ServerAddress = "http://$SERVER_NAME:$SERVER_PORT$REQUEST_URI";
+       }
+       $ScriptName = basename($HTTP_SERVER_VARS["PHP_SELF"]);
+       $ScriptUrl = $ServerAddress . $ScriptName;
+    }
  
     $LogoImage = "<img src='${ServerAddress}$logo' border='0'>";
     $LogoImage = "<a href='$ScriptUrl'>$LogoImage</a>";

[phpwiki-checkins] CVS: phpwiki/lib transform.php,1.5,1.6

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv30954

Modified Files:
	transform.php 
Log Message:
added "!" syntax for URLs as well, i.e. !http://some.site/ does NOT create a hyperlink

Index: transform.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** transform.php	2000/10/25 14:45:53	1.5
--- transform.php	2000/10/31 19:24:08	1.6
***************
*** 103,109 ****
        // with Wiki words later. Wiki words in URL's break things.
  
!       $tmpline = tokenize($tmpline, "\b($AllowedProtocols):[^\s<>\[\]\"'()]*[^\s<>\[\]\"'(),.?]", $replacements, $ntokens);
        while ($oldn < $ntokens) {
! 	$replacements[$oldn] = LinkURL($replacements[$oldn]);
          $oldn++;
        }
--- 103,112 ----
        // with Wiki words later. Wiki words in URL's break things.
  
!       $tmpline = tokenize($tmpline, "!?\b($AllowedProtocols):[^\s<>\[\]\"'()]*[^\s<>\[\]\"'(),.?]", $replacements, $ntokens);
        while ($oldn < $ntokens) {
!         if($replacements[$oldn][0] == '!')
! 	   $replacements[$oldn] = substr($replacements[$oldn], 1);
! 	else
! 	   $replacements[$oldn] = LinkURL($replacements[$oldn]);
          $oldn++;
        }

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.6,1.7

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv30792

Modified Files:
	stdlib.php 
Log Message:
"phpwiki:" protocol patch -- omitted stdlib.php in previous commit - *sigh*

Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** stdlib.php	2000/10/26 11:34:36	1.6
--- stdlib.php	2000/10/31 19:23:03	1.7
***************
*** 342,346 ****
        global $remoteuser; // this is set in the config
        global $dateformat;
-       global $ScriptUrl;
        global $WikiPageStore;
  
--- 342,345 ----
***************
*** 391,395 ****
           $newpage[$k++] = "* [$pagename] (new) ..... $remoteuser\r";
        } else {
! 	 $diffurl = "$ScriptUrl?diff=" . rawurlencode($pagename);
           $newpage[$k++] = "* [$pagename] ([diff|$diffurl]) ..... $remoteuser\r";
        }
--- 390,394 ----
           $newpage[$k++] = "* [$pagename] (new) ..... $remoteuser\r";
        } else {
! 	 $diffurl = "phpwiki:?diff=" . rawurlencode($pagename);
           $newpage[$k++] = "* [$pagename] ([diff|$diffurl]) ..... $remoteuser\r";
        }
***************
*** 414,418 ****
  
     function ParseAndLink($bracketlink) {
!       global $dbi, $AllowedProtocols, $InlineImages;
  
        // $bracketlink will start and end with brackets; in between
--- 413,417 ----
  
     function ParseAndLink($bracketlink) {
!       global $dbi, $ScriptUrl, $AllowedProtocols, $InlineImages;
  
        // $bracketlink will start and end with brackets; in between
***************
*** 424,428 ****
        preg_match("/([^|]+)(\|)?([^|]+)?/", $match[2], $matches);
  
- 
        // if $matches[3] is set, this is a link in the form of:
        // [some link name | http://blippy.com/]
--- 423,426 ----
***************
*** 440,444 ****
                 $link['link'] = "<a href=\"$URL\">$linkname</a>";
  	    }
!          } else {
              $link['type'] = 'url-bad';
              $link['link'] = "<b><u>BAD URL -- links have to start with one" . 
--- 438,445 ----
                 $link['link'] = "<a href=\"$URL\">$linkname</a>";
  	    }
!          } elseif (preg_match("#^phpwiki:(.*)#", $URL, $match)) {
! 	    $link['type'] = 'url-wiki-named';
! 	    $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" . 
***************
*** 470,477 ****
              $link['link'] = LinkUnknownWikiWord($linkname);
           }
- 
  	 return $link;
        }
- 
  
        $link['type'] = 'unknown';
--- 471,476 ----

[phpwiki-checkins] CVS: phpwiki/lib config.php,1.11,1.12

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17066/lib

Modified Files:
	config.php 
Log Message:
added "phpwiki:" protocol within named links [name|uri]
UpdateRecentChanges() uses "phpwiki:" instead of raw url now


Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** config.php	2000/10/31 16:18:42	1.11
--- config.php	2000/10/31 17:07:08	1.12
***************
*** 188,191 ****
--- 188,193 ----
  
     // allowed protocols for links - be careful not to allow "javascript:"
+    // within a named link [name|uri] one more protocol is defined: phpwiki
+    // that phpwiki protocol must not be used below
     $AllowedProtocols = "http|https|mailto|ftp|news|gopher";
  

[phpwiki-checkins] CVS: phpwiki/lib config.php,1.10,1.11

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv11829/lib

Modified Files:
	config.php 
Log Message:
Changed $WikiNameRegexp: doesn't use "\b" (word-boundary) anymore.
Necessary because '_' is interpreted as word-character too and thus
e.g. "__WikiName__" is not recognized as link. Note that now
"previously_not_a_WikiName" renders the "WikiName" part as link now too.


Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** config.php	2000/10/30 07:41:10	1.10
--- config.php	2000/10/31 16:18:42	1.11
***************
*** 194,198 ****
  
     // Perl regexp for WikiNames
!    $WikiNameRegexp = "\b([A-Z][a-z]+){2,}\b";
  
     // this defines how many page names to list when displaying
--- 194,199 ----
  
     // Perl regexp for WikiNames
!    // (?<!..) & (?!...) used instead of '\b' because \b matches '_' as well
!    $WikiNameRegexp = "(?<![A-Za-z0-9])([A-Z][a-z]+){2,}(?![A-Za-z0-9])";
  
     // this defines how many page names to list when displaying

[phpwiki-checkins] CVS: phpwiki/lib config.php,1.9,1.10

[Arno H. <aho...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv25045/lib

Modified Files:
	config.php 
Log Message:
fix for bug #117729 (fake author)

Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** config.php	2000/10/28 17:44:00	1.9
--- config.php	2000/10/30 07:41:10	1.10
***************
*** 224,229 ****
     // Apache won't show REMOTE_HOST unless the admin configured it
     // properly. We'll be nice and see if it's there.
!    empty($REMOTE_HOST) ?
!       ($remoteuser = $REMOTE_ADDR) : ($remoteuser = $REMOTE_HOST);
  
     // constants used for HTML output. List tags like UL and 
--- 224,229 ----
     // Apache won't show REMOTE_HOST unless the admin configured it
     // properly. We'll be nice and see if it's there.
!    getenv('REMOTE_HOST') ? ($remoteuser = getenv('REMOTE_HOST'))
!                          : ($remoteuser = getenv('REMOTE_ADDR'));
  
     // constants used for HTML output. List tags like UL and