FS#2213 - Ask for admin password while installation

Florian Schaal

2015-05-05 55cb0239acf8fde69ada4862baaf1912804d277a

FS#2213 - Ask for admin password while installation

 install/install.php

@@ -453,6 +453,7 @@

    //** 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['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);
@@ -792,6 +793,7 @@

        //** 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['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);

 install/lib/installer_base.lib.php

@@ -2200,6 +2200,11 @@
        $command = "chmod +x $install_dir/server/scripts/*.sh";
        caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

        if ($this->install_ispconfig_interface == true && isset($conf['interface_password']) && $conf['interface_password']!='admin') {
            $sql = "UPDATE sys_user SET passwort = md5(?) WHERE username = 'admin';";
            $this->db->query($sql, $conf['interface_password']);
        }

        if($conf['apache']['installed'] == true && $this->install_ispconfig_interface == true){
            //* Copy the ISPConfig vhost for the controlpanel
            $vhost_conf_dir = $conf['apache']['vhost_conf_dir'];