From c3851fffbbd1093a2dc078ede7b7eccaf143aa02 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Sun, 7 Jan 2007 18:41:23 +0000
Subject: [PATCH] Add USE_SEARCHHIGHLIGHT, EXTERNAL_HTML2PDF_PAGELIST,
 UPLOAD_FILE_PATH, UPLOAD_DATA_PATH

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@5433 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 config/config-default.ini |  6 ++++--
 config/config-dist.ini    | 20 ++++++++++++++++++--
 configurator.php          | 19 +++++++++++++++++--
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/config/config-default.ini b/config/config-default.ini
index 1144fdd41..98b86facd 100644
--- a/config/config-default.ini
+++ b/config/config-default.ini
@@ -1,4 +1,4 @@
-; $Id: config-default.ini,v 1.48 2007-01-03 21:30:49 rurban Exp $
+; $Id: config-default.ini,v 1.49 2007-01-07 18:41:23 rurban Exp $
 ; This is the default PhpWiki configuration for undefined config.ini entries.
 
 ; recent development and debugging features:
@@ -29,6 +29,7 @@ WYSIWYG_DEFAULT_PAGETYPE_HTML = false
 UPLOAD_USERDIR = true
 DISABLE_UNITS = false
 ; UNITS_EXE = /usr/bin/units
+USE_SEARCHHIGHLIGHT = false
 
 WIKI_NAME = PhpWiki
 ENABLE_REVERSE_DNS = true
@@ -162,13 +163,14 @@ DISABLE_GETIMAGESIZE = false
 ; FORTUNE_DIR = /usr/share/fortune
 ; GOOGLE_LICENSE_KEY = "..."
 ; DBADMIN_USER = 
-; DBADMIN_PASSWD = 
+; DBADMIN_PASSWD =
 BLOG_DEFAULT_EMPTY_PREFIX = true
 ; TOOLBAR_PAGELINK_PULLDOWN = *
 ; TOOLBAR_TEMPLATE_PULLDOWN = Template*
 
 ; External executables:
 ; USE_EXTERNAL_HTML2PDF = "htmldoc --quiet --format pdf14 --no-toc --no-title %s"
+EXTERNAL_HTML2PDF_PAGELIST = "htmldoc --quiet --webpage --format pdf14"
 BABYCART_PATH = /usr/local/bin/babycart
 ; GRAPHVIZ_EXE = /usr/local/bin/dot
 
diff --git a/config/config-dist.ini b/config/config-dist.ini
index 5d94c715e..e668d18f0 100644
--- a/config/config-dist.ini
+++ b/config/config-dist.ini
@@ -137,6 +137,13 @@
 ; Blog/day/time only. Convenience for a single-user blog theme.
 ;BLOG_DEFAULT_EMPTY_PREFIX = true
 
+; External Searchengine hits are detected automatically, and can be highlighted 
+; in the displayed page either with the SearchHighlight plugin, which is currently really ugly,
+; or by the experimental inline highlighter (default if DEBUG>0). This is not really stable.
+; It might break the appearance of the markup.
+; Default: false
+;USE_SEARCHHIGHLIGHT = true
+
 ;==========================================================================
 ; Part One: Authentication and security settings.
 ;
@@ -1081,6 +1088,11 @@ CHARSET = iso-8859-1
 ;/
 ;VIRTUAL_PATH = /SomeWiki
 
+; Override the default uploads dir. We have to define the local file path,
+; and the webpath (DATA_PATH). Ensure an ending slash on both. 
+;UPLOAD_FILE_PATH = /var/www/htdocs/uploads/
+;UPLOAD_DATA_PATH = /uploads/
+
 ; In case your system has no idea about /tmp, TEMP or TMPDIR, 
 ; better provide it here. E.g. needed for zipdumps.
 ;TEMP_DIR = /tmp
@@ -1177,11 +1189,15 @@ MINOR_EDIT_TIMEOUT = 604800
 ; http://www.google.com/apis/maps/signup.html
 ;GOOGLE_LICENSE_KEY = "..."
 
-; On action=pdf: If enabled don't use the internal fpdf library.
+; On action=pdf or format=pdf: If enabled don't use the internal fpdf library.
 ; External PDF executable, %s is the xhtml filename
-; 
 ;USE_EXTERNAL_HTML2PDF = "htmldoc --quiet --format pdf14 --no-toc --no-title %s"
 
+; On format=pdf with pagelist actionpages.
+; The multifile variant: book (with index and toc) or webpage format
+;EXTERNAL_HTML2PDF_PAGELIST = "htmldoc --quiet --book --format pdf14"
+EXTERNAL_HTML2PDF_PAGELIST = "htmldoc --quiet --webpage --format pdf14"
+
 ; Optional: SPAMASSASSIN wrapper. Only used if ENABLE_SPAMASSASSIN = true
 ; http://www.cynistar.net/~apthorpe/code/babycart/babycart.html
 BABYCART_PATH = /usr/local/bin/babycart
diff --git a/configurator.php b/configurator.php
index 3deb29362..5b2547e98 100644
--- a/configurator.php
+++ b/configurator.php
@@ -1,4 +1,4 @@
-<?php // $Id: configurator.php,v 1.47 2007-01-04 16:56:26 rurban Exp $
+<?php // -*-php-*- $Id: configurator.php,v 1.48 2007-01-07 18:41:23 rurban Exp $
 /*
  * Copyright 2002,2003,2005 $ThePhpWikiProgrammingTeam
  * Copyright 2002 Martin Geisler <gimpster@gimpster.com> 
@@ -162,7 +162,7 @@ echo '<','?xml version="1.0" encoding="iso-8859-1"?',">\n";
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<!-- $Id: configurator.php,v 1.47 2007-01-04 16:56:26 rurban Exp $ -->
+<!-- $Id: configurator.php,v 1.48 2007-01-07 18:41:23 rurban Exp $ -->
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <title>Configuration tool for PhpWiki <?php echo $config_file ?></title>
 <style type="text/css" media="screen">
@@ -424,6 +424,8 @@ new boolean_define_commented_optional('USE_SAFE_DBSESSION');
 $properties["BLOG_DEFAULT_EMPTY_PREFIX"] =
 new boolean_define_commented_optional('BLOG_DEFAULT_EMPTY_PREFIX');
 
+$properties["USE_SEARCHHIGHLIGHT"] =
+new boolean_define_commented_optional('USE_SEARCHHIGHLIGHT');
 
 $properties["Part One"] =
 new part('_part1', $SEPARATOR."\n", "
@@ -1585,6 +1587,8 @@ $properties["FORTUNE_DIR"] =
   new _define_commented_optional('FORTUNE_DIR', "/usr/share/fortune");
 $properties["USE_EXTERNAL_HTML2PDF"] =
     new _define_commented_optional('USE_EXTERNAL_HTML2PDF', "htmldoc --quiet --format pdf14 --no-toc --no-title %s");
+$properties["EXTERNAL_HTML2PDF_PAGELIST"] =
+    new _define_commented_optional('EXTERNAL_HTML2PDF_PAGELIST');
 $properties["BABYCART_PATH"] =
     new _define_commented_optional('BABYCART_PATH', "/usr/local/bin/babycart");
 $properties["GOOGLE_LICENSE_KEY"] =
@@ -1593,6 +1597,17 @@ $properties["RATEIT_IMGPREFIX"] =
     new _define_commented_optional('RATEIT_IMGPREFIX'); //BStar
 $properties["GRAPHVIZ_EXE"] =
     new _define_commented_optional('GRAPHVIZ_EXE'); // /usr/local/bin/dot
+
+if (PHP_OS == "Darwin") // Mac OS X
+    $ttfont   = "/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts/LucidaSansRegular.ttf";
+elseif (isWindows()) {
+    $ttfont = $_ENV['windir'].'\Fonts\Arial.ttf';
+} else {
+    $ttfont = 'luximr'; // This is the only what sourceforge offered.
+    //$ttfont = 'Helvetica';
+}
+$properties["TTFONT"] =
+    new _define_commented_optional('TTFONT',$ttfont);
 $properties["VISUALWIKIFONT"] =
     new _define_commented_optional('VISUALWIKIFONT'); // Arial
 $properties["VISUALWIKI_ALLOWOPTIONS"] =
-- 
2.45.0