Update of /cvsroot/phpwiki/phpwiki/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16256
Modified Files:
config-default.ini config-dist.ini
Log Message:
update configs
Index: config-default.ini
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/config/config-default.ini,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -2 -b -p -d -r1.28 -r1.29
--- config-default.ini 25 Jan 2005 06:47:04 -0000 1.28
+++ config-default.ini 26 Feb 2005 18:27:46 -0000 1.29
@@ -13,5 +13,7 @@ USECACHE = true
WIKIDB_NOCACHE_MARKUP = false
ENABLE_SPAMASSASSIN = false
+ENABLE_LIVESEARCH = false
GOOGLE_LINKS_NOFOLLOW = true
+USE_SAFE_DBSESSION = false
WIKI_NAME = PhpWiki
@@ -98,5 +100,5 @@ ALLOW_IMAP_LOGIN = false
THEME = default
-; DEFAULT_LANGUAGE = en
+; DEFAULT_LANGUAGE =
CHARSET = iso-8859-1
WIKI_PGSRC = pgsrc
Index: config-dist.ini
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/config/config-dist.ini,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -2 -b -p -d -r1.40 -r1.41
--- config-dist.ini 31 Jan 2005 23:05:58 -0000 1.40
+++ config-dist.ini 26 Feb 2005 18:27:47 -0000 1.41
@@ -44,10 +44,10 @@
;ENABLE_PAGEPERM = false
-; Experimental new edit feature. Default: true
-; Reportedly broken on MacOSX Safari, and with application/xhtml+xml
+; Graphical buttons on edit. Default: true
+; Reportedly broken on MacOSX Safari
;ENABLE_EDIT_TOOLBAR = false
; Adds two additional buttons in EDIT_TOOLBAR, Search&Replace and Undo
-; Currently broken. Default: false
+; Default: true
;JS_SEARCHREPLACE = true
@@ -55,7 +55,6 @@
;ENABLE_DOUBLECLICKEDIT = false
-; Experimental. Conflicts with ENABLE_EDIT_TOOLBAR and Signin Button
-; document.write() javascript. Needed for inlined SVG and MathML.
-; Default: false
+; Needed for inlined SVG and MathM, but may conflict with document.write().
+; Experimental. Default: false
;ENABLE_XHTML_XML = true
@@ -74,4 +73,14 @@
;GOOGLE_LINKS_NOFOLLOW = false
+; LiveSearch enables immediate title search results via XMLHttpRequest.
+; Displays the results in a dropdown under the titlesearch inputbox
+; while typing. (experimental, only with certain themes)
+; You'll have to copy livesearch.js from http://blog.bitflux.ch/wiki/LiveSearch
+; to themes/default/ and define ENABLE_LIVESEARCH in config.ini to true.
+; See themes/blog/themeinfo.php.
+; Currently we use the bitflux.ch library, but we will change to
+; the russian acdropdown soon.
http://momche.net/publish/article.php?page=acdropdown
+;ENABLE_LIVESEARCH = true
+
;==========================================================================
; Part One: Authentication and security settings.
@@ -195,5 +204,5 @@ MINOR_EDIT_TIMEOUT = 604800
; If flag 2 is set, phpwiki also writes. (Default on SQL or ADODB)
; This must use DATABASE_TYPE = SQL or ADODB
-;ACCESS_LOG_SQL = 1 ; read
+;ACCESS_LOG_SQL = 1 ; phpwiki reads, apache mod_log_sql writes
;ACCESS_LOG_SQL = 2 ; read + write
@@ -765,9 +774,8 @@ CHARSET = iso-8859-1
; Chinese "zh" (Chinese - ?)
;
-; If you set DEFAULT_LANGUAGE to the empty string, your system's
-; default language (as determined by the applicable environment
-; variables) will be used.
-; Japanese requires CHARSET=euc-jp or utf-8, Chinese CHARSET=utf-8
-DEFAULT_LANGUAGE = en
+; 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
+;DEFAULT_LANGUAGE = en
; WIKI_PGSRC -- specifies the source for the initial page contents of
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
|