Update of /cvsroot/phpwiki/phpwiki/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10802
Modified Files:
config-default.ini config-dist.ini
Log Message:
document new options
Index: config-default.ini
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/config/config-default.ini,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -2 -b -p -d -r1.46 -r1.47
--- config-default.ini 23 Jul 2006 14:03:18 -0000 1.46
+++ config-default.ini 23 Dec 2006 15:35:19 -0000 1.47
@@ -141,4 +141,6 @@ ENABLE_MARKUP_COLOR = true
ENABLE_MARKUP_TEMPLATE = false
DISABLE_MARKUP_WIKIWORD = false
+ENABLE_MARKUP_DIVSPAN = false
+PLUGIN_MARKUP_MAP = ""
; these not:
Index: config-dist.ini
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/config/config-dist.ini,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -2 -b -p -d -r1.74 -r1.75
--- config-dist.ini 15 Aug 2006 13:45:46 -0000 1.74
+++ config-dist.ini 23 Dec 2006 15:35:19 -0000 1.75
@@ -46,5 +46,6 @@
;ENABLE_DOUBLECLICKEDIT = false
-; Enable WYSIWYG editing. Converting back HTML to wikitext does not work yet. Experimental!
+; Enable WYSIWYG editing. Converting back HTML to wikitext does not work in most engines.
+; Experimental!
;ENABLE_WYSIWYG = true
@@ -58,5 +59,5 @@
;WYSIWYG_BACKEND = Wikiwyg
-; Store all pages as HTML? Will loose most link and plugin options.
+; 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
@@ -374,6 +375,6 @@ COOKIE_EXPIRATION_DAYS = 365
; dba: use one of the standard UNIX dbm libraries. Use BerkeleyDB (db3,4) (fastest)
; file: use a serialized file database. (easiest)
-; flatfile: use a flat file database. (readable, slow)
-; cvs: use a CVS server to store everything. (experimental, not recommended)
+; flatfile: use a flat file database. (experimental, readable, slow)
+; cvs: use a CVS server to store everything. (experimental, slowest, not recommended)
DATABASE_TYPE = dba
@@ -435,9 +436,9 @@ DATABASE_DIRECTORY = /tmp
; items.
; Better not use other hacks such as inifile, flatfile or cdb.
-DATABASE_DBA_HANDLER = gdbm
+DATABASE_DBA_HANDLER = db4
; How long will the system wait for a database operation to complete?
; Specified in seconds.
-DATABASE_TIMEOUT = 5
+DATABASE_TIMEOUT = 12
; How often to try and optimise the database. Specified in seconds.
@@ -461,6 +462,7 @@ DATABASE_TIMEOUT = 5
;DBADMIN_PASSWD = secret
-; Store DB query results in memory to avoid duplicate queries.
+; Store DB query results (esp. for page lists) in memory to avoid duplicate queries.
; Disable only for old php's with low memory or memory_limit=8MB.
+; Requires at least memory_limit=16MB
; Default: true
;USECACHE = false
@@ -585,5 +587,5 @@ ALLOW_USER_PASSWORDS = true
; Db: Use DBAUTH_AUTH_* (see below) with PearDB or
; ADODB only.
-; LDAP: Authenticate against LDAP_AUTH_HOST with LDAP_BASE_DN (experimental)
+; 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)
@@ -592,6 +594,7 @@ ALLOW_USER_PASSWORDS = true
; Use Apache's htpasswd to manage this file.
; HttpAuth: Use the protection by the webserver (.htaccess/.htpasswd)
-; Enforcing HTTP Auth not yet. Note that the ADMIN_USER should exist also.
+; Note that the ADMIN_USER should exist also.
; Using HttpAuth disables all other methods and no userauth sessions are used.
+; With mod_ntlm and mod_auth_sspi use this. (automatic login with MSIE)
;
; Several of these methods can be used together, in the manner specified by
@@ -646,22 +649,22 @@ USER_AUTH_POLICY = stacked
; Directory Server. Specify the options (as allowed by the PHP LDAP module)
; and their values as NAME=value pairs separated by colons.
-; LDAP_SET_OPTION = "LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0"
+;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
; allow anonymous queries. (Windows Active Directory Server)
-; LDAP_AUTH_USER = "CN=ldapuser,ou=Users,o=Development,dc=mycompany.com"
+;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
; specified in the LDAP_AUTH_USER option (above).
-; LDAP_AUTH_PASSWORD = secret
+;LDAP_AUTH_PASSWORD = secret
; If you want to match usernames against an attribute other than uid,
; specify it here. Default: uid
-; LDAP_SEARCH_FIELD = sAMAccountName
+;LDAP_SEARCH_FIELD = sAMAccountName
; If you have an organizational unit for all users, define it here.
; This narrows the search, and is needed for LDAP group membership (if GROUP_METHOD=LDAP)
; Default: ou=Users
-; LDAP_OU_USERS = ou=Users
+;LDAP_OU_USERS = ou=Users
; If you have an organizational unit for all groups, define it here.
@@ -669,5 +672,5 @@ USER_AUTH_POLICY = stacked
; The entries in this ou must have a gidNumber and cn attribute.
; Default: ou=Groups
-; LDAP_OU_GROUP = ou=Groups
+;LDAP_OU_GROUP = ou=Groups
@@ -679,13 +682,13 @@ USER_AUTH_POLICY = stacked
; "localhost", "localhost:143/imap/notls",
; "localhost:993/imap/ssl/novalidate-cert" (SuSE refuses non-SSL conections)
-; IMAP_AUTH_HOST = "localhost:143/imap/notls"
+;IMAP_AUTH_HOST = "localhost:143/imap/notls"
; POP3 authentication options:
;
; Host to connect to.
-; POP3_AUTH_HOST = "localhost:110"
+;POP3_AUTH_HOST = "localhost:110"
; Port to connect. Deprecated: Use POP3_AUTH_HOST:<port> instead
-; POP3_AUTH_PORT = 110
+;POP3_AUTH_PORT = 110
; File authentication options:
@@ -721,5 +724,5 @@ GROUP_METHOD = WIKIPAGE
; Page where all groups are listed. Default: Translation of "CategoryGroup"
-; CATEGORY_GROUP_PAGE = CategoryGroup
+;CATEGORY_GROUP_PAGE = CategoryGroup
; For GROUP_METHOD = FILE, the file given below is referenced to obtain
@@ -739,6 +742,6 @@ GROUP_METHOD = WIKIPAGE
; A database DSN to connect to. Defaults to the DSN specified for the Wiki
; as a whole.
-;DBAUTH_AUTH_DSN = "mysql://wikiuser:@localhost/phpwiki"
-
+;DBAUTH_AUTH_DSN = "mysql://wikiuser:@127.0.0.1/phpwiki"
+;
; USER/PASSWORD queries
;
@@ -749,8 +752,8 @@ GROUP_METHOD = WIKIPAGE
;
; Plaintext Passwords:
-; DBAUTH_AUTH_CHECK = "SELECT IF(passwd='$password',1,0) AS ok FROM pref WHERE userid='$userid'"
+; DBAUTH_AUTH_CHECK = "SELECT IF(TRIM(passwd)='$password',1,0) AS ok FROM pref WHERE TRIM(userid)='$userid'"
;
; Database-hashed passwords (more secure):
-;DBAUTH_AUTH_CHECK = "SELECT IF(passwd=PASSWORD('$password'),1,0) AS ok FROM pref WHERE userid='$userid'"
+;DBAUTH_AUTH_CHECK = "SELECT IF(TRIM(passwd)=PASSWORD('$password'),1,0) AS ok FROM pref WHERE TRIM(userid)='$userid'"
DBAUTH_AUTH_CRYPT_METHOD = plain
@@ -758,5 +761,5 @@ DBAUTH_AUTH_CRYPT_METHOD = plain
; to get the password out of the database with a simple SELECT query, and
; specify DBAUTH_AUTH_USER_EXISTS and DBAUTH_AUTH_CRYPT_METHOD:
-;DBAUTH_AUTH_CHECK = "SELECT passwd FROM pref where userid='$userid'"
+;DBAUTH_AUTH_CHECK = "SELECT passwd FROM pref WHERE TRIM(userid)='$userid'"
; DBAUTH_AUTH_CRYPT_METHOD = crypt
@@ -826,4 +829,6 @@ THEME = default
; as default, just some tricks to make the buttons smaller:
;THEME = smaller
+; the popular wikipedia layout:
+;THEME = MonoBook
; the popular Wordpress layout:
;THEME = Wordpress
@@ -834,6 +839,4 @@ THEME = default
; mozilla friendly, with lots of icons instead of buttons (i18n friendly):
;THEME = Crao
-; wikipedia layout:
-;THEME = MonoBook
; default + rateit navbar:
;THEME = wikilens
@@ -853,8 +856,8 @@ THEME = default
; character set.
;
-; If you change the default from iso-8859-1 PhpWiki may not work
-; properly and will require modifications in all existing pages.
-; At the very least you will have to convert the files in pgsrc
-; or locale/xx/pgsrc to match!
+; If you change the default from iso-8859-1 with existing pages,
+; PhpWiki may not work properly and will require modifications in all existing pages.
+; You'll have to dump the old pages with the old charset
+; and import it into the new one after having changed the charset.
; Currently we support utf-8 for zh and ja, euc-jp for ja (not enabled)
; and iso-8859-1 for all other langs. Changing languages (UserPreferences)
@@ -864,6 +867,5 @@ THEME = default
; modification depending on your setup. The database must also
; support the same charset, and of course the same is true for the
-; web browser. Some work is in progress hopefully to allow more
-; flexibility in this area.
+; web browser. euc-jp and utf-8 is also supported.
CHARSET = iso-8859-1
@@ -889,5 +891,5 @@ CHARSET = iso-8859-1
; If you set DEFAULT_LANGUAGE to the empty string, the users
; preferred language as determined by the browser setting will be used.
-; Japanese requires CHARSET=euc-jp or utf-8 (not yet safe), Chinese CHARSET=utf-8
+; Japanese requires CHARSET=euc-jp or utf-8, Chinese CHARSET=utf-8
;DEFAULT_LANGUAGE = en
@@ -994,6 +996,10 @@ CHARSET = iso-8859-1
;DISABLE_MARKUP_WIKIWORD = true
+; Enable <div> and <span> HTML blocks and attributes. Experimental. Not yet working.
+;ENABLE_MARKUP_DIVSPAN = true
+
; Plugin shortcuts: Enable <xml> syntax mapped to a plugin invocation. (as in mediawiki)
; <name arg=value>body</name> or <name /> => <?plugin pluginname arg=value body ?>
+; This breaks the InlineParser.
;PLUGIN_MARKUP_MAP = "html:RawHtml dot:GraphViz toc:CreateToc amath:AsciiMath richtable:RichTable include:IncludePage tex:TexToPng"
|