From: Reini U. <ru...@us...> - 2005-03-06 11:05:58
|
Update of /cvsroot/phpwiki/phpwiki In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24739 Modified Files: configurator.php Log Message: USE_PATH_INFO as _define_selection_optional_commented, exp warning Index: configurator.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/configurator.php,v retrieving revision 1.31 retrieving revision 1.32 diff -u -2 -b -p -d -r1.31 -r1.32 --- configurator.php 28 Feb 2005 20:02:26 -0000 1.31 +++ configurator.php 6 Mar 2005 11:05:45 -0000 1.32 @@ -29,5 +29,5 @@ * DONE: * o Initial expand ?show=_part1 (the part id) - * o read config-default.ini + * o read config-default.ini and use this as default_values * o commented / optional: non-default values should not be commented! * default values if optional can be omitted. @@ -160,4 +160,5 @@ pre { font-size: 120%; } td { border: thin solid black } tr { border: none } +div.hint { border: thin solid red, background-color: #eeeeee; } tr.hidden { border: none; display: none; } td.part { background-color: #eeeeee; color: inherit; } @@ -252,4 +253,9 @@ function do_init() { <h1>Configuration for PhpWiki <?php echo $config_file ?></h1> +<div class="hint"> + Using this configurator.php is experimental!<br> + On any configuration problems, please edit the resulting config.ini manually. +</div> + <?php //define('DEBUG', 1); @@ -1583,6 +1589,7 @@ resides."); $properties["Use PATH_INFO"] = -new boolean_define_commented_optional('USE_PATH_INFO', - array('true' => 'use PATH_INFO', +new _define_selection_optional_commented('USE_PATH_INFO', + array('' => 'automatic', + 'true' => 'use PATH_INFO', 'false' => 'do not use PATH_INFO'), " PhpWiki will try to use short urls to pages, eg @@ -2083,4 +2090,18 @@ class _variable_selection_optional extends _variable_selection { } +class _define_selection_optional_commented +extends _define_selection_optional { + function _get_config_line($posted_value) { + if ($this->description) + $n = "\n"; + if ($posted_value == $this->default_value) + return "${n};" . $this->_config_format($posted_value); + elseif ($posted_value == '') + return "${n};" . $this->_config_format(""); + else + return "${n}" . $this->_config_format($posted_value); + } +} + class _define_password extends _define { |