diff --git a/Core/Frameworks/Baikal/WWWRoot/cal.php b/Core/Frameworks/Baikal/WWWRoot/cal.php index 3eea99a..386945f 100644 --- a/Core/Frameworks/Baikal/WWWRoot/cal.php +++ b/Core/Frameworks/Baikal/WWWRoot/cal.php @@ -35,7 +35,11 @@ if(file_exists(getcwd() . "/Core")) { define("PROJECT_PATH_ROOT", dirname(getcwd()) . "/"); #../ } -require PROJECT_PATH_ROOT . '/vendor/autoload.php'; +if(!file_exists(PROJECT_PATH_ROOT . 'vendor/')) { + die('
Baïkal dependancies have not been installed. Please, execute "composer install" in the folder where you installed Baïkal.'); +} + +require PROJECT_PATH_ROOT . 'vendor/autoload.php'; # Bootstraping Flake \Flake\Framework::bootstrap(); diff --git a/Core/Frameworks/Baikal/WWWRoot/card.php b/Core/Frameworks/Baikal/WWWRoot/card.php index 01fbbde..1ed0d72 100644 --- a/Core/Frameworks/Baikal/WWWRoot/card.php +++ b/Core/Frameworks/Baikal/WWWRoot/card.php @@ -35,7 +35,11 @@ if(file_exists(getcwd() . "/Core")) { define("PROJECT_PATH_ROOT", dirname(getcwd()) . "/"); #../ } -require PROJECT_PATH_ROOT . '/vendor/autoload.php'; +if(!file_exists(PROJECT_PATH_ROOT . 'vendor/')) { + die('
Baïkal dependancies have not been installed. Please, execute "composer install" in the folder where you installed Baïkal.'); +} + +require PROJECT_PATH_ROOT . 'vendor/autoload.php'; # Bootstraping Flake \Flake\Framework::bootstrap(); diff --git a/Core/Frameworks/Baikal/WWWRoot/index.php b/Core/Frameworks/Baikal/WWWRoot/index.php index 016e86b..a217dec 100755 --- a/Core/Frameworks/Baikal/WWWRoot/index.php +++ b/Core/Frameworks/Baikal/WWWRoot/index.php @@ -34,7 +34,11 @@ if(file_exists(getcwd() . "/Core")) { define("PROJECT_PATH_ROOT", dirname(getcwd()) . "/"); #../ } -require PROJECT_PATH_ROOT . '/vendor/autoload.php'; +if(!file_exists(PROJECT_PATH_ROOT . 'vendor/')) { + die('
Baïkal dependancies have not been installed. Please, execute "composer install" in the folder where you installed Baïkal.'); +} + +require PROJECT_PATH_ROOT . 'vendor/autoload.php'; # Bootstraping Flake \Flake\Framework::bootstrap(); diff --git a/Core/Frameworks/BaikalAdmin/Controller/Install/Initialize.php b/Core/Frameworks/BaikalAdmin/Controller/Install/Initialize.php index f40343c..faec088 100755 --- a/Core/Frameworks/BaikalAdmin/Controller/Install/Initialize.php +++ b/Core/Frameworks/BaikalAdmin/Controller/Install/Initialize.php @@ -34,8 +34,12 @@ class Initialize extends \Flake\Core\Controller { public function execute() { # Assert that /Specific is writable + if(!file_exists(PROJECT_PATH_SPECIFIC) || !is_dir(PROJECT_PATH_SPECIFIC) || !is_writable(PROJECT_PATH_SPECIFIC)) { - throw new \Exception("Specific/ dir is readonly. Baïkal Admin requires write permissions on this dir."); + $message = "
"; + $message .= "
In order to work properly, Baïkal needs to have write permissions in the Specific/ folder.
"; + + die($message); } $this->createHtaccessFilesIfNeeded(); diff --git a/Core/Frameworks/BaikalAdmin/WWWRoot/index.php b/Core/Frameworks/BaikalAdmin/WWWRoot/index.php index 0d235d2..476ead6 100755 --- a/Core/Frameworks/BaikalAdmin/WWWRoot/index.php +++ b/Core/Frameworks/BaikalAdmin/WWWRoot/index.php @@ -39,7 +39,11 @@ if(file_exists(dirname(getcwd()). "/Core")) { define("PROJECT_PATH_ROOT", dirname(dirname(getcwd())) . "/"); #../../ } -require PROJECT_PATH_ROOT . '/vendor/autoload.php'; +if(!file_exists(PROJECT_PATH_ROOT . 'vendor/')) { + die('Baïkal dependancies have not been installed. Please, execute "composer install" in the folder where you installed Baïkal.'); +} + +require PROJECT_PATH_ROOT . 'vendor/autoload.php'; # Bootstraping Flake \Flake\Framework::bootstrap(); diff --git a/Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php b/Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php index 24f7ae9..3a9bb94 100755 --- a/Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php +++ b/Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php @@ -39,8 +39,13 @@ if(file_exists(dirname(dirname(getcwd())) . "/Core")) { define("PROJECT_PATH_ROOT", dirname(dirname(dirname(getcwd()))) . "/"); # ../../../ } -# Bootstraping Flake +if(!file_exists(PROJECT_PATH_ROOT . 'vendor/')) { + die('
Baïkal dependancies have not been installed. Please, execute "composer install" in the folder where you installed Baïkal.'); +} + require PROJECT_PATH_ROOT . "vendor/autoload.php"; + +# Bootstraping Flake \Flake\Framework::bootstrap(); # Bootstrap BaikalAdmin