From 66b4f903ee89aff755b2fd434cd0322223df4e71 Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Sun, 19 Aug 2007 21:53:10 -0400
Subject: [PATCH] Made log file a constant, replaced with __FILE__
---
install/install.php | 7 +++++++
install/lib/installer_base.lib.php | 6 +++---
install/lib/install.lib.php | 3 +--
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/install/install.php b/install/install.php
index 40bb450..fd040cf 100644
--- a/install/install.php
+++ b/install/install.php
@@ -66,6 +66,8 @@
//TODO: this is not there ????
$conf['dist'] = $dist;
+define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
+
//****************************************************************************************************
//** Installer Interface
//****************************************************************************************************
@@ -74,12 +76,17 @@
swriteln($inst->lng(' Default values are in [brackets] and can be accepted with <ENTER>.'));
swriteln($inst->lng(' Tap in "quit" (without the quotes) to stop the installer.'."\n\n"));
+if(!is_writable(ISPC_LOG_FILE)){
+ die("ERROR: Cannot write to the log file '".ISPC_LOG_FILE."'. Are you root ?\n\n");
+}
+
//** Select the language
$conf['language'] = $inst->simple_query('Select language', array('en','de'), 'en');
//** Select installation mode
$install_mode = $inst->simple_query('Installation mode', array('Standard','Expert'), 'Standard');
+
//** Get the hostname
$tmp_out = array();
exec('hostname -f', $tmp_out);
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 27edb74..f705d2b 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -78,8 +78,7 @@
}
function ilog($msg){
- $logfile = '/var/log/ispconfig_install.log';
- exec("echo `date` \"- [ISPConfig] - \"".$msg." >> ".$logfile);
+ exec("echo `date` \"- [ISPConfig] - \"".$msg." >> ".ISPC_LOG_FILE);
}
function error($msg){
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 6d247b4..47ca813 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -142,14 +142,14 @@
//* Load the database dump into the database, if database contains no tables
$db_tables = $this->db->getTables();
if(count($db_tables) > 0) {
- $this->error('Stopped: Database contains already some tables.');
+ $this->error('Stopped: Database already contains some tables.');
} else {
if($cf['admin_password'] == '') {
caselog("mysql -h '".$cf['host']."' -u '".$cf['admin_user']."' '".$cf['database']."' < 'sql/ispconfig3.sql' &> /dev/null",
- $FILE, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
+ __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
} else {
caselog("mysql -h '".$cf['host']."' -u '".$cf['admin_user']."' -p'".$cf['admin_password']."' '".$cf['database']."' < 'sql/ispconfig3.sql' &> /dev/null",
- $FILE, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
+ __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
}
$db_tables = $this->db->getTables();
if(count($db_tables) == 0) {
--
Gitblit v1.9.1