X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FInstaller.php;h=4f2f2d99f3c9e0615781a6dff73b0ca4f8c9c676;hb=043e04f484c1fbaf4444454ba08b2c769ca2761c;hp=73f85785e79e23792143e50f3bdf61450c9a643f;hpb=eafcf3592db02392770cdc88bed9ddb000cb44f2;p=friendica.git diff --git a/src/Core/Installer.php b/src/Core/Installer.php index 73f85785e7..4f2f2d99f3 100644 --- a/src/Core/Installer.php +++ b/src/Core/Installer.php @@ -1,17 +1,33 @@ . + * */ + namespace Friendica\Core; use DOMDocument; use Exception; -use Friendica\Core\Config\Cache\IConfigCache; -use Friendica\Database\DBA; +use Friendica\Core\Config\Cache; +use Friendica\Database\Database; use Friendica\Database\DBStructure; -use Friendica\Object\Image; -use Friendica\Util\Network; -use Friendica\Util\Profiler; +use Friendica\DI; +use Friendica\Util\Images; use Friendica\Util\Strings; /** @@ -129,39 +145,38 @@ class Installer * - Creates `config/local.config.php` * - Installs Database Structure * - * @param string $phppath Path to the PHP-Binary (optional, if not set e.g. 'php' or '/usr/bin/php') - * @param string $urlpath Path based on the URL of Friendica (e.g. '/friendica') - * @param string $dbhost Hostname/IP of the Friendica Database - * @param string $dbuser Username of the Database connection credentials - * @param string $dbpass Password of the Database connection credentials - * @param string $dbdata Name of the Database - * @param string $timezone Timezone of the Friendica Installaton (e.g. 'Europe/Berlin') - * @param string $language 2-letter ISO 639-1 code (eg. 'en') - * @param string $adminmail Mail-Adress of the administrator - * @param string $basepath The basepath of Friendica + * @param Cache $configCache The config cache with all config relevant information * * @return bool true if the config was created, otherwise false * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public function createConfig($phppath, $urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $timezone, $language, $adminmail, $basepath) + public function createConfig(Cache $configCache) { + $basepath = $configCache->get('system', 'basepath'); + $tpl = Renderer::getMarkupTemplate('local.config.tpl'); $txt = Renderer::replaceMacros($tpl, [ - '$phpath' => $phppath, - '$dbhost' => $dbhost, - '$dbuser' => $dbuser, - '$dbpass' => $dbpass, - '$dbdata' => $dbdata, - '$timezone' => $timezone, - '$language' => $language, - '$urlpath' => $urlpath, - '$adminmail' => $adminmail, + '$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'), ]); $result = file_put_contents($basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.config.php', $txt); if (!$result) { - $this->addCheck(L10n::t('The database configuration file "config/local.config.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'), false, false, htmlentities($txt, ENT_COMPAT, 'UTF-8')); + $this->addCheck(DI::l10n()->t('The database configuration file "config/local.config.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'), false, false, htmlentities($txt, ENT_COMPAT, 'UTF-8')); } return $result; @@ -180,8 +195,8 @@ class Installer $result = DBStructure::update($basePath, false, true, true); if ($result) { - $txt = L10n::t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . EOL; - $txt .= L10n::t('Please see the file "INSTALL.txt".'); + $txt = DI::l10n()->t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . EOL; + $txt .= DI::l10n()->t('Please see the file "doc/INSTALL.md".'); $this->addCheck($txt, false, true, htmlentities($result, ENT_COMPAT, 'UTF-8')); @@ -242,17 +257,18 @@ class Installer $help = ""; if (!$passed) { - $help .= L10n::t('Could not find a command line version of PHP in the web server PATH.') . EOL; - $help .= 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 .= 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; $tpl = Renderer::getMarkupTemplate('field_input.tpl'); + /// @todo Separate backend Installer class and presentation layer/view $help .= Renderer::replaceMacros($tpl, [ - '$field' => ['phpath', L10n::t('PHP executable path'), $phppath, L10n::t('Enter full path to php executable. You can leave this blank to continue the installation.')], + '$field' => ['config-php_path', DI::l10n()->t('PHP executable path'), $phppath, DI::l10n()->t('Enter full path to php executable. You can leave this blank to continue the installation.')], ]); $phppath = ""; } - $this->addCheck(L10n::t('Command line PHP') . ($passed ? " ($phppath)" : ""), $passed, false, $help); + $this->addCheck(DI::l10n()->t('Command line PHP') . ($passed ? " ($phppath)" : ""), $passed, false, $help); if ($passed) { $cmd = "$phppath -v"; @@ -261,10 +277,10 @@ class Installer list($result) = explode("\n", $result); $help = ""; if (!$passed2) { - $help .= L10n::t("PHP executable is not the php cli binary \x28could be cgi-fgci version\x29") . EOL; - $help .= L10n::t('Found PHP version: ') . "$result"; + $help .= DI::l10n()->t("PHP executable is not the php cli binary \x28could be cgi-fgci version\x29") . EOL; + $help .= DI::l10n()->t('Found PHP version: ') . "$result"; } - $this->addCheck(L10n::t('PHP cli binary'), $passed2, true, $help); + $this->addCheck(DI::l10n()->t('PHP cli binary'), $passed2, true, $help); } else { // return if it was required return !$required; @@ -277,13 +293,13 @@ class Installer $passed3 = $result == $str; $help = ""; if (!$passed3) { - $help .= L10n::t('The command line version of PHP on your system does not have "register_argc_argv" enabled.') . EOL; - $help .= L10n::t('This is required for message delivery to work.'); + $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('This is required for message delivery to work.'); } else { $this->phppath = $phppath; } - $this->addCheck(L10n::t('PHP register_argc_argv'), $passed3, true, $help); + $this->addCheck(DI::l10n()->t('PHP register_argc_argv'), $passed3, true, $help); } // passed2 & passed3 are required if first check passed @@ -315,11 +331,11 @@ class Installer // Get private key if (!$res) { - $help .= L10n::t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys') . EOL; - $help .= L10n::t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".'); + $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('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".'); $status = false; } - $this->addCheck(L10n::t('Generate encryption keys'), $res, true, $help); + $this->addCheck(DI::l10n()->t('Generate encryption keys'), $res, true, $help); return $status; } @@ -358,6 +374,7 @@ class Installer * - mb_string * - XML * - iconv + * - fileinfo * - POSIX * * @return bool false if something required failed @@ -370,27 +387,27 @@ class Installer $status = true; if (function_exists('apache_get_modules')) { if (!in_array('mod_rewrite', apache_get_modules())) { - $help = L10n::t('Error: Apache webserver mod-rewrite module is required but not installed.'); + $help = DI::l10n()->t('Error: Apache webserver mod-rewrite module is required but not installed.'); $status = false; $returnVal = false; } } - $this->addCheck(L10n::t('Apache mod_rewrite module'), $status, true, $help); + $this->addCheck(DI::l10n()->t('Apache mod_rewrite module'), $status, true, $help); $help = ''; $status = true; if (!function_exists('mysqli_connect') && !class_exists('pdo')) { $status = false; - $help = L10n::t('Error: PDO or MySQLi PHP module required but not installed.'); + $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 = L10n::t('Error: The MySQL driver for PDO is not installed.'); + $help = DI::l10n()->t('Error: The MySQL driver for PDO is not installed.'); $returnVal = false; } } - $this->addCheck(L10n::t('PDO or MySQLi PHP module'), $status, true, $help); + $this->addCheck(DI::l10n()->t('PDO or MySQLi PHP module'), $status, true, $help); // check for XML DOM Documents being able to be generated $help = ''; @@ -398,57 +415,64 @@ class Installer try { new DOMDocument(); } catch (Exception $e) { - $help = L10n::t('Error, XML PHP module required but not installed.'); + $help = DI::l10n()->t('Error, XML PHP module required but not installed.'); $status = false; $returnVal = false; } - $this->addCheck(L10n::t('XML PHP module'), $status, true, $help); + $this->addCheck(DI::l10n()->t('XML PHP module'), $status, true, $help); $status = $this->checkFunction('curl_init', - L10n::t('libCurl PHP module'), - L10n::t('Error: libCURL PHP module required but not installed.'), + DI::l10n()->t('libCurl PHP module'), + DI::l10n()->t('Error: libCURL PHP module required but not installed.'), true ); $returnVal = $returnVal ? $status : false; $status = $this->checkFunction('imagecreatefromjpeg', - L10n::t('GD graphics PHP module'), - L10n::t('Error: GD graphics PHP module with JPEG support required but not installed.'), + DI::l10n()->t('GD graphics PHP module'), + DI::l10n()->t('Error: GD graphics PHP module with JPEG support required but not installed.'), true ); $returnVal = $returnVal ? $status : false; $status = $this->checkFunction('openssl_public_encrypt', - L10n::t('OpenSSL PHP module'), - L10n::t('Error: openssl PHP module required but not installed.'), + DI::l10n()->t('OpenSSL PHP module'), + DI::l10n()->t('Error: openssl PHP module required but not installed.'), true ); $returnVal = $returnVal ? $status : false; $status = $this->checkFunction('mb_strlen', - L10n::t('mb_string PHP module'), - L10n::t('Error: mb_string PHP module required but not installed.'), + DI::l10n()->t('mb_string PHP module'), + DI::l10n()->t('Error: mb_string PHP module required but not installed.'), true ); $returnVal = $returnVal ? $status : false; $status = $this->checkFunction('iconv_strlen', - L10n::t('iconv PHP module'), - L10n::t('Error: iconv PHP module required but not installed.'), + DI::l10n()->t('iconv PHP module'), + DI::l10n()->t('Error: iconv PHP module required but not installed.'), true ); $returnVal = $returnVal ? $status : false; $status = $this->checkFunction('posix_kill', - L10n::t('POSIX PHP module'), - L10n::t('Error: POSIX PHP module required but not installed.'), + DI::l10n()->t('POSIX PHP module'), + DI::l10n()->t('Error: POSIX PHP module required but not installed.'), true ); $returnVal = $returnVal ? $status : false; $status = $this->checkFunction('json_encode', - L10n::t('JSON PHP module'), - L10n::t('Error: JSON PHP module required but not installed.'), + DI::l10n()->t('JSON PHP module'), + DI::l10n()->t('Error: JSON PHP module required but not installed.'), + true + ); + $returnVal = $returnVal ? $status : false; + + $status = $this->checkFunction('finfo_open', + DI::l10n()->t('File Information PHP module'), + DI::l10n()->t('Error: File Information PHP module required but not installed.'), true ); $returnVal = $returnVal ? $status : false; @@ -471,13 +495,13 @@ class Installer (!file_exists('config/local.config.php') && !is_writable('.'))) { $status = false; - $help = 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 .= 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 .= 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 .= L10n::t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" 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.') . 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 "INSTALL.txt" for instructions.') . EOL; } - $this->addCheck(L10n::t('config/local.config.php is writable'), $status, false, $help); + $this->addCheck(DI::l10n()->t('config/local.config.php is writable'), $status, false, $help); // Local INI File is not required return true; @@ -497,13 +521,13 @@ class Installer if (!is_writable('view/smarty3')) { $status = false; - $help = L10n::t('Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') . EOL; - $help .= 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 .= 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 .= 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.') . 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; } - $this->addCheck(L10n::t('view/smarty3 is writable'), $status, true, $help); + $this->addCheck(DI::l10n()->t('view/smarty3 is writable'), $status, true, $help); return $status; } @@ -523,23 +547,23 @@ class Installer $help = ""; $error_msg = ""; if (function_exists('curl_init')) { - $fetchResult = Network::fetchUrlFull($baseurl . "/install/testrewrite"); + $fetchResult = DI::httpRequest()->fetchFull($baseurl . "/install/testrewrite"); $url = Strings::normaliseLink($baseurl . "/install/testrewrite"); if ($fetchResult->getReturnCode() != 204) { - $fetchResult = Network::fetchUrlFull($url); + $fetchResult = DI::httpRequest()->fetchFull($url); } if ($fetchResult->getReturnCode() != 204) { $status = false; - $help = L10n::t('Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist to .htaccess.'); + $help = DI::l10n()->t('Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist to .htaccess.'); $error_msg = []; - $error_msg['head'] = L10n::t('Error message from Curl when fetching'); + $error_msg['head'] = DI::l10n()->t('Error message from Curl when fetching'); $error_msg['url'] = $fetchResult->getRedirectUrl(); $error_msg['msg'] = $fetchResult->getError(); } - $this->addCheck(L10n::t('Url rewrite is working'), $status, true, $help, $error_msg); + $this->addCheck(DI::l10n()->t('Url rewrite is working'), $status, true, $help, $error_msg); } else { // cannot check modrewrite if libcurl is not installed /// @TODO Maybe issue warning here? @@ -562,17 +586,17 @@ class Installer if (class_exists('Imagick')) { $imagick = true; - $supported = Image::supportedTypes(); + $supported = Images::supportedTypes(); if (array_key_exists('image/gif', $supported)) { $gif = true; } } if (!$imagick) { - $this->addCheck(L10n::t('ImageMagick PHP extension is not installed'), $imagick, false, ""); + $this->addCheck(DI::l10n()->t('ImageMagick PHP extension is not installed'), $imagick, false, ""); } else { - $this->addCheck(L10n::t('ImageMagick PHP extension is installed'), $imagick, false, ""); + $this->addCheck(DI::l10n()->t('ImageMagick PHP extension is installed'), $imagick, false, ""); if ($imagick) { - $this->addCheck(L10n::t('ImageMagick supports GIF'), $gif, false, ""); + $this->addCheck(DI::l10n()->t('ImageMagick supports GIF'), $gif, false, ""); } } @@ -583,32 +607,41 @@ class Installer /** * Checking the Database connection and if it is available for the current installation * - * @param IConfigCache $configCache The configuration cache - * @param Profiler $profiler The profiler of this app - * @param string $dbhost Hostname/IP of the Friendica Database - * @param string $dbuser Username of the Database connection credentials - * @param string $dbpass Password of the Database connection credentials - * @param string $dbdata Name of the Database + * @param Database $dba * * @return bool true if the check was successful, otherwise false * @throws Exception */ - public function checkDB(IConfigCache $configCache, Profiler $profiler, $dbhost, $dbuser, $dbpass, $dbdata) + public function checkDB(Database $dba) { - if (!DBA::connect($configCache, $profiler, $dbhost, $dbuser, $dbpass, $dbdata)) { - $this->addCheck(L10n::t('Could not connect to database.'), false, true, ''); + $dba->reconnect(); - return false; - } - - if (DBA::connected()) { + if ($dba->isConnected()) { if (DBStructure::existsTable('user')) { - $this->addCheck(L10n::t('Database already in use.'), false, true, ''); + $this->addCheck(DI::l10n()->t('Database already in use.'), false, true, ''); return false; } + } else { + $this->addCheck(DI::l10n()->t('Could not connect to database.'), false, true, ''); + + return false; } return true; } + + /** + * Setup the default cache for a new installation + * + * @param Cache $configCache The configuration cache + * @param string $basePath The determined basepath + * + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + */ + public function setUpCache(Cache $configCache, $basePath) + { + $configCache->set('config', 'php_path' , $this->getPHPPath()); + $configCache->set('system', 'basepath' , $basePath); + } }