diff --git a/install/install.php b/install/install.php index 76723290..7a258149 100644 --- a/install/install.php +++ b/install/install.php @@ -15,8 +15,13 @@ * @package Install * */ -if(!file_exists(dirname(__DIR__) . '/vendor/autoload.php')){ - die('Vendor does not exist. Please run "composer install". For more informationen https://github.com/Froxlor/Froxlor/wiki'); +if (! file_exists(dirname(__DIR__) . '/vendor/autoload.php')) { + // get hint-template + $vendor_hint = file_get_contents(dirname(__DIR__) . '/templates/Sparkle/misc/vendormissinghint.tpl'); + // replace values + $vendor_hint = str_replace("", dirname(__DIR__), $vendor_hint); + $vendor_hint = str_replace("", date('Y', time()), $vendor_hint); + die($vendor_hint); } require dirname(__DIR__) . '/vendor/autoload.php'; require __DIR__ . '/lib/class.FroxlorInstall.php'; diff --git a/lib/init.php b/lib/init.php index bec161f6..e3a050b5 100644 --- a/lib/init.php +++ b/lib/init.php @@ -16,8 +16,17 @@ * @package System * */ -if(!file_exists(dirname(__DIR__) . '/vendor/autoload.php')){ - die('Vendor does not exist. Please run "composer install". For more informationen https://github.com/Froxlor/Froxlor/wiki'); + +// define default theme for configurehint, etc. +$_deftheme = 'Sparkle'; + +if (! file_exists(dirname(__DIR__) . '/vendor/autoload.php')) { + // get hint-template + $vendor_hint = file_get_contents(dirname(__DIR__) . '/templates/' . $_deftheme . '/misc/vendormissinghint.tpl'); + // replace values + $vendor_hint = str_replace("", dirname(__DIR__), $vendor_hint); + $vendor_hint = str_replace("", date('Y', time()), $vendor_hint); + die($vendor_hint); } require dirname(__DIR__) . '/vendor/autoload.php'; @@ -72,9 +81,6 @@ unset($key); $filename = htmlentities(basename($_SERVER['PHP_SELF'])); -// define default theme for configurehint, etc. -$_deftheme = 'Sparkle'; - // check whether the userdata file exists if (! file_exists(\Froxlor\Froxlor::getInstallDir() . '/lib/userdata.inc.php')) { $config_hint = file_get_contents(\Froxlor\Froxlor::getInstallDir() . '/templates/' . $_deftheme . '/misc/configurehint.tpl'); @@ -92,7 +98,7 @@ if (! is_readable(\Froxlor\Froxlor::getInstallDir() . '/lib/userdata.inc.php')) // replace values $owner_hint = str_replace("", $posixusername['name'], $owner_hint); $owner_hint = str_replace("", $posixgroup['name'], $owner_hint); - $owner_hint = str_replace("<\Froxlor\Froxlor::getInstallDir()>", \Froxlor\Froxlor::getInstallDir(), $owner_hint); + $owner_hint = str_replace("", \Froxlor\Froxlor::getInstallDir(), $owner_hint); $owner_hint = str_replace("", date('Y', time()), $owner_hint); // show die($owner_hint); diff --git a/templates/Sparkle/misc/ownershiphint.tpl b/templates/Sparkle/misc/ownershiphint.tpl index 9ab32641..ec510e87 100644 --- a/templates/Sparkle/misc/ownershiphint.tpl +++ b/templates/Sparkle/misc/ownershiphint.tpl @@ -25,7 +25,7 @@

 

This mostly happens due to wrong ownership.
Try the following command to correct the ownership:

 

- 

chown -R : <\Froxlor\Froxlor::getInstallDir()>

+ 

chown -R :