From b2f827b04393eecf33e16d6a883f5e6ff30086d9 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 05 May 2015 10:25:51 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
install/install.php | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/install/install.php b/install/install.php
index 6bc198d..447d793 100644
--- a/install/install.php
+++ b/install/install.php
@@ -454,6 +454,17 @@
//** Customize the port ISPConfig runs on
$ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080','ispconfig_port');
$conf['interface_password'] = $inst->free_query('Admin password', 'admin');
+ if($conf['interface_password'] != 'admin') {
+ $check = false;
+ do {
+ unset($temp_password);
+ $temp_password = $inst->free_query('Re-enter admin password', '');
+ $check = @($temp_password == $conf['interface_password'])?true:false;
+ if(!$check) swriteln('Passwords do not match.');
+ } while (!$check);
+ }
+ unset($check);
+ unset($temp_password);
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);
@@ -794,6 +805,17 @@
//** Customise the port ISPConfig runs on
$ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080','ispconfig_port');
$conf['interface_password'] = $inst->free_query('Admin password', 'admin');
+ if($conf['interface_password'] != 'admin') {
+ $check = false;
+ do {
+ unset($temp_password);
+ $temp_password = $inst->free_query('Re-enter admin password', '');
+ $check = @($temp_password == $conf['interface_password'])?true:false;
+ if(!$check) swriteln('Passwords do not match.');
+ } while (!$check);
+ }
+ unset($check);
+ unset($temp_password);
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);
@@ -839,4 +861,4 @@
echo "Installation completed.\n";
-?>
+?>
\ No newline at end of file
--
Gitblit v1.9.1