From 4766e9e10c141a75a14a1440dc63eb1d8a5ada8c Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Sun, 19 Aug 2007 00:59:09 -0400
Subject: [PATCH] * Introducing the sb_local.php.skel file to keep a local configuration
---
interface/lib/config.inc.php | 10 ++++++----
interface/lib/db_local.php.skel | 9 +++++++++
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index c6f779c..f2b334f 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -27,6 +27,8 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+error_reporting(E_ALL|E_STRICT);
+
header('Pragma: no-cache');
header('Cache-Control: no-store, no-cache, max-age=0, must-revalidate');
header('Content-Type: text/html');
@@ -69,20 +71,20 @@
*/
//** Detect for local database setting or set and load default params
-if( file_exists('db_local.php') ){
- require_once('db_local.php');
+if(file_exists(dirname(__FILE__).'/db_local.php')){
+ require_once(dirname(__FILE__).'/db_local.php');
$conf['db_type'] = $DB['type'];
$conf['db_host'] = $DB['host'];
- $conf['db_database'] = $DB['database'];
$conf['db_user'] = $DB['user'];
$conf['db_password'] = $DB['password'];
+ $conf['db_database'] = $DB['database'];
}else{
//** Database Settings
$conf['db_type'] = 'mysql';
$conf['db_host'] = 'localhost';
- $conf['db_database'] = 'ispconfig3';
$conf['db_user'] = 'root';
$conf['db_password'] = '';
+ $conf['db_database'] = 'ispconfig3';
}
diff --git a/interface/lib/db_local.php.skel b/interface/lib/db_local.php.skel
new file mode 100755
index 0000000..973978b
--- /dev/null
+++ b/interface/lib/db_local.php.skel
@@ -0,0 +1,9 @@
+<?php
+
+//** These are the local connection paramaters on your machine
+$DB['type'] = 'mysql';
+$DB['host'] = 'localhost';
+$DB['user'] = 'root';
+$DB['password'] = 'mash';
+$DB['database'] = 'ispconfig';
+?>
\ No newline at end of file
--
Gitblit v1.9.1