From 9ea0e0388890f3cd5580498fcf1e0d824294bc72 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Tue, 30 Nov 2004 09:51:35 +0000
Subject: [PATCH] changed KEYWORDS from pageprefix to search term. added
 installer detection.

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4216 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 config/config-default.ini | 13 +++----
 config/config-dist.ini    | 78 +++++++++++++++++++--------------------
 lib/IniConfig.php         | 50 ++++++++++++++++---------
 lib/display.php           | 13 +++++--
 4 files changed, 85 insertions(+), 69 deletions(-)

diff --git a/config/config-default.ini b/config/config-default.ini
index 507684ab5..d1581f025 100644
--- a/config/config-default.ini
+++ b/config/config-default.ini
@@ -1,4 +1,4 @@
-; $Id: config-default.ini,v 1.21 2004-11-11 10:31:26 rurban Exp $
+; $Id: config-default.ini,v 1.22 2004-11-30 09:51:35 rurban Exp $
 ; This is the default PhpWiki configuration for undefined config.ini entries.
 
 ; recent development and debugging features:
@@ -6,7 +6,7 @@ DEBUG = 0
 ENABLE_USER_NEW = true
 ENABLE_PAGEPERM = true
 ENABLE_EDIT_TOOLBAR = true
-JS_SEARCHREPLACE = false
+JS_SEARCHREPLACE = true
 ENABLE_DOUBLECLICKEDIT = true
 ENABLE_XHTML_XML = false
 USECACHE = true
@@ -26,15 +26,15 @@ HTML_DUMP_SUFFIX = .html
 MAX_UPLOAD_SIZE = 16777216
 MINOR_EDIT_TIMEOUT = 604800
 ; DISABLED_ACTIONS = "dumpserial : loadfile"
+ENABLE_MODERATEDPAGE_ALL = false
 ACCESS_LOG = ""
 ACCESS_LOG_SQL = 0
 ; COMPRESS_OUTPUT = true
 CACHE_CONTROL = LOOSE
 CACHE_CONTROL_MAX_AGE = 600
-; WIKIDB_NOCACHE_MARKUP = true
 DATABASE_TYPE = dba
-; DATABASE_PREFIX = ""
-; DATABASE_SESSION_TABLE = session
+DATABASE_PREFIX = ""
+DATABASE_SESSION_TABLE = session
 DATABASE_DIRECTORY = /tmp
 DATABASE_DBA_HANDLER = gdbm
 DATABASE_TIMEOUT = 5
@@ -101,8 +101,7 @@ WIKI_NAME_REGEXP = "(?<![[:alnum:]])(?:[[:upper:]][[:lower:]]+){2,}(?![[:alnum:]
 SUBPAGE_SEPARATOR = "/"
 INTERWIKI_MAP_FILE = lib/interwiki.map
 WARN_NONPUBLIC_INTERWIKIMAP = false
-KEYWORDS = "Category:Topic"
-; KEYWORD_LINK_REGEXP = "(?<=^\'. join(\'|^\', $keywords) . \')[[:upper:]].*$"
+KEYWORDS = "Category* OR Topic*"
 TOC_FULL_SYNTAX = true
 COPYRIGHTPAGE_TITLE = "GNU General Public License"
 COPYRIGHTPAGE_URL = "http://www.gnu.org/copyleft/gpl.html#SEC1"
diff --git a/config/config-dist.ini b/config/config-dist.ini
index 8e1f6041e..79fe14f91 100644
--- a/config/config-dist.ini
+++ b/config/config-dist.ini
@@ -2,10 +2,11 @@
 ; Note that seartain characters are used as comment char and therefore 
 ; these entries must be in double-quotes. Such as ":", ";", "," and "|"
 ;
-; This file is divided into seven parts: Parts Zero, One, Two, Three,
-; Four, Five and Six. Each one has different configuration settings you can
+; This file is divided into eight parts. 
+; Each one has different configuration settings you can
 ; change; in all cases the default should work on your system,
 ; however, we recommend you tailor things to your particular setting.
+; Here undefined definitions get defined by config-default.ini settings.
 
 ;=========================================================================
 ; Part Zero: Latest Development and Tricky Options
@@ -61,12 +62,6 @@
 ; Default: true
 ;USECACHE = false
 
-; Don't store the rendered HTML version of the page in the DB (gzipped).
-; to avoid unnecessary rendering on unchanged pages.
-; Enable only for old php's with low memory or memory_limit=8MB.
-; Default: false
-;WIKIDB_NOCACHE_MARKUP = 1
-
 ;==========================================================================
 ; Part One: Authentication and security settings.
 ;
@@ -171,6 +166,11 @@ MINOR_EDIT_TIMEOUT = 604800
 ; getActionDescription.
 ; DISABLED_ACTIONS = "dumpserial : loadfile"
 
+; If you enable this option every page is moderated by the ModeratedPage
+; action page plugin. Changing a moderated page will be delayed to be 
+; granted by a moderator by email.
+; ENABLE_MODERATEDPAGE_ALL = true
+
 ; PhpWiki can generate an access_log (in "NCSA combined log" format)
 ; for you. If you want one, define this to the name of the log
 ; file. The server must have write access to the directory specified.
@@ -192,8 +192,8 @@ MINOR_EDIT_TIMEOUT = 604800
 ; fashion.
 ; Leave it undefined to leave the choice up to PhpWiki.
 ;
-; WARNING: Compressing the output has been reported to cause serious problems
-; when PHP is running as a CGI or on MacOSX.
+; WARNING: Compressing the output has been reported to cause problems
+; when PHP is running on MacOSX or on redirected requests.
 ; This setting should now be correctly determined automatically.
 ;COMPRESS_OUTPUT = false
 
@@ -245,17 +245,16 @@ CACHE_CONTROL_MAX_AGE = 600
 ; PhpWiki normally caches a preparsed version (i.e. mostly
 ; converted to HTML) of the most recent version of each page.
 ; (Parsing the wiki-markup takes a fair amount of CPU.)
-;
 ; Define WIKIDB_NOCACHE_MARKUP to true to disable the
 ; caching of marked-up page content.
-;
 ; Note that you can also disable markup caching on a per-page
 ; temporary basis by addinging a query arg of '?nocache=1'
-; to the URL to the page.  (Use '?nocache=purge' to completely
-; discard the cached version of the page.)
-;
+; to the URL to the page or by adding a NoCache plugin line. 
+; Use '?nocache=purge' to completely discard the cached version of the page.
 ; You can also purge the cached markup globally by using the
 ; "Purge Markup Cache" button on the PhpWikiAdministration page.
+; Enable only for old php's with low memory or memory_limit=8MB.
+; Default: false
 ;WIKIDB_NOCACHE_MARKUP = true
 
 COOKIE_EXPIRATION_DAYS = 365
@@ -666,8 +665,8 @@ DBAUTH_AUTH_CRYPT_METHOD = plain
 ;   DBAUTH_GROUP_MEMBERS = "SELECT DISTINCT userid FROM member WHERE groupname='$groupname'"
 ;   DBAUTH_USER_GROUPS = "SELECT groupname FROM member WHERE userid='$userid'"
 
-; A interim page which gets displayed on every edit attempt
-EDITING_POLICY = EditingPolicy
+; A interim page which gets displayed on every edit attempt, if it exists.
+;EDITING_POLICY = EditingPolicy
 
 ;========================================================================
 ; Part Four: Page appearance and layout
@@ -739,15 +738,15 @@ DEFAULT_LANGUAGE = en
 ; accessed for the first time (or after clearing the database.)
 ; WIKI_PGSRC can either name a directory or a zip file. In either case
 ; WIKI_PGSRC is scanned for files -- one file per page.
-WIKI_PGSRC = pgsrc
+;WIKI_PGSRC = pgsrc
 
 ; DEFAULT_WIKI_PGSRC is only used when the language is *not* the
 ; default (English) and when reading from a directory: in that case
 ; some English pages are inserted into the wiki as well.
 ; DEFAULT_WIKI_PGSRC defines where the English pages reside.
-DEFAULT_WIKI_PGSRC = pgsrc
-; These are the pages which will get loaded from DEFAULT_WIKI_PGSRC.
-DEFAULT_WIKI_PAGES = "ReleaseNotes:SteveWainstead:TestPage"
+;DEFAULT_WIKI_PGSRC = pgsrc
+; These are ':'-seperated pages which will get loaded untranslated from DEFAULT_WIKI_PGSRC.
+;DEFAULT_WIKI_PAGES = "ReleaseNotes:SteveWainstead:TestPage"
 
 ;=========================================================================
 ; Part Five: Mark-up options.
@@ -758,18 +757,18 @@ DEFAULT_WIKI_PAGES = "ReleaseNotes:SteveWainstead:TestPage"
 ; within a named link [name|uri] one more protocol is defined: phpwiki
 ; Separate each of the protocol names with a vertical pipe, and ensure there
 ; is no extraneous whitespace.
-ALLOWED_PROTOCOLS = "http|https|mailto|ftp|news|nntp|ssh|gopher"
+;ALLOWED_PROTOCOLS = "http|https|mailto|ftp|news|nntp|ssh|gopher"
 
 ; URLs ending with the following extension should be inlined as images.
 ; Specify as per ALLOWED_PROTOCOLS
-INLINE_IMAGES = "png|jpg|gif"
+;INLINE_IMAGES = "png|jpg|gif"
 
 ; Perl regexp for WikiNames ("bumpy words")
 ; (?<!..) & (?!...) used instead of '\b' because \b matches '_' as well
-WIKI_NAME_REGEXP = "(?<![[:alnum:]])(?:[[:upper:]][[:lower:]]+){2,}(?![[:alnum:]])"
+;WIKI_NAME_REGEXP = "(?<![[:alnum:]])(?:[[:upper:]][[:lower:]]+){2,}(?![[:alnum:]])"
 
 ; Defaults to '/', but '.' was also used.
-SUBPAGE_SEPARATOR = /
+;SUBPAGE_SEPARATOR = /
 
 ; InterWiki linking -- wiki-style links to other wikis on the web
 ;
@@ -777,22 +776,21 @@ SUBPAGE_SEPARATOR = /
 ; If that page is not found (or is not locked), or map
 ; data can not be found in it, then the file specified
 ; by INTERWIKI_MAP_FILE (if any) will be used.
-INTERWIKI_MAP_FILE = lib/interwiki.map
+;INTERWIKI_MAP_FILE = lib/interwiki.map
 
 ; Display a warning if the internal lib/interwiki.map is used, and 
 ; not the public InterWikiMap page. This file is not readable from outside.
-WARN_NONPUBLIC_INTERWIKIMAP = false
+;WARN_NONPUBLIC_INTERWIKIMAP = false
 
-; Regexp used for automatic keyword extraction.
+; Search term used for automatic page classification by keyword extraction.
 ;
-; Any links on a page to pages whose names match this regexp will
-; be used keywords in the keywords meta tag.  (This is an aid to
-; classification by search engines.)  The value of the match is
+; Any links on a page to pages whose names match this search 
+; will be used keywords in the keywords html meta tag. This is an aid to
+; classification by search engines. The value of the match is
 ; used as the keyword.
 ;
-; The default behavior is to match Category* and Topic* links.
-KEYWORDS = "Category:Topic"
-; KEYWORD_LINK_REGEXP = "(?<=^\'. join(\'|^\', $keywords) . \')[[:upper:]].*$"
+; The default behavior is to match Category* or Topic* links.
+;KEYWORDS = "Category* OR Topic*"
 
 ; Author and Copyright Site Navigation Links
 ;
@@ -802,23 +800,23 @@ KEYWORDS = "Category:Topic"
 ;
 ; If you have your own copyright and contact information pages change
 ; these as appropriate.
-COPYRIGHTPAGE_TITLE = "GNU General Public License"
-COPYRIGHTPAGE_URL = "http://www.gnu.org/copyleft/gpl.html#SEC1"
+;COPYRIGHTPAGE_TITLE = "GNU General Public License"
+;COPYRIGHTPAGE_URL = "http://www.gnu.org/copyleft/gpl.html#SEC1"
 ; Other useful alternatives to consider:
 ; COPYRIGHTPAGE_TITLE = "GNU Free Documentation License"
 ; COPYRIGHTPAGE_URL = "http://www.gnu.org/copyleft/fdl.html"
 ; COPYRIGHTPAGE_TITLE = "Creative Commons License 2.0"
 ; COPYRIGHTPAGE_URL = "http://creativecommons.org/licenses/by/2.0/"
 ;  see http://creativecommons.org/learn/licenses/ for variations
-AUTHORPAGE_TITLE = The PhpWiki Programming Team
-AUTHORPAGE_URL = http://phpwiki.org/ThePhpWikiProgrammingTeam
+;AUTHORPAGE_TITLE = The PhpWiki Programming Team
+;AUTHORPAGE_URL = http://phpwiki.org/ThePhpWikiProgrammingTeam
 
 ; Allow full markup in headers to be parsed by the CreateToc plugin.
 ;
 ; If false you may not use WikiWords or [] links or any other markup in 
 ; headers in pages with the CreateToc plugin. But if false the parsing is 
 ; faster and more stable.
-TOC_FULL_SYNTAX = true
+;TOC_FULL_SYNTAX = true
 
 ;==========================================================================
 ; Part Six: URL options.
@@ -954,7 +952,7 @@ TOC_FULL_SYNTAX = true
 ;USE_EXTERNAL_HTML2PDF = "htmldoc --quiet --format pdf14 --no-toc --no-title %s"
 
 ;===========================================================================
-; PLUGINCACHED Pear/Cache Settings: (moved from lib/plugincache-config.php)
+; Part Eight: PLUGINCACHED Pear/Cache Settings
 ;===========================================================================
 
 ; Cache_Container storage class: 'file' is the fastest. See pear/Cache/Container/
diff --git a/lib/IniConfig.php b/lib/IniConfig.php
index 0f2ce033f..c2a3ffebe 100644
--- a/lib/IniConfig.php
+++ b/lib/IniConfig.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: IniConfig.php,v 1.66 2004-11-17 17:23:12 rurban Exp $');
+rcs_id('$Id: IniConfig.php,v 1.67 2004-11-30 09:51:35 rurban Exp $');
 
 /**
  * A configurator intended to read it's config from a PHP-style INI file,
@@ -63,6 +63,13 @@ rcs_id('$Id: IniConfig.php,v 1.66 2004-11-17 17:23:12 rurban Exp $');
 include_once (dirname(__FILE__)."/config.php");
 include_once (dirname(__FILE__)."/FileFinder.php");
 
+/**
+ * Speed-up iniconfig loading.
+ *
+ * Dump the static parts of the parsed config/config.ini settings to a fast-loadable config.php file.
+ * The dynamic parts are then evaluated as before.
+ * Requires write-permissions to config/config.php
+ */
 function save_dump($file) {
     $vars =& $GLOBALS; // copy + unset not possible
     $ignore = array();
@@ -92,6 +99,7 @@ function save_dump($file) {
 }
 
 function IniConfig($file) {
+
     // check config/config.php dump for faster startup
     $dump = substr($file, 0, -3)."php";
     if (isWindows($dump)) $dump = str_replace("/","\\",$dump);
@@ -103,6 +111,14 @@ function IniConfig($file) {
         }
     }
 
+    if (!file_exists($file)) {
+        // first-time installer detection here...
+        // similar to SetupWiki()
+        include(dirname(__FILE__)."/install.php");
+        trigger_error("Datasource file '$file' does not exist", E_USER_ERROR);
+        exit();
+    }
+
     // List of all valid config options to be define()d which take "values" (not
     // booleans). Needs to be categorised, and generally made a lot tidier. 
     $_IC_VALID_VALUE = array
@@ -115,7 +131,7 @@ function IniConfig($file) {
          'GROUP_METHOD',
          'EDITING_POLICY', 'THEME', 'CHARSET',
          'DEFAULT_LANGUAGE', 'WIKI_PGSRC', 'DEFAULT_WIKI_PGSRC',
-         'ALLOWED_PROTOCOLS', 'INLINE_IMAGES', 'SUBPAGE_SEPARATOR',
+         'ALLOWED_PROTOCOLS', 'INLINE_IMAGES', 'SUBPAGE_SEPARATOR', /*'KEYWORDS',*/
          // extra logic:
          //'DATABASE_PREFIX', 'DATABASE_DSN', 'DATABASE_TYPE', 'DATABASE_DBHANDLER',
          'INTERWIKI_MAP_FILE', 'COPYRIGHTPAGE_TITLE', 'COPYRIGHTPAGE_URL',
@@ -160,11 +176,6 @@ function IniConfig($file) {
          'PLUGIN_CACHED_USECACHE', 'PLUGIN_CACHED_FORCE_SYNCMAP',
          );
 
-    if(!file_exists($file)){
-        trigger_error("Datasource file '$file' does not exist", E_USER_ERROR);
-        exit();
-    }
-         
     $rs = @parse_ini_file($file);
     $rsdef = @parse_ini_file(dirname(__FILE__)."/../config/config-default.ini");
     foreach ($rsdef as $k => $v) {
@@ -390,19 +401,19 @@ function IniConfig($file) {
     if (!trim($WikiNameRegexp))
        $WikiNameRegexp = '(?<![[:alnum:]])(?:[[:upper:]][[:lower:]]+){2,}(?![[:alnum:]])';
 
-    // Another "too-tricky" redefine
-    global $KeywordLinkRegexp;
+    // got rid of global $KeywordLinkRegexp by using a TextSearchQuery instead of "Category:Topic"
     if (!isset($rs['KEYWORDS'])) $rs['KEYWORDS'] = @$rsdef['KEYWORDS'];
-    if (!isset($rs['KEYWORDS'])) $rs['KEYWORDS'] = "Category:Topic";
-    $keywords = preg_split('/\s*:\s*/', $rs['KEYWORDS']);
-    if (empty($keywords)) $keywords = array("Category","Topic");
-    $KeywordLinkRegexp = '(?<=' . implode('|^', $keywords) . ')[[:upper:]].*$';
+    if (!isset($rs['KEYWORDS'])) $rs['KEYWORDS'] = "Category* OR Topic*";
+    if ($rs['KEYWORDS'] == 'Category:Topic') $rs['KEYWORDS'] = "Category* OR Topic*";
+    if (!defined('KEYWORDS')) define('KEYWORDS', $rs['KEYWORDS']);
+    //if (empty($keywords)) $keywords = array("Category","Topic");
+    //$KeywordLinkRegexp = '(?<=' . implode('|^', $keywords) . ')[[:upper:]].*$';
 
     // TODO: can this be a constant?
     global $DisabledActions;
-    if (!array_key_exists('DISABLED_ACTIONS',$rs) and array_key_exists('DISABLED_ACTIONS',$rsdef))
+    if (!array_key_exists('DISABLED_ACTIONS', $rs) and array_key_exists('DISABLED_ACTIONS', $rsdef))
         $rs['DISABLED_ACTIONS'] = @$rsdef['DISABLED_ACTIONS'];
-    if (array_key_exists('DISABLED_ACTIONS',$rs))
+    if (array_key_exists('DISABLED_ACTIONS', $rs))
         $DisabledActions = preg_split('/\s*:\s*/', $rs['DISABLED_ACTIONS']);
 
     global $PLUGIN_CACHED_IMGTYPES;
@@ -520,18 +531,18 @@ function fixup_static_configs() {
 
     // check whether the crypt() function is needed and present
     if (defined('ENCRYPTED_PASSWD') && !function_exists('crypt')) {
-        $error = sprintf(_("Encrypted passwords cannot be used: %s."),
+        $error = sprintf("Encrypted passwords cannot be used: %s.",
                          "'function crypt()' not available in this version of php");
         trigger_error($error);
     }
 
     if (!defined('ADMIN_PASSWD') or ADMIN_PASSWD == '')
-        trigger_error(_("The admin password cannot be empty. Please update your config/config.ini"));
+        trigger_error("The admin password cannot be empty. Please update your config/config.ini");
 
     if (defined('USE_DB_SESSION') and USE_DB_SESSION) {
         if (! $DBParams['db_session_table'] ) {
             $DBParams['db_session_table'] = @$DBParams['prefix'] . 'session';
-            trigger_error(sprintf(_("DATABASE_SESSION_TABLE configuration set to %s."), 
+            trigger_error(sprintf("DATABASE_SESSION_TABLE configuration set to %s.", 
                                   $DBParams['db_session_table']),
                           E_USER_ERROR);
         }
@@ -750,6 +761,9 @@ function fixup_dynamic_configs() {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.66  2004/11/17 17:23:12  rurban
+// fixed chdir back from locale
+//
 // Revision 1.65  2004/11/11 10:31:26  rurban
 // Disable default options in config-dist.ini
 // Add new CATEGORY_GROUP_PAGE root page: Default: Translation of "CategoryGroup"
diff --git a/lib/display.php b/lib/display.php
index aa14f8188..9d5082213 100644
--- a/lib/display.php
+++ b/lib/display.php
@@ -1,6 +1,6 @@
 <?php
 // display.php: fetch page or get default content
-rcs_id('$Id: display.php,v 1.61 2004-11-21 11:59:19 rurban Exp $');
+rcs_id('$Id: display.php,v 1.62 2004-11-30 09:51:35 rurban Exp $');
 
 require_once('lib/Template.php');
 
@@ -8,12 +8,14 @@ require_once('lib/Template.php');
  * Extract keywords from Category* links on page. 
  */
 function GleanKeywords ($page) {
-    global $KeywordLinkRegexp;
-
+    if (!defined('KEYWORDS')) return '';
+    include_once("lib/TextSearchQuery.php");
+    $search = new TextSearchQuery(KEYWORDS, true);
+    $KeywordLinkRegexp = $search->asRegexp();
     $links = $page->getPageLinks();
     $keywords[] = SplitPagename($page->getName());
     while ($link = $links->next()) {
-        if (preg_match("/${KeywordLinkRegexp}/x", $link->getName(), $m))
+        if (preg_match($KeywordLinkRegexp, $link->getName(), $m))
             $keywords[] = SplitPagename($m[0]);
     }
     $keywords[] = WIKI_NAME;
@@ -219,6 +221,9 @@ function displayPage(&$request, $template=false) {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.61  2004/11/21 11:59:19  rurban
+// remove final \n to be ob_cache independent
+//
 // Revision 1.60  2004/11/19 19:22:03  rurban
 // ModeratePage part1: change status
 //
-- 
2.45.0