diff --git a/inc/.gitignore b/inc/.gitignore deleted file mode 100644 index 7e9e3af..0000000 --- a/inc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -config.inc.php diff --git a/inc/config.default.inc.php b/inc/config.inc.php similarity index 97% rename from inc/config.default.inc.php rename to inc/config.inc.php index 9b9106d..630a073 100644 --- a/inc/config.default.inc.php +++ b/inc/config.inc.php @@ -2,7 +2,7 @@ /** * (c) 2009 BeCast * ------------------------------------- - * Filename: config.defult.inc.php + * Filename: config.default.inc.php * Purpose: Configuration * CVS Header: $Header$ * diff --git a/install/install.php b/install/install.php index 8ad8862..ddcc486 100755 --- a/install/install.php +++ b/install/install.php @@ -498,8 +498,8 @@ $config[\'prefix\']=\''.$prefix.'\'; // your Database Sytem $config[\'db_class\']= \''.$driver.'\'; ?>'; - include dirname(dirname(__FILE__)).'/inc/logger.class.php'; - include dirname(dirname(__FILE__)).'/core/database/'.$driver.'.class.php'; + include dirname(__FILE__, 2) .'/inc/logger.class.php'; + include dirname(__FILE__, 2) .'/core/database/'.$driver.'.class.php'; try{ $db = new db($server, $user, $pass, $db,'utf8', FALSE,TRUE); $result=$db->query("SHOW TABLES"); @@ -507,7 +507,7 @@ $config[\'db_class\']= \''.$driver.'\'; $error=true; } if(!$error){ - $datei = fopen(dirname(dirname(__FILE__)).'/config.tmp.php','w'); + $datei = fopen(dirname(__FILE__, 2) .'/config.tmp.php','w'); fputs($datei,$configdata); fclose($datei); $locked=''; @@ -517,9 +517,9 @@ $config[\'db_class\']= \''.$driver.'\'; } } if(isset($_POST['send'])){ - include dirname(dirname(__FILE__)).'/inc/logger.class.php'; - include dirname(dirname(__FILE__)).'/config.tmp.php'; - include dirname(dirname(__FILE__)).'/core/database/'.$config['db_class'].'.class.php'; + include dirname(__FILE__, 2) .'/inc/logger.class.php'; + include dirname(__FILE__, 2) .'/config.tmp.php'; + include dirname(__FILE__, 2) .'/core/database/'.$config['db_class'].'.class.php'; $configdata=''; - $datei = fopen(dirname(dirname(__FILE__)).'/inc/config.inc.php','w+'); + $datei = fopen(dirname(__FILE__, 2) .'/inc/config.inc.php','w+'); fputs($datei,$configdata); fclose($datei); $db = new db($config['host'], $config['user'], $config['pass'], $config['db'],'utf8', FALSE,TRUE); @@ -578,7 +578,7 @@ define(\'DEBUG\', FALSE); $dump->prepare($config['prefix']); $dump->execute(); $pdata=$_POST; - @unlink(dirname(dirname(__FILE__)).'/config.tmp.php'); + @unlink(dirname(__FILE__, 2) .'/config.tmp.php'); header("Location: install.php?step=user"); } if($pdata['dbprefix']==''){