Fixed bug redeclaring gettext functions. Edit KusabaX config before including it.

This commit is contained in:
Michael Save 2012-03-15 18:42:17 +11:00
parent 9fab9253a3
commit f3d784de51

View File

@ -6,6 +6,7 @@
/* Config */ /* Config */
// Path to KusabaX configuration file (config.php) // Path to KusabaX configuration file (config.php)
// Warning: This script will ignore anything past the first `require`. This is only a problem if you've extensively modified your config.php
$kusabaxc['config'] = ''; $kusabaxc['config'] = '';
/* End config */ /* End config */
@ -20,8 +21,25 @@
if(!isset($kusabaxc['config']) || empty($kusabaxc['config'])) if(!isset($kusabaxc['config']) || empty($kusabaxc['config']))
error('Did you forget to configure the script?'); error('Did you forget to configure the script?');
if(!file_exists($kusabaxc['config']) || !is_readable($kusabaxc['config']))
error('Kusaba X config file doesn\'t exist or I can\'t read it.');
$temp = tempnam($config['tmp'], 'kusabax');
$raw_config = file_get_contents($kusabaxc['config']);
// replace __FILE__ with the actual filename
$raw_config = str_replace('__FILE__', '\'' . addslashes(realpath($kusabaxc['config'])) . '\'', $raw_config);
// remove anything after the first `require`
$raw_config = substr($raw_config, 0, strpos($raw_config, 'require KU_ROOTDIR'));
file_put_contents($temp, $raw_config);
// Load KusabaX config // Load KusabaX config
require $kusabaxc['config']; require $temp;
unlink($temp);
if(KU_DBTYPE != 'mysql' && KU_DBTYPE != 'mysqli') if(KU_DBTYPE != 'mysql' && KU_DBTYPE != 'mysqli')
error('Database type <strong>' . KU_DBTYPE . '</strong> not supported!'); error('Database type <strong>' . KU_DBTYPE . '</strong> not supported!');