- allow partly configured autoinstall.ini

Marius Cramer

2015-11-17 c8509bf2e438adcf80591a6bc072359d6d44ed97

- allow partly configured autoinstall.ini

 install/install.php

@@ -115,6 +115,10 @@
        include_once $cmd_opt['autoinstall'];
    } elseif($path_parts['extension'] == 'ini') {
        $tmp = ini_to_array(file_get_contents('autoinstall.ini'));
        if(!is_array($tmp['install'])) $tmp['install'] = array();
        if(!is_array($tmp['ssl_cert'])) $tmp['ssl_cert'] = array();
        if(!is_array($tmp['expert'])) $tmp['expert'] = array();
        if(!is_array($tmp['update'])) $tmp['update'] = array();
        $autoinstall = $tmp['install'] + $tmp['ssl_cert'] + $tmp['expert'] + $tmp['update'];
        unset($tmp);
    }

 install/update.php

@@ -120,6 +120,10 @@
        include_once $cmd_opt['autoinstall'];
    } elseif($path_parts['extension'] == 'ini') {
        $tmp = ini_to_array(file_get_contents('autoinstall.ini'));
        if(!is_array($tmp['install'])) $tmp['install'] = array();
        if(!is_array($tmp['ssl_cert'])) $tmp['ssl_cert'] = array();
        if(!is_array($tmp['expert'])) $tmp['expert'] = array();
        if(!is_array($tmp['update'])) $tmp['update'] = array();
        $autoinstall = $tmp['install'] + $tmp['ssl_cert'] + $tmp['expert'] + $tmp['update'];
        unset($tmp);
    }