From 7fe908c50c8dbc5cc05f571dbe11d66141caacd4 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 14 Nov 2013 09:01:22 -0500
Subject: [PATCH] Cleaning up code to match coding guidelines
---
install/install.php | 216 +++++++++++++++++++++++++++---------------------------
1 files changed, 108 insertions(+), 108 deletions(-)
diff --git a/install/install.php b/install/install.php
index be3e37d..e2d569e 100644
--- a/install/install.php
+++ b/install/install.php
@@ -37,7 +37,7 @@
define('INSTALLER_RUN', true);
//** The banner on the command line
-echo "\n\n".str_repeat('-',80)."\n";
+echo "\n\n".str_repeat('-', 80)."\n";
echo " _____ ___________ _____ __ _ ____
|_ _/ ___| ___ \ / __ \ / _(_) /__ \
| | \ `--.| |_/ / | / \/ ___ _ __ | |_ _ __ _ _/ /
@@ -46,14 +46,14 @@
\___/\____/\_| \____/\___/|_| |_|_| |_|\__, | \____/
__/ |
|___/ ";
-echo "\n".str_repeat('-',80)."\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');
+require_once 'lib/install.lib.php';
//** Include the base class of the installer class
-require_once('lib/installer_base.lib.php');
+require_once 'lib/installer_base.lib.php';
//** Ensure that current working directory is install directory
$cur_dir = getcwd();
@@ -76,12 +76,12 @@
if($dist['id'] == '') die('Linux distribution or version not recognized.');
//** Include the distribution-specific installer class library and configuration
-if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
-include_once('dist/lib/'.$dist['id'].'.lib.php');
-include_once('dist/conf/'.$dist['id'].'.conf.php');
+if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once 'dist/lib/'.$dist['baseid'].'.lib.php';
+include_once 'dist/lib/'.$dist['id'].'.lib.php';
+include_once 'dist/conf/'.$dist['id'].'.conf.php';
//****************************************************************************************************
-//** Installer Interface
+//** Installer Interface
//****************************************************************************************************
$inst = new installer();
swriteln($inst->lng(' Following will be a few questions for primary configuration so be careful.'));
@@ -90,7 +90,7 @@
//** Check log file is writable (probably not root or sudo)
if(!is_writable(dirname(ISPC_LOG_FILE))){
- die("ERROR: Cannot write to the ".dirname(ISPC_LOG_FILE)." directory. Are you root or sudo ?\n\n");
+ die("ERROR: Cannot write to the ".dirname(ISPC_LOG_FILE)." directory. Are you root or sudo ?\n\n");
}
if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) {
@@ -105,7 +105,7 @@
$inst->find_installed_apps();
//** Select the language and set default timezone
-$conf['language'] = $inst->simple_query('Select language', array('en','de'), 'en');
+$conf['language'] = $inst->simple_query('Select language', array('en', 'de'), 'en');
$conf['timezone'] = get_system_timezone();
//* Set default theme
@@ -113,7 +113,7 @@
$conf['language_file_import_enabled'] = true;
//** Select installation mode
-$install_mode = $inst->simple_query('Installation mode', array('standard','expert'), 'standard');
+$install_mode = $inst->simple_query('Installation mode', array('standard', 'expert'), 'standard');
//** Get the hostname
@@ -133,13 +133,13 @@
$tmp_mysql_server_admin_password = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
$tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database']);
$tmp_mysql_server_charset = $inst->free_query('MySQL charset', $conf['mysql']['charset']);
-
+
if($install_mode == 'expert') {
swriteln("The next two questions are about the internal ISPConfig database user and password.\nIt is recommended to accept the defaults which are 'ispconfig' as username and a random password.\nIf you use a different password, use only numbers and chars for the password.\n");
$conf['mysql']['ispconfig_user'] = $inst->free_query('ISPConfig mysql database username', $conf['mysql']['ispconfig_user']);
$conf['mysql']['ispconfig_password'] = $inst->free_query('ISPConfig mysql database password', $conf['mysql']['ispconfig_password']);
}
-
+
//* Initialize the MySQL server connection
if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
$conf['mysql']['host'] = $tmp_mysql_server_host;
@@ -155,44 +155,44 @@
unset($finished);
// Resolve the IP address of the MySQL hostname.
-$tmp = explode(':',$conf['mysql']['host']);
+$tmp = explode(':', $conf['mysql']['host']);
if(!$conf['mysql']['ip'] = gethostbyname($tmp[0])) die('Unable to resolve hostname'.$tmp[0]);
unset($tmp);
//** Initializing database connection
-include_once('lib/mysql.lib.php');
+include_once 'lib/mysql.lib.php';
$inst->db = new db();
//** Begin with standard or expert installation
if($install_mode == 'standard') {
-
+
//* Create the MySQL database
$inst->configure_database();
-
+
//* Configure Webserver - Apache or nginx
if($conf['apache']['installed'] == true && $conf['nginx']['installed'] == true) {
- $http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache','nginx'), 'apache');
+ $http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache', 'nginx'), 'apache');
if($http_server_to_use == 'apache'){
$conf['nginx']['installed'] = false;
} else {
$conf['apache']['installed'] = false;
}
}
-
+
//* Insert the Server record into the database
$inst->add_database_server_record();
//* Configure Postfix
$inst->configure_postfix();
-
+
//* Configure Mailman
$inst->configure_mailman('install');
-
+
//* Configure jailkit
swriteln('Configuring Jailkit');
$inst->configure_jailkit();
-
+
if($conf['dovecot']['installed'] == true) {
//* Configure Dovecot
swriteln('Configuring Dovecot');
@@ -205,7 +205,7 @@
//* Configure PAM
swriteln('Configuring PAM');
$inst->configure_pam();
-
+
//* Configure Courier
swriteln('Configuring Courier');
$inst->configure_courier();
@@ -222,7 +222,7 @@
//* Configure Getmail
swriteln('Configuring Getmail');
$inst->configure_getmail();
-
+
//* Configure Pureftpd
swriteln('Configuring Pureftpd');
$inst->configure_pureftpd();
@@ -238,39 +238,39 @@
swriteln('Configuring MyDNS');
$inst->configure_mydns();
}
-
+
//* Configure Apache
if($conf['apache']['installed'] == true){
swriteln('Configuring Apache');
$inst->configure_apache();
}
-
+
//* Configure nginx
if($conf['nginx']['installed'] == true){
swriteln('Configuring nginx');
$inst->configure_nginx();
}
-
- //** Configure Vlogger
- swriteln('Configuring Vlogger');
- $inst->configure_vlogger();
-
+
+ //** Configure Vlogger
+ swriteln('Configuring Vlogger');
+ $inst->configure_vlogger();
+
//** Configure apps vhost
swriteln('Configuring Apps vhost');
$inst->configure_apps_vhost();
-
+
//* Configure Firewall
//* Configure Bastille Firewall
$conf['services']['firewall'] = true;
swriteln('Configuring Bastille Firewall');
$inst->configure_firewall();
- //* Configure Fail2ban
- if($conf['fail2ban']['installed'] == true) {
- swriteln('Configuring Fail2ban');
- $inst->configure_fail2ban();
- }
-
+ //* Configure Fail2ban
+ if($conf['fail2ban']['installed'] == true) {
+ swriteln('Configuring Fail2ban');
+ $inst->configure_fail2ban();
+ }
+
/*
if($conf['squid']['installed'] == true) {
$conf['services']['proxy'] = true;
@@ -282,22 +282,22 @@
$inst->configure_nginx();
}
*/
-
+
//* Configure ISPConfig
swriteln('Installing ISPConfig');
-
+
//** Customize the port ISPConfig runs on
$ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080');
if($conf['apache']['installed'] == true) $conf['apache']['vhost_port'] = $ispconfig_vhost_port;
if($conf['nginx']['installed'] == true) $conf['nginx']['vhost_port'] = $ispconfig_vhost_port;
unset($ispconfig_vhost_port);
- if(strtolower($inst->simple_query('Do you want a secure (SSL) connection to the ISPConfig web interface',array('y','n'),'y')) == 'y') {
- $inst->make_ispconfig_ssl_cert();
+ if(strtolower($inst->simple_query('Do you want a secure (SSL) connection to the ISPConfig web interface', array('y', 'n'), 'y')) == 'y') {
+ $inst->make_ispconfig_ssl_cert();
}
$inst->install_ispconfig();
-
+
//* Configure DBServer
swriteln('Configuring DBServer');
$inst->configure_dbserver();
@@ -305,7 +305,7 @@
//* Configure ISPConfig
swriteln('Installing ISPConfig crontab');
$inst->install_crontab();
-
+
swriteln('Restarting services ...');
if($conf['mysql']['installed'] == true && $conf['mysql']['init_script'] != '') system($inst->getinitcommand($conf['mysql']['init_script'], 'restart'));
if($conf['postfix']['installed'] == true && $conf['postfix']['init_script'] != '') system($inst->getinitcommand($conf['postfix']['init_script'], 'restart'));
@@ -331,11 +331,11 @@
if($conf['mydns']['installed'] == true && $conf['mydns']['init_script'] != '') system($inst->getinitcommand($conf['mydns']['init_script'], 'restart').' &> /dev/null');
if($conf['powerdns']['installed'] == true && $conf['powerdns']['init_script'] != '') system($inst->getinitcommand($conf['powerdns']['init_script'], 'restart').' &> /dev/null');
if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '') system($inst->getinitcommand($conf['bind']['init_script'], 'restart').' &> /dev/null');
- //if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['squid']['init_script'])) system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
+ //if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['squid']['init_script'])) system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '') system($inst->getinitcommand($conf['nginx']['init_script'], 'restart').' &> /dev/null');
- //if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
+ //if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
} else {
-
+
//* In expert mode, we select the services in the following steps, only db is always available
$conf['services']['mail'] = false;
$conf['services']['web'] = false;
@@ -343,23 +343,23 @@
$conf['services']['db'] = true;
$conf['services']['firewall'] = false;
$conf['services']['proxy'] = false;
-
-
+
+
//** Get Server ID
// $conf['server_id'] = $inst->free_query('Unique Numeric ID of the server','1');
// Server ID is an autoInc value of the mysql database now
-
- if(strtolower($inst->simple_query('Shall this server join an existing ISPConfig multiserver setup',array('y','n'),'n')) == 'y') {
+
+ if(strtolower($inst->simple_query('Shall this server join an existing ISPConfig multiserver setup', array('y', 'n'), 'n')) == 'y') {
$conf['mysql']['master_slave_setup'] = 'y';
-
+
//** Get MySQL root credentials
$finished = false;
do {
$tmp_mysql_server_host = $inst->free_query('MySQL master server hostname', $conf['mysql']['master_host']);
$tmp_mysql_server_admin_user = $inst->free_query('MySQL master server root username', $conf['mysql']['master_admin_user']);
$tmp_mysql_server_admin_password = $inst->free_query('MySQL master server root password', $conf['mysql']['master_admin_password']);
- $tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database']);
-
+ $tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database']);
+
//* Initialize the MySQL server connection
if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
$conf['mysql']['master_host'] = $tmp_mysql_server_host;
@@ -372,7 +372,7 @@
}
} while ($finished == false);
unset($finished);
-
+
// initialize the connection to the master database
$inst->dbmaster = new db();
if($inst->dbmaster->linkId) $inst->dbmaster->closeConn();
@@ -380,39 +380,39 @@
$inst->dbmaster->dbName = $conf['mysql']["master_database"];
$inst->dbmaster->dbUser = $conf['mysql']["master_admin_user"];
$inst->dbmaster->dbPass = $conf['mysql']["master_admin_password"];
-
+
} else {
// the master DB is the same then the slave DB
$inst->dbmaster = $inst->db;
}
-
+
//* Create the mysql database
$inst->configure_database();
-
+
//* Configure Webserver - Apache or nginx
if($conf['apache']['installed'] == true && $conf['nginx']['installed'] == true) {
- $http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache','nginx'), 'apache');
+ $http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache', 'nginx'), 'apache');
if($http_server_to_use == 'apache'){
$conf['nginx']['installed'] = false;
} else {
$conf['apache']['installed'] = false;
}
}
-
+
//* Insert the Server record into the database
swriteln('Adding ISPConfig server record to database.');
swriteln('');
$inst->add_database_server_record();
-
- if(strtolower($inst->simple_query('Configure Mail', array('y','n') ,'y') ) == 'y') {
-
+
+ if(strtolower($inst->simple_query('Configure Mail', array('y', 'n') , 'y') ) == 'y') {
+
$conf['services']['mail'] = true;
-
+
//* Configure Postfix
swriteln('Configuring Postfix');
$inst->configure_postfix();
-
+
//* Configure Mailman
swriteln('Configuring Mailman');
$inst->configure_mailman();
@@ -422,15 +422,15 @@
swriteln('Configuring Dovecot');
$inst->configure_dovecot();
} else {
-
+
//* Configure saslauthd
swriteln('Configuring SASL');
$inst->configure_saslauthd();
-
+
//* Configure PAM
swriteln('Configuring PAM');
$inst->configure_pam();
-
+
//* Configure courier
swriteln('Configuring Courier');
$inst->configure_courier();
@@ -447,7 +447,7 @@
//* Configure Getmail
swriteln('Configuring Getmail');
$inst->configure_getmail();
-
+
if($conf['postfix']['installed'] == true && $conf['postfix']['init_script'] != '') system($inst->getinitcommand($conf['postfix']['init_script'], 'restart'));
if($conf['saslauthd']['installed'] == true && $conf['saslauthd']['init_script'] != '') system($inst->getinitcommand($conf['saslauthd']['init_script'], 'restart'));
if($conf['amavis']['installed'] == true && $conf['amavis']['init_script'] != '') system($inst->getinitcommand($conf['amavis']['init_script'], 'restart'));
@@ -462,22 +462,22 @@
if($conf['dovecot']['installed'] == true && $conf['dovecot']['init_script'] != '') system($inst->getinitcommand($conf['dovecot']['init_script'], 'restart'));
if($conf['mailman']['installed'] == true && $conf['mailman']['init_script'] != '') system('nohup '.$inst->getinitcommand($conf['mailman']['init_script'], 'restart').' >/dev/null 2>&1 &');
}
-
+
//** Configure Jailkit
- if(strtolower($inst->simple_query('Configure Jailkit', array('y','n'),'y') ) == 'y') {
+ if(strtolower($inst->simple_query('Configure Jailkit', array('y', 'n'), 'y') ) == 'y') {
swriteln('Configuring Jailkit');
$inst->configure_jailkit();
}
-
+
//** Configure Pureftpd
- if(strtolower($inst->simple_query('Configure FTP Server', array('y','n'),'y') ) == 'y') {
+ if(strtolower($inst->simple_query('Configure FTP Server', array('y', 'n'), 'y') ) == 'y') {
swriteln('Configuring Pureftpd');
$inst->configure_pureftpd();
if($conf['pureftpd']['installed'] == true && $conf['pureftpd']['init_script'] != '') system($inst->getinitcommand($conf['pureftpd']['init_script'], 'restart'));
}
-
+
//** Configure DNS
- if(strtolower($inst->simple_query('Configure DNS Server',array('y','n'),'y')) == 'y') {
+ if(strtolower($inst->simple_query('Configure DNS Server', array('y', 'n'), 'y')) == 'y') {
$conf['services']['dns'] = true;
//* Configure DNS
if($conf['powerdns']['installed'] == true) {
@@ -493,12 +493,12 @@
$inst->configure_mydns();
if($conf['mydns']['init_script'] != '') system($inst->getinitcommand($conf['mydns']['init_script'], 'restart').' &> /dev/null');
}
-
+
}
-
+
/*
//** Configure Squid
- if(strtolower($inst->simple_query('Configure Proxy Server', array('y','n'),'y') ) == 'y') {
+ if(strtolower($inst->simple_query('Configure Proxy Server', array('y','n'),'y') ) == 'y') {
if($conf['squid']['installed'] == true) {
$conf['services']['proxy'] = true;
swriteln('Configuring Squid');
@@ -512,50 +512,50 @@
}
}
*/
-
+
//** Configure Apache
if($conf['apache']['installed'] == true){
swriteln("\nHint: If this server shall run the ISPConfig interface, select 'y' in the 'Configure Apache Server' option.\n");
- if(strtolower($inst->simple_query('Configure Apache Server',array('y','n'),'y')) == 'y') {
+ if(strtolower($inst->simple_query('Configure Apache Server', array('y', 'n'), 'y')) == 'y') {
$conf['services']['web'] = true;
swriteln('Configuring Apache');
$inst->configure_apache();
-
+
//** Configure Vlogger
swriteln('Configuring Vlogger');
$inst->configure_vlogger();
-
+
//** Configure apps vhost
swriteln('Configuring Apps vhost');
$inst->configure_apps_vhost();
}
}
-
+
//** Configure nginx
if($conf['nginx']['installed'] == true){
swriteln("\nHint: If this server shall run the ISPConfig interface, select 'y' in the 'Configure nginx Server' option.\n");
- if(strtolower($inst->simple_query('Configure nginx Server',array('y','n'),'y')) == 'y') {
+ if(strtolower($inst->simple_query('Configure nginx Server', array('y', 'n'), 'y')) == 'y') {
$conf['services']['web'] = true;
swriteln('Configuring nginx');
$inst->configure_nginx();
-
+
//** Configure Vlogger
//swriteln('Configuring Vlogger');
//$inst->configure_vlogger();
-
+
//** Configure apps vhost
swriteln('Configuring Apps vhost');
$inst->configure_apps_vhost();
}
}
-
+
//** Configure Firewall
- if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') {
+ if(strtolower($inst->simple_query('Configure Firewall Server', array('y', 'n'), 'y')) == 'y') {
//if($conf['bastille']['installed'] == true) {
- //* Configure Bastille Firewall
- $conf['services']['firewall'] = true;
- swriteln('Configuring Bastille Firewall');
- $inst->configure_firewall();
+ //* Configure Bastille Firewall
+ $conf['services']['firewall'] = true;
+ swriteln('Configuring Bastille Firewall');
+ $inst->configure_firewall();
/*} elseif($conf['ufw']['installed'] == true) {
//* Configure Ubuntu Firewall
$conf['services']['firewall'] = true;
@@ -564,18 +564,18 @@
}
*/
}
-
+
//** Configure Firewall
- /*if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') {
+ /*if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') {
swriteln('Configuring Firewall');
$inst->configure_firewall();
}*/
-
+
//** Configure ISPConfig :-)
$install_ispconfig_interface_default = ($conf['mysql']['master_slave_setup'] == 'y')?'n':'y';
- if(strtolower($inst->simple_query('Install ISPConfig Web Interface',array('y','n'),$install_ispconfig_interface_default)) == 'y') {
+ if(strtolower($inst->simple_query('Install ISPConfig Web Interface', array('y', 'n'), $install_ispconfig_interface_default)) == 'y') {
swriteln('Installing ISPConfig');
-
+
//** We want to check if the server is a module or cgi based php enabled server
//** TODO: Don't always ask for this somehow ?
/*
@@ -595,23 +595,23 @@
if($conf['apache']['installed'] == true) $conf['apache']['vhost_port'] = $ispconfig_vhost_port;
if($conf['nginx']['installed'] == true) $conf['nginx']['vhost_port'] = $ispconfig_vhost_port;
unset($ispconfig_vhost_port);
-
- if(strtolower($inst->simple_query('Enable SSL for the ISPConfig web interface',array('y','n'),'y')) == 'y') {
+
+ if(strtolower($inst->simple_query('Enable SSL for the ISPConfig web interface', array('y', 'n'), 'y')) == 'y') {
$inst->make_ispconfig_ssl_cert();
}
-
+
$inst->install_ispconfig_interface = true;
-
+
} else {
$inst->install_ispconfig_interface = false;
}
-
+
$inst->install_ispconfig();
-
+
//* Configure DBServer
swriteln('Configuring DBServer');
$inst->configure_dbserver();
-
+
//* Configure ISPConfig
swriteln('Installing ISPConfig crontab');
$inst->install_crontab();
@@ -621,13 +621,13 @@
if($conf['nginx']['php_fpm_init_script'] != '') system($inst->getinitcommand($conf['nginx']['php_fpm_init_script'], 'reload'));
if($conf['nginx']['init_script'] != '') system($inst->getinitcommand($conf['nginx']['init_script'], 'reload'));
}
-
-
-
+
+
+
} //* << $install_mode / 'Standard' or Genius
echo "Installation completed.\n";
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1