Update of /cvsroot/phpwiki/phpwiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2488
Modified Files:
configurator.php
Log Message:
configurator recursion fixes, dont print temp _dsn vars
Index: configurator.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/configurator.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -2 -b -p -d -r1.32 -r1.33
--- configurator.php 6 Mar 2005 11:05:45 -0000 1.32
+++ configurator.php 27 Mar 2005 20:36:16 -0000 1.33
@@ -37,4 +37,7 @@
*
* 1.3.11 TODO: (or 1.3.12?)
+ * o parse_ini_file("config-default.ini") for the commented vars
+ * o check automatically for commented and optional vars
+ * o mixin class for commented
* o fix SQL quotes, AUTH_ORDER quotes and file forward slashes
* o posted values validation, extend js validation for sane DB values
@@ -62,5 +65,5 @@ $tdwidth = 700;
$config_file = (substr(PHP_OS,0,3) == 'WIN') ? 'config\\config.ini' : 'config/config.ini';
$fs_config_file = dirname(__FILE__) . (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/') . $config_file;
-if (isset($HTTP_POST_VARS['create'])) header('Location: '.$configurator.'?create=1#create');
+if (isset($HTTP_POST_VARS['create'])) header('Location: '.$configurator.'?show=_part1&create=1#create');
// helpers from lib/WikiUser/HttpAuth.php
@@ -1830,4 +1833,5 @@ class _variable {
function _config_format($value) {
+ return '';
$v = $this->get_config_item_name();
// handle arrays: a|b --> a['b']
@@ -2110,5 +2114,6 @@ extends _define {
$this->_define($config_item_name, $default_value, $description, $jscheck);
if (!$jscheck)
- $this->jscheck = "onchange=\"validate_ereg('Sorry, \'%s\' cannot be empty.', '^.+$', '" . $this->get_config_item_name() . "', this);\"";
+ $this->jscheck = "onchange=\"validate_ereg('Sorry, \'%s\' cannot be empty.', '^.+$', '"
+ . $this->get_config_item_name() . "', this);\"";
}
function _get_config_line($posted_value) {
|
