X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FInstaller.php;h=1d29a5cf996899ba84fc53963eaca970f9210e97;hb=82972744a9cb77ca3d2f8db289e97fee2709ebd7;hp=b2b84c6182eaa76e3618c87463e21d4470631972;hpb=03edb944473a59d1ef4b164dad6da3edc21cb706;p=friendica.git
diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index b2b84c6182..1d29a5cf99 100644
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -1,6 +1,6 @@
checkTLS()) {
+ $returnVal = false;
+ }
+
if (!$this->checkKeys()) {
$returnVal = false;
}
@@ -185,17 +189,15 @@ class Installer
/***
* Installs the DB-Scheme for Friendica
*
- * @param string $basePath The base path of this application
- *
* @return bool true if the installation was successful, otherwise false
* @throws Exception
*/
- public function installDatabase($basePath)
+ public function installDatabase(): bool
{
- $result = DBStructure::install($basePath);
+ $result = DBStructure::install();
if ($result) {
- $txt = DI::l10n()->t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . EOL;
+ $txt = DI::l10n()->t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . '
';
$txt .= DI::l10n()->t('Please see the file "doc/INSTALL.md".');
$this->addCheck($txt, false, true, htmlentities($result, ENT_COMPAT, 'UTF-8'));
@@ -257,9 +259,9 @@ class Installer
$help = "";
if (!$passed) {
- $help .= DI::l10n()->t('Could not find a command line version of PHP in the web server PATH.') . EOL;
- $help .= DI::l10n()->t("If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See 'Setup the worker'") . EOL;
- $help .= EOL . EOL;
+ $help .= DI::l10n()->t('Could not find a command line version of PHP in the web server PATH.') . '
';
+ $help .= DI::l10n()->t("If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See 'Setup the worker'") . '
';
+ $help .= '
';
$tpl = Renderer::getMarkupTemplate('field_input.tpl');
/// @todo Separate backend Installer class and presentation layer/view
$help .= Renderer::replaceMacros($tpl, [
@@ -274,10 +276,10 @@ class Installer
$cmd = "$phppath -v";
$result = trim(shell_exec($cmd));
$passed2 = (strpos($result, "(cli)") !== false);
- list($result) = explode("\n", $result);
+ [$result] = explode("\n", $result);
$help = "";
if (!$passed2) {
- $help .= DI::l10n()->t("PHP executable is not the php cli binary \x28could be cgi-fgci version\x29") . EOL;
+ $help .= DI::l10n()->t("PHP executable is not the php cli binary \x28could be cgi-fgci version\x29") . '
';
$help .= DI::l10n()->t('Found PHP version: ') . "$result";
}
$this->addCheck(DI::l10n()->t('PHP cli binary'), $passed2, true, $help);
@@ -293,7 +295,7 @@ class Installer
$passed3 = $result == $str;
$help = "";
if (!$passed3) {
- $help .= DI::l10n()->t('The command line version of PHP on your system does not have "register_argc_argv" enabled.') . EOL;
+ $help .= DI::l10n()->t('The command line version of PHP on your system does not have "register_argc_argv" enabled.') . '
';
$help .= DI::l10n()->t('This is required for message delivery to work.');
} else {
$this->phppath = $phppath;
@@ -331,7 +333,7 @@ class Installer
// Get private key
if (!$res) {
- $help .= DI::l10n()->t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys') . EOL;
+ $help .= DI::l10n()->t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys') . '
';
$help .= DI::l10n()->t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".');
$status = false;
}
@@ -484,6 +486,13 @@ class Installer
);
$returnVal = $returnVal ? $status : false;
+ $status = $this->checkFunction('gmp_strval',
+ DI::l10n()->t('GNU Multiple Precision PHP module'),
+ DI::l10n()->t('Error: GNU Multiple Precision PHP module required but not installed.'),
+ true
+ );
+ $returnVal = $returnVal ? $status : false;
+
return $returnVal;
}
@@ -502,10 +511,10 @@ class Installer
(!file_exists('config/local.config.php') && !is_writable('.'))) {
$status = false;
- $help = DI::l10n()->t('The web installer needs to be able to create a file called "local.config.php" in the "config" folder of your web server and it is unable to do so.') . EOL;
- $help .= DI::l10n()->t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.') . EOL;
- $help .= DI::l10n()->t('At the end of this procedure, we will give you a text to save in a file named local.config.php in your Friendica "config" folder.') . EOL;
- $help .= DI::l10n()->t('You can alternatively skip this procedure and perform a manual installation. Please see the file "doc/INSTALL.md" for instructions.') . EOL;
+ $help = DI::l10n()->t('The web installer needs to be able to create a file called "local.config.php" in the "config" folder of your web server and it is unable to do so.') . '
';
+ $help .= DI::l10n()->t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.') . '
';
+ $help .= DI::l10n()->t('At the end of this procedure, we will give you a text to save in a file named local.config.php in your Friendica "config" folder.') . '
';
+ $help .= DI::l10n()->t('You can alternatively skip this procedure and perform a manual installation. Please see the file "doc/INSTALL.md" for instructions.') . '
';
}
$this->addCheck(DI::l10n()->t('config/local.config.php is writable'), $status, false, $help);
@@ -528,10 +537,10 @@ class Installer
if (!is_writable('view/smarty3')) {
$status = false;
- $help = DI::l10n()->t('Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') . EOL;
- $help .= DI::l10n()->t('In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder.') . EOL;
- $help .= DI::l10n()->t("Please ensure that the user that your web server runs as \x28e.g. www-data\x29 has write access to this folder.") . EOL;
- $help .= DI::l10n()->t("Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files \x28.tpl\x29 that it contains.") . EOL;
+ $help = DI::l10n()->t('Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') . '
';
+ $help .= DI::l10n()->t('In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder.') . '
';
+ $help .= DI::l10n()->t("Please ensure that the user that your web server runs as \x28e.g. www-data\x29 has write access to this folder.") . '
';
+ $help .= DI::l10n()->t("Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files \x28.tpl\x29 that it contains.") . '
';
}
$this->addCheck(DI::l10n()->t('view/smarty3 is writable'), $status, true, $help);
@@ -553,16 +562,16 @@ class Installer
$help = "";
$error_msg = "";
if (function_exists('curl_init')) {
- $fetchResult = DI::httpRequest()->fetchFull($baseurl . "/install/testrewrite");
+ $fetchResult = DI::httpClient()->fetchFull($baseurl . "/install/testrewrite");
$url = Strings::normaliseLink($baseurl . "/install/testrewrite");
if ($fetchResult->getReturnCode() != 204) {
- $fetchResult = DI::httpRequest()->fetchFull($url);
+ $fetchResult = DI::httpClient()->fetchFull($url);
}
if ($fetchResult->getReturnCode() != 204) {
$status = false;
- $help = DI::l10n()->t('Url rewrite in .htaccess seems not working. Make sure you copied .htaccess-dist to .htaccess.') . EOL;
+ $help = DI::l10n()->t('Url rewrite in .htaccess seems not working. Make sure you copied .htaccess-dist to .htaccess.') . '
';
$help .= DI::l10n()->t('In some circumstances (like running inside containers), you can skip this error.');
$error_msg = [];
$error_msg['head'] = DI::l10n()->t('Error message from Curl when fetching');
@@ -580,6 +589,38 @@ class Installer
return $status;
}
+ /**
+ * 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.
+ *
+ * @return bool (true) as TLS is not mandatory
+ */
+ public function checkTLS()
+ {
+ $tls = false;
+
+ if (isset($_SERVER['HTTPS'])) {
+ if (($_SERVER['HTTPS'] == 1) || ($_SERVER['HTTPS'] == 'on')) {
+ $tls = true;
+ }
+ }
+
+ if (!$tls) {
+ $help = DI::l10n()->t('The detection of TLS to secure the communication between the browser and the new Friendica server failed.');
+ $help .= ' ' . DI::l10n()->t('It is highly encouraged to use Friendica only over a secure connection as sensitive information like passwords will be transmitted.');
+ $help .= ' ' . DI::l10n()->t('Please ensure that the connection to the server is secure.');
+ $this->addCheck(DI::l10n()->t('No TLS detected'), $tls, false, $help);
+ } else {
+ $this->addCheck(DI::l10n()->t('TLS detected'), $tls, false, '');
+ }
+
+ // TLS is not required
+ return true;
+ }
+
/**
* Imagick Check
*
@@ -620,7 +661,7 @@ class Installer
* @return bool true if the check was successful, otherwise false
* @throws Exception
*/
- public function checkDB(Database $dba)
+ public function checkDB(Database $dba): bool
{
$dba->reconnect();
@@ -642,8 +683,8 @@ class Installer
/**
* Setup the default cache for a new installation
*
- * @param Cache $configCache The configuration cache
- * @param string $basePath The determined basepath
+ * @param \Friendica\Core\Config\ValueObject\Cache $configCache The configuration cache
+ * @param string $basePath The determined basepath
*
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/