From d5cf65e7d10bc3ee03ce2cef0cdb2b4d72404c69 Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Sun, 19 Aug 2007 20:57:07 -0400
Subject: [PATCH] Minor interface tidyup
---
install/install.php | 59 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/install/install.php b/install/install.php
index 286cfe2..8228971 100644
--- a/install/install.php
+++ b/install/install.php
@@ -47,8 +47,8 @@
\___/\____/\_| \____/\___/|_| |_|_| |_|\__, |
__/ |
|___/ ";
-
-echo "\n\n>> sInitial configuration \n\n";
+echo "\n".str_repeat('-',80)."\n";
+echo "\n\n>> Initial configuration \n\n";
//** Include the library with the basic installer functions
require_once('lib/install.lib.php');
@@ -68,7 +68,8 @@
//** Lets go !
$inst = new installer();
-swriteln($inst->lng('Following will be a few questions for primary configuration so be careful please',"\n\n"));
+swriteln($inst->lng(' Following will be a few questions for primary configuration so be careful.'));
+swriteln($inst->lng(' Default values are in [brackets] and can be accepted with <ENTER>'."\n\n"));
//** Select the language
$conf['language'] = $inst->simple_query('Select language', array('en','de'), 'en');
@@ -79,7 +80,7 @@
//** Get the hostname
$tmp_out = array();
exec('hostname -f', $tmp_out);
-$conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server', $tmp_out[0]);
+$conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg foo.example.com ', $tmp_out[0]);
unset($tmp_out);
//** Get MySQL root credentials
@@ -160,19 +161,19 @@
$inst->install_crontab();
swriteln('Restarting services ...');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['mysql']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['postfix']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['saslauthd']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['amavis']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['clamav']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-authdaemon'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-imap'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-imap-ssl'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-pop'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-pop-ssl'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['apache']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['pureftpd']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['mydns']['init_script'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['mysql']['init_script'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['postfix']['init_script'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['saslauthd']['init_script'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['amavis']['init_script'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['clamav']['init_script'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-authdaemon'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-imap'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-imap-ssl'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-pop'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-pop-ssl'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['apache']['init_script'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['pureftpd']['init_script'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['mydns']['init_script'].' restart');
}else{
@@ -211,29 +212,29 @@
swriteln('Configuring Getmail');
$inst->configure_getmail();
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['postfix']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['saslauthd']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['amavis']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['clamav']['init_script'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-authdaemon'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-imap'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-imap-ssl'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-pop'].' restart');
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['courier']['courier-pop-ssl'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['postfix']['init_script'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['saslauthd']['init_script'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['amavis']['init_script'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['clamav']['init_script'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-authdaemon'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-imap'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-imap-ssl'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-pop'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-pop-ssl'].' restart');
}
//** Configure Pureftpd
if(strtolower($inst->simple_query('Configure FTP Server', array('y','n'),'y') ) == 'y') {
swriteln('Configuring Pureftpd');
$inst->configure_pureftpd();
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['pureftpd']['init_script'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['pureftpd']['init_script'].' restart');
}
//** Configure MyDNS
if(strtolower($inst->simple_query('Configure DNS Server',array('y','n'),'y')) == 'y') {
swriteln('Configuring MyDNS');
$inst->configure_mydns();
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['mydns']['init_script'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['mydns']['init_script'].' restart');
}
//** Configure Apache
@@ -250,7 +251,7 @@
//* Configure ISPConfig
swriteln('Installing Crontab');
$inst->install_crontab();
- system($conf['dist']["init_scripts"].'/'.$conf['dist']['apache']['init_script'].' restart');
+ system($conf['dist']['init_scripts'].'/'.$conf['dist']['apache']['init_script'].' restart');
}
} //* << $install_mode / 'Standard' or Genius
--
Gitblit v1.9.1