From c0e8762324f63dc055db41c47f0f75e2ce87f7f8 Mon Sep 17 00:00:00 2001 From: rurban Date: Mon, 10 Oct 2005 19:37:39 +0000 Subject: [PATCH] add NUM_SPAM_LINKS=20 git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4894 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- config/config-default.ini | 4 ++- config/config-dist.ini | 55 ++++++++++++++++++++------------------- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/config/config-default.ini b/config/config-default.ini index b5a9ca98c..7bb36705c 100644 --- a/config/config-default.ini +++ b/config/config-default.ini @@ -1,4 +1,4 @@ -; $Id: config-default.ini,v 1.38 2005-09-17 08:17:18 rurban Exp $ +; $Id: config-default.ini,v 1.39 2005-10-10 19:37:39 rurban Exp $ ; This is the default PhpWiki configuration for undefined config.ini entries. ; recent development and debugging features: @@ -20,6 +20,8 @@ GOOGLE_LINKS_NOFOLLOW = true USE_SAFE_DBSESSION = false ENABLE_DISCUSSION_LINK = false ENABLE_CAPTCHA = false +ENABLE_WYSIWYG = false +NUM_SPAM_LINKS = 20 WIKI_NAME = PhpWiki ENABLE_REVERSE_DNS = true diff --git a/config/config-dist.ini b/config/config-dist.ini index a4aeed1d9..156cf21cf 100644 --- a/config/config-dist.ini +++ b/config/config-dist.ini @@ -34,21 +34,6 @@ ; Default: 0 ;DEBUG = 1 -; Enable the new method of handling WikiUsers. This is currently an -; experimental feature, although it is considered fairly stable. It's best -; to leave it on, and only disable it if you have problems with it. -; Servers with memory-limit problems might want to turn it off. It costs ~300KB -; Default: true -;ENABLE_USER_NEW = false - -; Use access control lists (as in Solaris and Windows NTFS) per page and group, -; not per user for the whole wiki. -; -; I suspect ACL page permissions to degrade speed by 10%. -; GROUP_METHOD=WIKIPAGE is slowest. (See Part 3a) -; Default: true -;ENABLE_PAGEPERM = false - ; Graphical buttons on edit. Default: true ; Reportedly broken on MacOSX Safari ;ENABLE_EDIT_TOOLBAR = false @@ -67,15 +52,14 @@ ; See http://hixie.ch/advocacy/xhtml ;ENABLE_XHTML_XML = true -; Store DB query results in memory to avoid duplicate queries. -; Disable only for old php's with low memory or memory_limit=8MB. -; Default: true -;USECACHE = false - ; Needs babycart installed. See http://phpwiki.org/SpamAssassinIntegration ; Optionally define BABYCART_PATH. Default: /usr/local/bin/babycart ;ENABLE_SPAMASSASSIN = true +; If more than this number of external links appear on non-authenticated +; edits it will be rejected as spam. +;NUM_SPAM_LINKS = 20 + ; 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. @@ -435,6 +419,11 @@ DATABASE_TIMEOUT = 5 ;DBADMIN_USER = root ;DBADMIN_PASSWD = secret +; Store DB query results in memory to avoid duplicate queries. +; Disable only for old php's with low memory or memory_limit=8MB. +; Default: true +;USECACHE = false + ;======================================================================== ; Section 3a: Page revisions ; @@ -713,7 +702,7 @@ DBAUTH_AUTH_CRYPT_METHOD = plain ; If you want to use Unix crypt()ed passwords, you can use DBAUTH_AUTH_CHECK ; 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 user where userid='$userid'" +;DBAUTH_AUTH_CHECK = "SELECT passwd FROM user where userid='$userid'" ; DBAUTH_AUTH_CRYPT_METHOD = crypt ; ; Update the user's authentication credential. If this is not defined but @@ -721,12 +710,12 @@ DBAUTH_AUTH_CRYPT_METHOD = plain ; password. ; ; Plaintext passwords: -; DBAUTH_AUTH_UPDATE = "UPDATE user SET passwd='$password' WHERE userid='$userid'" +;DBAUTH_AUTH_UPDATE = "UPDATE user SET passwd='$password' WHERE userid='$userid'" ; Database-hashed passwords: ; DBAUTH_AUTH_UPDATE = "UPDATE user SET passwd=PASSWORD('$password') WHERE userid='$userid'" ; ; Allow the user to create their own account. -; DBAUTH_AUTH_CREATE = "INSERT INTO user SET passwd=PASSWORD('$password'),userid='$userid'" +;DBAUTH_AUTH_CREATE = "INSERT INTO user SET passwd=PASSWORD('$password'),userid='$userid'" ; USER/PREFERENCE queries ; @@ -738,12 +727,11 @@ DBAUTH_AUTH_CRYPT_METHOD = plain ; The prefs field stores the serialized form of the user's preferences array, ; to ease the complication of storage. ; DBAUTH_PREF_SELECT = "SELECT prefs FROM user WHERE userid='$userid'" -; DBAUTH_PREF_SELECT = "SELECT prefs FROM pref WHERE userid='$userid'" +;DBAUTH_PREF_SELECT = "SELECT prefs FROM pref WHERE userid='$userid'" ; Update the user's preferences -; DBAUTH_PREF_UPDATE = "UPDATE user SET prefs='$pref_blob' WHERE userid='$userid'" -; Note that REPLACE works only with mysql and destroy all other columns! -; DBAUTH_PREF_UPDATE = "REPLACE INTO pref SET prefs='$pref_blob',userid='$userid'" +;DBAUTH_PREF_UPDATE = "UPDATE user SET prefs='$pref_blob' WHERE userid='$userid'" +;DBAUTH_PREF_INSERT = "INSERT INTO pref SET prefs='$pref_blob', userid='$userid'" ; USERS/GROUPS queries ; @@ -762,6 +750,19 @@ DBAUTH_AUTH_CRYPT_METHOD = plain ; A interim page which gets displayed on every edit attempt, if it exists. ;EDITING_POLICY = EditingPolicy +; Enable the new extended method of handling WikiUsers to support external auth and PAGEPERM. +; Servers with memory-limit problems might want to turn it off. It costs ~300KB +; Default: true +;ENABLE_USER_NEW = false + +; Use access control lists (as in Solaris and Windows NTFS) per page and group, +; not per user for the whole wiki. +; +; I suspect ACL page permissions to degrade speed by 10%. +; GROUP_METHOD=WIKIPAGE is slowest. +; Default: true +;ENABLE_PAGEPERM = false + ;======================================================================== ; Part Four: Page appearance and layout ;======================================================================== -- 2.45.0