Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[9746] trunk
|
From: <var...@us...> - 2015-12-14 09:20:08
|
Revision: 9746
http://sourceforge.net/p/phpwiki/code/9746
Author: vargenau
Date: 2015-12-14 09:20:05 +0000 (Mon, 14 Dec 2015)
Log Message:
-----------
No space at end of line
Modified Paths:
--------------
trunk/GoogleSearch.wsdl
trunk/INSTALL
trunk/README
trunk/TODO
trunk/UPGRADING
trunk/admin/README
trunk/admin/odt2phpwiki.xsl
trunk/config/config-default.ini
trunk/config/config-dist.ini
trunk/config/two-level-tlds
trunk/doc/CREDITS
trunk/doc/HISTORY
trunk/doc/INSTALL.MacOSX
trunk/doc/INSTALL.flatfile
trunk/doc/INSTALL.mSQL
trunk/doc/INSTALL.mssqlnative
trunk/doc/INSTALL.mysql
trunk/doc/INSTALL.oci8
trunk/doc/INSTALL.pgsql
trunk/doc/INSTALL.sqlite
trunk/doc/README.coding
trunk/doc/README.foaf
trunk/doc/README.phpwiki-auth
trunk/doc/README.phpwiki-cache
trunk/doc/THEMES
trunk/lib/interwiki.map
trunk/lib/main.php
trunk/lib/stdlib.php
trunk/locale/Makefile
trunk/locale/de/pgsrc/Vorlage%2FBeispiel
trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto
trunk/locale/fr/pgsrc/Aide%2FPluginM%C3%A9t%C3%A9oPhp
trunk/locale/it/pgsrc/NoteDiRilascio
trunk/locale/po/de.po
trunk/pgsrc/GeneralDisclaimer
trunk/pgsrc/Help%2FSyntaxHighlighterPlugin
trunk/pgsrc/ReleaseNotes
trunk/schemas/mssql-initialize.sql
trunk/schemas/mysql-1_3_11.sql
trunk/schemas/mysql-initialize.sql
trunk/schemas/oci8-destroy.sql
trunk/schemas/oci8-initialize.sql
trunk/schemas/psql-1_3_12.sql
trunk/schemas/psql-initialize.sql
trunk/schemas/psql-tsearch2.sql
trunk/schemas/sqlite-initialize.sql
trunk/schemas/sqlsrv-initialize.sql
trunk/themes/MonoBook/wikibits.js
trunk/themes/README
trunk/themes/default/ASCIIsvg.js
trunk/themes/default/ajax.js
trunk/themes/default/templates/README
trunk/themes/wikilens/images/README
trunk/themes/wikilens/wikilens.js
trunk/wiki
Modified: trunk/GoogleSearch.wsdl
===================================================================
--- trunk/GoogleSearch.wsdl 2015-12-11 10:01:05 UTC (rev 9745)
+++ trunk/GoogleSearch.wsdl 2015-12-14 09:20:05 UTC (rev 9746)
@@ -17,9 +17,9 @@
<!-- Types for search - result elements, directory categories -->
<types>
- <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+ <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
targetNamespace="urn:GoogleSearch">
-
+
<xsd:complexType name="GoogleSearchResult">
<xsd:all>
<xsd:element name="documentFiltering" type="xsd:boolean"/>
@@ -49,7 +49,7 @@
<xsd:element name="directoryTitle" type="xsd:string"/>
</xsd:all>
</xsd:complexType>
-
+
<xsd:complexType name="ResultElementArray">
<xsd:complexContent>
<xsd:restriction base="soapenc:Array">
@@ -74,10 +74,10 @@
</xsd:complexType>
</xsd:schema>
- </types>
+ </types>
<!-- Messages for Google Web APIs - cached page, search, spelling. -->
-
+
<message name="doGetCachedPage">
<part name="key" type="xsd:string"/>
<part name="url" type="xsd:string"/>
@@ -110,7 +110,7 @@
</message>
<message name="doGoogleSearchResponse">
- <part name="return" type="typens:GoogleSearchResult"/>
+ <part name="return" type="typens:GoogleSearchResult"/>
</message>
<!-- Port for Google Web APIs, "GoogleSearch" -->
Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL 2015-12-11 10:01:05 UTC (rev 9745)
+++ trunk/INSTALL 2015-12-14 09:20:05 UTC (rev 9746)
@@ -5,7 +5,7 @@
All users of PHP are strongly encouraged to upgrade to
PHP 5.3.29 or to PHP 5.4 or 5.5.
-Visit <http://www.php.net> and <http://php.net/downloads.php>
+Visit <http://www.php.net> and <http://php.net/downloads.php>
for downloads and information.
You need the Perl regular expressions package compiled in; this is the
Modified: trunk/README
===================================================================
--- trunk/README 2015-12-11 10:01:05 UTC (rev 9745)
+++ trunk/README 2015-12-14 09:20:05 UTC (rev 9746)
@@ -36,8 +36,8 @@
For a list of current bugs see:
https://sourceforge.net/bugs/?group_id=6121
-The fastest and out-of-the-box version uses DATABASE_TYPE=dba,
-a dbm file in the /tmp directory; you may wish a more permanent
+The fastest and out-of-the-box version uses DATABASE_TYPE=dba,
+a dbm file in the /tmp directory; you may wish a more permanent
place for yours, but make sure it's read/writable by your web server!
NOTE: Not all database versions are equal. The MySQL and Postgresql
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2015-12-11 10:01:05 UTC (rev 9745)
+++ trunk/TODO 2015-12-14 09:20:05 UTC (rev 9746)
@@ -24,9 +24,9 @@
* Move serialized data from page_data / version_data to separate SQL columns.
* WikiDB hooks. (?)
* Content expansion hooks in transformer. (SearchHighlight)
-* Convert RecentChanges to PageList as source for format options.
+* Convert RecentChanges to PageList as source for format options.
Generic rss, rdf handling.
-* embedd basic RDF in XHTML (dc, foaf, ...) for GRDDL.
+* embedd basic RDF in XHTML (dc, foaf, ...) for GRDDL.
* Do Microformats automatically? It's a stupid hack so support it only optionally.
ToDo: for Calendar, CalendarList, FoafPlugin
@@ -44,7 +44,7 @@
* support missing REST interfaces (optional): action=remove => DELETE,
action=editpage and minor updates (rating,...) => PUT.
with fallbacks to POST
-* format=mm (FreeMind) for RecentChanges, SemanticWeb's and simple PageList's.
+* format=mm (FreeMind) for RecentChanges, SemanticWeb's and simple PageList's.
See http://wikkawiki.org/FreeMind. Maybe format=mmap for the commercial MindMap.
* Spellcheck AJAX backend (see DokuWiki)
* GeSHi Highlighter plugin
@@ -52,7 +52,7 @@
fixes:
* fix pagelist nopage unification (store just key as names?)
* pcre textsearch with multiple words: order-independency
-* SQL textsearch with multiple words: AND
+* SQL textsearch with multiple words: AND
(the two new failing unit tests)
* fix textsearch optimize with "word -word -word"
@@ -96,7 +96,7 @@
* pdf button when an external html2pdf app is defined
(enabled at PhpWikiDemo)
* enhanced WikiPluginCached (static, ondemand)
-* added LdapSearchPlugin
+* added LdapSearchPlugin
* more PageList options
2004-11-10 20:25:13 rurban
@@ -116,7 +116,7 @@
2004-11-09 18:10:22 rurban
* revert to the wikidb ref passing. there's no memory abuse there.
* use new wikidb->_cache->_id_cache[] instead of wikidb->_iwpcache, to effectively
- store page ids with getPageLinks (GleanDescription) of all existing pages, which
+ store page ids with getPageLinks (GleanDescription) of all existing pages, which
are also needed at the rendering for linkExistingWikiWord().
pass options to pageiterator.
use this cache also for _get_pageid()
@@ -129,12 +129,12 @@
* fix more sf.net bugs and patches (90%)
* fix LDAP with USER_AUTH_POLICY=old (100%)
* ADODB lock and transaction fixes (50%)
- * some more theme beautification, new crao and nuke theme,
+ * some more theme beautification, new crao and nuke theme,
cut or split long sidebar links somehow (100%)
- * add some basic Recommender engine to enable rating recommendations,
+ * add some basic Recommender engine to enable rating recommendations,
fix metadata getAvg and test it. (100%)
* fix metadata RateIt methods and RateIt usergroups, (100%)
- * rewrite WikiGroup to be current_user independent to be able
+ * rewrite WikiGroup to be current_user independent to be able
to ask for group membership of any user. (100%)
* more action=upgrade (diffs, multi-page interface) (60%)
* finish PdfOutput plugin and button (80%)
@@ -151,7 +151,7 @@
* fix WikiAdminSetAcl (least common ACL denominator) (100%)
* enable ACL's in the mime dumps (100%)
- * force strict PagePermissions on all plugins, which require now
+ * force strict PagePermissions on all plugins, which require now
admin and some more administrative actions (90%)
* complete full paging support (limit=, prev/next buttons in PageList) (95%)
fix paging in MostPopular
Modified: trunk/UPGRADING
===================================================================
--- trunk/UPGRADING 2015-12-11 10:01:05 UTC (rev 9745)
+++ trunk/UPGRADING 2015-12-14 09:20:05 UTC (rev 9746)
@@ -1,6 +1,6 @@
-To migrate to a new phpwiki installation you might want to backup your old pages
-(best via a zip dump), configure your new installation, and restore the old
-pages in PhpWikiAdministration.
+To migrate to a new phpwiki installation you might want to backup your old pages
+(best via a zip dump), configure your new installation, and restore the old
+pages in PhpWikiAdministration.
UPGRADING from 1.3.7 on requires just ?action=upgrade.
Can't unpack bad cached markup. Probably php_zlib extension not loaded.
@@ -10,16 +10,16 @@
?action=upgrade
===============
-To upgrade default pages, the database and some config settings
+To upgrade default pages, the database and some config settings
add "?action=upgrade" to your HomePage url and press "Enter", which will
do most of the upgrades automatically.
-You might need to enter the DBADMIN_USER and DBADMIN_PASSWD in
+You might need to enter the DBADMIN_USER and DBADMIN_PASSWD in
config/config.ini for SQL databases and default permissions.
-The importer looks at the Date header of the page. In your current wikidb
+The importer looks at the Date header of the page. In your current wikidb
against the creation date of the pgsrc, you want to import.
-If you changed your pages after I changed the pgsrc pages,
+If you changed your pages after I changed the pgsrc pages,
they will not be upgraded.
Or just upgrade your configuration as described below.
@@ -34,38 +34,38 @@
UPGRADING from 1.3.9
======================
-At first you have to manually create a config/config.ini based on
+At first you have to manually create a config/config.ini based on
config-dist.ini and your previous index.php. We don't have a script,
to do that automatically.
mysql:
ALTER TABLE page CHANGE id id INT NOT NULL AUTO_INCREMENT;
-NOTE: ?action=upgrade does this also, if your mysql user has the
+NOTE: ?action=upgrade does this also, if your mysql user has the
ALTER permissions or DBADMIN_USER and DBADMIN_PASSWD are set.
UPGRADING from 1.3.7
======================
mysql + postgres:
ALTER TABLE session ADD sess_ip CHAR(15) NOT NULL;
- CREATE INDEX sess_date ON session (sess_date);
+ CREATE INDEX sess_date ON session (sess_date);
postgres:
- New pref and session tables have been added for more
+ New pref and session tables have been added for more
efficiency.
user and themes:
-WikiUser and signin.tmpl changed from $user->getId() to
+WikiUser and signin.tmpl changed from $user->getId() to
$user->getAuthenticatedId()
-Authenticated reflects the level (confirmed by password),
+Authenticated reflects the level (confirmed by password),
Signed just the username (possibly by cookie only)
pgsrc:
-To upgrade not-existing pages add "?action=upgrade" to
+To upgrade not-existing pages add "?action=upgrade" to
your HomePage url and press "Enter", which will
add all fresh pages from pgsrc to your pageset.
-If you deleted some pages on purpose, you'll have to removed
+If you deleted some pages on purpose, you'll have to removed
them again with PhpWikiAdministration/Remove then.
There's no smart "Merge Diffs" yet to upgrade existing docs,
@@ -83,17 +83,17 @@
FIXME: add more.
-Here's an excerpt from a note I posted on phpwiki-talk with my
-recommendation on how to move a wiki from and older version of
+Here's an excerpt from a note I posted on phpwiki-talk with my
+recommendation on how to move a wiki from and older version of
PhpWiki to a 1.3.x PhpWiki:
From: Jeff Dairiki <da...@da...>
Cc: php...@li...
Date: Fri, 9 Nov 2001 11:33:18 -0800
-> Now, say I want to migrate all my 1.2.1 pages. I need to do a zip dump
+> Now, say I want to migrate all my 1.2.1 pages. I need to do a zip dump
> (does the admin page let me do that?) and then.... what?
-
+
It's still a bit of a messy process at this point. Here's my suggestion.
1. Start 1.3.x with an empty database. Browse the FrontPage. This should
@@ -101,7 +101,7 @@
already gotten this far.)
2. Make a zip dump of your 1.2 wiki. If the contents of
-PhpWikiAdministration are correct there should be a links
+PhpWikiAdministration are correct there should be a links
(near the top) which will do that for you. You need to be
in admin mode, though. This means you must have set an
admin user and passwd in admin.php, and you should be browsing
@@ -127,7 +127,7 @@
If that works, the pages from your 1.2 wiki have now overwritten
the 1.3 pages (though the 1.3 pages are still saved in the archive).
This will break a bunch of 1.3 functionality until you restore
-the page contents. Of the top of my head, some pages for which
+the page contents. Of the top of my head, some pages for which
this will be an issue are:
MostPopular, RecentChanges, PhpWikiAdministration,
MagicPhpWikiURLs, and ReleaseNotes.
@@ -142,7 +142,7 @@
(at the bottom of the page). This should get you a list of all
archived versions of the page.
-4c. Browse to the archive 1.3 version of the page (probably version
+4c. Browse to the archive 1.3 version of the page (probably version
number 1) by clicking on the version number of the desired version.
4d. Click the "Edit old revision" button (bottom of page). This should
Modified: trunk/admin/README
===================================================================
--- trunk/admin/README 2015-12-11 10:01:05 UTC (rev 9745)
+++ trunk/admin/README 2015-12-14 09:20:05 UTC (rev 9746)
@@ -2,7 +2,7 @@
It is recommended to do daily backups of your database and/or your wiki pages.
-In this directory are some sample scripts, which could help to setup your
+In this directory are some sample scripts, which could help to setup your
cronjobs, on the server or even remotely (zipdump or dumpserial).
# berkeley db backup
@@ -43,9 +43,9 @@
<input name="P" size="18" maxlength="256"
value="<?php echo $s?>"
onfocus="if (this.value == '<?php echo _("Search")?>') {this.value = '';}"
- onmouseout="window.status=''; return true;"
+ onmouseout="window.status=''; return true;"
onmouseover="window.status='<?php echo _("Quick Search")?>'; return true;"
- type="text" id="search2"
+ type="text" id="search2"
title="<?php echo _("Search term(s)") ?>" />
<div align="right" style="padding-right:10px;">
<input type="submit" name="searchtype" value="fulltext" class="searchButton" title="External Fulltext Search">
Modified: trunk/admin/odt2phpwiki.xsl
===================================================================
--- trunk/admin/odt2phpwiki.xsl 2015-12-11 10:01:05 UTC (rev 9745)
+++ trunk/admin/odt2phpwiki.xsl 2015-12-14 09:20:05 UTC (rev 9746)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!--
odt2phpwiki: OpenDocument to Phpwiki transformation
Copyright (C) 2007 Bernhard Haumacher (haui at haumacher dot de)
Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -46,38 +46,38 @@
ALONE BASIS."
-->
-<stylesheet version="1.0"
+<stylesheet version="1.0"
xmlns="http://www.w3.org/1999/XSL/Transform"
- xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
- xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
- xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
- xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
- xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
- xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
- xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
- xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
- xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
- xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
- xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
- xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
- xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:math="http://www.w3.org/1998/Math/MathML"
- xmlns:dom="http://www.w3.org/2001/xml-events"
- xmlns:xforms="http://www.w3.org/2002/xforms"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+ xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+ xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+ xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+ xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+ xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
+ xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
+ xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+ xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
+ xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+ xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
+ xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:math="http://www.w3.org/1998/Math/MathML"
+ xmlns:dom="http://www.w3.org/2001/xml-events"
+ xmlns:xforms="http://www.w3.org/2002/xforms"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>
- <output
- method="text"
- media-type="text/plain"
+ <output
+ method="text"
+ media-type="text/plain"
encoding="UTF-8"
/>
- <!--
- == Reference resolution ==
+ <!--
+ == Reference resolution ==
-->
<key
@@ -137,7 +137,7 @@
<!-- Constant defining the newline token. -->
<variable name="NL" select="' '"/>
- <!--
+ <!--
Multiple pages (draw only)
-->
@@ -148,15 +148,15 @@
</template>
- <!--
- == Lists ==
+ <!--
+ == Lists ==
-->
<template match="text:list-item">
<if test="position() > 1 or boolean(ancestor::text:list-item)">
<value-of select="$NL"/>
</if>
- <variable name="list-style"
+ <variable name="list-style"
select="key('list-style-ref',ancestor::text:list[boolean(@text:style-name)][1]/@text:style-name)"/>
<call-template name="mk-list-token">
<with-param name="list-style" select="$list-style"/>
@@ -201,7 +201,7 @@
</template>
- <!--
+ <!--
== Headings ==
-->
@@ -221,7 +221,7 @@
</if>
</template>
- <!--
+ <!--
Function generating a wiki heading prefix.
@param level
@@ -244,8 +244,8 @@
</choose>
</template>
- <!--
- Function generating a token consisting of the given character
+ <!--
+ Function generating a token consisting of the given character
repeated 'level' times.
@param level
@@ -266,7 +266,7 @@
</template>
- <!--
+ <!--
== Tables ==
-->
@@ -320,8 +320,8 @@
</template>
- <!--
- == WikiMath ==
+ <!--
+ == WikiMath ==
-->
<template match="text:span[@text:style-name='WikiMath']">
@@ -331,8 +331,8 @@
</template>
- <!--
- == Native links ==
+ <!--
+ == Native links ==
-->
<template match="text:a">
@@ -354,8 +354,8 @@
</template>
- <!--
- == WikiLink ==
+ <!--
+ == WikiLink ==
-->
<template match="text:span[@text:style-name='WikiLink']">
@@ -375,8 +375,8 @@
</template>
- <!--
- == Paragraphs ==
+ <!--
+ == Paragraphs ==
-->
<template match="text:p[string-length(.) > 0]">
@@ -386,11 +386,11 @@
</call-template>
</variable>
- <variable name="code"
+ <variable name="code"
select="($style mod (2 * $CODE_BIT)) - ($style mod ($CODE_BIT)) != 0"/>
- <variable name="center"
+ <variable name="center"
select="($style mod (2 * $CENTER_BIT)) - ($style mod ($CENTER_BIT)) != 0"/>
- <variable name="right"
+ <variable name="right"
select="($style mod (2 * $RIGHT_BIT)) - ($style mod ($RIGHT_BIT)) != 0"/>
<choose>
@@ -416,13 +416,13 @@
</when>
</choose>
- <variable name="paragraph-right"
+ <variable name="paragraph-right"
select="./following-sibling::text:p[1]"/>
<if test="boolean($paragraph-right)">
- <!--
- Insert end of line only if not within a list. Within wiki lists,
- a line break leaves the current list item.
+ <!--
+ Insert end of line only if not within a list. Within wiki lists,
+ a line break leaves the current list item.
-->
<choose>
<when test="boolean(ancestor::text:list-item)">
@@ -435,7 +435,7 @@
</call-template>
</variable>
- <variable name="code-right"
+ <variable name="code-right"
select="($style-right mod (2 * $CODE_BIT)) - ($style-right mod ($CODE_BIT)) != 0"/>
<value-of select="$NL"/>
@@ -457,8 +457,8 @@
</template>
- <!--
- == Preformatted text ==
+ <!--
+ == Preformatted text ==
-->
<template match="text:s">
@@ -468,7 +468,7 @@
</call-template>
</variable>
- <variable name="code"
+ <variable name="code"
select="($style mod (2 * $CODE_BIT)) - ($style mod ($CODE_BIT)) != 0"/>
<if test="$code">
@@ -493,7 +493,7 @@
</call-template>
</variable>
- <variable name="code"
+ <variable name="code"
select="($style mod (2 * $CODE_BIT)) - ($style mod ($CODE_BIT)) != 0"/>
<if test="$code">
@@ -502,7 +502,7 @@
</if>
</template>
- <!--
+ <!--
Footnotes
-->
@@ -524,9 +524,9 @@
<text>"/></text>
</template>
-
- <!--
- == Images ==
+
+ <!--
+ == Images ==
-->
<template match="draw:text-box[boolean(.//draw:image)]">
@@ -585,10 +585,10 @@
</template>
- <!--
+ <!--
References
-->
-
+
<!-- TODO: text:bibliography-mark -->
<template match="text:reference-ref">
@@ -596,8 +596,8 @@
<choose>
<when test="boolean($reference-mark)">
- <!--
- In wiki syntax, only a local reference to a heading can be inserted.
+ <!--
+ In wiki syntax, only a local reference to a heading can be inserted.
If the link target is a descendant of a heading element, a link can be
inserted in the result. -->
<variable name="header-anchor" select="$reference-mark/ancestor::text:h[1]"/>
@@ -616,8 +616,8 @@
</when>
<otherwise>
- <!--
- TODO: Evaluate the @text:reference-format attribute and
+ <!--
+ TODO: Evaluate the @text:reference-format attribute and
generate the replacement text (difficult).-->
<text>(REFERENCE TEXT UNAVAILABLE: "</text>
<value-of select="@text:ref-name"/>
@@ -647,15 +647,15 @@
<!-- TODO: Output an anchor. -->
</template>
- <!--
- == Plain text ==
+ <!--
+ == Plain text ==
-->
<template match="text:p/text() | text:h/text() | text:span/text() | text:sequence/text() | text:sequence-ref/text() | text:a/text() | text:bookmark-ref/text() | text:reference-mark/text()">
<choose>
<when test="boolean(./ancestor::table:table-header-rows | ./ancestor::text:h)">
- <!--
- No explicit styles within table headings or section headings,
+ <!--
+ No explicit styles within table headings or section headings,
because those styles are consistently declared by the Wiki engine. -->
<value-of select="."/>
</when>
@@ -667,22 +667,22 @@
</call-template>
</variable>
- <variable name="current-paragraph"
+ <variable name="current-paragraph"
select="./ancestor::text:p[1]"/>
- <variable name="paragraph-id"
+ <variable name="paragraph-id"
select="generate-id($current-paragraph)"/>
- <variable name="frames"
+ <variable name="frames"
select="$current-paragraph/descendant::draw:frame"/>
- <variable name="frame-count"
+ <variable name="frame-count"
select="count($frames)"/>
- <!--
- The current style context consists of all text nodes that are
- descendants of the paragraph ancestor of this text node but not
- descendants of any frame nodes that are descendants of the current
+ <!--
+ The current style context consists of all text nodes that are
+ descendants of the paragraph ancestor of this text node but not
+ descendants of any frame nodes that are descendants of the current
text nodes paragraph.
-->
- <variable name="context"
+ <variable name="context"
select="$current-paragraph//text()[not(boolean(./ancestor::draw:frame[1]) and count(./ancestor::draw:frame[1] | $frames) = $frame-count)]"/>
<variable name="context-size" select="count($context)"/>
@@ -698,10 +698,10 @@
<choose>
<when test="$context-index > 1">
<variable name="left" select="$context[$context-index - 1]"/>
- <!--
- The preceding text node is a child of this nodes topmost
- styled ancestor. This means that the result of the
- transformation will be directly concatenated.
+ <!--
+ The preceding text node is a child of this nodes topmost
+ styled ancestor. This means that the result of the
+ transformation will be directly concatenated.
-->
<call-template name="mk-style-set">
<with-param name="node" select="$left"/>
@@ -716,10 +716,10 @@
<choose>
<when test="$context-index < count($context)">
<variable name="right" select="$context[$context-index + 1]"/>
- <!--
- The preceding text node is a child of this nodes topmost
- styled ancestor. This means that the result of the
- transformation will be directly concatenated.
+ <!--
+ The preceding text node is a child of this nodes topmost
+ styled ancestor. This means that the result of the
+ transformation will be directly concatenated.
-->
<call-template name="mk-style-set">
<with-param name="node" select="$right"/>
@@ -731,43 +731,43 @@
</choose>
</variable>
- <variable name="bold"
+ <variable name="bold"
select="($style mod (2 * $BOLD_BIT)) != 0"/>
- <variable name="italic"
+ <variable name="italic"
select="($style mod (2 * $ITALIC_BIT)) - ($style mod ($ITALIC_BIT)) != 0"/>
- <variable name="superscript"
+ <variable name="superscript"
select="($style mod (2 * $SUPERSCRIPT_BIT)) - ($style mod ($SUPERSCRIPT_BIT)) != 0"/>
- <variable name="subscript"
+ <variable name="subscript"
select="($style mod (2 * $SUBSCRIPT_BIT)) - ($style mod ($SUBSCRIPT_BIT)) != 0"/>
- <variable name="code"
+ <variable name="code"
select="($style mod (2 * $CODE_BIT)) - ($style mod ($CODE_BIT)) != 0"/>
- <variable name="typewriter"
+ <variable name="typewriter"
select="($style mod (2 * $TYPEWRITER_BIT)) - ($style mod ($TYPEWRITER_BIT)) != 0"/>
- <variable name="bold-left"
+ <variable name="bold-left"
select="($style-left mod (2 * $BOLD_BIT)) != 0"/>
- <variable name="italic-left"
+ <variable name="italic-left"
select="($style-left mod (2 * $ITALIC_BIT)) - ($style-left mod ($ITALIC_BIT)) != 0"/>
- <variable name="superscript-left"
+ <variable name="superscript-left"
select="($style-left mod (2 * $SUPERSCRIPT_BIT)) - ($style-left mod ($SUPERSCRIPT_BIT)) != 0"/>
- <variable name="subscript-left"
+ <variable name="subscript-left"
select="($style-left mod (2 * $SUBSCRIPT_BIT)) - ($style-left mod ($SUBSCRIPT_BIT)) != 0"/>
- <variable name="typewriter-left"
+ <variable name="typewriter-left"
select="($style-left mod (2 * $TYPEWRITER_BIT)) - ($style-left mod ($TYPEWRITER_BIT)) != 0"/>
- <variable name="bold-right"
+ <variable name="bold-right"
select="($style-right mod (2 * $BOLD_BIT)) != 0"/>
- <variable name="italic-right"
+ <variable name="italic-right"
select="($style-right mod (2 * $ITALIC_BIT)) - ($style-right mod ($ITALIC_BIT)) != 0"/>
- <variable name="superscript-right"
+ <variable name="superscript-right"
select="($style-right mod (2 * $SUPERSCRIPT_BIT)) - ($style-right mod ($SUPERSCRIPT_BIT)) != 0"/>
- <variable name="subscript-right"
+ <variable name="subscript-right"
select="($style-right mod (2 * $SUBSCRIPT_BIT)) - ($style-right mod ($SUBSCRIPT_BIT)) != 0"/>
- <variable name="typewriter-right"
+ <variable name="typewriter-right"
select="($style-right mod (2 * $TYPEWRITER_BIT)) - ($style-right mod ($TYPEWRITER_BIT)) != 0"/>
<!-- Debugging: Add style infos to the output. -->
- <!--
+ <!--
<value-of select="'{'"/>
<value-of select="$style-left"/>
<value-of select="'-'"/>
@@ -814,7 +814,7 @@
</if>
<!-- Debugging: Add style details to the output. -->
- <!--
+ <!--
<value-of select="'{'"/>
<value-of select="$style"/>
<value-of select="'-'"/>
@@ -826,12 +826,12 @@
</choose>
</template>
- <!--
- Function for looking up the position of a node identified by the given
- 'current-id' within a node set 'context'.
+ <!--
+ Function for looking up the position of a node identified by the given
+ 'current-id' within a node set 'context'.
- The search starts with the the index 'test-index'. The search is recursive
- in the 'test-index' argument. To save recursion depth, each recursive call
+ The search starts with the the index 'test-index'. The search is recursive
+ in the 'test-index' argument. To save recursion depth, each recursive call
iteratively tests a fixed number of indexes (by loop unrolling).
-->
<template name="mk-context-index">
@@ -924,27 +924,27 @@
</choose>
</template>
- <!--
- == Wiki styles: bold, italics, ... ==
+ <!--
+ == Wiki styles: bold, italics, ... ==
-->
<template name="mk-style-set">
<param name="node"/>
- <variable
- name="context"
+ <variable
+ name="context"
select="$node/ancestor-or-self::*[@text:style-name][1]"
/>
<choose>
<when test="boolean($context)">
- <variable
- name="style"
+ <variable
+ name="style"
select="key('style-ref', $context/@text:style-name)"
/>
<!-- Debugging: Print inspected styles. -->
- <!--
+ <!--
<message>
<value-of select="'=== '"/>
<value-of select="$style/@style:name"/>
@@ -965,21 +965,21 @@
</choose>
</template>
- <!--
- Compute the wiki style set that corresponds
- to the given office style at the given context node.
+ <!--
+ Compute the wiki style set that corresponds
+ to the given office style at the given context node.
@param node
- A node in which context the style is computed. If neither the given style
- nor one of its linked styles does specify a style of the given type,
+ A node in which context the style is computed. If neither the given style
+ nor one of its linked styles does specify a style of the given type,
ancestor nodes of the given context node are considered.
@param style
A style:style element node. The style of the requested type is searched
- in the given style and its linked styles.
+ in the given style and its linked styles.
@style-set
A bit set of styles already defined by the context.
@style-mask
- A bit set of styles that must not be taken from the currently inspected
+ A bit set of styles that must not be taken from the currently inspected
style, because those styles are already defined by the context.
@return A bit set composed of the wiki style constants.
@@ -993,21 +993,21 @@
<variable name="text-properties" select="$style/style:text-properties"/>
<!-- Decompose style-mask into individual bits. -->
- <variable name="bold-requested"
+ <variable name="bold-requested"
select="($style-mask mod (2 * $BOLD_BIT)) = 0"/>
- <variable name="italic-requested"
+ <variable name="italic-requested"
select="($style-mask mod (2 * $ITALIC_BIT)) - ($style-mask mod ($ITALIC_BIT)) = 0"/>
- <variable name="superscript-requested"
+ <variable name="superscript-requested"
select="($style-mask mod (2 * $SUPERSCRIPT_BIT)) - ($style-mask mod ($SUPERSCRIPT_BIT)) = 0"/>
- <variable name="subscript-requested"
+ <variable name="subscript-requested"
select="($style-mask mod (2 * $SUBSCRIPT_BIT)) - ($style-mask mod ($SUBSCRIPT_BIT)) = 0"/>
- <variable name="typewriter-requested"
+ <variable name="typewriter-requested"
select="($style-mask mod (2 * $TYPEWRITER_BIT)) - ($style-mask mod ($TYPEWRITER_BIT)) = 0"/>
- <variable name="code-requested"
+ <variable name="code-requested"
select="($style-mask mod (2 * $CODE_BIT)) - ($style-mask mod ($CODE_BIT)) = 0"/>
- <variable name="center-requested"
+ <variable name="center-requested"
select="($style-mask mod (2 * $CENTER_BIT)) - ($style-mask mod ($CENTER_BIT)) = 0"/>
- <variable name="right-requested"
+ <variable name="right-requested"
select="($style-mask mod (2 * $RIGHT_BIT)) - ($style-mask mod ($RIGHT_BIT)) = 0"/>
<!-- Extract styles that are not already defined by the context. -->
@@ -1025,8 +1025,8 @@
<variable name="bold-mask">
<choose>
<when test="$bold-requested and boolean($text-properties/@fo:font-weight)">
- <!--
- Other value than "bold" means that the character style is not
+ <!--
+ Other value than "bold" means that the character style is not
bold and no parent style must be considered.
-->
<value-of select="$BOLD_BIT"/>
@@ -1051,8 +1051,8 @@
<variable name="italic-mask">
<choose>
<when test="$italic-requested and boolean($text-properties/@fo:font-style)">
- <!--
- Other value than "italic" means that the character style is not
+ <!--
+ Other value than "italic" means that the character style is not
italic and no parent style must be considered.
-->
<value-of select="$ITALIC_BIT"/>
@@ -1108,7 +1108,7 @@
<variable name="typewriter-style">
<choose>
<when test="$typewriter-requested and ($style/@style:family='text') and boolean($text-properties/@style:font-name)">
- <variable name="font-face"
+ <variable name="font-face"
select="key('font-face-ref', $text-properties/@style:font-name)"/>
<choose>
<when test="$font-face/@style:font-pitch='fixed'">
@@ -1139,7 +1139,7 @@
<variable name="code-style">
<choose>
<when test="$code-requested and ($style/@style:family='paragraph') and boolean($text-properties/@style:font-name)">
- <variable name="font-face"
+ <variable name="font-face"
select="key('font-face-ref', $text-properties/@style:font-name)"/>
<choose>
<when test="$font-face/@style:font-pitch='fixed'">
@@ -1210,13 +1210,13 @@
<!-- Compute the updated styles and mask. -->
- <!--
- Note: The bit masks style-mask, bold-style, italic-style,... are
- guaranteed to be disjoint, therefore, addition can be use instead
+ <!--
+ Note: The bit masks style-mask, bold-style, italic-style,... are
+ guaranteed to be disjoint, therefore, addition can be use instead
of bitwise or (which is missing in XPath). -->
- <variable name="updated-style"
+ <variable name="updated-style"
select="$style-set + $bold-style + $italic-style + $superscript-style + $subscript-style + $code-style + $typewriter-style + $center-style + $right-style"/>
- <variable name="updated-mask"
+ <variable name="updated-mask"
select="$style-mask + $bold-mask + $italic-mask + $superscript-mask + $subscript-mask + $code-mask + $typewriter-mask + $center-mask + $right-mask"/>
<!-- Inspect linked and nested styles. -->
@@ -1234,7 +1234,7 @@
<variable name="ancestors" select="$node/ancestor::*[@text:style-name][1]"/>
<!-- Debugging: Print currently inspected style. -->
- <!--
+ <!--
<message>
<value-of select="'{'"/>
<value-of select="$style/@style:name"/>
@@ -1250,9 +1250,9 @@
<value-of select="'}'"/>
</message>
-->
-
- <!--
- If there is an ancestor that has a style, use that style,
+
+ <!--
+ If there is an ancestor that has a style, use that style,
otherwise, a style is not found. -->
<choose>
<when test="boolean($ancestors)">
@@ -1274,8 +1274,8 @@
</template>
- <!--
- == Descending the tree ==
+ <!--
+ == Descending the tree ==
-->
<template match="/">
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini 2015-12-11 10:01:05 UTC (rev 9745)
+++ trunk/config/config-default.ini 2015-12-14 09:20:05 UTC (rev 9746)
@@ -69,7 +69,7 @@
; let all revisions be stored
MAJOR_MIN_KEEP = 2147483647
MINOR_MIN_KEEP = 2147483647
-; older fine-tuned settings for low-storage systems.
+; older fine-tuned settings for low-storage systems.
; just comment the two lines above to enable it.
MAJOR_MAX_AGE = 32
MAJOR_KEEP = 8
@@ -123,7 +123,7 @@
ALLOW_IMAP_LOGIN = false
THEME = Sidebar
-; DEFAULT_LANGUAGE =
+; DEFAULT_LANGUAGE =
WIKI_PGSRC = pgsrc
DEFAULT_WIKI_PGSRC = pgsrc
; untranslated pgsrc pages to always include
@@ -152,13 +152,13 @@
; these not:
; DBAUTH_AUTH_DSN =
-; SERVER_NAME =
-; SERVER_PORT =
-; SCRIPT_NAME =
-; DATA_PATH =
-; PHPWIKI_DIR =
-; VIRTUAL_PATH =
-; USE_PATH_INFO =
+; SERVER_NAME =
+; SERVER_PORT =
+; SCRIPT_NAME =
+; DATA_PATH =
+; PHPWIKI_DIR =
+; VIRTUAL_PATH =
+; USE_PATH_INFO =
; TEMP_DIR = /tmp
; ALLOWED_LOAD = /tmp
@@ -166,7 +166,7 @@
DISABLE_GETIMAGESIZE = false
; FORTUNE_DIR = /usr/share/fortune
; GOOGLE_LICENSE_KEY = "..."
-; DBADMIN_USER =
+; DBADMIN_USER =
; DBADMIN_PASSWD =
BLOG_DEFAULT_EMPTY_PREFIX = true
; TOOLBAR_PAGELINK_PULLDOWN = *
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2015-12-11 10:01:05 UTC (rev 9745)
+++ trunk/config/config-dist.ini 2015-12-14 09:20:05 UTC (rev 9746)
@@ -1,10 +1,10 @@
; This is the main configuration file for PhpWiki.
-; Note that certain characters are used as comment char and therefore
+; Note that certain characters are used as comment char and therefore
; these entries must be in double-quotes. Such as ":", ";", "," and "|"
;
; <?php die(); ?> for security
;
-; This file is divided into eight parts.
+; This file is divided into eight parts.
; Each one has different configuration settings you can
; change; in all cases the default should work on your system,
; however, we recommend you tailor things to your particular setting.
@@ -17,10 +17,10 @@
; code, you can set the include_path here.
;
; Override PHP's include path so that it can find some needed additional libraries.
-; You shouldn't need to do this unless your system include_path esp. your
-; system pear libs are broken or oudated. The PHPWIKI_DIR is automatically
+; You shouldn't need to do this unless your system include_path esp. your
+; system pear libs are broken or oudated. The PHPWIKI_DIR is automatically
; put to the front and the local lib/pear path is automatically added to the end.
-; But if you define it, be sure to include either the system pear path or
+; But if you define it, be sure to include either the system pear path or
; the phpwiki/lib/pear path to override your Pear_DB.
; Note that on Windows-based servers, you should use ; rather than :
; as the path separator.
@@ -28,7 +28,7 @@
; Set DEBUG to 1 to view the XHTML and CSS validator icons, page
; processing timer, and possibly other debugging messages at the
-; bottom of each page. 65 for a more verbose level with AUTH hints.
+; bottom of each page. 65 for a more verbose level with AUTH hints.
; See lib/config.php for all supported values.
; Default: 0
;DEBUG = 1
@@ -46,7 +46,7 @@
; Default: false
;ENABLE_DOUBLECLICKEDIT = false
-; Enable WYSIWYG editing. Converting back HTML to wikitext does not work in most engines.
+; Enable WYSIWYG editing. Converting back HTML to wikitext does not work in most engines.
; Experimental!
;ENABLE_WYSIWYG = true
@@ -54,34 +54,34 @@
; Recommended is only Wikiwyg.
;
; Wikiwyg http://openjsan.org/doc/i/in/ingy/Wikiwyg/
-; tinymce http://tinymce.moxiecode.com/
-; CKeditor http://ckeditor.com/
-; spaw http://sourceforge.net/projects/spaw
-; htmlarea3
-; htmlarea2
+; tinymce http://tinymce.moxiecode.com/
+; CKeditor http://ckeditor.com/
+; spaw http://sourceforge.net/projects/spaw
+; htmlarea3
+; htmlarea2
;WYSIWYG_BACKEND = Wikiwyg
; Store all WYSIWYG pages as HTML? Will loose most link and plugin options.
; Not recommended, but presented here to test several WYSIWYG backends.
;WYSIWYG_DEFAULT_PAGETYPE_HTML = false
-; Upload into separate userdirs. If enabled (default since 1.3.13) the generated Upload: link
-; will include the username plus "/". This will make all uploaded links longer, but we
+; Upload into separate userdirs. If enabled (default since 1.3.13) the generated Upload: link
+; will include the username plus "/". This will make all uploaded links longer, but we
; avoid nameclashes and you see who uploaded what file.
;UPLOAD_USERDIR = false
; SemanticWeb Units require the standard units executable, available in every distribution.
; On Windows the cygwin version works fine if e.g. the cygwin bin is in the webserver path.
-; However if units fails, attribute comparisons will fail. Esp. getting the base unit and
+; However if units fails, attribute comparisons will fail. Esp. getting the base unit and
; base values for all attributes.
-; So you might want to disable the unit strictness at all (area:=936km^2 < 1,000,000 ?).
+; So you might want to disable the unit strictness at all (area:=936km^2 < 1,000,000 ?).
; Default: false
;DISABLE_UNITS = true
; For a non-standard path
;UNITS_EXE = /usr/bin/units
-; Needed for inlined SVG and MathM, but conflicts with document.write().
+; Needed for inlined SVG and MathM, but conflicts with document.write().
; Experimental. Default: false.
; See http://hixie.ch/advocacy/xhtml
;ENABLE_XHTML_XML = true
@@ -93,11 +93,11 @@
; Optionally define BABYCART_PATH. Default: /usr/local/bin/babycart
;ENABLE_SPAMASSASSIN = true
-; Check for links to blocked external tld domains in new edits, against
+; Check for links to blocked external tld domains in new edits, against
; multi.surbl.org and bl.spamcop.net.
;ENABLE_SPAMBLOCKLIST = true
-; If more than this number of external links appear on non-authenticated
+; If more than this number of external links appear on non-authenticated
; edits it will be rejected as spam.
; Setting NUM_SPAM_LINKS to 0 will disable the check.
;NUM_SPAM_LINKS = 20
@@ -110,16 +110,16 @@
; Default: false
;DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS = false
-; If GOOGLE_LINKS_NOFOLLOW is true, ref=nofollow is added to
+; If GOOGLE_LINKS_NOFOLLOW is true, ref=nofollow is added to
; all external links to discourage spam. You might want to turn it off,
; if you want to improve pageranks on external links.
; TODO: Add ref=nofollow only for external links added by anonymous users.
; All internal action links do contain ref=nofollow
;GOOGLE_LINKS_NOFOLLOW = false
-; Aysnchronous ajax callbacks to dynamically display pages
+; Aysnchronous ajax callbacks to dynamically display pages
; (as format=xml) on demand.
-; Experimental feature for plugin DynamicIncludePage, which might fail on
+; Experimental feature for plugin DynamicIncludePage, which might fail on
; some strictly non-conformant entities.
;ENABLE_AJAX = false
@@ -128,25 +128,25 @@
; If set to true, add some anti-spam countermeasures based on captcha
; tests. See http://www.captcha.net/ for more information on captcha.
-;ENABLE_CAPTCHA = true
+;ENABLE_CAPTCHA = true
; If USE_CAPTCHA_RANDOM_WORD is set to true,
; Captcha will use a random word, otherwise a dictionary word.
;USE_CAPTCHA_RANDOM_WORD = false
-; USE_SAFE_DBSESSION should be enabled, if you encounter session problems, with
-; duplicate INSERT sess_id warnings at the bottom of the page. Reason is a
-; unreliable affected_rows implementation() in the sql backend.
+; USE_SAFE_DBSESSION should be enabled, if you encounter session problems, with
+; duplicate INSERT sess_id warnings at the bottom of the page. Reason is a
+; unreliable affected_rows implementation() in the sql backend.
; Default is Disabled, using the fastest DbSession UPDATE method.
;USE_SAFE_DBSESSION = false
-; If true don't use UserName/Blog/day/time pagenames for the ADMIN_USER, but
+; If true don't use UserName/Blog/day/time pagenames for the ADMIN_USER, but
; Blog/day/time only. Convenience for a single-user blog theme.
;BLOG_DEFAULT_EMPTY_PREFIX = true
-; External Searchengine hits are detected automatically and will be
+; External Searchengine hits are detected automatically and will be
; highlighted in the displayed page if enabled.
-; Optionally the actionpage SearchHighlight is also prepended, which
+; Optionally the actionpage SearchHighlight is also prepended, which
; prints a notice.
; Default: true
;ENABLE_SEARCHHIGHLIGHT = false
@@ -160,13 +160,13 @@
; Default: false
;ENABLE_RECENTCHANGESBOX = true
-; You can enable an admin checkbox to set a "public" page attribute, to
+; You can enable an admin checkbox to set a "public" page attribute, to
; be used by external tools to generate a separate public wiki.
; Default: false
;ENABLE_PAGE_PUBLIC = true
; Enable this for system maintainance (e.g. read-only mount) or a general
-; read-only database.
+; read-only database.
; Default: false
;READONLY = true
@@ -199,25 +199,25 @@
; password and use the passencrypt.php tool to encrypt the password from
; prying eyes.
; http://wolfram.org/writing/howto/password.html
-;
+;
; Logging into the wiki with the admin user and password allows you to lock,
; unlock, or remove pages and to perform other PhpWikiAdministration
; functions. On all other occasions you should simply log in with your
; regular WikiName.
; If your password contains special chars like ";" or ":" better quote it in double-quotes.
-;ADMIN_USER =
+;ADMIN_USER =
; You must set this! Username and password of the administrator.
; ADMIN_PASSWD is ignored on HttpAuth
;ADMIN_PASSWD =
-; It is recommended that you use encrypted passwords to be stored in the
+; It is recommended that you use encrypted passwords to be stored in the
; config.ini and the users homepages metadata.
; You might want to use the passencrypt.php utility to encode the
; admin password, in the event that someone gains ftp or ssh access to the
-; server and directory containing phpwiki.
+; server and directory containing phpwiki.
; <i>SQL access passwords cannot be encrypted, besides using external DATABASE_DSN aliases within PDO.</i>
-;
+;
; If true, all user passwords will be stored encrypted.
; You might have to set it to false, if your PHP doesn't support crypt().
; To use plain text passwords, in particular for the ADMIN_PASSWD, set
@@ -240,7 +240,7 @@
; The RawHtml plugin allows page authors to embed real, raw HTML into Wiki
; pages. This is a possible security threat, as much HTML (or, rather,
; JavaScript) can be very risky. If you are in a controlled environment,
-; or you are using the two options below, however, it could be of use.
+; or you are using the two options below, however, it could be of use.
ENABLE_RAW_HTML = true
; If this is set, only pages locked by the Administrator may contain the
@@ -253,22 +253,22 @@
; Actions listed in this array will not be allowed. The complete list
; of actions can be found in lib/main.php with the function
-; getActionDescription.
+; getActionDescription.
;
-; purge, remove, revert, xmlrpc, soap, upload, browse, create, diff, dumphtml,
+; purge, remove, revert, xmlrpc, soap, upload, browse, create, diff, dumphtml,
; dumpserial, edit, loadfile, lock, unlock, viewsource, zip, ziphtml, ...
;DISABLED_ACTIONS = "dumpserial : loadfile"
-; Disable insecure and performance sensitive actions for non-admin users.
+; Disable insecure and performance sensitive actions for non-admin users.
;
; Allow for localhost only
-; If true, only the admin user or users from localhost (without password) can do:
+; If true, only the admin user or users from localhost (without password) can do:
; RPC2, SOAP, ziphtml and dumphtml
INSECURE_ACTIONS_LOCALHOST_ONLY = true
; If you enable this option, every page is moderated by the ModeratedPage
-; actionpage plugin. Changing a moderated page will be delayed to be
+; actionpage plugin. Changing a moderated page will be delayed to be
; granted by a moderator by email. Default: false to allow finer control.
;ENABLE_MODERATEDPAGE_ALL = true
@@ -285,7 +285,7 @@
; abuse detection and referer lists.
; See http://www.outoforder.cc/projects/apache/mod_log_sql/docs-2.0/#id2756178
;
-; If defined (e.g. 1) read-access is done via SQL.
+; If defined (e.g. 1) read-access is done via SQL.
; If flag 2 is set, phpwiki also writes. Default on SQL database.
; This must use DATABASE_TYPE = SQL or ADODB or PDO.
; ACCESS_LOG_SQL = 0 ; disable SQL access logging
@@ -308,13 +308,13 @@
;COMPRESS_OUTPUT = false
; This controls how PhpWiki sets the HTTP cache control
-; headers (Expires: and Cache-Control:)
+; headers (Expires: and Cache-Control:)
;
; Choose one of:
;
; NO_CACHE: This is roughly the old (pre 1.3.4) behavior. PhpWiki will
; instruct proxies and browsers never to cache PhpWiki output.
-; This was previously called 'NONE', but NONE was treated specially
+; This was previously called 'NONE', but NONE was treated specially
; by parse_ini_config().
;
; STRICT: Cached pages will be invalidated whenever the database global
@@ -359,7 +359,7 @@
; caching of marked-up page content.
; Note that you can also disable markup caching on a per-page
; temporary basis by addinging a query arg of '?nocache=1'
-; to the URL to the page or by adding a NoCache plugin line.
+; to the URL to the page or by adding a NoCache plugin line.
; Use '?nocache=purge' to completely discard the cached version of the page.
; You can also purge the cached markup globally by using the
; "Purge Markup Cache" button on the PhpWikiAdministration page.
@@ -384,9 +384,9 @@
; On USE_DB_SESSION = true you can ignore this.
;SESSION_SAVE_PATH = some_other_directory
-; On USE_DB_SESSION = true or false you can force the behaviour
+; On USE_DB_SESSION = true or false you can force the behaviour
; how to transport session data.
-;USE_DB_SESSION = false
+;USE_DB_SESSION = false
;======================================================================
; Part Two: Database Selection
@@ -401,7 +401,7 @@
; file: use a serialized file database. (easiest)
; flatfile: use a flat file database. (experimental, readable, slow)
DATABASE_TYPE = dba
-
+
; Prefix for filenames or table names
;
; Currently you MUST EDIT THE SQL file too (in the schemas/
@@ -431,7 +431,7 @@
DATABASE_DSN = "mysql://guest@unix(/var/lib/mysql/mysql.sock)/test"
; Keep persistent connections: (mysql_pconnect, ...)
-; Recommended is false for bigger servers, and true for small servers
+; Recommended is false for bigger servers, and true for small servers
; with not so many connections. postgresql: Please leave it false. Default: false
; Should really be set as database option in the DSN above.
DATABASE_PERSISTENT = false
@@ -465,11 +465,11 @@
; Specified in seconds.
DATABASE_TIMEOUT = 12
-; How often to try and optimise the database. Specified in seconds.
+; How often to try and optimise the database. Specified in seconds.
; Set to 0 to disable optimisation completely. Default is 50 (seconds).
;
; This is a fairly crude way of doing things as it requires a page save
-; to occur during the right minute for the optimisation to be triggered.
+; to occur during the right minute for the optimisation to be triggered.
;
; With most modern databases (eg. Postgres) and distributions (eg. Debian)
; the system maintenance scripts take care of this nightly, so you will want
@@ -477,7 +477,7 @@
;DATABASE_OPTIMISE_FREQUENCY = 50
; Optional: Administrative SQL DB access (for action=upgrade)
-; If action=upgrade detects (My)SQL problems, but has no ALTER permissions,
+; If action=upgrade detects (My)SQL problems, but has no ALTER permissions,
; give here a database username which has the necessary ALTER or CREATE permissions.
; Of course you can fix your database manually. See lib/upgrade.php for known issues.
;DBADMIN_USER = root
@@ -502,7 +502,7 @@
; class a revision belongs in is determined by whether the author
; checked the "this is a minor revision" checkbox when they saved the
; page.
-;
+;
; There is, additionally, a third class of revisions: author
; revisions. The most recent non-mergable revision from each distinct
; author is an author revision.
@@ -573,7 +573,7 @@
;========================================================================
;
; New user authentication configuration:
-; We support three basic authentication methods and a stacked array
+; We support three basic authentication methods and a stacked array
; of advanced auth methods to get and check the passwords:
;
; ALLOW_ANON_USER default true
@@ -587,11 +587,11 @@
ALLOW_ANON_EDIT = true
; If ALLOW_BOGO_LOGIN is true, users are allowed to login (with
-; any/no password) using any userid which:
+; any/no password) using any userid which:
; 1) is not the ADMIN_USER, and
; 2) is a valid WikiWord (matches $WikiNameRegexp.)
-; If true, users may be created by themselves. Otherwise we need separate auth.
-; If such a user will create a so called HomePage with his userid, he will
+; If true, users may be created by themselves. Otherwise we need separate auth.
+; If such a user will create a so called HomePage with his userid, he will
; be able to store his preferences and password there.
ALLOW_BOGO_LOGIN = true
@@ -608,14 +608,14 @@
; BogoLogin: WikiWord username, with no *actual* password checking,
; although the user will still have to enter one.
; PersonalPage: Store passwords in the users homepage metadata (simple)
-; Db: Use DBAUTH_AUTH_* (see below) with PearDB or
+; Db: Use DBAUTH_AUTH_* (see below) with PearDB or
; ADODB only.
; LDAP: Authenticate against LDAP_AUTH_HOST with LDAP_BASE_DN
; IMAP: Authenticate against IMAP_AUTH_HOST (email account)
; POP3: Authenticate against POP3_AUTH_HOST (email account)
; Session: Get username and level from a PHP session variable
; (e.g. for FusionForge)
-; File: Store username:crypted-passwords in .htaccess like files.
+; File: Store username:crypted-passwords in .htaccess like files.
; Use Apache's htpasswd to manage this file.
; HttpAuth: Use the protection by the webserver (.htaccess/.htpasswd)
; Note that the ADMIN_USER should exist also.
@@ -636,24 +636,24 @@
; certain number of characters long. This applies even to the BogoLogin
; method. Default: 0 (to allow immediate passwordless BogoLogin)
;PASSWORD_LENGTH_MINIMUM = 6
-
+
; The following policies are available for user authentication:
; first-only: use only the first method in USER_AUTH_ORDER
-; old: ignore USER_AUTH_ORDER and try to use all available
+; old: ignore USER_AUTH_ORDER and try to use all available
; methods as in the previous PhpWiki releases (slow)
-; strict: check if the user exists for all methods:
-; on the first existing user, try the password.
-; dont try the other methods on failure then.
+; strict: check if the user exists for all methods:
+; on the first existing user, try the password.
+; dont try the other methods on failure then.
; Note: May result in crashes on endless recursion
; stacked: check the given user - password combination for all
; methods and return true on the first success.
; Note: May result in crashes on endless recursion
USER_AUTH_POLICY = first-only
-; Use access control lists (as in Solaris and Windows NTFS) per page and group,
+; Use access control lists (as in Solaris and Windows NTFS) per page and group,
; not per user for the whole wiki.
-;
-; We suspect ACL page permissions to degrade speed by 10%.
+;
+; We suspect ACL page permissions to degrade speed by 10%.
; GROUP_METHOD=WIKIPAGE is slowest.
; Default: true
;ENABLE_PAGEPERM = false
@@ -676,17 +676,17 @@
; and their values as NAME=value pairs separated by colons.
;LDAP_SET_OPTION = "LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0"
-; DN to initially bind to the LDAP server as. This is needed if the server doesn't
+; DN to initially bind to the LDAP server as. This is needed if the server doesn't
; allow anonymous queries. (Windows Active Directory Server)
;LDAP_AUTH_USER = "CN=ldapuser,ou=Users,o=Development,dc=mycompany.com"
-; Password to use to initially bind to the LDAP server, as the DN
+; Password to use to initially bind to the LDAP server, as the DN
; specified in the LDAP_AUTH_USER option (above).
;LDAP_AUTH_PASSWORD = secret
; If you want to match usernames against an attribute other than uid,
; specify it here. uid is for real active users. cn for anything like test users,
-; sAMAccountName often for Windows/Samba.
+; sAMAccountName often for Windows/Samba.
; Default: uid. Use also "cn" or "sAMAccountName".
;LDAP_SEARCH_FIELD = sAMAccountName
@@ -712,7 +712,7 @@
; The IMAP server to check usernames from. Defaults to localhost.
;
; Some IMAP_AUTH_HOST samples:
-; "localhost", "localhost:143/imap/notls",
+; "localhost", "localhost:143/imap/notls",
; "localhost:993/imap/ssl/novalidate-cert" (SuSE refuses non-SSL conections)
;IMAP_AUTH_HOST = "localhost:143/imap/notls"
@@ -751,7 +751,7 @@
; WIKIPAGE Define groups as list at "CategoryGroup". (Slowest, but easiest to maintain)
; DB Stored in an SQL database. Optionally external. See USERS/GROUPS queries
; FILE Flatfile. See AUTH_GROUP_FILE below.
-; LDAP LDAP groups. See "LDAP authentication options" above and
+; LDAP LDAP groups. See "LDAP authentication options" above and
; lib/WikiGroup.php. (experimental)
GROUP_METHOD = WIKIPAGE
@@ -895,7 +895,7 @@
; Japanese "ja" (Japanese - ホームページ)
; Chinese "zh" (Chinese - 首頁)
;
-; If you set DEFAULT_LANGUAGE to the empty string, the users
+; If you set DEFAULT_LANGUAGE to the empty string, the users
; preferred language as determined by the browser setting will be used.
DEFAULT_LANGUAGE = en
@@ -929,8 +929,8 @@
; URLs ending with the following extension should be inlined as images.
; Specify as per ALLOWED_PROTOCOLS.
; Note that you can now also allow class|svg|svgz|vrml|swf ...,
-; which will create embedded object instead of img.
-; Typical CGI extensions as pl or cgi maybe allowed too,
+; which will create embedded object instead of img.
+; Typical CGI extensions as pl or cgi maybe allowed too,
; but those two will be enforced to img.
;INLINE_IMAGES = "png|jpg|jpeg|gif|swf"
@@ -940,7 +940,7 @@
; WIKI_NAME_REGEXP = "(?<![[:alnum:]])(?:[[:upper:]][[:lower:][:digit:]]+){2,}(?![[:alnum:]])"
; Allow lower+digits+dots: BumpyVersion1.3.2
; WIKI_NAME_REGEXP = "(?<![[:alnum:]])(?:[[:upper:]][[:lower:][:digit:]\.]+){2,}(?![[:alnum:]])"
-; Default old behaviour, no digits as lowerchars.
+; Default old behaviour, ...
[truncated message content] |
