phpwiki-checkins Mailing List for PhpWiki

これからはイベント盛りだくさん。
女子大生を一人にしておいたら
可哀想、もったいない!
http://liu-xiaxia.com/deai/
問い合わせ
sinece2005_yah@yahoo,com.cn

DQqCsYLqgqmC54LNg0ODeIOTg2eQt4Logr6CrYKzgvGBQg0Kj5eOcZHlkLaC8IjqkGyCyYK1gsSC
qIKigr2C5w0KicKIo5F6gUGC4ILBgr2CooLIgqKBSQ0KaHR0cDovL2xpdS14aWF4aWEuY29tL2d1
aWRlLw0KDQqW4oKijYeC7YK5DQp4aWFvbWVua2FpeGluZ2Z1bGFpQHlobyyCg29tgUVjbg0KDQoy
MzA5OQ0K

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2317
Removed Files:
	AddCommentPlugin AddingPages AnalyseAccessLogSqlPlugin 
	AppendTextPlugin AuthorHistoryPlugin CalendarListPlugin 
	CalendarPlugin CommentPlugin CreatePagePlugin CreateTocPlugin 
	EditMetaDataPlugin EditText ExternalSearchPlugin 
	FoafViewerPlugin FrameIncludePlugin GoodStyle GraphVizPlugin 
	HelloWorldPlugin HowToUseWiki IncludePagePlugin LinkIcons 
	ListPagesPlugin MagicPhpWikiURLs MoreAboutMechanics 
	NewMarkupTestPage OldMarkupTestPage OldStyleTablePlugin 
	OldTextFormattingRules PageGroupTest PageGroupTestOne 
	PageGroupTestThree PageGroupTestTwo PhotoAlbumPlugin 
	PhpHighlightPlugin PhpWeatherPlugin RawHtmlPlugin 
	RedirectToPlugin RichTablePlugin RssFeedPlugin 
	SearchHighlightPlugin SyntaxHighlighterPlugin SystemInfoPlugin 
	TeX2pngPlugin TemplatePlugin TextFormattingRules 
	TranscludePlugin UnfoldSubpagesPlugin UpLoadPlugin WabiSabi 
	WikiBlogPlugin WikiPlugin 
Log Message:
major pgsrc restructuring: step 2
--- AddCommentPlugin DELETED ---
--- AddingPages DELETED ---
--- AnalyseAccessLogSqlPlugin DELETED ---
--- AppendTextPlugin DELETED ---
--- AuthorHistoryPlugin DELETED ---
--- CalendarListPlugin DELETED ---
--- CalendarPlugin DELETED ---
--- CommentPlugin DELETED ---
--- CreatePagePlugin DELETED ---
--- CreateTocPlugin DELETED ---
--- EditMetaDataPlugin DELETED ---
--- EditText DELETED ---
--- ExternalSearchPlugin DELETED ---
--- FoafViewerPlugin DELETED ---
--- FrameIncludePlugin DELETED ---
--- GoodStyle DELETED ---
--- GraphVizPlugin DELETED ---
--- HelloWorldPlugin DELETED ---
--- HowToUseWiki DELETED ---
--- IncludePagePlugin DELETED ---
--- LinkIcons DELETED ---
--- ListPagesPlugin DELETED ---
--- MagicPhpWikiURLs DELETED ---
--- MoreAboutMechanics DELETED ---
--- NewMarkupTestPage DELETED ---
--- OldMarkupTestPage DELETED ---
--- OldStyleTablePlugin DELETED ---
--- OldTextFormattingRules DELETED ---
--- PageGroupTest DELETED ---
--- PageGroupTestOne DELETED ---
--- PageGroupTestThree DELETED ---
--- PageGroupTestTwo DELETED ---
--- PhotoAlbumPlugin DELETED ---
--- PhpHighlightPlugin DELETED ---
--- PhpWeatherPlugin DELETED ---
--- RawHtmlPlugin DELETED ---
--- RedirectToPlugin DELETED ---
--- RichTablePlugin DELETED ---
--- RssFeedPlugin DELETED ---
--- SearchHighlightPlugin DELETED ---
--- SyntaxHighlighterPlugin DELETED ---
--- SystemInfoPlugin DELETED ---
--- TeX2pngPlugin DELETED ---
--- TemplatePlugin DELETED ---
--- TextFormattingRules DELETED ---
--- TranscludePlugin DELETED ---
--- UnfoldSubpagesPlugin DELETED ---
--- UpLoadPlugin DELETED ---
--- WabiSabi DELETED ---
--- WikiBlogPlugin DELETED ---
--- WikiPlugin DELETED ---

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30257
Modified Files:
	FindPage HomePage PgsrcTranslation%2Fsv ReleaseNotes 
Added Files:
	Help%2FAddCommentPlugin Help%2FAddingPages 
	Help%2FAnalyseAccessLogSqlPlugin Help%2FAppendTextPlugin 
	Help%2FAuthorHistoryPlugin Help%2FCalendarListPlugin 
	Help%2FCalendarPlugin Help%2FCommentPlugin 
	Help%2FCreatePagePlugin Help%2FCreateTocPlugin 
	Help%2FEditMetaDataPlugin Help%2FEditText 
	Help%2FExternalSearchPlugin Help%2FFoafViewerPlugin 
	Help%2FFrameIncludePlugin Help%2FGoodStyle 
	Help%2FGraphVizPlugin Help%2FHelloWorldPlugin 
	Help%2FHowToUseWiki Help%2FIncludePagePlugin Help%2FLinkIcons 
	Help%2FListPagesPlugin Help%2FMagicPhpWikiURLs 
	Help%2FMoreAboutMechanics Help%2FNewMarkupTestPage 
	Help%2FOldMarkupTestPage Help%2FOldStyleTablePlugin 
	Help%2FOldTextFormattingRules Help%2FPageGroupTest 
	Help%2FPageGroupTestFour Help%2FPageGroupTestOne 
	Help%2FPageGroupTestThree Help%2FPageGroupTestTwo 
	Help%2FPhotoAlbumPlugin Help%2FPhotoAlbumPlugin%2FSlides 
	Help%2FPhpHighlightPlugin Help%2FPhpWeatherPlugin 
	Help%2FRawHtmlPlugin Help%2FRedirectToPlugin 
	Help%2FRichTablePlugin Help%2FRssFeedPlugin 
	Help%2FSearchHighlightPlugin Help%2FSyntaxHighlighterPlugin 
	Help%2FSystemInfoPlugin Help%2FTeX2pngPlugin 
	Help%2FTemplatePlugin Help%2FTextFormattingRules 
	Help%2FTranscludePlugin Help%2FUnfoldSubpagesPlugin 
	Help%2FUpLoadPlugin Help%2FWabiSabi Help%2FWikiBlogPlugin 
	Help%2FWikiPlugin 
Log Message:
major pgsrc restructuring: internal doc into Help/*
--- NEW FILE: Help%2FAddCommentPlugin ---
Date: Sun, 4 Jul 2004 01:31:02 -0700
Mime-Version: 1.0 (Produced by PhpWiki 1.3.8)
X-Rcs-Id: $Id: Help%2FAddCommentPlugin,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FAddCommentPlugin;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
Help:WikiPlugin to let users attach comments to the end of a page. Since v1.3.8.
Change the layout via the templates comment.tmpl and addcomment.tmpl, and the CSS classes
wikicomment, wikicomment-header, wikicomment-body, wikicomment-footer
!! Usage
<verbatim>
 <?plugin AddComment order||=normal jshide||=0 mode||=show,add noheader||=0 ?>
</verbatim>
!! Plugin Arguments
__jshide__: |
 Boolean if the comments and/or textbox should be initially hidden and on click expanded. Default: 0
__order__: |
 List comments in chronological (order=normal) or reverse order (order=reverse)
__mode__: |
 List of add and/or show. Default: add,show
__noheader__: |
 Boolean if the "Comments" h2 header should be omitted. Default: 0
__pagename__: |
 Attach to which page? Default: current pagename
!! Known Problems
jshide does not work yet. Not very well tested.
!! Examples
<?plugin AddComment jshide||=1 ?>
-------------
PhpWikiDocumentation Help:WikiPlugin
--- NEW FILE: Help%2FAddingPages ---
Date: 2002年1月27日 17:28:55 -0500
Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks)
X-Rcs-Id: $Id: Help%2FAddingPages,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FAddingPages;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
To add a new page to Wiki, all you have to do is come up with a
meaningful title, capitalize all the words and
StringThemTogetherLikeThis. Wiki automagically recognizes it as a
hyperlink. Alternatively, you can put anything into Help:e brackets].
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://phpwiki.sourceforge.net/
The Wiki does not support HTML tags (see Help:TextFormattingRules).
<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.
----
PhpWikiDocumentation
--- NEW FILE: Help%2FAnalyseAccessLogSqlPlugin ---
Date: Wed, 2 Feb 2005 20:32:44 +0100
Mime-Version: 1.0 (Produced by PhpWiki 1.3.11)
X-Rcs-Id: $Id: Help%2FAnalyseAccessLogSqlPlugin,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FAnalyseAccessLogSqlPlugin;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
The AnalyseAccessLogSql plugin provides a framework to analyse the SQL access log 
and display the results.
This information may be sensitive and therefore this plugin is limited to 
administrator access only.
A small number of queries that may (or might not) use the ~MySQL
specific dialect of SQL are provided in <tt>lib/plugin/~AnalyseAccessLogSql.php</tt>. 
For more information, please see the section *Adding new queries* below.
!!!Usage
Experimental! Will change a lot.
!!!Usage
<verbatim>
 <?plugin AnalyseAccessLogSql mode=<QUERY NAME> ?>
</verbatim>
!Parameters
mode _(required parameter)_:
 The name of the query to execute. See *Adding new queries* below.
period:
 Use in combination with the _count_ parameter. The type of history period to retrieve from the SQL access log. Blank (the default) for all history, or one of "*weeks*", "*days*", "*hours*", or "*minutes*".
count:
 Use in combination with the _period_ parameter. Must be a number. The number of periods to retrieve from the access log.
caption:
 The value of this parameter is used as the caption for the output. If not set, the caption on the table defaults to the mode.
center:
 If set, the table is centered on the page, otherwise left justified.
debugShowQuery:
 If set, the SQL will be displayed in the table footer. Useful while debugging new queries or just for interest.
user:
 Blank (the default) to retrieve all users, or a specific user, or "*<NONE>*" for SQL access log entries with no user.
host:
 Blank (the default) to retrieve all remote_hosts, or a specific host.
referrer:
 Blank (the default) to retrieve all referrers, "*<NONE>*" to retrieve entries with no referrer, otherwise any referrer that matches this parameter, truncating longer referrers before matching. So a parameter of referrer='~http://localhost' will match '~http://localhost/wiki/index.php', '~http://localhost/wiki/index.php/~HomePage' etc.
local_referrers:
 If set (the default), return all referrers. If not set, return only external referring sites, excluding references from within the wiki.
!!!Adding new queries
The file <tt>lib/plugin/AnalyseAccessLogSql.php</tt> contains a default set of queries against the SQL access log.
Feel free to change this file to suit your own needs, but please note that this requires filesystem access to the web server where PhpWiki is running.
In particular, this file may need to be modified to correctly query databases other than MySQL.
The queries supplied by default are: "*Referring URLs*", "*Referring Domains*", "*Remote Hosts*", "*Users*" and "*Host Users*".
To add a new query, add a new section towards the end of the file, using one of the existing queries as a template. An example of an existing query is:
<pre>
} elseif ($mode=="Users") {
 $query = "SELECT "
 ."remote_user AS User, "
 ."count(*) AS 'Access Count' "
 ."FROM $accesslog "
 .($whereConditions ? 'WHERE '.$whereConditions : '')
 ."GROUP BY User";
</pre>
If you do add a query, please consider contributing it back to the PhpWiki project at http://http://sourceforge.net/projects/phpwiki
!API for ~AnalyseAccessLogSql
* input arguments:
 - *$mode* contains the name of the query requested in the plugin parameters.
 - *$accesslog* contains the qualified name of the accesslog table, which may or may not be equal to "accesslog".
 - *$whereConditions* contains the conditions (specific user, etc.) requested in the plugin parameters.
* output:
 - *$query* must contain the final SQL query to be executed.
* conventions:
 - While constructing the query string,
 * each clause is on a separate line and
 * each clause contains the required trailing punctuation or space.
 - The mode parameter is, by default, displayed as the caption in the final output, so please choose a user friendly name.
 - The column names displayed on the wiki page are generated from the SQL column names defined in the queries, so please choose user friendly names. MySQL allows column names to include spaces. If spaces are not allowed, then "*_*" is probably the next best choice.
* language hints for PHP newbies - please remember:
 - terminate statements with "*;*",
 - assignment uses "*=*" and comparison uses "*==*",
 - concatenate strings using the "*.*" operator,
 - the parentheses around the expression "*=($whereConditions ? 'WHERE '.$whereConditions : '' )=*" are essential,
 - strings enclosed in single quotes may not contain substrings enclosed in single quotes (actually the truth is more complex but let's leave it like that here), and
 - strings enclosed in double quotes will evaluate and replace variable names so that, for example, *"FROM $accesslog "* might be evaluated to *"FROM phpwiki_accesslog "*.
! Author
PhpWiki:CharlesCorrigan %%%
Changes by PhpWiki:ReiniUrban
----
PhpWikiDocumentation Help:WikiPlugin
--- NEW FILE: Help%2FAppendTextPlugin ---
Date: 2004年11月25日 14:56:01 +0100
Mime-Version: 1.0 (Produced by PhpWiki 1.3.11pre)
X-Rcs-Id: $Id: Help%2FAppendTextPlugin,v 1.1 2005年11月21日 22:19:00 rurban Exp $ 
Content-Type: application/x-phpwiki;
 pagename=Help%2FAppendTextPlugin;
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
AppendText is a Help:WikiPlugin to automatically add text to a page. For general 
usage better use the AddCommentPlugin.
<verbatim>
<?plugin AppendText ?>
</verbatim>
!! Plugin Arguments
__page__: |
 Append to which page. Default: Current page.
__s__: |
 What text to add. Note: A \n is always prepended.
__before__: |
 (Optional) Add before the matching line beginning with before.
__after__: |
 (Optional) Add after the matching line beginning with after.
!! Examples
Add from a list of all available plugins one to the current page.
<verbatim>
 <?plugin WikiFormRich action=AppendText buttontext="AddPlugin"
 	 pulldown[] name=s text="Plugins: " value=<!plugin-list BackLinks page=WikiPlugin !>
 	 ?>
</verbatim>
Add from a list of all available Categories to the current page.
<verbatim>
 <?plugin WikiFormRich action=AppendText buttontext="AddCategory"
 	 pulldown[] name=s text="Categories: " value=<!plugin-list TitleSearch s=Category !>
 	 ?>
</verbatim>
----
PhpWikiDocumentation
--- NEW FILE: Help%2FAuthorHistoryPlugin ---
Date: Sun, 4 Jul 2004 01:31:02 -0700
Mime-Version: 1.0 (Produced by PhpWiki 1.3.7)
X-Rcs-Id: $Id: Help%2FAuthorHistoryPlugin,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FAuthorHistoryPlugin;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
This plugin allows you to list the history of edits by a particular
author; you can specify the page name as well (default is the current
page).
<verbatim>
<?plugin AuthorHistory user="test" ?>
<?plugin AuthorHistory page=HomePage ?>
</verbatim>
The second example will default to the current page. We can't provide
examples for you since we don't know any potential usernames for your
wiki.
-------------
PhpWikiDocumentation Help:WikiPlugin
--- NEW FILE: Help%2FCalendarListPlugin ---
Date: Sun, 4 Jul 2004 01:31:02 -0700
Mime-Version: 1.0 (Produced by PhpWiki 1.3.7)
X-Rcs-Id: $Id: Help%2FCalendarListPlugin,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FCalendarListPlugin;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
The Help:n | Help: is used in conjunction with the CalendarPlugin. It was written for those who use a wiki as a personal information manager.
Just click any date in the calendar, edit the for that date, then come back to this page. The event should be listed below the calendar.
Usage:
<verbatim>
<?plugin Calendar ?>
<?plugin CalendarList ?>
</verbatim>
Example (click any date and edit it, then return to this page):
<?plugin Calendar ?>
<?plugin CalendarList ?>
-----
PhpWikiDocumentation Help:WikiPlugin
--- NEW FILE: Help%2FCalendarPlugin ---
Date: Wed, 2 Feb 2005 20:32:44 +0100
Mime-Version: 1.0 (Produced by PhpWiki 1.3.11)
X-Rcs-Id: $Id: Help%2FCalendarPlugin,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FCalendarPlugin;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
The Help:n | Help: can be used to generate a monthly calendar in a
wiki page. It's handy for PhpWiki:PersonalWiki~s.
Individual dates in the calendar link to specially named wiki pages.
The names for the "day pages" are by default formed by appending the
date to the pagename on which the calendar appears.
_This feature was inspired by Help:a |http://manila.userland.com/],
and first implemented by PhpWiki:GaryBenson. It was later implemented as a
Help:WikiPlugin by PhpWiki:JeffDairiki._
!!Usage:
<verbatim>
<?plugin Calendar?>
</verbatim>
will get you:
<?plugin Calendar?>
--------
!! Plugin Arguments
!Selection of Month
<strong>year</strong>:
 Specify the year for the calendar. (Default: current year.)
<strong>month</strong>:
 Specify the month for the calendar. (Default: current month.)
<strong>month_offset</strong>:
 Added to ''month''. Can be used to include several months worth of
 calendars on a single wiki page.
 <?plugin Calendar month_offset=+1?>
!"Day Page" Names
<strong>date_format</strong>:
 Help:e | php-function:strftime] style format string used to
 generate page names for the "day pages." The default value is
 =%Y-%m-%d=.
<strong>prefix</strong>:
 Prepended to the date (formatted per ''date_format'') to generate
 the "day page" names. The default value is =~ Help:e ]/=.
!Appearance
<strong>month_format</strong>:
 Help:e | php-function:strftime] style format string used to
 generate the title of the calendar. (Default: =%B, %Y=.)
<strong>wday_format</strong>:
 Help:e | php-function:strftime] style format string used to
 generate the day-of-week names at the top of the calendar.
<strong>start_wday</strong>:
 What day of the week does the calendar start on. This should be
 specified as an integer in the range zero (Sunday) through six
 (Saturday), inclusive.
 <?plugin Calendar start_wday=1 ?>
-----
! Patch for 1.2
PhpWiki:GaryBenson wrote the first calendar implementation for PhpWiki 1.2.
(Since 1.2 doesn't support plugins, it uses a =###CALENDAR###= token
as a trigger.) 
Gary provides a screenshot at [ http://inauspicious.org/files/screenshots/calender.png | screenshot ], 
a Help:h | http://inauspicious.org/files/phpwiki/phpwiki-1.2.0-calendar.patch] (on 1.2.0), and
 Help:r .php | http://inauspicious.org/files/phpwiki/calendar.php]
(which renders a view of the year.)
----
PhpWikiDocumentation
--- NEW FILE: Help%2FCommentPlugin ---
Date: 2003年1月28日 11:26:41 +0100
Mime-Version: 1.0 (Produced by PhpWiki 1.3.4)
X-Rcs-Id: $Id: Help%2FCommentPlugin,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FCommentPlugin;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
!!! Synopsis
The [CommentPlugin|Help:CommentPlugin] lets you hide parts of a Wiki page without actually
deleting the text. Comments will only be visible in the Wiki markup
when editing or viewing the source.
!!! Usage
Simply place the text to be commented out between =<?plugin Comment=
and =?>=:
<verbatim>
<?plugin Comment
!!! A Hidden Section
This text will not show up in the generated HTML page, but it is still
visible when editing the WikiMarkup.
?>
</verbatim>
!!! Author
Martin Geisler mailto:gim...@gi....
<?plugin Comment
!!! "Fuzzy" Logic
Theorem: a cat has nine tails.
Proof:
 No cat has eight tails. A cat has one tail more than no cat.
 Therefore, a cat has nine tails.
?>
----
Help:WikiPlugin
--- NEW FILE: Help%2FCreatePagePlugin ---
Date: 2004年12月20日 01:30:02 -0800
Mime-Version: 1.0 (Produced by PhpWiki 1.3.11)
X-Rcs-Id: $Id: Help%2FCreatePagePlugin,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FCreatePagePlugin;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
Help:WikiPlugin to easily create new pages, optionally with default content. Since v1.3.8
This allows you to create a page geting the new pagename from a 
forms-based interface, and optionally with the initial content from 
some template.
Put a "<~?plugin-form ~CreatePage ?~>" at some page, browse this page, 
enter the name of the page to create, then click the button.
!! Usage
<verbatim>
 <?plugin-form CreatePage ?>
 <?plugin-form CreatePage template=CategoryHomePage ?>
 <?plugin-form CreatePage template=SomeTemplatePage vars="year=2004&name=None" ?>
</verbatim>
!! Plugin Arguments
*s*: |
 The pagename, which will passed to the plugin. Default: ""
*initial_content*: |
 The new page will be pre-filled with this content. Default: ""
*template*: |
 The new page will be pre-filled with the content of this page. Default: ""
*vars*: |
 variables to be expanded. Default: ""
*overwrite*: |
 Whether to overwrite an existing page. Default: "" 
!! Known Problems
None
!! Variable Expansion
The content (either initial_content or template) might hold some variables, which will be 
expanded on creation. Unassigned variables will stay as %%<var>%%, assigned variables without 
matching %%<var>%% placeholder will be ignored, without any warning.
A variable in a template is denoted as <tt>%%var%%</tt>, which will be expanded by the 
value of <tt>var</tt> given to the vars argument (in urlencoded php notation).
Some special variables are automatically assigned:
%%ctime%% | 
 $WikiTheme->formatDateTime(time())
%%author%% | 
 $user->getId()
This forms together with page templates and the PhpWiki:WikiFormRichPlugin and 
optionally the PhpWiki:SqlResultPlugin a framework to create templated pages.
!! Authors
Dan Frankowski, Reini Urban
!! Examples
<?plugin-form CreatePage s=MyHomePage ?>
See also PhpWiki:EasilyCreateNewPages, PhpWiki:WikiFormRichPlugin, PhpWiki:SqlResultPlugin
-------------
PhpWikiDocumentation Help:WikiPlugin
--- NEW FILE: Help%2FCreateTocPlugin ---
Date: 2005年10月10日 01:31:02 -0700
Mime-Version: 1.0 (Produced by PhpWiki 1.3.11p1)
X-Rcs-Id: $Id: Help%2FCreateTocPlugin,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FCreateTocPlugin;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
<?plugin CreateToc jshide||=1 ?>
Help:WikiPlugin to create a dynamical *Table Of Contents* of all headers. Since v1.3.8
!! Usage
<verbatim>
 <?plugin CreateToc ?>
 <?plugin CreateToc jshide||=1 with_toclink||=1 ?>
</verbatim>
!! Plugin Arguments
__jshide__: |
 Boolean if the TOC should be initially hidden and on click expanded. Default: 0
__with_toclink__: |
 Boolean if headers should link back to the TOC. Default: false
__with_counter__: |
 Boolean if hierarchical prefixes should be added. Default: false
__headers__: |
 Which headers to include. Default: !!!,!!,! 1,2,3 also allowed
__noheader__: |
 Boolean if the "Table of Contents" h2 header should be omitted. Default: 0
__liststyle__: |
 dl or ol or ul. Default: dl
__indentstr__: |
 Default: &nbsp;&nbsp;
__pagename__: |
 TOC of which page? Default: current pagename
!! Examples
See for example PhpWikiDemo:en/TextFormattingRules
-------------
PhpWikiDocumentation Help:WikiPlugin
--- NEW FILE: Help%2FEditMetaDataPlugin ---
Date: Sun, 4 Jul 2004 01:31:02 -0700
Mime-Version: 1.0 (Produced by PhpWiki 1.3.7)
X-Rcs-Id: $Id: Help%2FEditMetaDataPlugin,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FEditMetaDataPlugin;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
<b>This plugin allows you to add/edit/delete metadata key/value pairs for a given page. You must be logged in as the administrator to do this. The page's metadata contains things like the page hit count, last edit time and so on.</b>
<b>Editing the metadata for the homepage would look like this:</b>
------
<?plugin EditMetaData page="HomePage" ?>
------
<b>With no arguments the plugin defaults to the current page:</b>
------
<?plugin EditMetaData ?>
-----
PhpWikiDocumentation Help:WikiPlugin
--- NEW FILE: Help%2FEditText ---
Date: 2002年1月27日 17:28:55 -0500
Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks)
X-Rcs-Id: $Id: Help%2FEditText,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FEditText;
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
All pages (except search results) have an EditText link at the bottom.
You can edit the page you are reading by clicking that link.
----
PhpWikiDocumentation
--- NEW FILE: Help%2FExternalSearchPlugin ---
Date: Fri, 3 Jan 2003 22:00:00 -0500
Mime-Version: 1.0 (Produced by PhpWiki 1.3.4)
X-Rcs-Id: $Id: Help%2FExternalSearchPlugin,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FExternalSearchPlugin;
 flags=PAGE_LOCKED;
 pgsrc_version="2 $Revision: 1.1 $";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
!! Synopsis
The ExternalSearchPlugin creates a form to query InterWiki~s or other
internet sites.
!! Typical Usage
<verbatim>
<?plugin ExternalSearch
 url="InterWiki or URL"
 name="button text"
?>
</verbatim>
!! Arguments
__url__:
 Specify a wiki from the InterWikiMap or a url. Any text entered by
 the user will be appended to the search url. The string placeholder
 '__=%s=__' can be used to insert a search query into the url rather
 than appending it.
__name__:
 Text to display in the submit button. For InterWiki sites the
 default is the wiki name, for other urls the default is the text
 "External Search".
__formsize__:
 Specify the input area size. (default: 30 characters)
__debug__:
 Don't really redirect to the external site, just print out the url
 that would be redirected to.
!! Examples
<verbatim>
 url="http://sunir.org/apps/meta.pl?" name="Metawiki Search"
 url="http://www.usemod.com/cgi-bin/mb.pl?" name="MeatBall Search"
 url=php-lookup
 url=php-function
 url=PhpWiki
</verbatim>
Perform a full-text search on multiple wiki's:
<?plugin ExternalSearch url="http://sunir.org/apps/meta.pl?" name="Metawiki Search" ?>
Perform a full-text search on Help:l |MeatBall:SiteSearch] wiki:
<?plugin ExternalSearch url="http://www.usemod.com/cgi-bin/mb.pl?" name="MeatBall Search" ?>
Search the PHP web site for a function name:
<?plugin ExternalSearch url=php-lookup name="PHP Lookup" ?>
Enter the name of a PHP function to view the documentation page:%%%
<?plugin ExternalSearch url=php-function ?>
Enter any existing page name on PhpWiki to jump to that page:
<?plugin ExternalSearch url=PhpWiki ?>
----
PhpWikiDocumentation Help:WikiPlugin
--- NEW FILE: Help%2FFoafViewerPlugin ---
Date: Sun, 4 Jul 2004 01:31:02 -0700
Mime-Version: 1.0 (Produced by PhpWiki 1.3.7)
X-Rcs-Id: $Id: Help%2FFoafViewerPlugin,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FFoafViewerPlugin;
 pgsrc_version="1 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
!About
FoafViewerPlugin is written to facilitate the viewing of FOAF / RDF files in human readable form. Please note, it provides only basic features at this time.
!Version
0.0.1
!Usage
<verbatim>
<?plugin FoafViewer foaf=http://www.myfoaf.com/foaf.rdf ?>
/FoafViewerPlugin?foaf=http://www.myfoaf.com/foaf.rdf
</verbatim>
!Download from....
http://www.ahsonline.com.au/dod/FoafViewerPlugin.zip
!Example
<?plugin FoafViewer foaf=http://www.ahsonline.com.au/dod/FOAF.rdf ?>
-----
PhpWikiDocumentation Help:WikiPlugin
--- NEW FILE: Help%2FFrameIncludePlugin ---
Date: Sun, 4 Jul 2004 01:31:02 -0700
Mime-Version: 1.0 (Produced by PhpWiki 1.3.7)
X-Rcs-Id: $Id: Help%2FFrameIncludePlugin,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FFrameIncludePlugin;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
This plugin will create an HTML frame that will fill the entire display area of the page (that is, the whole area the user is allowed to edit). All other text will be discarded when the page is rendered (anything outside the call to plugin, that is). In the language of hypertext this is called <i>transclusion</i>.
You might also be interested in the IncludePagePlugin.
Examples: to include a page from another site, use the <b>src</b> attribute:
<verbatim>
<?plugin FrameInclude src="http://phpwiki.org/" ?>
</verbatim>
To include a page from within this wiki, use the <b>page</b> attribute:
<verbatim>
<?plugin FrameInclude page=HomePage ?>
</verbatim>
For more information on this plugin please read the PHP source code in the /lib/plugin directory.
-----
PhpWikiDocumentation Help:WikiPlugin
--- NEW FILE: Help%2FGoodStyle ---
Date: 2002年1月27日 17:28:55 -0500
Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks)
X-Rcs-Id: $Id: Help%2FGoodStyle,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FGoodStyle;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
"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
----
PhpWikiDocumentation
--- NEW FILE: Help%2FGraphVizPlugin ---
Date: 2005年10月29日 19:28:52 +0100
Mime-Version: 1.0 (Produced by PhpWiki 1.3.11p1)
X-Rcs-Id: $Id: Help%2FGraphVizPlugin,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FGraphVizPlugin;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
! Example
<verbatim>
<?plugin GraphViz
digraph automata_0 {
	size ="8.5, 11";
	node Help:e = circle];
	0 [ style = filled, color=lightgrey ];
	2 [ shape = doublecircle ];
	0 -> 2 [ label = "a " ];
	0 -> 1 [ label = "other " ];
	1 -> 2 [ label = "a " ];
	1 -> 1 [ label = "other " ];
	2 -> 2 [ label = "a " ];
	2 -> 1 [ label = "other " ];
	"Machine: a" [ shape = plaintext ];
}
?>
</verbatim>
is rendered as 
<?plugin GraphViz
digraph automata_0 {
	size ="8.5, 11";
	node Help:e = circle];
	0 [ style = filled, color=lightgrey ];
	2 [ shape = doublecircle ];
	0 -> 2 [ label = "a " ];
	0 -> 1 [ label = "other " ];
	1 -> 2 [ label = "a " ];
	1 -> 1 [ label = "other " ];
	2 -> 2 [ label = "a " ];
	2 -> 1 [ label = "other " ];
	"Machine: a" [ shape = plaintext ];
}
?>
--- NEW FILE: Help%2FHelloWorldPlugin ---
Date: Sun, 4 Jul 2004 01:31:02 -0700
Mime-Version: 1.0 (Produced by PhpWiki 1.3.5pre)
X-Rcs-Id: $Id: Help%2FHelloWorldPlugin,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FHelloWorldPlugin;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
A simple example plugin.
<?plugin HelloWorld salutation="Hello," name="WikiUser" ?>
From the source of this page:
<verbatim>
<?plugin HelloWorld salutation="Hello," name="WikiUser" ?>
</verbatim>
-----
PhpWiki's plugin architecture allows you to add custom page elements to your wiki. All you have to do is extend (subclass) the ~WikiPlugin class and create your output via the run() method, dependend on the Wiki- or Request arguments, 
* either with the predefined HTML classes to create valid XHTML,
* or by using templates, which are easier customizable, but generally more a mess to use and easier to create invalid XHTML.
<?plugin PhpHighlight
/**
 * A simple demonstration Help:WikiPlugin.
 *
 * Usage:
 * <?plugin HelloWorld?&gt;
 * <?plugin HelloWorld
 * salutation="Greetings, "
 * name=Wikimeister
 * ? >
 * <?plugin HelloWorld salutation=Hi ? >
 * <?plugin HelloWorld name=WabiSabi ? >
 */
// Constants are defined before the class.
if (!defined('THE_END'))
 define('THE_END', "!");
class Help:WikiPlugin_HelloWorld
extends Help:WikiPlugin
{
 // Five required functions in a Help:WikiPlugin.
 function getName () {
 return _("HelloWorld");
 }
 function getDescription () {
 return _("Simple Sample Plugin");
 }
 function getVersion() {
 return preg_replace("/ Help:n : $]/", '',
 "\$Revision: 1.1 $");
 }
 // Establish default values for each of this plugin's arguments.
 function getDefaultArguments() {
 return array('salutation' => "Hello,",
 'name' => "World");
 }
 function run($dbi, $argstr, $request) {
 extract($this->getArgs($argstr, $request));
 // Any text that is returned will not be further transformed,
 // so use html where necessary.
 $html = HTML::tt(fmt('%s: %s', $salutation, WikiLink($name, 'auto')),
 THE_END);
 return $html;
 }
};
?>
-------------
PhpWikiDocumentation Help:WikiPlugin
--- NEW FILE: Help%2FHowToUseWiki ---
Date: 2005年1月27日 17:28:55 -0500
Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks)
X-Rcs-Id: $Id: Help%2FHowToUseWiki,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FHowToUseWiki;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
''"Wiki wiki"'' means "quick" in Hawai'ian.
*All you really need to know is:*
* To edit any page click on the Edit 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 underscores on either side
 _like this_.
* You get *bold text* by using two asterisks on either side.
* And, *_bold italics_* by using both.
* You get =monospaced text= by using two equal-signs on either side.
* You get bullets by using an asterisk * at the start of the line.
* To have a paragraph in plain monospaced font, start it with <pre>
 and end it with </pre>:
 <pre>
 this is a poem for sure
 about monospacing
 i wrote in purple velour
 but couldn't find a rhyme for monospacing
 </pre>
* You separate 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: SteveWainsteadEatsLiveWorms. 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 AddingPages.
----
A WikiWikiWeb is meant to be fast and easy to edit. It has very simple
markup that you can read about in Help:TextFormattingRules.
----
If you don't like the size of the text editing window you get, you can
change it. See UserPreferences.
----
PhpWikiDocumentation
--- NEW FILE: Help%2FIncludePagePlugin ---
Date: Sun, 4 Jul 2004 01:31:02 -0700
Mime-Version: 1.0 (Produced by PhpWiki 1.3.7)
X-Rcs-Id: $Id: Help%2FIncludePagePlugin,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FIncludePagePlugin;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
This plugin will "include" other pages in this wiki. In the language of hypertext this is called <i>transclusion</i>. The pages will render in distinct tables. You can also load external pages in a more limited fashion with the FrameIncludePlugin. Examples:
<?plugin IncludePage page="HomePage" ?>
<?plugin IncludePage page="WabiSabi" ?>
-----
PhpWikiDocumentation Help:WikiPlugin
--- NEW FILE: Help%2FLinkIcons ---
Date: 2002年3月28日 14:57:00 -0500
Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks)
X-Rcs-Id: $Id: Help%2FLinkIcons,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FLinkIcons;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
LinkIcons are an optional new feature of PhpWiki. When activated,
icons will be displayed in front of URLs to indicate the type of link.
* [http://phpwiki.sourceforge.net/demo/themes/default/images/http.png]
 http link
* [http://phpwiki.sourceforge.net/demo/themes/default/images/url.png]
 generic internet link
* [http://phpwiki.sourceforge.net/demo/themes/default/images/interwiki.png]
 InterWiki link
* [http://phpwiki.sourceforge.net/demo/themes/default/images/https.png]
 https link
* [http://phpwiki.sourceforge.net/demo/themes/default/images/mailto.png]
 mailto link
* [http://phpwiki.sourceforge.net/demo/themes/default/images/ftp.png]
 ftp link
__Note__: Some of the default icons use the alpha channel feature of
the [PNG | http://www.libpng.org/pub/png/png-sitemap.html] image format
for smooth rendering on any page color or textured background. Older
browsers may not display all the images properly.
!!!Examples
The following examples will display with the above link icons only if
the administrator has enabled this feature.
!! InterWiki links
* InterWiki link PhpWiki:InterWiki
* A named InterWiki [read WhyWikiWorks at c2|Wiki:WhyWikiWorks].
!!URLs
* Email address [PhpWiki-talk mailing list|mailto:php...@li...]
* Normal http link [PhpWiki's Home Page|http://phpwiki.sourceforge.net/phpwiki/]
* Secure http link [PhpWiki's Home Page|https://phpwiki.sourceforge.net/phpwiki/]
* File transfer ftp://ftp.sourceforge.net/
''A generic icon is shown for other less common link types.''
* news://nntp.news.com
* gopher://gopher.caltech.cmu.edu
LinkIcons will only display when the URL protocol is one which PhpWiki
is allowed to link to. The following examples won't show any icons and
PhpWiki won't automatically provide double-clickable links either,
unless the administrator adds them:
* bogus://oedipus.nostradamus.com
* bolo://lgm.cheshire.org
----
PhpWikiDocumentation
--- NEW FILE: Help%2FListPagesPlugin ---
Date: Thu, 7 Oct 2004 18:13:41 +0200
Mime-Version: 1.0 (Produced by PhpWiki 1.3.11pre) 
X-Rcs-Id: $Id: Help%2FListPagesPlugin,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FListPagesPlugin;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
The ListPagesPlugin is the simpliest plugin to explicitly list a set of pages with all available 
[pagelist|PhpWiki:PageList] options, mainly used for a wikilens theme to display ratings info 
and recommendations.
It can also be used with the PhpWiki:PluginList method to list a set of pages generated by 
another plugin, and/or to exclude a set of pages generated by another plugin.
See the PhpWiki:PageList options.
Usage:
<verbatim>
 <?plugin ListPages pages=HomePage,FindPage,WikiWikiWeb ?>
 <?plugin ListPages info=hits sortby=hits pages=<!plugin-list BackLink page=[] !> exclude=ListPagesPlugin,WikiPlugin ?>
</verbatim>
-------------
PhpWikiDocumentation Help:WikiPlugin 
--- NEW FILE: Help%2FMagicPhpWikiURLs ---
Date: 2002年2月27日 19:54:00 -0500
Mime-Version: 1.0 (Produced by PhpWiki 1.3.3-jeffs-hacks)
X-Rcs-Id: $Id: Help%2FMagicPhpWikiURLs,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FMagicPhpWikiURLs;
 flags=PAGE_LOCKED;
 pgsrc_version="2 $Revision: 1.1 $";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
!!! About phpwiki: URLs
A special type of URL is available for making links to perform
administrative and other special functions in PhpWiki. Here is a
brief description of how they work.
The basic syntax of a phpwiki: URL is
<pre>
__phpwiki:__''pagename''__?__''query-args''
</pre>
If _pagename_ is omitted it defaults to the current page.
_Query-args_ should be a set of parameters in standard HTTP GET
format.
The "action=''x''" parameter should almost always be given. It can be one of
__browse__, __diff__, __edit__, __viewsource__,
__zip__, __dumpserial__, __loadserial__,
__remove__, __lock__, __unlock__,
__login__, __logout__, __setprefs__ or __save__.
The default action is __browse__.
Some of the actions accept other parameters.
__FullTextSearch__, __TitleSearch__:
 Accepts __s__=search term, and __size__=input size.
__edit__:
 Accepts __version__.
__remove__:
 Accepts __verify__.
__save__:
 Accepts __editversion__, __minor_edit__, and __content__.
__setprefs__:
 Accepts __edit_area_width__, __edit_area_height__.
!! Writing Magic Links in Wiki Pages
A magic link looks like:
<pre>
__~[__ ''text'' __|__ ''phpwiki-url'' __]__
</pre>
The "''text'' *|*" is optional but usually recommended. If given it
will provide the label for the link.
The _phpwiki-url_ is a *phpwiki:* URL as described above.
!Some examples
<verbatim>
[ Edit the SandBox | phpwiki:SandBox?action=edit ]
</verbatim>
will generate a link which will take you directly to editing the
SandBox, like so: [Edit the SandBox | phpwiki:SandBox?action=edit].
Other possibilites:
* [ Diff the SandBox | phpwiki:SandBox?action=diff ],
* [ Lock the HomePage | phpwiki:HomePage?action=lock ],
* [ Get a Full Zip Dump | phpwiki:?action=zip&include=all ],
* Search for [ Page titles containing 'wiki' | phpwiki:?action=TitleSearch&s=wiki ]
!! Writing Magic Forms in Wiki Pages
''__Note__: The old syntax for Magic forms is no longer supported.
They are superseded by =<?plugin-form>=.''
If the plugin is called using *<?plugin-form* instead of *<?plugin*
and the plugin supports searching, then it will be rendered as a form.
''size'':
 If given, specifies the size of the input area.
''s'':
 Specifies the default value for the input.
!Examples:
A search plugin invoked with *<?plugin* instead of *<?plugin-form*
simply inserts the search results of the plugin:
<verbatim>
<?plugin TitleSearch s=wiki noheader=true ?>
</verbatim>
Search results for Page titles containing 'wiki':
<?plugin TitleSearch s=wiki noheader=true ?>
<verbatim>
<?plugin-form FullTextSearch ?>
</verbatim>
gives
<?plugin-form FullTextSearch ?>
While
<verbatim>
<?plugin-form TitleSearch formsize=12 ?>
</verbatim>
yields
<?plugin-form TitleSearch formsize=12 ?>
----
PhpWikiDocumentation
--- NEW FILE: Help%2FMoreAboutMechanics ---
Date: 2003年11月16日 02:28:52 +0100
Mime-Version: 1.0 (Produced by PhpWiki 1.3.5pre)
X-Rcs-Id: $Id: Help%2FMoreAboutMechanics,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FMoreAboutMechanics;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
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 database with
backup copies of previous versions of pages stored as well. (For the
database, PhpWiki works with DBM, MySQL, PostgreSQL or text files.)
Every time a user hits the site, the page requested is pulled from the
database and rendered on the fly. The user only really ever requests
the file =index.php=, which then decides which other php files to
include.
Links to pages in the Wiki are automatically linked: AddingPages.
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 URLs link, like this:
# http://www.wcsb.org/
# ftp://ftp.redhat.com/
# news://news.mozilla.org/
# http://slashdot.org/
# http://theregister.co.uk/
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.
----
PhpWikiDocumentation CategoryWiki
--- NEW FILE: Help%2FNewMarkupTestPage ---
Date: 2002年1月27日 17:28:55 -0500
Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks)
X-Rcs-Id: $Id: Help%2FNewMarkupTestPage,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FNewMarkupTestPage;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
New lists: asterisks, hash marks, and ";text:def" (wrong...)
* bullet
* l1
 * l2
 * l2
 * l3
 # one
 #two
 #three
Term1:
 definition1.1
 definition1.2
Term2 :
 definition2
 Term3:
 definition3
 Term4:
 definition4
 definition4.2
 Term5 :
 definition5
Mixed -
 * ul1
 # ul1-ol1
 # ul1-ol2
 * ul1-ol2-ul1
 * ul1-ol2-ul2
 * ul1-ol2-ul2-ul1
 * ul1-ol2-ul2-ul2
* l1
 <pre>
 preformatted text
 </pre>
 * l2
----
 old lists, oddly enough, work fine
	* level 1
	* l1
		*l2
		*l2
			*l3
			*l3
				*l4
			*l3
					*l5
			*l3
	#one
	#two
		#one
		#two
	*l1
		#three
		#four
	*l1
		*l2
		# one
		# two
<pre>
 preformatted text
 some more text
</pre>
	*l1
				*l2
	# number
	# number
this is a plain paragraph
	* bullet
this is a plain paragraph again
	# number
----
__Link tests__
# normal: HomePage
# in brackets: [HomePage] -- named: [the front page|HomePage]
# Link in brackets: [http://phpwiki.sourceforge.net/]
# Link outside brackets: http://phpwiki.sourceforge.net/
# Link with Wiki word: http://phpwiki.sourceforge.net/phpwiki/index.php?HomePage
# Two consecutive links: http://phpwiki.sourceforge.net/ http://phpwiki.sourceforge.net/phpwiki/
# [PhpWiki on Sourceforge | http://phpwiki.sourceforge.net/]
# [URL with a WikiWord | http://phpwiki.sourceforge.net/phpwiki/index.php?RecentChanges]
# Javascript: [boo! | javascript:alert('oops') ] (is now: named internal link)
# A [[Link] produces a [Link]
# A [Link] looks like this: [[Link]
# This is a [%%%] line break link
# Also this page is [[not linked to], and this one is !NotLinkedTo and this one neither !http://not.linked.to/.
 * WikiName - WikiNameSameStem -- !!WikiName - !!WikiNameSameStem
 * !!WikiName - !!WikiNameSameStem -- WikiName - WikiNameSameStem
 * WikiNameSameStem - WikiName -- !!WikiNameSameStem - !!WikiName
 * !!WikiNameSameStem - !!WikiName -- WikiNameSameStem - WikiName
----
Markup tests:
__underscores for bold__
'''quotes for bold'''
''quotes for italic''
__''underscores bold italic''__
'''''five quotes bold italic'''''
''''''six quotes''''''
'''''Bold italic''' and italic'' (buggy)
'''Bold and ''bold-italic''''' (also buggy)
!!! h1
!! h2
! h3
this is plain text with <br>%%%
a line break
look at the <a href="http://phpwiki.sourceforge.net/">markup language</a>
you cannot use &, < or >
----
Usage in preformatted text:
<pre>
 __underscores for bold__
 '''quotes for bold'''
 ''quotes for italic''
 __''underscores bold italic''__
 '''''five quotes bold italic'''''
 ''''''six quotes''''''
 !!! h1
 !! h2
 ! h3
 this is plain text with <br>%%%
 a line break
 look at the <a href="http://phpwiki.sourceforge.net/">markup language</a>
 you cannot use &, < or >
</pre>
--- NEW FILE: Help%2FOldMarkupTestPage ---
Date: 2002年1月27日 17:28:55 -0500
Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks)
X-Rcs-Id: $Id: Help%2FOldMarkupTestPage,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FOldMarkupTestPage;
 flags=PAGE_LOCKED;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
 New lists: asterisks, hash marks, and ";text:def"
* bullet
* l1
** l2
** l2
*** l3
# one
#two
#three
;Term1:definition1.1
;: defintion1.2
;Term2 :defintion2
;; Term3:defintion3
;;;Term4: definition4
;;; : defintion4.2
;;; Term5 : defintion5
Mixed:
*ul1
*#ul1-ol1
*#ul1-ol2
*#*ul1-ol2-ul1
*#*ul1-ol2-ul2
*#**ul1-ol2-ul2-ul1
*#**ul1-ol2-ul2-ul1
*l1
 preformatted text
** l2
----
 old lists
	* level 1
	* l1
		*l2
		*l2
			*l3
			*l3
				*l4
			*l3
					*l5
			*l3
	#one
	#two
		#one
		#two
	*l1
		#three
		#four
	*l1
		*l2
		# one
		# two
 preformatted text
 some more text
	*l1
				*l4
	# number
	# number
this is a plain paragraph
	* bullet
this is a plain paragraph again
	# number
----
__Link tests__
# normal: HomePage
# in brackets: [HomePage] -- named: [the front page|HomePage]
# Link in brackets: [http://phpwiki.sourceforge.net/]
# Link outside brackets: http://phpwiki.sourceforge.net/
# Link with Wiki word: http://phpwiki.sourceforge.net/phpwiki/index.php?HomePage
# Two consecutive links: http://phpwiki.sourceforge.net/ http://phpwiki.sourceforge.net/phpwiki/
# [PhpWiki on Sourceforge | http://phpwiki.sourceforge.net/]
# [URL with a WikiWord | http://phpwiki.sourceforge.net/phpwiki/index.php?RecentChanges]
# Javascript: [boo! | javascript:alert('oops') ] (is now: named internal link)
# A [[Link] produces a [Link]
# A [Link] looks like this: [[Link]
# This is a [%%%] line break link
# Also this page is [[not linked to], and this one is !NotLinkedTo and this one neither !http://not.linked.to/.
#* WikiName - WikiNameSameStem -- !!WikiName - !!WikiNameSameStem
#* !!WikiName - !!WikiNameSameStem -- WikiName - WikiNameSameStem
#* WikiNameSameStem - WikiName -- !!WikiNameSameStem - !!WikiName
#* !!WikiNameSameStem - !!WikiName -- WikiNameSameStem - WikiName
----
Markup tests:
__underscores for bold__
'''quotes for bold'''
''quotes for italic''
__''underscores bold italic''__
'''''five quotes bold italic'''''
''''''six quotes''''''
'''''Bold italic''' and italic'' (buggy)
'''Bold and ''bold-italic''''' (also buggy)
!!! h1
!! h2
! h3
this is plain text with <br>%%%
a line break
look at the <a href="http://phpwiki.sourceforge.net/">markup language</a>
you cannot use &, < or >
----
Usage in preformatted text:
 
 __underscores for bold__
 '''quotes for bold'''
 ''quotes for italic''
 __''underscores bold italic''__
 '''''five quotes bold italic'''''
 ''''''six quotes''''''
 !!! h1
 !! h2
 ! h3
 this is plain text with <br>%%%
 a line break
 look at the <a href="http://phpwiki.sourceforge.net/">markup language</a>
 you cannot use &, < or >
 
--- NEW FILE: Help%2FOldStyleTablePlugin ---
Date: Sun, 4 Jul 2004 01:31:02 -0700
Mime-Version: 1.0 (Produced by PhpWiki 1.3.4pre)
X-Rcs-Id: $Id: Help%2FOldStyleTablePlugin,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FOldStyleTablePlugin;
 flags="";
 pgsrc_version="2 $Revision: 1.1 $";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
The OldStyleTablePlugin can be used to include tables within a wiki
page using the old-style markup syntax for tables.
!!Usage:
<verbatim>
<?plugin OldStyleTable caption="OldStyleTable" border||=2
||^ *Name* |v *Cost* |v *Notes*
| *First* | *Last*
|> Jeff |< Dairiki |^ Cheap |< Not worth it
|> Marco |< Polo | Cheaper |< Not available
?>
</verbatim>
will get you
<?plugin OldStyleTable caption="OldStyleTable" border||=2
||^ *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.)
!! Plugin Arguments
__caption__:
 Any string. Default: ""
__border__:
 Any number. Default: 1
__cellspacing__:
 Any number. Default: 1
__cellpadding__:
 Any number. Default: 1
__summary__:
 Any string. Default: ""
----
Note that within each table cell, _new-style_ markup is used. You can
only use inline markup --- no block level markup is allowed within
table cells.
(Using old-style markup wouldn't make much sense, since one can't
include multi-line plugin invocations using the old-style markup
rules.)
-------------
PhpWikiDocumentation Help:WikiPlugin
--- NEW FILE: Help%2FOldTextFormattingRules ---
Date: Sat, 8 Jan 2005 22:55:20 +0100
Mime-Version: 1.0 (Produced by PhpWiki 1.3.11pre-20041223)
X-Rcs-Id: $Id: Help%2FOldTextFormattingRules,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FOldTextFormattingRules;
 pgsrc_version="2 $Revision: 1.1 $";
 flags=PAGE_LOCKED;
 charset=iso-8859-1;
 markup=2
Content-Transfer-Encoding: binary
! Synopsis
OldTextFormattingRules%%%
<strong>Emphasis:</strong> '<strong></strong>' for <em>italics</em>, _<em></em>~_ for <strong>bold</strong>, '<strong></strong>'_<em></em>~_ for <em><strong>both</strong></em>.%%%
<strong>Lists:</strong> * for bullet lists, # for numbered lists, <em><strong>;</strong> term <strong>:</strong> definition</em> for definition lists.%%%
<strong>References:</strong> ~JoinCapitalizedWords or use square brackets for a ~[page link] or URL ~[~http://cool.wiki.int/].%%%
<strong>Footnotes:</strong> Use ~[1],~[2],~[3],...%%%
<strong>Preventing linking:</strong> Prefix with "~!": ~!~DoNotHyperlink, name links like ~[~[text | URL] (double up on the "[").%%%
<strong>Misc:</strong> "~!", "~!~!", "~!~!~!" make headings, "%%<em></em>%" makes a linebreak, "-<em></em>-<em></em>-<em></em>-" makes a horizontal rule.%%%
<strong>Tables:</strong> »|« as first char, »|« for more columns, »|>« align right, »|<« align left, »|^« centered (default), »||« span columns, »|v« span rows
----
! 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
* %%<em></em>% 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:
<pre>
 This is in monospace
</pre>
This is not
!Indented Paragraphs
* semicolon-colon -- works like <BLOCKQUOTE>
;:this is an indented block of text
! Emphasis
* Use doubled single-quotes ('<strong></strong>') for emphasis (usually <em>italics</em>)
* Use doubled underscores (_<em></em>_) for strong emphasis (usually <strong>bold</strong>)
* Mix them at will: <strong><em>bold italics</em></strong>
* <em>Emphasis</em> can be used <em>multiple</em> times within a line, but <em>cannot</em> 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 #[|ftnt_ref_1]<sup>~[[1|#ftnt_1]~]</sup>. See footnote for counterpart. (If the ~[ is in the first column, it is a footnote <em>definition</em> rather than a footnote <em>reference</em> #[|ftnt_ref_1]<sup>~[[1|#ftnt_1]~]</sup>.)
* 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/demo/themes/default/images/png.png]
! Tables
* Simple tables are available. A table row is introduced by a <strong>|</strong> in the first column. It is best described by example:
<pre>
 || _<em></em>_Name_<em></em>~_ |v _<em></em>_Cost_<em></em>~_ |v _<em></em>_Notes_<em></em>~_
 | _<em></em>_First_<em></em>~_ | _<em></em>_Last_<em></em>~_
 |> Jeff |< Dairiki |^ Cheap |< Not worth it
 |> Marco |< Polo | Cheaper |< Not available
</pre>
;:will generate
<?plugin OldStyleTable
|| <strong>Name</strong> |v <strong>Cost</strong> |v <strong>Notes</strong>
| <strong>First</strong> | <strong>Last</strong>
|> Jeff |< Dairiki |^ Cheap |< Not worth it
|> Marco |< Polo | Cheaper |< Not available
?>
;:Note that multiple <strong>|</strong>'s lead to spanned columns, and <strong>v</strong>'s can be used to span rows. A <strong>></strong> generates a right justified column, <strong><</strong> a left justified column and <strong>^</strong> a centered column (which is the default.)
;:With the new TextFormatingsRules tables are only supported with the OldStyleTablePlugin.
! 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. (<em>deprecated</em>)
-----
! Footnotes:
#[|ftnt_1]~[[1|#ftnt_ref_1]~] By using ~[1] a second time (in the first column) the footnote itself is <em>defined</em>. 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 <em>after</em> the footnote <em>definition</em> will not be linked to.)
----
PhpWikiDocumentation
--- NEW FILE: Help%2FPageGroupTest ---
Date: 2004年11月30日 21:46:53 +0100
Mime-Version: 1.0 (Produced by PhpWiki 1.3.11pre-20041130)
X-Rcs-Id: $Id: Help%2FPageGroupTest,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FPageGroupTest;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
Help:PageGroupTest is a test of the ~PageGroup plugin.
Click the first page to start the tour of this experimental plugin.
!Table of Contents
# [Help:PageGroupTestOne]
# [Help:PageGroupTestTwo]
# [Help:PageGroupTestThree]
# [Help:PageGroupTestFour]
! TODO
* Support ~[ name | page ~] links
* Support Previous, Next ... image buttons
%%% %%% %%% %%%
----
For reference, here are all the pages that link to [Help:PageGroupTest]
(note that one is missing):
<?plugin BackLinks page=Help:PageGroupTest ?>
--- NEW FILE: Help%2FPageGroupTestFour ---
Date: 2002年1月31日 03:02:06 -0500
Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks)
X-Rcs-Id: $Id: Help%2FPageGroupTestFour,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FPageGroupTestFour;
 flags="";
 author=CarstenKlapp;
 author_id=CarstenKlapp;
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
So, this is the last page in this page group.
Note that looping of off on this page, so __Next:__ shouldn't show up
here but it does because of the bug described in Help:PageGroupTestOne.
%%% %%% %%% %%% %%% %%% %%%
----
<?plugin PageGroup
 parent=Help:PageGroupTest
 section="Table of Contents"
 loop=false
?>
----
Help:PageGroupTest
--- NEW FILE: Help%2FPageGroupTestOne ---
Date: 2002年1月31日 02:48:01 -0500
Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks)
X-Rcs-Id: $Id: Help%2FPageGroupTestOne,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FPageGroupTestOne;
 flags="";
 author=CarstenKlapp;
 author_id=CarstenKlapp;
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
Ok, this is page one in this page group.
There is a bug. When looping is true (and it is, but only for this
first page--another possible flaw) and if the Contents title is not
the first item on the Table of Contents page, and if there are other
things on the TOC page after the actual list, then things get screwed
up. Note that the __Previous:__ link below should point to the last
page. Click Next.
%%% %%% %%% %%% %%% %%% %%%
<?plugin PageGroup
 label="Other pages in this group"
 loop=1
 parent=Help:PageGroupTest
 section="Table of Contents"
?>
----
Help:PageGroupTest
--- NEW FILE: Help%2FPageGroupTestThree ---
Date: 2002年1月31日 02:50:26 -0500
Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks)
X-Rcs-Id: $Id: Help%2FPageGroupTestThree,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FPageGroupTestThree;
 flags="";
 author=CarstenKlapp;
 author_id=CarstenKlapp;
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
You're almost there!
%%% %%% %%% %%% %%% %%% %%%
<?plugin PageGroup
 label="Go!"
 parent=Help:PageGroupTest
 section="Table of Contents"
?>
Note that the navigation bar can be anywhere, it doesn't have to be at
the bottom or even consistent from page to page. The label can also
vary--not sure if this is a good thing. Click Next.
--- NEW FILE: Help%2FPageGroupTestTwo ---
Date: 2002年1月31日 02:53:30 -0500
Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks)
X-Rcs-Id: $Id: Help%2FPageGroupTestTwo,v 1.1 2005年11月21日 22:19:00 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FPageGroupTestTwo;
 flags="";
 author=CarstenKlapp;
 author_id=CarstenKlapp;
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
<?plugin PageGroup
 parent=Help:PageGroupTest
 section="Table of Contents"
?>
----
%%% %%% %%% %%% %%% %%% %%%
Welcome to page two.
It would be nice if this plugin would work together with BackLinks, so
that it's presence on a page ...
 
[truncated message content]

Update of /cvsroot/phpwiki/phpwiki/tests/unit/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29800/lib/plugin
Added Files:
	IncludePageTest.php 
Log Message:
IncludePageTest added, various minor enhancements
--- NEW FILE: IncludePageTest.php ---
<?php
require_once 'lib/WikiPlugin.php';
require_once 'lib/plugin/IncludePage.php';
require_once 'PHPUnit.php';
class IncludePageTest extends phpwiki_TestCase {
 function _ensure_loaded($pagename) {
 global $request;
 $dbi = $request->getDbh();
	if (! $dbi->isWikiPage($pagename)) {
	 require_once 'lib/loadsave.php';
	 $request->setArg('source', FindFile('pgsrc/'.urlencode($pagename)));
	 $request->setArg('overwrite', 1);
	 LoadAny($request, $request->getArg('source'));
	 $request->setArg('source', false);
	}
 }
 // extract Synopsis
 function testOldTextFormattingRules() {
 global $request;
	$pagename = 'Help/OldTextFormattingRules';
 	$this->_ensure_loaded($pagename);
 $dbi = $request->getDbh();
 $p = $dbi->getPage($pagename);
	$r = $p->getCurrentRevision();
 $c = $r->getContent();
	$section = extractSection('Synopsis', $c, $pagename, 1);
	$this->assertTrue(strstr(join("", $section), "OldTextFormattingRules%%%"));
 }
 // extract Synopsis
 function testTextFormattingRules() {
 global $request;
	$pagename = 'Help/TextFormattingRules';
 	$this->_ensure_loaded($pagename);
 $dbi = $request->getDbh();
 $p = $dbi->getPage($pagename);
	$r = $p->getCurrentRevision();
 $c = $r->getContent();
	$section = extractSection('Synopsis', $c, $pagename, 1);
	$this->assertTrue(strstr(join("", $section), "TextFormattingRules%%%"));
 }
 /**
 * Test the plugin with the typical editpage template call.
 */
 function testIncludePageSynopsis() {
 global $request;
	$pagename = 'Help/TextFormattingRules';
 $lp = new WikiPlugin_IncludePage();
 $this->assertEquals("IncludePage", $lp->getName());
 $dbi = $request->getDbh();
 $result = $lp->run($dbi, "page=$pagename section=Synopsis quiet=1", 
			 $request, "IncludePage");
 $this->assertType('object', $result, 'isa HtmlElement');
	//TODO: check content for found and extracted section
 }
}
?>

Update of /cvsroot/phpwiki/phpwiki/tests/unit/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29800/lib
Modified Files:
	InlineParserTest.php SetupWiki.php TextSearchTest.php 
Log Message:
IncludePageTest added, various minor enhancements
Index: InlineParserTest.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/tests/unit/lib/InlineParserTest.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -2 -b -p -d -r1.7 -r1.8
Index: SetupWiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/tests/unit/lib/SetupWiki.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -2 -b -p -d -r1.9 -r1.10
--- SetupWiki.php	22 Dec 2004 18:35:24 -0000	1.9
+++ SetupWiki.php	21 Nov 2005 22:16:46 -0000	1.10
@@ -15,5 +15,5 @@ class SetupWiki extends phpwiki_TestCase
 $this->assertFalse($dbi->isWikiPage($pagename));
 
- $request->setArg('source', FindFile('pgsrc/'.$pagename));
+ $request->setArg('source', FindFile('pgsrc/'.urlencode($pagename)));
 $request->setArg('overwrite', 1);
 LoadAny($request, $request->getArg('source'));
@@ -24,10 +24,10 @@ class SetupWiki extends phpwiki_TestCase
 /* PCRE memory problem (crash) with such big pages and anchored blocks */
 function testOldMarkupTestPage() {
- 	$this->_loadPage('OldMarkupTestPage');
+ 	$this->_loadPage('Help/OldMarkupTestPage');
 }
 
 /* ADODB set_links _id_cache error: IncludePagePlugin => HomePage */
 function testIncludePagePlugin() {
- 	$this->_loadPage('IncludePagePlugin');
+ 	$this->_loadPage('Help/IncludePagePlugin');
 }
 
Index: TextSearchTest.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/tests/unit/lib/TextSearchTest.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -2 -b -p -d -r1.3 -r1.4
--- TextSearchTest.php	11 Sep 2005 14:22:07 -0000	1.3
+++ TextSearchTest.php	21 Nov 2005 22:16:46 -0000	1.4
@@ -48,4 +48,8 @@ class TextSearchTest extends phpwiki_Tes
 
 $query = new TextSearchQuery('WikiPlugin* to let users attach comments*', false); // auto
+	/* => (LOWER(pagename) LIKE 'wikiplugin%' OR content LIKE 'wikiplugin%') AND (LOWER(pagename) LIKE '%to%') AND (LOWER(pagename) LIKE '%let%' OR content LIKE '%let%') AND (LOWER(pagename) LIKE '%users%' OR content LIKE '%users%') AND (LOWER(pagename) LIKE '%attach%' OR content LIKE '%attach%') AND (LOWER(pagename) LIKE 'comments%' OR content LIKE 'comments%')
+	 SELECT page.id AS id, page.pagename AS pagename, page.hits AS hits,page.pagedata as pagedata,version.version AS version, version.mtime AS mtime, version.minor_edit AS minor_edit, version.content AS content, version.versiondata AS versiondata FROM nonempty, page, recent, version WHERE nonempty.id=page.id AND page.id=recent.id AND page.id=version.id AND latestversion=version AND ((LOWER(pagename) LIKE 'wikiplugin%' OR content LIKE 'wikiplugin%') AND (LOWER(pagename) LIKE '%to%') AND (LOWER(pagename) LIKE '%let%' OR content LIKE '%let%') AND (LOWER(pagename) LIKE '%users%' OR content LIKE '%users%') AND (LOWER(pagename) LIKE '%attach%' OR content LIKE '%attach%') AND (LOWER(pagename) LIKE 'comments%' OR content LIKE 'comments%'))
+	 SELECT page.id AS id, page.pagename AS pagename, page.hits AS hits,page.pagedata as pagedata,version.version AS version, version.mtime AS mtime, version.minor_edit AS minor_edit, version.content AS content, version.versiondata AS versiondata FROM nonempty, page, recent, version WHERE nonempty.id=page.id AND page.id=recent.id AND page.id=version.id AND latestversion=version AND ((LOWER(pagename) LIKE 'wikiplugin%' OR content LIKE 'wikiplugin%') AND (1=1) AND (LOWER(pagename) LIKE '%let%' OR content LIKE '%let%') AND (LOWER(pagename) LIKE '%users%' OR content LIKE '%users%') AND (LOWER(pagename) LIKE '%attach%' OR content LIKE '%attach%') AND (LOWER(pagename) LIKE 'comments%' OR content LIKE 'comments%'))
+	 */
 $pages = $dbi->fullSearch($query, $sortby, $limit, $exclude);
 $result = array();

Update of /cvsroot/phpwiki/phpwiki/tests/unit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29800
Modified Files:
	mysql-test-initialize.sql runme_all test.php 
Log Message:
IncludePageTest added, various minor enhancements
Index: mysql-test-initialize.sql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/tests/unit/mysql-test-initialize.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -2 -b -p -d -r1.3 -r1.4
--- mysql-test-initialize.sql	22 Dec 2004 15:05:18 -0000	1.3
+++ mysql-test-initialize.sql	21 Nov 2005 22:16:46 -0000	1.4
@@ -55,6 +55,8 @@ CREATE TABLE test_link (
 	linkfrom INT NOT NULL,
 linkto INT NOT NULL,
+ relation INT DEFAULT 0,
 	INDEX (linkfrom),
- INDEX (linkto)
+ INDEX (linkto),
+ INDEX (relation)
 );
 
Index: runme_all
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/tests/unit/runme_all,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -2 -b -p -d -r1.5 -r1.6
--- runme_all	21 Nov 2004 11:42:22 -0000	1.5
+++ runme_all	21 Nov 2005 22:16:46 -0000	1.6
@@ -1,10 +1,16 @@
 #!/bin/sh
-# TODO: need to check write perms to the .testbox/* (mixed web/cli perms)
 
+# check write perms to the .testbox/* (mixed web/cli perms)
 chmod -R a+rw .testbox .dumphtml
 if [ -d .testbox/page_data -a ! -w .testbox/page_data/AllPages ]; then
 rm -rf .testbox/*
 fi
-for db in file dba SQL ADODB; do
- php -Cq -d register_argc_argv=1 test.php debug=1 level=10 db=$db | tee all_$db.result
+
+for db in file dba SQL ADODB cvs \
+ PearDB_mysql PearDB_pgsql PearDB_sqlite \
+ ADODB_mysql ADODB_postgres7 ADODB_sqlite
+ PDO_mysql PDO_pgsql PDO_sqlite
+do
+ php -Cq -d register_argc_argv=1 test.php debug=1 level=10 db=$db | \
+	tee all_$db.result
 done
Index: test.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/tests/unit/test.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -2 -b -p -d -r1.41 -r1.42
--- test.php	29 Oct 2005 13:33:18 -0000	1.41
+++ test.php	21 Nov 2005 22:16:46 -0000	1.42
@@ -80,14 +80,14 @@ $database_backends = array(
 'SQL', // default backend defined in the config.ini DSN
 'ADODB', // same backend as defined in the config.ini DSN
-			 // specific backends (need to be setup)
+			 // specific backends (need to be setup as db=test_phpwiki
 			 'PearDB_pgsql', 'PearDB_sqlite', 'PearDB_mysql',
-			 //'PearDB_oci8', 
-			 //'PearDB_mssql', 
+			 //'PearDB_oci8','PearDB_mssql', 
 			 'ADODB_postgres7', 'ADODB_sqlite', 'ADODB_mysql', 
-			 //'ADODB_oci8', 
-			 //'ADODB_mssql', 
-			 'PDO_pqsql', 'PDO_sqlite', 'PDO_mysql', 
-			 //'PDO_oci', 'PDO_odbc', 
+			 //'ADODB_oci8', 'ADODB_mssql', 
 );
+if ((int)substr(phpversion(), 1) >= 5)
+ array_push($database_backends, 'PDO_pqsql', 'PDO_sqlite', 'PDO_mysql');
+ //'PDO_oci', 'PDO_odbc'
+
 //TODO: convert cvs test 
 //TODO: read some database values from config.ini, just use the "test_" prefix
@@ -374,5 +374,6 @@ $alltests = array('InlineParserTest','Ht
 'PageListTest','ListPagesTest',
 'SetupWiki',
- 'AllPagesTest','AllUsersTest','OrphanedPagesTest','WantedPagesTest','TextSearchTest',
+ 'AllPagesTest','AllUsersTest','OrphanedPagesTest','WantedPagesTest',
+ 'TextSearchTest','IncludePageTest',
 'DumpHtml');
 // support db=file db=dba test=SetupWiki test=DumpHtml debug=num -dconstant=value
@@ -395,4 +396,5 @@ if (!empty($argv)) {
 $define = array();
 $run_database_backends = array();
+ $m = array();
 foreach ($argv as $arg) {
 if (preg_match("/^test=(.+)$/",$arg,$m) and in_array($m[1], $alltests))
@@ -481,5 +483,5 @@ $ErrorManager->setPostponedErrorMask(EM_
 // FIXME: ignore cached requests (if-modified-since) from cli
 class MockRequest extends WikiRequest {
- function MockRequest(&$dbparams) {
+ function MockRequest($dbparams) {
 $this->_dbi = WikiDB::open($dbparams);
 $this->_user = new MockUser("a_user", $GLOBALS['user_level']);
@@ -534,4 +536,5 @@ if (DEBUG & _DEBUG_TRACE)
 if (isset($HTTP_SERVER_VARS['REQUEST_METHOD'])) {
 echo html_option_form();
+ flush();
 }
 

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25479
Modified Files:
	editpage.php 
Log Message:
fix syntax error inside ENABLE_SPAMBLOCKLIST
Index: editpage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/editpage.php,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -2 -b -p -d -r1.105 -r1.106
--- editpage.php	21 Nov 2005 20:53:59 -0000	1.105
+++ editpage.php	21 Nov 2005 22:03:08 -0000	1.106
@@ -376,6 +376,6 @@ class PageEditor
 $this->tokens['PAGE_LOCKED_MESSAGE'] = 
 HTML($this->getSpamMessage(),
- HTML::p(HTML::em(_("SpamAssassin reports: ", 
- join("\n", $babycart)))));
+ HTML::p(HTML::em(_("SpamAssassin reports: "), 
+ join("\n", $babycart))));
 return true;
 }
@@ -776,4 +776,7 @@ extends PageEditor
 /**
 $Log$
+ Revision 1.106 2005年11月21日 22:03:08 rurban
+ fix syntax error inside ENABLE_SPAMBLOCKLIST
+
 Revision 1.105 2005年11月21日 20:53:59 rurban
 beautify request pref lines, no antispam if admin (netznetz request), user is a member anyway

Update of /cvsroot/phpwiki/phpwiki/lib/DbSession
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5800
Modified Files:
	SQL.php 
Log Message:
fix ref warnings, analog to ADODB
Index: SQL.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/DbSession/SQL.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -2 -b -p -d -r1.1 -r1.2
--- SQL.php	11 Feb 2005 14:41:40 -0000	1.1
+++ SQL.php	21 Nov 2005 20:57:58 -0000	1.2
@@ -32,5 +32,5 @@ extends DbSession
 }
 
- function _connect() {
+ function & _connect() {
 $dbh = &$this->_dbh;
 $this->_connected = is_resource($dbh->connection);
@@ -95,5 +95,5 @@ extends DbSession
 function read ($id) {
 //$this->log("_read($id)");
- $dbh = &$this->_connect();
+ $dbh = $this->_connect();
 $table = $this->_table;
 $qid = $dbh->quote($id);
@@ -135,5 +135,5 @@ extends DbSession
 function write ($id, $sess_data) {
 
- $dbh = &$this->_connect();
+ $dbh = $this->_connect();
 //$dbh->unlock(false,1);
 $table = $this->_table;
@@ -183,5 +183,5 @@ extends DbSession
 */
 function destroy ($id) {
- $dbh = &$this->_connect();
+ $dbh = $this->_connect();
 $table = $this->_table;
 $qid = $dbh->quote($id);
@@ -201,5 +201,5 @@ extends DbSession
 */
 function gc ($maxlifetime) {
- $dbh = &$this->_connect();
+ $dbh = $this->_connect();
 $table = $this->_table;
 $threshold = time() - $maxlifetime;
@@ -215,5 +215,5 @@ extends DbSession
 function currentSessions() {
 $sessions = array();
- $dbh = &$this->_connect();
+ $dbh = $this->_connect();
 $table = $this->_table;
 $res = $dbh->query("SELECT sess_data,sess_date,sess_ip FROM $table ORDER BY sess_date DESC");
@@ -242,4 +242,7 @@ extends DbSession
 
 // $Log$
+// Revision 1.2 2005年11月21日 20:57:58 rurban
+// fix ref warnings, analog to ADODB
+//
 // Revision 1.1 2005年02月11日 14:41:40 rurban
 // seperate DbSession classes: less memory, a bit slower

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5545
Modified Files:
	BlogJournal.php 
Log Message:
no duplicate headline and no direct page link anymore
Index: BlogJournal.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/BlogJournal.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -2 -b -p -d -r1.3 -r1.4
--- BlogJournal.php	21 Nov 2005 20:47:21 -0000	1.3
+++ BlogJournal.php	21 Nov 2005 20:56:23 -0000	1.4
@@ -75,5 +75,5 @@ extends WikiPlugin_WikiBlog
 $i++;
 $blog = $this->_blog($rev);
- $html->pushContent(HTML::h3(WikiLink($page, 'known', $rev->get('summary'))));
+ //$html->pushContent(HTML::h3(WikiLink($page, 'known', $rev->get('summary'))));
 $html->pushContent($rev->getTransformedContent('wikiblog'));
 }
@@ -91,4 +91,7 @@ extends WikiPlugin_WikiBlog
 
 // $Log$
+// Revision 1.4 2005年11月21日 20:56:23 rurban
+// no duplicate headline and no direct page link anymore
+//
 // Revision 1.3 2005年11月21日 20:47:21 rurban
 // fix count error

Update of /cvsroot/phpwiki/phpwiki/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4140
Modified Files:
	INSTALL.pgsql 
Log Message:
update for 1.3.12: tsearch2,...
Index: INSTALL.pgsql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/doc/INSTALL.pgsql,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -2 -b -p -d -r1.6 -r1.7
--- INSTALL.pgsql	17 Dec 2004 09:28:40 -0000	1.6
+++ INSTALL.pgsql	21 Nov 2005 20:50:26 -0000	1.7
@@ -1,7 +1,19 @@
-Note: postgresql does work with phpwiki 1.2.x and 1.3.x
+NOTE: postgresql does work with phpwiki 1.2.x and 1.3.x
 
 You might want to see http://www.sslug.dk/~chlor/phpwiki-pgsql-install.html 
 for notes how to install it for 1.3.4 (and later)
 
+UPGRADE FROM 1.3.11 to 1.3.12
+
+ tsearch2 is mandatory now.
+ stored procedures and referential integrity was added.
+ auto-incrementing indices were added (SERIAL INDEX)
+ The user table is deprecated now, pref is enough.
+
+ There's a special upgrade script:
+
+ bash$ psql phpwiki < /usr/share/postgresql/contrib/tsearch2.sql 
+ bash$ pgql phpwiki < schemas/psql-1_3_12.sql
+
 ----------
 NOTE for the 1.2 release: You may see a few warnings when you first
@@ -25,19 +37,20 @@ copy from http://www.postgresql.org/. Ho
 Red Hat Linux, all you need to do is install the PHP RPM and the 
 Postgresql RPM and edit your Apache httpd.conf file, and uncomment 
-the lines for all PHP files (and add index.php to the list of directory
-files while you're at it... you may also need to add .php as a type
-handled by mod_php: 
+the lines for all PHP files.
 
-<IfModule mod_php3.c>
+ And BTW. add index.php to the list of directory files while you're 
+ at it... you may also need to add .php as a type handled by mod_php: 
+
+ <IfModule mod_php3.c>
 AddType application/x-httpd-php3 .php3
 AddType application/x-httpd-php3 .php
 AddType application/x-httpd-php3-source .phps
-</IfModule>
+ </IfModule>
 
-FIXME: php4
+ FIXME: php4
 
-(This is from a stock 6.2 Red Hat distro, which ships with an rpm of
-PHP 3.0.12, but should give you an idea. I had to add the line for
-.php).
+ (This is from a stock 6.2 Red Hat distro, which ships with an rpm of
+ PHP 3.0.12, but should give you an idea. I had to add the line for
+ .php).
 
 Also note that Postgresql by default has a hard limit of 8K per
@@ -67,4 +80,12 @@ Newer versions of postgresql will requir
 bash$ pgql phpwiki < schemas/psql-initialize.sql
 
+Since phpwiki-1.3.12 you'll need to initialize the tsearch2 module before.
+You may want to manually inspect schemas/psql-initialize.sql and add 
+dictionaries and stopword lists for your language.
+See http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2/
+
+ bash$ psql phpwiki < /usr/share/postgresql/contrib/tsearch2.sql 
+ bash$ pgql phpwiki < schemas/psql-initialize.sql
+
 If the schema starts to load but then fails near the end, you might
 need to change the user name at the top of psql-initialize.sql to
@@ -76,7 +97,6 @@ effect.. after that just open up the Wik
 have a brand-new PhpWiki running!
 
-If you find something I missed, please let me know.
-Steve Wainstead
-s...@pa...
+If you find something I missed, please let us know.
+Reini Urban, Steve Wainstead <sw...@pa...>
 
 Report bugs to php...@li...

Update of /cvsroot/phpwiki/phpwiki/lib/DbSession
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3706
Modified Files:
	ADODB.php 
Log Message:
fix ref warnings reported by schorni
Index: ADODB.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/DbSession/ADODB.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -2 -b -p -d -r1.1 -r1.2
--- ADODB.php	11 Feb 2005 14:41:40 -0000	1.1
+++ ADODB.php	21 Nov 2005 20:48:48 -0000	1.2
@@ -46,5 +46,5 @@ extends DbSession
 }
 
- function _connect() {
+ function & _connect() {
 global $request;
 static $parsed = false;
@@ -52,5 +52,5 @@ extends DbSession
 if (!$dbh or !is_resource($dbh->_connectionID)) {
 if (!$parsed) $parsed = parseDSN($request->_dbi->getParam('dsn'));
- $this->_dbh = &ADONewConnection($parsed['phptype']); // Probably only MySql works just now
+ $this->_dbh =& ADONewConnection($parsed['phptype']); // Probably only MySql works just now
 $this->_dbh->Connect($parsed['hostspec'],$parsed['username'], 
 $parsed['password'], $parsed['database']);
@@ -111,5 +111,5 @@ extends DbSession
 function read ($id) {
 //$this->log("_read($id)");
- $dbh = &$this->_connect();
+ $dbh = $this->_connect();
 $table = $this->_table;
 $qid = $dbh->qstr($id);
@@ -149,5 +149,5 @@ extends DbSession
 function write ($id, $sess_data) {
 
- $dbh = &$this->_connect();
+ $dbh = $this->_connect();
 $table = $this->_table;
 $qid = $dbh->qstr($id);
@@ -196,5 +196,5 @@ extends DbSession
 */
 function destroy ($id) {
- $dbh = &$this->_connect();
+ $dbh = $this->_connect();
 $table = $this->_table;
 $qid = $dbh->qstr($id);
@@ -214,5 +214,5 @@ extends DbSession
 */
 function gc ($maxlifetime) {
- $dbh = &$this->_connect();
+ $dbh = $this->_connect();
 $table = $this->_table;
 $threshold = time() - $maxlifetime;
@@ -228,5 +228,5 @@ extends DbSession
 function currentSessions() {
 $sessions = array();
- $dbh = &$this->_connect();
+ $dbh = $this->_connect();
 $table = $this->_table;
 $rs = $dbh->Execute("SELECT sess_data,sess_date,sess_ip FROM $table ORDER BY sess_date DESC");
@@ -259,4 +259,7 @@ extends DbSession
 
 // $Log$
+// Revision 1.2 2005年11月21日 20:48:48 rurban
+// fix ref warnings reported by schorni
+//
 // Revision 1.1 2005年02月11日 14:41:40 rurban
 // seperate DbSession classes: less memory, a bit slower

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3539
Modified Files:
	BlogJournal.php 
Log Message:
fix count error
Index: BlogJournal.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/BlogJournal.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -2 -b -p -d -r1.2 -r1.3
--- BlogJournal.php	29 Oct 2005 09:06:37 -0000	1.2
+++ BlogJournal.php	21 Nov 2005 20:47:21 -0000	1.3
@@ -70,5 +70,5 @@ extends WikiPlugin_WikiBlog
 $pages = $dbi->titleSearch(new TextSearchQuery("^".$prefix, true, 'posix'));
 $html = HTML(); $i = 0;
- while (($page = $pages->next()) and $i < $count) {
+ while (($page = $pages->next()) and $i < $args['count']) {
 $rev = $page->getCurrentRevision(false);
 if ($rev->get('pagetype') != 'wikiblog') continue;
@@ -91,4 +91,7 @@ extends WikiPlugin_WikiBlog
 
 // $Log$
+// Revision 1.3 2005年11月21日 20:47:21 rurban
+// fix count error
+//
 // Revision 1.2 2005年10月29日 09:06:37 rurban
 // move common blog methods to WikiBlog

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27818/pgsrc
Added Files:
	Help%2FSemanticRelations 
Log Message:
Plugin to display the list of SemanticRelations - list of relations and 
attributes of given page(s).
Relations are stored in the link table.
Attributes as simple page meta-data.
--- NEW FILE: Help%2FSemanticRelations ---
Date: Sun, 6 Nov 2005 18:37:29 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.3.12)
X-Rcs-Id: $Id: Help%2FSemanticRelations,v 1.1 2005年11月21日 20:14:20 rurban Exp $
Content-Type: application/x-phpwiki;
 pagename=Help%2FSemanticRelations;
 pgsrc_version="2 $Revision: 1.1 $";
 flags="";
 markup=2;
 charset=iso-8859-1
Content-Transfer-Encoding: binary
The PhpWiki:SemanticWeb implementation follows closely the mediawiki implementation. It features:
* Annotation of article-article-links by means of configurable relations (link-types).
* Annotation of articles with simple data-values that are assigned to configurable attributes.
* Support for using physical units of measurement in all numerical attributes, without need 
 for prior configuration.
The annotation data will be combined with annotations from the current
category system to generate standard-compliant OWL/RDF output, which
can be fully processed with tools that support OWL DL or OWL Lite, but
which can also be treated in a meaningful way by software that
supports RDF, RDFS or XML.
! Relations
Relations (link-types) are defined as link with the following syntax: 
 relation::pagename
! Attributes
Attributes are defined as link with the following syntax: 
 attribute:-value
Attributes and relations refer only to the current page - the current
page is the subject, the relation the predicate, the linked page the
object in a RDF triple. Relations always refer to another page,
attributes not.
! Example
<em>Sample taken from http://wiki.ontoworld.org/index.php/San_Diego </em>
<verbatim>
San Diego [is_a::city] located in the southwestern corner of
[California|located_in::California], the extreme southwestern corner
of the United States. It is the county seat of San Diego County. As of
the 2000 census, the city had a total population of
[1,223,400|population:=1223400]; as of 2005, the California Department
of Finance estimated the city to have 1,305,736 residents. The city is
the second-largest in California and the seventh-largest in the United
States and is noted for its temperate climate and many beaches.
According to the United States Census Bureau, the city has a total
area of 963.6 km2 (372.0 mi2). 840.0 km2 (324.3 mi2) of it is land and
123.5 km2 (47.7 mi2) of it is water. The total area is 12.82% water.
Most notably, San Diego is the location of the 2005 International
Symposium on Wikis 2005, and the San Diego Zoo, and the San Diego
Chargers.
<?plugin SemanticRelations page=SanDiego ?>
</verbatim>
! See Also
See PhpWiki:SemanticWeb, Help:SemanticRelationsPlugin, Help:SemanticSearchPlugin
-------------
PhpWikiDocumentation

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27818/lib/plugin
Added Files:
	SemanticRelations.php 
Log Message:
Plugin to display the list of SemanticRelations - list of relations and 
attributes of given page(s).
Relations are stored in the link table.
Attributes as simple page meta-data.
--- NEW FILE: SemanticRelations.php ---
<?php // -*-php-*-
rcs_id('$Id: SemanticRelations.php,v 1.1 2005年11月21日 20:14:20 rurban Exp $');
/*
 Copyright 2005 Reini Urban
 This file is part of PhpWiki.
 PhpWiki is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 PhpWiki is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with PhpWiki; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
/**
 * SemanticRelations - Display the list of relations and attributes of given page(s).
 * Relations are stored in the link table.
 * Attributes as simple page meta-data.
 *
 * @author: Reini Urban
 */
class WikiPlugin_SemanticRelations
extends WikiPlugin
{
 function getName() {
 return _("SemanticRelations");
 }
 function getDescription() {
 return _("Display the list of relations and attributes");
 }
 function getVersion() {
 return preg_replace("/[Revision: $]/", '',
 "\$Revision: 1.1 $");
 }
 function getDefaultArguments() { 
 return array(
 'page' => "", // which pages (glob allowed), default: current
 'relations' => '', // which relations. default all
 'attributes' => '', // which attributes. default all
 'units' => '', // ?
 'noheader' => false,
 'nohelp' => false
 );
 }
 function run ($dbi, $argstr, &$request, $basepage) { 
 global $WikiTheme;
 $args = $this->getArgs($argstr, $request);
 extract($args);
 if (empty($page))
 $page = $request->getArg('pagename');
 $relhtml = HTML();
 foreach (explodePageList($page) as $pagename) {
 $p = $dbi->getPage($pagename);
 $links = $p->getRelations(); // iter of pagelinks
 // TODO: merge same relations together located_in::here, located_in::there
 while ($object = $links->next()) {
 if ($related = $object->get('linkrelation')) { // a page name
 $relhtml->pushContent
 ($pagename . " ",
 // Link to a special "Relation:" InterWiki link?
 WikiLink($related, false, $related), 
 " :: ", // use spaces?
 WikiLink($object->_pagename), 
 " ",
 // Link to SemanticSearch
 $WikiTheme->makeActionButton(array('relation' => $related,
 'object' => $object->_pagename),
 '+',
 _("SemanticSearch")),
 HTML::br());
 }
 }
 if (!empty($relhtml->_content) and !$noheader)
 $relhtml = HTML(HTML::hr(),
 HTML::h3(fmt("Semantic relations for %s", $p->getName())),
 $relhtml);
 $atthtml = HTML();
 if ($attributes = $p->get('attributes')) { // a hash of unique pairs
 foreach ($attributes as $att => $val) {
 if ($noheader)
 $atthtml->pushContent("$pagename $att := $val", HTML::br());
 else
 $atthtml->pushContent("$att := $val", HTML::br());
 }
 if (!$noheader)
 $relhtml = HTML($relhtml,
 HTML::hr(),
 HTML::h3(fmt("Attributes of %s", $p->getName())), 
 $atthtml);
 else
 $relhtml = HTML($relhtml, $atthtml);
 }
 }
 if ($nohelp) return $relhtml;
 return HTML($relhtml, 
 HTML::hr(), 
 WikiLink(_("Help/SemanticRelations"), false,
 HTML::em(_("Help/SemanticRelations"))),
 " - ",
 HTML::em(_("Find out how to add relations and attributes to pages.")));
 }
};
// $Log: SemanticRelations.php,v $
// Revision 1.1 2005年11月21日 20:14:20 rurban
// Plugin to display the list of SemanticRelations - list of relations and
// attributes of given page(s).
// Relations are stored in the link table.
// Attributes as simple page meta-data.
//
// Local Variables:
// mode: php
// tab-width: 8
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
?>

Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6245
Modified Files:
	PearDB_pgsql.php 
Log Message:
Just use update_recent as stored procedure because of quoting problems
with type TEXT on LANGUAGE SQL (I don't want users to force createlang pqsql)
Index: PearDB_pgsql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/PearDB_pgsql.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -2 -b -p -d -r1.21 -r1.22
--- PearDB_pgsql.php	15 Nov 2005 21:15:13 -0000	1.21
+++ PearDB_pgsql.php	16 Nov 2005 07:36:22 -0000	1.22
@@ -117,9 +117,14 @@ extends WikiDB_backend_PearDB
 unset($data['%pagedata']);
 
+ $this->lock();
 $id = $this->_get_pageid($pagename, true);
- $dbh->query(sprintf("SELECT set_versiondata (%d, %d, %d, %d, '%s'::text, '%s'::text)",
+ $dbh->query(sprintf("DELETE FROM version WHERE id=%d AND version=%d", $id, $version));
+ $dbh->query(sprintf("INSERT INTO version (id,version,mtime,minor_edit,content,versiondata)" .
+ " VALUES (%d, %d, %d, %d, '%s', '%s')",
 $id, $version, $mtime, $minor_edit, 
 $this->_quote($content),
 $this->_serialize($data)));
+ $dbh->query(sprintf("SELECT update_recent (%d, %d)", $id, $version));
+ $this->unlock();
 }
 

Update of /cvsroot/phpwiki/phpwiki/schemas
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5862
Modified Files:
	psql-1_3_12.sql psql-destroy.sql psql-initialize.sql 
Log Message:
LANGUAGE SQL quote problems with TEXT: just use update_recent()
add experimental pagedata/versiondata/pageperm joins 
 (not to serialize the arrays into blobs)
Index: psql-1_3_12.sql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/schemas/psql-1_3_12.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -2 -b -p -d -r1.3 -r1.4
--- psql-1_3_12.sql	15 Nov 2005 21:12:22 -0000	1.3
+++ psql-1_3_12.sql	16 Nov 2005 07:33:43 -0000	1.4
@@ -173,5 +173,5 @@ CREATE OR REPLACE FUNCTION 
 DELETE FROM version WHERE id=1ドル AND version=2ドル;
 INSERT INTO version (id,version,mtime,minor_edit,content,versiondata)
- VALUES(1,ドル 2,ドル 3,ドル 4,ドル ''5ドル''::text, ''6ドル''::text);
+ VALUES(1,ドル 2,ドル 3,ドル 4,ドル 5,ドル 6ドル);
 DELETE FROM recent WHERE id=1ドル;
 INSERT INTO recent (id, latestversion, latestmajor, latestminor)
Index: psql-destroy.sql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/schemas/psql-destroy.sql,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -2 -b -p -d -r1.8 -r1.9
--- psql-destroy.sql	15 Nov 2005 21:12:22 -0000	1.8
+++ psql-destroy.sql	16 Nov 2005 07:33:43 -0000	1.9
@@ -36,11 +36,16 @@
 
 \echo Dropping table :version_tbl
-DROP TABLE :version_tbl;
+DROP TABLE :version_tbl CASCADE;
 
 \echo Dropping table :recent_tbl
-DROP TABLE :recent_tbl;
+DROP TABLE :recent_tbl CASCADE;
 
 \echo Dropping table :nonempty_tbl
-DROP TABLE :nonempty_tbl;
+DROP TABLE :nonempty_tbl CASCADE;
+
+\echo Dropping experimental pagedata tables (not yet used)
+DROP TABLE pagedata CASCADE;
+DROP TABLE versiondata CASCADE;
+DROP TABLE pageperm CASCADE;
 
 \echo Dropping table :link_tbl
@@ -78,5 +83,4 @@ DROP TABLE :accesslog_tbl;
 
 \echo Dropping stored procedures
-DROP FUNCTION delete_versiondata (INT4, INT4);
-DROP FUNCTION set_versiondata (INT4, INT4, INT4, INT2, TEXT, TEXT);
+DROP FUNCTION update_recent (INT4, INT4);
 DROP FUNCTION prepare_rename_page (INT4, INT4);
Index: psql-initialize.sql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/schemas/psql-initialize.sql,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -2 -b -p -d -r1.9 -r1.10
--- psql-initialize.sql	15 Nov 2005 21:12:22 -0000	1.9
+++ psql-initialize.sql	16 Nov 2005 07:33:43 -0000	1.10
@@ -3,9 +3,9 @@
 \set QUIET
 
--- init the database with: 
--- $ createdb phpwiki
--- $ createuser -S -R -d phpwiki # (see httpd_user below)
--- $ psql phpwiki < /usr/share/postgresql/contrib/tsearch2.sql 
--- $ psql phpwiki < psql-initialize.sql
+\echo At first init the database with: 
+\echo $ createdb phpwiki
+\echo $ createuser -S -R -d phpwiki # (see httpd_user below)
+\echo $ psql phpwiki < /usr/share/postgresql/contrib/tsearch2.sql 
+\echo $ psql phpwiki < psql-initialize.sql
 
 --================================================================
@@ -118,4 +118,5 @@ CREATE TABLE :recent_tbl (
 );
 CREATE UNIQUE INDEX :recent_id_idx ON :recent_tbl (id);
+CREATE INDEX recent_latestversion_idx ON :recent_tbl (latestversion);
 
 \echo Creating :nonempty_tbl
@@ -125,5 +126,36 @@ CREATE TABLE :nonempty_tbl (
 CREATE UNIQUE INDEX :nonmt_id_idx ON :nonempty_tbl (id);
 
-\echo Creating page views
+\echo Creating experimental pagedata (not yet used)
+CREATE TABLE pagedata (
+	id	INT4 NOT NULL REFERENCES :page_tbl ON DELETE CASCADE,
+	date INT4,
+	locked BOOLEAN,
+ rest	TEXT NOT NULL DEFAULT ''
+);
+CREATE INDEX pagedata_id_idx ON pagedata (id);
+
+\echo Creating experimental versiondata (not yet used)
+CREATE TABLE versiondata (
+	id	 INT4 NOT NULL,
+	version	 INT4 NOT NULL,
+	markup INT2 DEFAULT 2, 
+	author VARCHAR(48), 
+	author_id VARCHAR(48), 
+	pagetype VARCHAR(20) DEFAULT 'wikitext', 
+ rest	 TEXT NOT NULL DEFAULT '',
+	FOREIGN KEY (id, version) REFERENCES :version_tbl (id, version)
+);
+\echo Creating experimental pageperm (not yet used)
+CREATE TABLE pageperm (
+	id	 INT4 NOT NULL REFERENCES :page_tbl(id) ON DELETE CASCADE,
+ -- view,edit,create,list,remove,change,dump
+	access CHAR(12) NOT NULL, 
+	groupname VARCHAR(48),
+	allowed BOOLEAN
+);
+CREATE INDEX pageperm_id_idx ON pageperm (id);
+CREATE INDEX pageperm_access_idx ON pageperm (access);
+
+\echo Creating experimental page views (not yet used)
 
 -- nonempty versiondata
@@ -188,4 +220,5 @@ CREATE TABLE :pref_tbl (
 );
 -- CREATE UNIQUE INDEX :pref_id_idx ON :pref_tbl (userid);
+CREATE INDEX pref_group_idx ON :pref_tbl (groupname);
 
 -- Use the member table, if you need it for n:m user-group relations,
@@ -268,7 +301,6 @@ GRANT SELECT,INSERT,UPDATE,DELETE ON :ac
 \echo Initializing stored procedures
 
-CREATE OR REPLACE FUNCTION delete_versiondata (id INT4, version INT4) 
+CREATE OR REPLACE FUNCTION update_recent (id INT4, version INT4) 
 	RETURNS void AS '
-DELETE FROM version WHERE id=1ドル AND version=2ドル;
 DELETE FROM recent WHERE id=1ドル;
 INSERT INTO recent (id, latestversion, latestmajor, latestminor)
@@ -286,26 +318,4 @@ INSERT INTO nonempty (id)
 ' LANGUAGE SQL;
 
-CREATE OR REPLACE FUNCTION 
- set_versiondata (id INT4, version INT4, mtime INT4, minor_edit INT2,
- content TEXT, versiondata TEXT)
-	RETURNS void AS '
-DELETE FROM version WHERE id=1ドル AND version=2ドル;
-INSERT INTO version (id,version,mtime,minor_edit,content,versiondata)
- VALUES(1,ドル 2,ドル 3,ドル 4,ドル ''5ドル''::text, ''6ドル''::text);
-DELETE FROM recent WHERE id=1ドル;
-INSERT INTO recent (id, latestversion, latestmajor, latestminor)
- SELECT id, MAX(version), MAX(CASE WHEN minor_edit=0 THEN version END), 
-	 MAX(CASE WHEN minor_edit<>0 THEN version END)
- FROM version WHERE id=2ドル GROUP BY id;
-DELETE FROM nonempty WHERE id=1ドル;
-INSERT INTO nonempty (id)
- SELECT recent.id
- FROM recent, version
- WHERE recent.id=version.id
- AND version=latestversion
- AND content<>''''
- AND recent.id=1ドル;
-' LANGUAGE sql;
-
 CREATE OR REPLACE FUNCTION prepare_rename_page (oldid INT4, newid INT4) 
 RETURNS void AS '

Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31873/WikiDB/backend
Modified Files:
	PearDB_pgsql.php 
Log Message:
fix psql syntax error
Index: PearDB_pgsql.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/PearDB_pgsql.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -2 -b -p -d -r1.20 -r1.21
--- PearDB_pgsql.php	14 Nov 2005 22:24:33 -0000	1.20
+++ PearDB_pgsql.php	15 Nov 2005 21:15:13 -0000	1.21
@@ -118,5 +118,5 @@ extends WikiDB_backend_PearDB
 
 $id = $this->_get_pageid($pagename, true);
- $dbh->query(sprintf("SELECT set_versiondata (%d, %d, %d; %d, '%s'::text, '%s'::text)",
+ $dbh->query(sprintf("SELECT set_versiondata (%d, %d, %d, %d, '%s'::text, '%s'::text)",
 $id, $version, $mtime, $minor_edit, 
 $this->_quote($content),

Update of /cvsroot/phpwiki/phpwiki/schemas
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31202
Modified Files:
	mysql-initialize.sql psql-1_3_12.sql psql-destroy.sql 
	psql-initialize.sql 
Log Message:
fix broken postgresql schema and upgrade, add views
Index: mysql-initialize.sql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/schemas/mysql-initialize.sql,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -2 -b -p -d -r1.9 -r1.10
--- mysql-initialize.sql	28 Sep 2005 19:27:23 -0000	1.9
+++ mysql-initialize.sql	15 Nov 2005 21:12:22 -0000	1.10
@@ -44,6 +44,8 @@ CREATE TABLE link (
 	linkfrom INT NOT NULL,
 linkto INT NOT NULL,
+ relation INT DEFAULT 0,
 	INDEX (linkfrom),
- INDEX (linkto)
+ INDEX (linkto),
+ INDEX (relation)
 );
 
Index: psql-1_3_12.sql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/schemas/psql-1_3_12.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -2 -b -p -d -r1.2 -r1.3
--- psql-1_3_12.sql	14 Nov 2005 23:09:40 -0000	1.2
+++ psql-1_3_12.sql	15 Nov 2005 21:12:22 -0000	1.3
@@ -89,22 +89,32 @@ ALTER TABLE :version_tbl
 ALTER TABLE :nonempty_tbl 
 	ALTER COLUMN id TYPE INT4, 
-	ALTER COLUMN id SET NOT NULL,
 ADD FOREIGN KEY (id) REFERENCES :page_tbl ON DELETE CASCADE;
+
+\echo Creating page views
+
+-- nonempty versiondata
+CREATE VIEW existing_page AS
+ SELECT * FROM :page_tbl P INNER JOIN :nonempty_tbl N USING (id);
+
+-- latest page version
+CREATE VIEW curr_page AS
+ SELECT P.id,P.pagename,P.hits,P.pagedata,P.cached_html,
+	 V.version,V.mtime,V.minor_edit,V.content,V.versiondata
+ FROM :page_tbl P 
+ JOIN :version_tbl V USING (id)
+ JOIN :recent_tbl R ON (V.id=R.id AND V.version=R.latestversion);
+
 ALTER TABLE :link_tbl 
 	ALTER COLUMN linkfrom TYPE INT4,
-	ALTER COLUMN linkfrom SET NOT NULL,
 	ALTER COLUMN linkto TYPE INT4,
-	ALTER COLUMN linkto SET NOT NULL,
 	ADD COLUMN relation INT4 DEFAULT 0,
- ADD FOREIGN KEY (linkfrom) REFERENCES :page_tbl (id) ON DELETE CASCADE,
- ADD FOREIGN KEY (linkto) REFERENCES :page_tbl (id) ON DELETE CASCADE;
+ ADD FOREIGN KEY (linkfrom) REFERENCES :page_tbl (id),
+ ADD FOREIGN KEY (linkto) REFERENCES :page_tbl (id);
 CREATE INDEX :relation_idx ON :link_tbl (relation);
 ALTER TABLE :rating_tbl 
 	ALTER COLUMN raterpage TYPE INT8,
-	ALTER COLUMN raterpage SET NOT NULL,
 	ALTER COLUMN rateepage TYPE INT8,
-	ALTER COLUMN rateepage SET NOT NULL,
- ADD FOREIGN KEY (raterpage) REFERENCES :page_tbl (id) ON DELETE CASCADE,
- ADD FOREIGN KEY (rateepage) REFERENCES :page_tbl (id) ON DELETE CASCADE;
+ ADD FOREIGN KEY (raterpage) REFERENCES :page_tbl (id),
+ ADD FOREIGN KEY (rateepage) REFERENCES :page_tbl (id);
 ALTER TABLE :member_tbl 
 	ALTER COLUMN userid TYPE CHAR(48), 
@@ -143,5 +153,6 @@ DELETE FROM version WHERE id=1ドル AND vers
 DELETE FROM recent WHERE id=1ドル;
 INSERT INTO recent (id, latestversion, latestmajor, latestminor)
- SELECT id, MAX(version), MAX(CASE WHEN minor_edit=0 THEN version END), 
+ SELECT id, MAX(version), 
+	 MAX(CASE WHEN minor_edit=0 THEN version END), 
 	 MAX(CASE WHEN minor_edit<>0 THEN version END)
 FROM version WHERE id=2ドル GROUP BY id;
@@ -159,6 +170,5 @@ CREATE OR REPLACE FUNCTION 
 set_versiondata (id integer, version integer, mtime integer, minor_edit smallint,
 content text, versiondata text)
-	RETURNS void AS 
-'
+	RETURNS void AS '
 DELETE FROM version WHERE id=1ドル AND version=2ドル;
 INSERT INTO version (id,version,mtime,minor_edit,content,versiondata)
@@ -180,6 +190,5 @@ INSERT INTO nonempty (id)
 
 CREATE OR REPLACE FUNCTION prepare_rename_page (oldid integer, newid integer) 
- RETURNS void AS
-'
+ RETURNS void AS '
 DELETE FROM page WHERE id=2ドル;
 DELETE FROM version WHERE id=2ドル;
Index: psql-destroy.sql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/schemas/psql-destroy.sql,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -2 -b -p -d -r1.7 -r1.8
--- psql-destroy.sql	14 Nov 2005 22:20:21 -0000	1.7
+++ psql-destroy.sql	15 Nov 2005 21:12:22 -0000	1.8
@@ -30,43 +30,52 @@
 \set session_tbl	:prefix 'session'
 \set pref_tbl		:prefix 'pref'
--- \set user_tbl	:prefix 'user'
+--\set user_tbl	 :prefix 'user'
 \set member_tbl 	:prefix 'member'
 \set rating_tbl		:prefix 'rating'
 \set accesslog_tbl	:prefix 'accesslog'
 
-\echo Dropping :version_tbl
+\echo Dropping table :version_tbl
 DROP TABLE :version_tbl;
 
-\echo Dropping :recent_tbl
+\echo Dropping table :recent_tbl
 DROP TABLE :recent_tbl;
 
-\echo Dropping :nonempty_tbl
+\echo Dropping table :nonempty_tbl
 DROP TABLE :nonempty_tbl;
 
-\echo Dropping :link_tbl
+\echo Dropping table :link_tbl
 DROP TABLE :link_tbl;
 
---\echo Dropping :user_tbl
--- DROP TABLE :user_tbl;
-
-\echo Dropping :rating_tbl
+\echo Dropping table :rating_tbl
 DROP TABLE :rating_tbl;
 
-\echo Dropping :page_tbl
-DROP TABLE :page_tbl;
+\set existing_page :prefix 'existing_page'
+\echo Dropping view :existing_page
+DROP VIEW :existing_page;
+
+\set curr_page :prefix 'curr_page'
+\echo Dropping view :curr_page
+DROP VIEW :curr_page;
+
+\echo Dropping table :page_tbl
+DROP TABLE :page_tbl CASCADE;
 \echo Dropping :page_id_seq only needed for postgresql < 7.2
 
-\echo Dropping :member_tbl
+\echo Dropping table :member_tbl
 DROP TABLE :member_tbl;
 
-\echo Dropping :pref_tbl
+\echo Dropping table :pref_tbl
 DROP TABLE :pref_tbl;
 
-\echo Dropping :session_tbl
+--\echo Dropping table :user_tbl
+--DROP TABLE :user_tbl;
+
+\echo Dropping table :session_tbl
 DROP TABLE :session_tbl;
 
-\echo Dropping :accesslog_tbl
+\echo Dropping table :accesslog_tbl
 DROP TABLE :accesslog_tbl;
 
+\echo Dropping stored procedures
 DROP FUNCTION delete_versiondata (INT4, INT4);
 DROP FUNCTION set_versiondata (INT4, INT4, INT4, INT2, TEXT, TEXT);
Index: psql-initialize.sql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/schemas/psql-initialize.sql,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -2 -b -p -d -r1.8 -r1.9
--- psql-initialize.sql	14 Nov 2005 22:20:21 -0000	1.8
+++ psql-initialize.sql	15 Nov 2005 21:12:22 -0000	1.9
@@ -41,5 +41,5 @@
 \echo ' httpd_user = ' :qhttp_user
 \echo
-\echo 'Expect some \'NOTICE: CREATE ... will create implicit sequence ...\' messages '
+\echo 'Expect some \'NOTICE: CREATE ... will create implicit sequence/index ...\' messages '
 
 \set page_tbl 		:prefix 'page'
@@ -113,9 +113,10 @@ CREATE TABLE :recent_tbl (
 	latestversion	INT4,
 	latestmajor	INT4,
-	latestminor	INT4
+	latestminor	INT4,
+	FOREIGN KEY (id, latestversion) REFERENCES :version_tbl (id, version),
+	CHECK (latestminor >= latestmajor)
 );
 CREATE UNIQUE INDEX :recent_id_idx ON :recent_tbl (id);
 
-
 \echo Creating :nonempty_tbl
 CREATE TABLE :nonempty_tbl (
@@ -124,4 +125,18 @@ CREATE TABLE :nonempty_tbl (
 CREATE UNIQUE INDEX :nonmt_id_idx ON :nonempty_tbl (id);
 
+\echo Creating page views
+
+-- nonempty versiondata
+CREATE VIEW existing_page AS
+ SELECT * FROM :page_tbl P INNER JOIN :nonempty_tbl N USING (id);
+
+-- latest page version
+CREATE VIEW curr_page AS
+ SELECT P.id,P.pagename,P.hits,P.pagedata,P.cached_html,
+	 V.version,V.mtime,V.minor_edit,V.content,V.versiondata
+ FROM :page_tbl P 
+ JOIN :version_tbl V USING (id)
+ JOIN :recent_tbl R ON (V.id=R.id AND V.version=R.latestversion);
+
 \echo Creating :link_tbl
 CREATE TABLE :link_tbl (
@@ -253,11 +268,6 @@ GRANT SELECT,INSERT,UPDATE,DELETE ON :ac
 \echo Initializing stored procedures
 
-\set maxversion 'MAX(version)'
-\set maxmajor 'MAX(CASE WHEN minor_edit=0 THEN version END)'
-\set maxminor 'MAX(CASE WHEN minor_edit<>0 THEN version END)'
-
 CREATE OR REPLACE FUNCTION delete_versiondata (id INT4, version INT4) 
 	RETURNS void AS '
-BEGIN;
 DELETE FROM version WHERE id=1ドル AND version=2ドル;
 DELETE FROM recent WHERE id=1ドル;
@@ -274,5 +284,4 @@ INSERT INTO nonempty (id)
 AND content<>''''
 AND recent.id=1ドル;
-COMMIT;
 ' LANGUAGE SQL;
 
@@ -280,10 +289,8 @@ CREATE OR REPLACE FUNCTION 
 set_versiondata (id INT4, version INT4, mtime INT4, minor_edit INT2,
 content TEXT, versiondata TEXT)
-	RETURNS void AS 
-'
-BEGIN;
+	RETURNS void AS '
 DELETE FROM version WHERE id=1ドル AND version=2ドル;
 INSERT INTO version (id,version,mtime,minor_edit,content,versiondata)
- VALUES(1,ドル 2,ドル 3,ドル 4,ドル 5,ドル 6ドル);
+ VALUES(1,ドル 2,ドル 3,ドル 4,ドル ''5ドル''::text, ''6ドル''::text);
 DELETE FROM recent WHERE id=1ドル;
 INSERT INTO recent (id, latestversion, latestmajor, latestminor)
@@ -299,11 +306,8 @@ INSERT INTO nonempty (id)
 AND content<>''''
 AND recent.id=1ドル;
-COMMIT; 
 ' LANGUAGE sql;
 
 CREATE OR REPLACE FUNCTION prepare_rename_page (oldid INT4, newid INT4) 
- RETURNS void AS
-'
-BEGIN;
+ RETURNS void AS '
 DELETE FROM page WHERE id=2ドル;
 DELETE FROM version WHERE id=2ドル;
@@ -313,4 +317,3 @@ DELETE FROM nonempty WHERE id=2ドル;
 UPDATE link SET linkfrom=1ドル WHERE linkfrom=2ドル;
 UPDATE link SET linkto=1ドル WHERE linkto=2ドル;
-COMMIT;
 ' LANGUAGE sql;

Update of /cvsroot/phpwiki/phpwiki/schemas
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25218
Modified Files:
	psql-1_3_12.sql 
Log Message:
fix syntax errors
Index: psql-1_3_12.sql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/schemas/psql-1_3_12.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -2 -b -p -d -r1.1 -r1.2
--- psql-1_3_12.sql	14 Nov 2005 22:20:21 -0000	1.1
+++ psql-1_3_12.sql	14 Nov 2005 23:09:40 -0000	1.2
@@ -53,4 +53,5 @@
 \set link_from_idx 	:prefix 'link_from_idx'
 \set link_to_idx 	:prefix 'link_to_idx'
+\set relation_idx 	:prefix 'relation_idx'
 
 \set session_tbl 	:prefix 'session'
@@ -78,19 +79,36 @@
 
 ALTER TABLE :page_tbl 
-	ALTER COLUMN id TYPE SERIAL PRIMARY KEY
- ALTER COLUMN pagename TYPE VARCHAR(100) 
-	ALTER COLUMN pagename SET NOT NULL 
-	ALTER COLUMN pagename ADD CONSTRAINT pagename_key UNIQUE CHECK (pagename <> '');
-ALTER TABLE :version_tbl ALTER COLUMN id INT4 REFERENCES :page_tbl ON DELETE CASCADE;
-ALTER TABLE :nonempty_tbl ALTER COLUMN id INT4 NOT NULL REFERENCES :page_tbl ON DELETE CASCADE;
+	ALTER COLUMN id TYPE SERIAL /* PRIMARY KEY */,
+ ALTER COLUMN pagename TYPE VARCHAR(100),
+	ALTER COLUMN pagename SET NOT NULL,
+	ADD UNIQUE(pagename),
+	ADD CHECK (pagename <> '');
+ALTER TABLE :version_tbl
+	ALTER COLUMN id TYPE INT4,
+ ADD FOREIGN KEY (id) REFERENCES :page_tbl ON DELETE CASCADE;
+ALTER TABLE :nonempty_tbl 
+	ALTER COLUMN id TYPE INT4, 
+	ALTER COLUMN id SET NOT NULL,
+ ADD FOREIGN KEY (id) REFERENCES :page_tbl ON DELETE CASCADE;
 ALTER TABLE :link_tbl 
-	ALTER COLUMN linkfrom INT4 NOT NULL REFERENCES :page_tbl ON DELETE CASCADE
-	ALTER COLUMN linkto INT4 NOT NULL REFERENCES :page_tbl ON DELETE CASCADE
-	ADD COLUMN relation INT4 DEFAULT 0;
+	ALTER COLUMN linkfrom TYPE INT4,
+	ALTER COLUMN linkfrom SET NOT NULL,
+	ALTER COLUMN linkto TYPE INT4,
+	ALTER COLUMN linkto SET NOT NULL,
+	ADD COLUMN relation INT4 DEFAULT 0,
+ ADD FOREIGN KEY (linkfrom) REFERENCES :page_tbl (id) ON DELETE CASCADE,
+ ADD FOREIGN KEY (linkto) REFERENCES :page_tbl (id) ON DELETE CASCADE;
 CREATE INDEX :relation_idx ON :link_tbl (relation);
 ALTER TABLE :rating_tbl 
-	ALTER COLUMN raterpage INT8 NOT NULL REFERENCES :page_tbl ON DELETE CASCADE
-	ALTER COLUMN rateepage INT8 NOT NULL REFERENCES :page_tbl ON DELETE CASCADE;
-ALTER TABLE :member_tbl ALTER COLUMN userid CHAR(48) NOT NULL REFERENCES :pref_tbl ON DELETE CASCADE;
+	ALTER COLUMN raterpage TYPE INT8,
+	ALTER COLUMN raterpage SET NOT NULL,
+	ALTER COLUMN rateepage TYPE INT8,
+	ALTER COLUMN rateepage SET NOT NULL,
+ ADD FOREIGN KEY (raterpage) REFERENCES :page_tbl (id) ON DELETE CASCADE,
+ ADD FOREIGN KEY (rateepage) REFERENCES :page_tbl (id) ON DELETE CASCADE;
+ALTER TABLE :member_tbl 
+	ALTER COLUMN userid TYPE CHAR(48), 
+	ALTER COLUMN userid SET NOT NULL,
+	ADD FOREIGN KEY (userid) REFERENCES :pref_tbl;
 
 --================================================================
@@ -139,11 +157,11 @@ INSERT INTO nonempty (id)
 
 CREATE OR REPLACE FUNCTION 
- set_versiondata (id integer, version integer, mtime integer, minor_edit integer,
- content TEXT, versiondata TEXT)
+ set_versiondata (id integer, version integer, mtime integer, minor_edit smallint,
+ content text, versiondata text)
 	RETURNS void AS 
 '
 DELETE FROM version WHERE id=1ドル AND version=2ドル;
 INSERT INTO version (id,version,mtime,minor_edit,content,versiondata)
- VALUES(1,ドル 2,ドル 3,ドル 4,ドル 5,ドル 6ドル);
+ VALUES(1,ドル 2,ドル 3,ドル 4,ドル ''5ドル''::text, ''6ドル''::text);
 DELETE FROM recent WHERE id=1ドル;
 INSERT INTO recent (id, latestversion, latestmajor, latestminor)

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16817
Modified Files:
	FullTextSearch.php 
Log Message:
print ignored stoplist words
Index: FullTextSearch.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/FullTextSearch.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -2 -b -p -d -r1.25 -r1.26
--- FullTextSearch.php	11 Sep 2005 14:55:05 -0000	1.25
+++ FullTextSearch.php	14 Nov 2005 22:33:04 -0000	1.26
@@ -107,4 +107,8 @@ extends WikiPlugin
 $list->pushContent(HTML::dd(_("<no matches>")));
 
+ if (!empty($pages->stoplisted))
+ $list = HTML(HTML::p(fmt(_("Ignored stoplist words '%s'"), 
+ join(', ', $pages->stoplisted))), 
+ $list);
 if ($noheader)
 return $list;
@@ -137,4 +141,7 @@ extends WikiPlugin
 
 // $Log$
+// Revision 1.26 2005年11月14日 22:33:04 rurban
+// print ignored stoplist words
+//
 // Revision 1.25 2005年09月11日 14:55:05 rurban
 // implement fulltext stoplist

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16703
Modified Files:
	upgrade.php 
Log Message:
remove user, SKIP on !session
Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/upgrade.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -2 -b -p -d -r1.47 -r1.48
--- upgrade.php	27 Feb 2005 19:13:27 -0000	1.47
+++ upgrade.php	14 Nov 2005 22:32:38 -0000	1.48
@@ -368,5 +368,5 @@ function CheckDatabaseUpdate(&$request) 
 echo "<h4>",_("Backend type: "),$backend_type,"</h4>\n";
 $prefix = isset($DBParams['prefix']) ? $DBParams['prefix'] : '';
- foreach (explode(':','session:user:pref:member') as $table) {
+ foreach (explode(':','session:pref:member') as $table) {
 echo sprintf(_("check for table %s"), $table)," ...";
 	if (!in_array($prefix.$table, $tables)) {
@@ -404,5 +404,7 @@ function CheckDatabaseUpdate(&$request) 
 $session_tbl = $prefix . $DBParams['db_session_table'];
 $sess_fields = $dbh->_backend->listOfFields($database, $session_tbl);
- if (!strstr(strtolower(join(':', $sess_fields)), "sess_ip")) {
+ if (!$sess_fields) {
+ echo _("SKIP");
+ } elseif (!strstr(strtolower(join(':', $sess_fields)), "sess_ip")) {
 // TODO: postgres test (should be able to add columns at the end, but not in between)
 echo "<b>",_("ADDING"),"</b>"," ... ";		
@@ -442,6 +444,11 @@ function CheckDatabaseUpdate(&$request) 
 }
 
+ /*
+ ALTER TABLE link ADD relation INT default 0;
+ CREATE INDEX linkrelation on link (relation);
+ */
+
 // mysql >= 4.0.4 requires LOCK TABLE privileges
- if (substr($backend_type,0,5) == 'mysql'/* and $DBParams['dbtype'] != 'PDO' */) {
+ if (0 and substr($backend_type,0,5) == 'mysql'/* and $DBParams['dbtype'] != 'PDO' */) {
 	echo _("check for mysql LOCK TABLE privilege")," ...";
 $mysql_version = $dbh->_backend->_serverinfo['version'];
@@ -692,5 +699,5 @@ _("And on windows at least the privilege
 function _upgrade_cached_html (&$dbh, $verbose=true) {
 global $DBParams;
- if (!in_array($DBParams['dbtype'], array('SQL','ADODB'))) return;
+ if (!in_array($DBParams['dbtype'], array('SQL','ADODB','PDO'))) return;
 $count = 0;
 if (phpwiki_version() >= 1030.10) {
@@ -700,4 +707,8 @@ function _upgrade_cached_html (&$dbh, $v
 extract($dbh->_backend->_table_names);
 $fields = $dbh->_backend->listOfFields($database, $page_tbl);
+ if (!$fields) {
+ echo _("SKIP"), "<br />\n";
+ return 0;
+ }
 if (!strstr(strtolower(join(':', $fields)), "cached_html")) {
 if ($verbose)
@@ -885,4 +896,7 @@ function DoUpgrade($request) {
 /*
 $Log$
+ Revision 1.48 2005年11月14日 22:32:38 rurban
+ remove user, SKIP on !session
+
 Revision 1.47 2005年02月27日 19:13:27 rurban
 latin1 mysql fix

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16361
Modified Files:
	InlineParser.php 
Log Message:
add SemanticWeb support
Index: InlineParser.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/InlineParser.php,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -2 -b -p -d -r1.70 -r1.71
--- InlineParser.php	31 Oct 2005 16:45:23 -0000	1.70
+++ InlineParser.php	14 Nov 2005 22:31:12 -0000	1.71
@@ -389,4 +389,7 @@ function LinkBracketLink($bracketlink) {
 elseif (preg_match("/^phpwiki:/", $link))
 return new Cached_PhpwikiURL($link, $label);
+ /* Semantic relations and attributes */
+ elseif (preg_match("/:[:-]/", $link) and !isImageLink($link))
+ return new Cached_SemanticLink($link, $label);
 /*
 * Inline images in Interwiki urls's:
@@ -874,4 +877,7 @@ function TransformLinks($text, $markup =
 
 // $Log$
+// Revision 1.71 2005年11月14日 22:31:12 rurban
+// add SemanticWeb support
+//
 // Revision 1.70 2005年10月31日 16:45:23 rurban
 // added cfg-able markups only for default TextTransformation, not for links and others

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16104
Modified Files:
	TextSearchQuery.php 
Log Message:
fix VOID, add tsearch2 support
Index: TextSearchQuery.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/TextSearchQuery.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -2 -b -p -d -r1.21 -r1.22
--- TextSearchQuery.php	14 Sep 2005 05:59:48 -0000	1.21
+++ TextSearchQuery.php	14 Nov 2005 22:30:17 -0000	1.22
@@ -186,5 +186,5 @@ class TextSearchQuery {
 return join(" $node->op ", $subclauses);
 default:
- assert($node->op == VOID);
+ assert($node->op == 'VOID');
 return '1=1';
 }
@@ -218,4 +218,36 @@ class TextSearchQuery {
 }
 
+ /*
+ postgresql tsearch2 uses no WHERE operators, just & | and ! in the searchstring
+ */
+ function makeTsearch2SqlClauseObj(&$sql_search_cb) {
+ $this->_sql_clause_cb = $sql_search_cb;
+ return $this->_Tsearch2Sql_clause_obj($this->_tree);
+ }
+
+ function _Tsearch2Sql_clause_obj($node) {
+ // TODO: "such a phrase"
+ switch ($node->op) {
+ case 'NOT':
+ return "!" . $node->leaves[0];
+ case 'AND':
+ $subclauses = array();
+ foreach ($node->leaves as $leaf)
+ $subclauses[] = $this->_Tsearch2Sql_clause_obj($leaf);
+ return join("&", $subclauses);
+ case 'OR':
+ $subclauses = array();
+ foreach ($node->leaves as $leaf)
+ $subclauses[] = $this->_Tsearch2Sql_clause_obj($leaf);
+ return join("|", $subclauses);
+ case 'VOID':
+ return '';
+ case 'ALL':
+ return '1';
+ default:
+ return $this->_sql_clause_cb->call($node);
+ }
+ }
+
 function sql() { return '%'.$this->_sql_quote($this->word).'%'; }
 
@@ -320,5 +352,5 @@ extends TextSearchQuery_node
 return '(?=.*' . preg_quote($this->word, '/') . ')';
 }
- function highlight_words($negated = false) {
+ function highlight_words ($negated = false) {
 return $negated ? array() : array($this->word);
 }
@@ -340,5 +372,5 @@ extends TextSearchQuery_node_word {
 var $op = "STARTS_WITH";
 function regexp() { return '(?=.*\b' . preg_quote($this->word, '/') . ')'; }
- function sql() { return $this->_sql_quote($this->word).'%'; }
+ function sql () { return $this->_sql_quote($this->word).'%'; }
 }
 
@@ -347,5 +379,5 @@ extends TextSearchQuery_node_word {
 var $op = "ENDS_WITH";
 function regexp() { return '(?=.*' . preg_quote($this->word, '/') . '\b)'; }
- function sql() { return '%'.$this->_sql_quote($this->word); }
+ function sql () { return '%'.$this->_sql_quote($this->word); }
 }
 
@@ -354,5 +386,5 @@ extends TextSearchQuery_node_word {
 var $op = "EXACT";
 function regexp() { return '(?=\b' . preg_quote($this->word, '/') . '\b)'; }
- function sql() { return $this->_sql_squote($this->word); }
+ function sql () { return $this->_sql_squote($this->word); }
 }
 
@@ -361,5 +393,5 @@ extends TextSearchQuery_node_word {
 var $op = "REGEX"; // using REGEXP or ~ extension
 function regexp() { return '(?=.*\b' . $this->word . '\b)'; }
- function sql() { return $this->_sql_quote($this->word); }
+ function sql () { return $this->_sql_quote($this->word); }
 }
 
@@ -408,5 +440,5 @@ extends TextSearchQuery_node
 }
 
- function highlight_words($negated = false) {
+ function highlight_words ($negated = false) {
 return $this->leaves[0]->highlight_words(!$negated);
 }

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15212
Modified Files:
	WikiDB.php CachedMarkup.php 
Log Message:
add linkrelation support
 getPageLinks returns now an array of hashes
pass stoplist through iterator
Index: WikiDB.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB.php,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -2 -b -p -d -r1.137 -r1.138
--- WikiDB.php	12 Oct 2005 06:16:18 -0000	1.137
+++ WikiDB.php	14 Nov 2005 22:27:07 -0000	1.138
@@ -364,5 +364,7 @@ class WikiDB {
 return new WikiDB_PageIterator($this, $result,
 array('exclude' => $exclude,
- 'limit' => $limit));
+ 'limit' => $limit,
+ 'stoplisted' => $result->stoplisted
+ ));
 }
 
@@ -802,5 +804,5 @@ class WikiDB_Page 
 * All values in the hash should be scalars (strings or integers).
 *
- * @param array $links List of pagenames which this page links to.
+ * @param hash $links List of linkto=>pagename, relation=>pagename which this page links to.
 *
 * @return WikiDB_PageRevision Returns the new WikiDB_PageRevision object. If
@@ -1085,5 +1087,5 @@ class WikiDB_Page 
 * @return WikiDB_PageRevision The current WikiDB_PageRevision object. 
 */
- function getCurrentRevision($need_content = true) {
+ function getCurrentRevision ($need_content = true) {
 $backend = &$this->_wikidb->_backend;
 $cache = &$this->_wikidb->_cache;
@@ -1116,5 +1118,5 @@ class WikiDB_Page 
 * Note that version zero of any page always exists.
 */
- function getRevision($version, $need_content=true) {
+ function getRevision ($version, $need_content=true) {
 $cache = &$this->_wikidb->_cache;
 $pagename = &$this->_pagename;
@@ -1148,5 +1150,5 @@ class WikiDB_Page 
 * the default revision) will always be found.
 */
- function getRevisionBefore($version=false, $need_content=true) {
+ function getRevisionBefore ($version=false, $need_content=true) {
 $backend = &$this->_wikidb->_backend;
 $pagename = &$this->_pagename;
@@ -1192,5 +1194,5 @@ class WikiDB_Page 
 * all matching pages.
 */
- function getLinks($reversed = true, $include_empty=false, $sortby=false, 
+ function getLinks ($reversed = true, $include_empty=false, $sortby=false, 
 $limit=false, $exclude=false) {
 $backend = &$this->_wikidb->_backend;
@@ -1216,4 +1218,20 @@ class WikiDB_Page 
 return $this->getLinks(false, $include_empty, $sortby, $limit, $exclude);
 }
+ /**
+ * Relations: All links from this page to other pages with relation <> 0. 
+ * Like isa:=page
+ */
+ function getRelations($sortby=false, $limit=false, $exclude=false) {
+ $backend = &$this->_wikidb->_backend;
+ $result = $backend->get_links($this->_pagename, false, true,
+ $sortby, $limit, $exclude, 
+ true);
+ // we do not care for the linked page versiondata, just the pagename and relationname
+ return new WikiDB_PageIterator($this->_wikidb, $result, 
+ array('include_empty' => true,
+ 'sortby' => $sortby, 
+ 'limit' => $limit, 
+ 'exclude' => $exclude));
+ }
 
 /**
@@ -1235,4 +1253,15 @@ class WikiDB_Page 
 }
 
+ /* Semantic relations are links with the relation pointing to another page,
+ the so called "RDF Triple".
+ [San Diego] is%20a::city
+ => "At the page San Diego there is a relation link of 'is a' to the page 'city'."
+ */
+
+ /* Semantic attributes for a page. 
+ [San Diego] population:=1,305,736
+ Attributes are links with the relation pointing to another page.
+ */
+ 
 /**
 * Access WikiDB_Page non version-specific meta-data.
@@ -1799,5 +1828,8 @@ class WikiDB_PageIterator
 $this->_wikidb->_cache->_id_cache[$next['pagename']] = $next['id'];
 }
- return new WikiDB_Page($this->_wikidb, $pagename);
+ $page = new WikiDB_Page($this->_wikidb, $pagename);
+ if (isset($next['linkrelation']))
+ $page->set('linkrelation', $next['linkrelation']);
+ return $page;
 }
 
@@ -2199,4 +2231,9 @@ function _sql_debuglog_shutdown_function
 
 // $Log$
+// Revision 1.138 2005年11月14日 22:27:07 rurban
+// add linkrelation support
+// getPageLinks returns now an array of hashes
+// pass stoplist through iterator
+//
 // Revision 1.137 2005年10月12日 06:16:18 rurban
 // better From header
Index: CachedMarkup.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/CachedMarkup.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -2 -b -p -d -r1.37 -r1.38
--- CachedMarkup.php	12 Oct 2005 06:15:44 -0000	1.37
+++ CachedMarkup.php	14 Nov 2005 22:27:07 -0000	1.38
@@ -79,9 +79,9 @@ class CacheableMarkup extends XmlContent
 *
 * @return array
- * A list of wiki page names (strings).
+ * A hash of linkto=>pagenames, relation=>pagenames (strings).
 */
 function getWikiPageLinks() {
- include_once('lib/WikiPlugin.php');
- $ploader = new WikiPluginLoader();
+ // include_once('lib/WikiPlugin.php');
+ // $ploader = new WikiPluginLoader();
 
 	$links = array();
@@ -89,12 +89,8 @@ class CacheableMarkup extends XmlContent
 	 if (!isa($item, 'Cached_DynamicContent'))
 continue;
-
 if (!($item_links = $item->getWikiPageLinks($this->_basepage)))
 continue;
- foreach ($item_links as $pagename)
- if (is_string($pagename) and $pagename != '')
- $links[] = $pagename;
+ $links = array_merge($links, $item_links);
 }
-
 	return array_unique($links);
 }
@@ -264,8 +260,9 @@ class Cached_DynamicContent {
 
 class XmlRpc_LinkInfo {
- function XmlRpc_LinkInfo($page, $type, $href) {
+ function XmlRpc_LinkInfo($page, $type, $href, $relation = '') {
 	$this->page = $page;
 	$this->type = $type;
 	$this->href = $href;
+	$this->relation = $relation;
 	//$this->pageref = str_replace("/RPC2.php", "/index.php", $href);
 }
@@ -286,5 +283,6 @@ class Cached_Link extends Cached_Dynamic
 	return new XmlRpc_LinkInfo($this->_getName($basepage),
 $this->_getType(),
- $this->_getURL($basepage));
+ $this->_getURL($basepage),
+ $this->_getRelation($basepage));
 }
 
@@ -292,4 +290,7 @@ class Cached_Link extends Cached_Dynamic
 	return $this->_url;
 }
+ function __getRelation($basepage) {
+	return $this->_relation;
+ }
 }
 
@@ -316,5 +317,6 @@ class Cached_WikiLink extends Cached_Lin
 function getWikiPageLinks($basepage) {
 if ($basepage == '') return false;
- if ($link = $this->getPagename($basepage)) return array($link);
+ if ($link = $this->getPagename($basepage)) 
+ return array(array('linkto' => $link, 'relation' => 0));
 else return false;
 }
@@ -393,4 +395,84 @@ class Cached_PhpwikiURL extends Cached_D
 } 
 
+class Cached_SemanticLink extends Cached_WikiLink {
+
+ function Cached_SemanticLink ($url, $label) {
+	$this->_url = $url;
+ if ($label && $label != $url)
+ $this->_label = $label;
+ }
+
+ function isInlineElement() {
+	return true;
+ }
+
+ function getPagename($basepage) {
+	$page = new WikiPageName($this->_page, $basepage);
+	if ($page->isValid()) return $page->name;
+	else return false;
+ }
+
+ /* add relation to the link table */
+ function getWikiPageLinks($basepage) {
+ if ($basepage == '') return false;
+ if ($link = $this->getPagename($basepage)) 
+ return array(array('linkto' => $link, 'relation' => $this->_relation));
+ else return false;
+ }
+
+ function _expand($url, $label = false) {
+ $m = array();
+ if (!preg_match('/^ ([^:]*) (:[:-]) (.*) $/x', $url, $m)) {
+ return HTML::strong(array('class' => 'rawurl'),
+ HTML::u(array('class' => 'baduri'),
+ _("BAD semantic relation link")));
+ }
+ $relation = $this->_relation = urldecode($m[1]);
+ $page = $this->_page = urldecode($m[3]);
+ $class = 'wikilink';
+ // do not link to the attribute value, but to the attribute
+ $is_attribute = ($m[2] == ':-');
+ if ($label) {
+ return HTML::span(
+ HTML::a(array('href' => WikiURL($is_attribute ? $relation : $page),
+ 'class' => $class),
+ $label)
+ );
+ } elseif ($is_attribute) {
+ return HTML::span(
+ HTML::a(array('href' => WikiURL($relation),
+ 'class' => $class),
+ $url)
+ );
+ } else {
+ return HTML::span(
+ HTML::a(array('href' => WikiURL($relation),
+ 'class' => $class),
+ $relation),
+ $m[2],
+ HTML::a(array('href' => WikiURL($page),
+ 'class' => $class),
+ $page)
+ );
+ }
+ }
+ function expand($basepage, &$markup) {
+ $label = isset($this->_label) ? $this->_label : false;
+ return $this->_expand($this->_url, $label);
+ }
+
+ function asXML() {
+ $label = isset($this->_label) ? $this->_label : false;
+ $link = $this->_expand($this->_url, $label);
+ return $link->asXML();
+ }
+
+ function asString() {
+ if (isset($this->_label))
+ return $this->_label;
+ return $this->_url;
+ }
+}
+ 
 class Cached_ExternalLink extends Cached_Link {