diff --git a/bootstrap.php b/bootstrap.php index 17aaf608..67b9fbaf 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -47,7 +47,9 @@ $conf['b8']['app']['namespace'] = 'PHPCI'; $conf['b8']['app']['default_controller'] = 'Home'; $conf['b8']['view']['path'] = dirname(__FILE__) . '/PHPCI/View/'; -$config = new b8\Config($conf); -$config->loadYaml(dirname(__FILE__) . '/PHPCI/config.yml'); +if (file_exists(dirname(__FILE__) . '/PHPCI/config.yml')) { + $config = new b8\Config($conf); + $config->loadYaml(dirname(__FILE__) . '/PHPCI/config.yml'); +} require_once(dirname(__FILE__) . '/vars.php'); diff --git a/public/install.php b/public/install.php index e08e647e..d792bdae 100644 --- a/public/install.php +++ b/public/install.php @@ -5,7 +5,7 @@ require_once(dirname(__FILE__) . '/../vars.php'); $installStage = 'start'; $formAction = ''; $config = array(); -$ciUrl = ($_SERVER['HTTPS'] == "on" ? 'https' : 'http') . '://'; +$ciUrl = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on" ? 'https' : 'http') . '://'; $ciUrl .= $_SERVER['HTTP_HOST']; $ciUrl .= str_replace('/install.php', '', $_SERVER['REQUEST_URI']); diff --git a/vars.php b/vars.php index 89a1d81e..5725805e 100644 --- a/vars.php +++ b/vars.php @@ -7,7 +7,7 @@ if (!defined('APPLICATION_PATH')) { } // Define our PHPCI_URL, if not already defined: -if (!defined('PHPCI_URL')) { +if (!defined('PHPCI_URL') && isset($config)) { define('PHPCI_URL', $config->get('phpci.url', '') . '/'); }