X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FInstaller.php;h=68f40c01a1694cfca3c3ea99b5d9a9bde1d66d4c;hb=dc9658f532a067adaf96d753a34f3ee99ff8587b;hp=fd86634719c22bec827843d169c66c4cb80f211a;hpb=6aa1dcfad371f34fea1f8e39b73de2cc3dd05784;p=friendica.git

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index fd86634719..68f40c01a1 100644
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -98,17 +98,17 @@ class Installer
 	 * Checks the current installation environment. There are optional and mandatory checks.
 	 *
 	 * @param string $baseurl The baseurl of Friendica
-	 * @param string $phpath  Optional path to the PHP binary
+	 * @param string $phppath Optional path to the PHP binary
 	 *
 	 * @return bool if the check succeed
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public function checkEnvironment($baseurl, $phpath = null)
+	public function checkEnvironment($baseurl, $phppath = null)
 	{
 		$returnVal = true;
 
-		if (isset($phpath)) {
-			if (!$this->checkPHP($phpath)) {
+		if (isset($phppath)) {
+			if (!$this->checkPHP($phppath)) {
 				$returnVal = false;
 			}
 		}
@@ -158,23 +158,20 @@ class Installer
 	{
 		$basepath = $configCache->get('system', 'basepath');
 
-		$tpl = Renderer::getMarkupTemplate('local.config.tpl');
+		$tpl = Renderer::getMarkupTemplate('install/local.config.tpl');
 		$txt = Renderer::replaceMacros($tpl, [
-			'$dbhost'    => $configCache->get('database', 'hostname'),
-			'$dbuser'    => $configCache->get('database', 'username'),
-			'$dbpass'    => $configCache->get('database', 'password'),
-			'$dbdata'    => $configCache->get('database', 'database'),
-
-			'$phpath'    => $configCache->get('config', 'php_path'),
-			'$adminmail' => $configCache->get('config', 'admin_email'),
-			'$hostname'  => $configCache->get('config', 'hostname'),
-
-			'$urlpath'   => $configCache->get('system', 'urlpath'),
-			'$baseurl'   => $configCache->get('system', 'url'),
-			'$sslpolicy' => $configCache->get('system', 'ssl_policy'),
-			'$basepath'  => $basepath,
-			'$timezone'  => $configCache->get('system', 'default_timezone'),
-			'$language'  => $configCache->get('system', 'language'),
+			'$dbhost'     => $configCache->get('database', 'hostname'),
+			'$dbuser'     => $configCache->get('database', 'username'),
+			'$dbpass'     => $configCache->get('database', 'password'),
+			'$dbdata'     => $configCache->get('database', 'database'),
+
+			'$phppath'    => $configCache->get('config', 'php_path'),
+			'$adminmail'  => $configCache->get('config', 'admin_email'),
+
+			'$system_url' => $configCache->get('system', 'url'),
+			'$basepath'   => $basepath,
+			'$timezone'   => $configCache->get('system', 'default_timezone'),
+			'$language'   => $configCache->get('system', 'language'),
 		]);
 
 		$result = file_put_contents($basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.config.php', $txt);
@@ -387,12 +384,10 @@ class Installer
 
 		$help = '';
 		$status = true;
-		if (function_exists('apache_get_modules')) {
-			if (!in_array('mod_rewrite', apache_get_modules())) {
-				$help = DI::l10n()->t('Error: Apache webserver mod-rewrite module is required but not installed.');
-				$status = false;
-				$returnVal = false;
-			}
+		if (function_exists('apache_get_modules') && !in_array('mod_rewrite', apache_get_modules())) {
+			$help = DI::l10n()->t('Error: Apache webserver mod-rewrite module is required but not installed.');
+			$status = false;
+			$returnVal = false;
 		}
 		$this->addCheck(DI::l10n()->t('Apache mod_rewrite module'), $status, true, $help);
 
@@ -402,15 +397,22 @@ class Installer
 			$status = false;
 			$help = DI::l10n()->t('Error: PDO or MySQLi PHP module required but not installed.');
 			$returnVal = false;
-		} else {
-			if (!function_exists('mysqli_connect') && class_exists('pdo') && !in_array('mysql', \PDO::getAvailableDrivers())) {
-				$status = false;
-				$help = DI::l10n()->t('Error: The MySQL driver for PDO is not installed.');
-				$returnVal = false;
-			}
+		} elseif (!function_exists('mysqli_connect') && class_exists('pdo') && !in_array('mysql', \PDO::getAvailableDrivers())) {
+			$status = false;
+			$help = DI::l10n()->t('Error: The MySQL driver for PDO is not installed.');
+			$returnVal = false;
 		}
 		$this->addCheck(DI::l10n()->t('PDO or MySQLi PHP module'), $status, true, $help);
 
+		$help   = '';
+		$status = true;
+		if (!class_exists('IntlChar')) {
+			$status    = false;
+			$help      = DI::l10n()->t('Error: The IntlChar module is not installed.');
+			$returnVal = false;
+		}
+		$this->addCheck(DI::l10n()->t('IntlChar PHP module'), $status, true, $help);
+
 		// check for XML DOM Documents being able to be generated
 		$help = '';
 		$status = true;
@@ -593,8 +595,8 @@ class Installer
 	 * TLS Check
 	 *
 	 * Tries to determine whether the connection to the server is secured
-	 * by TLS or not. If not the user will be warned that it is higly
-	 * encuraged to use TLS.
+	 * by TLS or not. If not the user will be warned that it is highly
+	 * encouraged to use TLS.
 	 *
 	 * @return bool (true) as TLS is not mandatory
 	 */