Skip to content

Commit dc7d8b5

Browse files
author
pedro_morgan
committed
Clean up some of the code. Perplexed as to why no constants. For later review
1 parent 74030b9 commit dc7d8b5

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

install/install.php

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,19 @@
3636
//if(is_dir("/usr/local/ispconfig")) die('We will stop here. There is already a ISPConfig installation, use the update script to update this installation.');
3737

3838
error_reporting(E_ALL|E_STRICT);
39-
echo ' _ _____ _____ _____ _____ __ _ _____ _ _____
40-
| | / ___/ | _ \ / ___| / _ \ | \ | | | ___| | | / ___|
41-
| | | |___ | |_| | | | | | | | | \| | | |__ | | | |
42-
| | \___ \ | ___/ | | | | | | | |\ | | __| | | | | _
43-
| | ___| | | | | |___ | |_| | | | \ | | | | | | |_| |
44-
|_| /_____/ |_| \_____| \_____/ |_| \_| |_| |_| \_____/ ';
4539

46-
echo "\n# Setup routine started...\n";
40+
//** The banner on the command line
41+
echo "\n\n".str_repeat('-',80)."\n";
42+
echo " _____ ___________ _____ __ _
43+
|_ _/ ___| ___ \ / __ \ / _(_)
44+
| | \ `--.| |_/ / | / \/ ___ _ __ | |_ _ __ _
45+
| | `--. \ __/ | | / _ \| '_ \| _| |/ _` |
46+
_| |_/\__/ / | | \__/\ (_) | | | | | | | (_| |
47+
\___/\____/\_| \____/\___/|_| |_|_| |_|\__, |
48+
__/ |
49+
|___/ ";
50+
51+
echo "\n\n>> sInitial configuration \n\n";
4752

4853
//** Include the library with the basic installer functions
4954
require_once('lib/install.lib.php');
@@ -63,7 +68,7 @@
6368

6469
//** Lets go !
6570
$inst = new installer();
66-
swriteln($inst->lng('This application will install ISPConfig 3 on your server.'));
71+
swriteln($inst->lng('Following will be a few questions for primary configuration so be careful please',"\n\n"));
6772

6873
//** Select the language
6974
$conf['language'] = $inst->simple_query('Select language', array('en','de'), 'en');
@@ -80,9 +85,9 @@
8085
//** Get MySQL root credentials
8186
$finished = false;
8287
do {
83-
$tmp_mysql_server_host = $inst->free_query('MySQL server hostname',$conf['mysql']['host']);
84-
$tmp_mysql_server_admin_user = $inst->free_query('MySQL root username',$conf['mysql']['admin_user']);
85-
$tmp_mysql_server_admin_password = $inst->free_query('MySQL root password',$conf['mysql']['admin_password']);
88+
$tmp_mysql_server_host = $inst->free_query('MySQL server hostname', $conf['mysql']['host']);
89+
$tmp_mysql_server_admin_user = $inst->free_query('MySQL root username', $conf['mysql']['admin_user']);
90+
$tmp_mysql_server_admin_password = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
8691

8792
//* Initialize the MySQL server connection
8893
if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {

0 commit comments

Comments
 (0)