phpwiki-checkins

[phpwiki-checkins] SF.net SVN: phpwiki:[6200] trunk/config

[<var...@us...>]

Revision: 6200
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6200&view=rev
Author:   vargenau
Date:     2008-08-26 12:57:28 +0000 (Tue, 26 Aug 2008)

Log Message:
-----------
Activated Id substitution for Subversion

Modified Paths:
--------------
    trunk/config/SqlResult.ini
    trunk/config/config-default.ini
    trunk/config/make-dbhelper.pl
    trunk/config/migrate-phpwiki-config

Property Changed:
----------------
    trunk/config/SqlResult.ini
    trunk/config/config-default.ini
    trunk/config/make-dbhelper.pl
    trunk/config/migrate-phpwiki-config

Modified: trunk/config/SqlResult.ini
===================================================================
--- trunk/config/SqlResult.ini	2008-08-26 09:58:43 UTC (rev 6199)
+++ trunk/config/SqlResult.ini	2008-08-26 12:57:28 UTC (rev 6200)
@@ -1,5 +1,5 @@
 ; Sample SqlResult.ini file for lib/plugin/SqlResult.ini
-; $Id: SqlResult.ini,v 1.1 2005-04-02 15:03:02 rurban Exp $
+; $Id$
 
 ; alias = dsn
 phpwiki = mysql://wikiuser:@localhost/phpwiki


Property changes on: trunk/config/SqlResult.ini
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2008-08-26 09:58:43 UTC (rev 6199)
+++ trunk/config/config-default.ini	2008-08-26 12:57:28 UTC (rev 6200)
@@ -1,4 +1,4 @@
-; $Id: config-default.ini,v 1.55 2008-07-27 21:47:38 rurban Exp $
+; $Id$
 ; This is the default PhpWiki configuration for undefined config.ini entries.
 
 ; recent development and debugging features:


Property changes on: trunk/config/config-default.ini
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/config/make-dbhelper.pl
===================================================================
--- trunk/config/make-dbhelper.pl	2008-08-26 09:58:43 UTC (rev 6199)
+++ trunk/config/make-dbhelper.pl	2008-08-26 12:57:28 UTC (rev 6200)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -sn
 # makefile helper to extract various settings from config/config.ini
-# $Id: make-dbhelper.pl,v 1.2 2004-07-01 08:15:10 rurban Exp $
+# $Id$
 
 #if ($v eq 'DATABASE_TYPE' and /^\s*DATABASE_TYPE\s*=\s*(\w+)/) {
 #    print "$1\n";


Property changes on: trunk/config/make-dbhelper.pl
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/config/migrate-phpwiki-config
===================================================================
--- trunk/config/migrate-phpwiki-config	2008-08-26 09:58:43 UTC (rev 6199)
+++ trunk/config/migrate-phpwiki-config	2008-08-26 12:57:28 UTC (rev 6200)
@@ -5,7 +5,7 @@
 #
 # Author:   Matt Brown <ma...@ma...>,
 #           Reini Urban <ru...@x-...>
-# Version:  $Id: migrate-phpwiki-config,v 1.2 2006-08-30 05:27:20 rurban Exp $
+# Version:  $Id$
 #
 # Run this script without any arguments for usage information.
 #


Property changes on: trunk/config/migrate-phpwiki-config
___________________________________________________________________
Added: svn:keywords
   + Id


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[6384] trunk/config

[<ru...@us...>]

Revision: 6384
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6384&view=rev
Author:   rurban
Date:     2009-01-08 13:32:57 +0000 (Thu, 08 Jan 2009)

Log Message:
-----------
More documentation. Enable RATEIT

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2009-01-08 11:03:03 UTC (rev 6383)
+++ trunk/config/config-default.ini	2009-01-08 13:32:57 UTC (rev 6384)
@@ -33,6 +33,7 @@
 ; UNITS_EXE = /usr/bin/units
 ENABLE_SEARCHHIGHLIGHT = true
 ENABLE_RECENTCHANGESBOX = false
+ENABLE_RATEIT = true
 ENABLE_PAGE_PUBLIC = false
 
 WIKI_NAME = PhpWiki

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2009-01-08 11:03:03 UTC (rev 6383)
+++ trunk/config/config-dist.ini	2009-01-08 13:32:57 UTC (rev 6384)
@@ -50,7 +50,9 @@
 ; Experimental!
 ;ENABLE_WYSIWYG = true
 
-; Which backend? Must be seperately installed. See lib/WysiwygEdit/
+; Which backend? Might need to be seperately installed. See lib/WysiwygEdit/
+; Recommended is only Wikiwyg.
+;
 ;  Wikiwyg     http://openjsan.org/doc/i/in/ingy/Wikiwyg/
 ;  tinymce     http://tinymce.moxiecode.com/ 
 ;  FCKeditor   http://fckeditor.net/ 
@@ -251,8 +253,8 @@
 ; of actions can be found in lib/main.php with the function
 ; getActionDescription. 
 ;
-; browse, create, diff, dumphtml, dumpserial, edit, loadfile, lock, 
-; remove, revert, xmlrpc, soap, unlock, upload, viewsource, zip, ziphtml, ...
+; 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. 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7077] trunk/config

[<ru...@us...>]

Revision: 7077
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7077&view=rev
Author:   rurban
Date:     2009-08-24 12:14:12 +0000 (Mon, 24 Aug 2009)

Log Message:
-----------
Add ENABLE_AJAX and READONLY

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2009-08-24 12:12:46 UTC (rev 7076)
+++ trunk/config/config-default.ini	2009-08-24 12:14:12 UTC (rev 7077)
@@ -10,6 +10,8 @@
 ENABLE_DOUBLECLICKEDIT = false
 ENABLE_XHTML_XML = false
 USECACHE = true
+READONLY = false
+
 ; calculated dynamically, but need a default
 WIKIDB_NOCACHE_MARKUP = false
 ENABLE_SPAMASSASSIN = false
@@ -35,6 +37,7 @@
 ENABLE_RECENTCHANGESBOX = false
 ENABLE_RATEIT = true
 ENABLE_PAGE_PUBLIC = false
+ENABLE_AJAX = true
 
 WIKI_NAME = PhpWiki
 ENABLE_REVERSE_DNS = true

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2009-08-24 12:12:46 UTC (rev 7076)
+++ trunk/config/config-dist.ini	2009-08-24 12:14:12 UTC (rev 7077)
@@ -127,6 +127,13 @@
 ; http://momche.net/publish/article.php?page=acdropdown
 ;ENABLE_ACDROPDOWN = false
 
+; Aysnchronous ajax callbacks to dynamically display pages 
+; (as format=xml) on demand.
+; Experimental feature for plugin DynamicIncludePage, which might fail on 
+; some strictly non-conformant entities.
+; Note: TitleSearch ajax calls are enabled by ENABLE_ACDROPDOWN (xmlrpc, not xml)
+;ENABLE_AJAX = false
+
 ; Experimental WikiPedia feature: Force Discussion/Article link at the topnavbar.
 ;ENABLE_DISCUSSION_LINK = true
 
@@ -169,6 +176,12 @@
 ; Default: false
 ;ENABLE_PAGE_PUBLIC = true
 
+; Enable this for system maintainance (e.g. read-only mount) or a general
+; read-only database. 
+; Default: false
+;READONLY = true
+
+
 ;==========================================================================
 ; Part One: Authentication and security settings.
 ;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7500] trunk/config

[<ru...@us...>]

Revision: 7500
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7500&view=rev
Author:   rurban
Date:     2010-06-08 12:43:09 +0000 (Tue, 08 Jun 2010)

Log Message:
-----------
saner defaults

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2010-06-08 12:08:05 UTC (rev 7499)
+++ trunk/config/config-default.ini	2010-06-08 12:43:09 UTC (rev 7500)
@@ -94,7 +94,7 @@
 USER_AUTH_ORDER = PersonalPage
 PASSWORD_LENGTH_MINIMUM = 0
 USER_AUTH_POLICY = stacked
-ENABLE_AUTH_OPENID = true
+ENABLE_AUTH_OPENID = false
 ;LDAP_AUTH_HOST = "ldap://localhost:389"
 ;LDAP_BASE_DN = "ou=Users,o=Development,dc=mycompany.com"
 ;LDAP_SET_OPTION = ""
@@ -152,8 +152,10 @@
 
 TOC_FULL_SYNTAX = true
 ENABLE_MARKUP_COLOR = true
+ENABLE_MARKUP_TEMPLATE = true
 DISABLE_MARKUP_WIKIWORD = false
 ENABLE_MARKUP_DIVSPAN = false
+PLUGIN_MARKUP_MAP = ""
 
 ; these not:
 ; DBAUTH_AUTH_DSN =

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2010-06-08 12:08:05 UTC (rev 7499)
+++ trunk/config/config-dist.ini	2010-06-08 12:43:09 UTC (rev 7500)
@@ -1045,7 +1045,7 @@
 ; Default: false
 ;DISABLE_MARKUP_WIKIWORD = true
 
-; Enable <div> and <span> HTML blocks and attributes. Experimental. Not yet working.
+; Enable <div> and <span> HTML blocks and attributes. Experimental.
 ;ENABLE_MARKUP_DIVSPAN = true
 
 ;==========================================================================


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7914] trunk/config

[<var...@us...>]

Revision: 7914
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7914&view=rev
Author:   vargenau
Date:     2011-01-27 09:11:37 +0000 (Thu, 27 Jan 2011)

Log Message:
-----------
SteveWainstead and SandBox are translated

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2011-01-26 17:48:29 UTC (rev 7913)
+++ trunk/config/config-default.ini	2011-01-27 09:11:37 UTC (rev 7914)
@@ -133,7 +133,7 @@
 WIKI_PGSRC = pgsrc
 DEFAULT_WIKI_PGSRC = pgsrc
 ; untranslated pgsrc pages to always include
-DEFAULT_WIKI_PAGES = "ReleaseNotes:SandBox:PhpWiki:SteveWainstead"
+DEFAULT_WIKI_PAGES = "ReleaseNotes"
 
 ALLOWED_PROTOCOLS = "http|https|mailto|ftp|news|nntp|ssh|gopher"
 INLINE_IMAGES = "png|jpg|jpeg|gif"

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2011-01-26 17:48:29 UTC (rev 7913)
+++ trunk/config/config-dist.ini	2011-01-27 09:11:37 UTC (rev 7914)
@@ -960,7 +960,7 @@
 ;DEFAULT_WIKI_PGSRC = pgsrc
 
 ; These are ':'-seperated pages which will get loaded untranslated from DEFAULT_WIKI_PGSRC.
-;DEFAULT_WIKI_PAGES = "ReleaseNotes:SteveWainstead:TestPage"
+;DEFAULT_WIKI_PAGES = "ReleaseNotes"
 
 ;=========================================================================
 ; Part Five: Mark-up options.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8180] trunk/config

[<ru...@us...>]

Revision: 8180
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8180&view=rev
Author:   rurban
Date:     2011-11-07 16:50:45 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
make first-only the default. be conservative, as the tricky recursion may fail

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2011-11-04 10:38:38 UTC (rev 8179)
+++ trunk/config/config-default.ini	2011-11-07 16:50:45 UTC (rev 8180)
@@ -94,7 +94,7 @@
 ALLOW_USER_PASSWORDS = true
 USER_AUTH_ORDER = PersonalPage
 PASSWORD_LENGTH_MINIMUM = 0
-USER_AUTH_POLICY = stacked
+USER_AUTH_POLICY = first-only
 ENABLE_AUTH_OPENID = false
 ;LDAP_AUTH_HOST = "ldap://localhost:389"
 ;LDAP_BASE_DN = "ou=Users,o=Development,dc=mycompany.com"

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2011-11-04 10:38:38 UTC (rev 8179)
+++ trunk/config/config-dist.ini	2011-11-07 16:50:45 UTC (rev 8180)
@@ -659,10 +659,12 @@
 ;                       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
+;                       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.
-USER_AUTH_POLICY = stacked
+;                   Note: May result in crashes on endless recursion
+USER_AUTH_POLICY = first-only
 
 ; 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

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.