From ccc383c57b82020d756fbb68a1f3a12fcf795634 Mon Sep 17 00:00:00 2001 From: rurban Date: Sat, 23 Dec 2006 16:11:30 +0000 Subject: [PATCH] more configurator support git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@5255 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- config/config-dist.ini | 83 +++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 38 deletions(-) diff --git a/config/config-dist.ini b/config/config-dist.ini index e06777485..1d9a41cb1 100644 --- a/config/config-dist.ini +++ b/config/config-dist.ini @@ -201,39 +201,6 @@ ENABLE_RAW_HTML_LOCKEDONLY = true ; See http://chxo.com/scripts/safe_html-test.php ENABLE_RAW_HTML_SAFE = true -; If you define this to true, (MIME-type) page-dumps (either zip dumps, -; or "dumps to directory" will be encoded using the quoted-printable -; encoding. If you're actually thinking of mailing the raw page dumps, -; then this might be useful, since (among other things,) it ensures -; that all lines in the message body are under 80 characters in length. -; -; Also, setting this will cause a few additional mail headers -; to be generated, so that the resulting dumps are valid -; RFC 2822 e-mail messages. -; -; Probably you can just leave this set to false, in which case you get -; raw ('binary' content-encoding) page dumps. -STRICT_MAILABLE_PAGEDUMPS = false - -; Here you can change the default dump directories. -; (Can be overridden by the directory argument) -DEFAULT_DUMP_DIR = /tmp/wikidump -HTML_DUMP_DIR = /tmp/wikidumphtml - -; Filename suffix used for XHTML page dumps. -; If you don't want any suffix just comment this out. -HTML_DUMP_SUFFIX = .html - -; The maximum file upload size, in bytes. -; The default, 16777216, is 16MB. -MAX_UPLOAD_SIZE = 16777216 - -; If the last edit is older than MINOR_EDIT_TIMEOUT seconds, the -; default state for the "minor edit" checkbox on the edit page form -; will be off. -; The default, 604800, is one week (7 days): 7 * 24 * 3600 -MINOR_EDIT_TIMEOUT = 604800 - ; 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. @@ -851,7 +818,7 @@ THEME = default ; Select a valid charset name to be inserted into the xml/html pages, ; and to reference links to the stylesheets (css). For more info see: -; . Note that PhpWiki +; http://www.iana.org/assignments/character-sets. Note that PhpWiki ; has been extensively tested only with the latin1 (iso-8859-1) ; character set. ; @@ -866,13 +833,13 @@ THEME = default ; Character sets similar to iso-8859-1 may work with little or no ; modification depending on your setup. The database must also ; support the same charset, and of course the same is true for the -; web browser. euc-jp and utf-8 is also supported. +; web browser. euc-jp and utf-8 works ok, but only is mbstring is used. CHARSET = iso-8859-1 ; Most exotic charsets are not supported by htmlspecialchars, which prints a warning: ; "charset `bla' not supported, assuming iso-8859-1" ; Even on simple 8bit charsets, where just <>& need to be replaced. -; See /ext/standard/html.c +; See php-src:/ext/standard/html.c ; We can ignore these warnings then. ;IGNORE_CHARSET_NOT_SUPPORTED_WARNING = true @@ -923,8 +890,9 @@ CHARSET = iso-8859-1 ; 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 instead of . -; Typical CGI extensions as pl or cgi maybe allowed too, but those two will be enforced to +; 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" ; Perl regexp for WikiNames ("bumpy words") @@ -1030,6 +998,8 @@ CHARSET = iso-8859-1 ;/ ;SERVER_NAME = some.host.com ;SERVER_PORT = 80 + +; https needs a special setting ;SERVER_PROTOCOL = http ; Relative URL (from the server root) of the PhpWiki @@ -1103,6 +1073,42 @@ CHARSET = iso-8859-1 ; Part Seven: Miscellaneous settings ;=========================================================================== +; If you define this to true, (MIME-type) page-dumps (either zip dumps, +; or "dumps to directory" will be encoded using the quoted-printable +; encoding. If you're actually thinking of mailing the raw page dumps, +; then this might be useful, since (among other things,) it ensures +; that all lines in the message body are under 80 characters in length. +; +; Also, setting this will cause a few additional mail headers +; to be generated, so that the resulting dumps are valid +; RFC 2822 e-mail messages. +; +; Probably you can just leave this set to false, in which case you get +; raw ('binary' content-encoding) page dumps. +STRICT_MAILABLE_PAGEDUMPS = false + +; Here you can change the default dump directories. +; (Can be overridden by the directory argument) +DEFAULT_DUMP_DIR = /tmp/wikidump +HTML_DUMP_DIR = /tmp/wikidumphtml + +; Filename suffix used for XHTML page dumps. +; If you don't want any suffix just comment this out. +HTML_DUMP_SUFFIX = .html + +; The maximum file upload size, in bytes. +; The default, 16777216, is 16MB. +MAX_UPLOAD_SIZE = 16777216 + +; If the last edit is older than MINOR_EDIT_TIMEOUT seconds, the +; default state for the "minor edit" checkbox on the edit page form +; will be off. +; The default, 604800, is one week (7 days): 7 * 24 * 3600 +MINOR_EDIT_TIMEOUT = 604800 + +; Page name of RecentChanges page. Used for RSS Auto-discovery +;RECENT_CHANGES = RecentChange + ; Disable HTTP redirects. ; (You probably don't need to touch this.) ; @@ -1138,6 +1144,7 @@ CHARSET = iso-8859-1 ; They need some time and memory. ; Insert a pagelink from this list: ;TOOLBAR_PAGELINK_PULLDOWN = * + ; Insert a template from this list: ;TOOLBAR_TEMPLATE_PULLDOWN = Template* -- 2.45.0