X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FInstaller.php;h=de041773ef6b88b7525b7a35cad64ce043e9e798;hb=79e69ee52807967858f5cb89e702be035f979ba5;hp=4c30c94b04ec274d1780abdbe6395804e8723f9a;hpb=fabc90e9dd5f1c4280a9bfa6c6930a3fc985f87a;p=friendica.git diff --git a/src/Core/Installer.php b/src/Core/Installer.php index 4c30c94b04..de041773ef 100644 --- a/src/Core/Installer.php +++ b/src/Core/Installer.php @@ -6,11 +6,13 @@ namespace Friendica\Core; use DOMDocument; use Exception; -use Friendica\Core\Renderer; -use Friendica\Database\DBA; +use Friendica\Core\Config\Cache\ConfigCache; use Friendica\Database\DBStructure; +use Friendica\Factory\DBFactory; use Friendica\Object\Image; +use Friendica\Util\Logger\VoidLogger; use Friendica\Util\Network; +use Friendica\Util\Profiler; use Friendica\Util\Strings; /** @@ -47,6 +49,7 @@ class Installer * Returns the PHP path * * @return string the PHP Path + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function getPHPPath() { @@ -79,10 +82,11 @@ 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 $baseurl The baseurl of Friendica + * @param string $phpath Optional path to the PHP binary * * @return bool if the check succeed + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function checkEnvironment($baseurl, $phpath = null) { @@ -126,32 +130,32 @@ 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 ConfigCache $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(ConfigCache $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); @@ -166,11 +170,14 @@ 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() + public function installDatabase($basePath) { - $result = DBStructure::update(false, true, true); + $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; @@ -212,16 +219,15 @@ class Installer * - Checks if a PHP binary is available * - Checks if it is the CLI version * - Checks if "register_argc_argv" is enabled - * - * @param string $phppath Optional. The Path to the PHP-Binary + * + * @param string $phppath Optional. The Path to the PHP-Binary * @param bool $required Optional. If set to true, the PHP-Binary has to exist (Default false) * * @return bool false if something required failed + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function checkPHP($phppath = null, $required = false) { - $passed = false; - $passed2 = false; $passed3 = false; if (!isset($phppath)) { @@ -240,8 +246,9 @@ class Installer $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 .= 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', L10n::t('PHP executable path'), $phppath, L10n::t('Enter full path to php executable. You can leave this blank to continue the installation.')], ]); $phppath = ""; } @@ -352,6 +359,7 @@ class Installer * - mb_string * - XML * - iconv + * - fileinfo * - POSIX * * @return bool false if something required failed @@ -390,7 +398,7 @@ class Installer $help = ''; $status = true; try { - $xml = new DOMDocument(); + new DOMDocument(); } catch (Exception $e) { $help = L10n::t('Error, XML PHP module required but not installed.'); $status = false; @@ -447,6 +455,13 @@ class Installer ); $returnVal = $returnVal ? $status : false; + $status = $this->checkFunction('finfo_open', + L10n::t('File Information PHP module'), + L10n::t('Error: File Information PHP module required but not installed.'), + true + ); + $returnVal = $returnVal ? $status : false; + return $returnVal; } @@ -507,8 +522,9 @@ class Installer * * Checks, if "url_rewrite" is enabled in the ".htaccess" file * - * @param string $baseurl The baseurl of the app + * @param string $baseurl The baseurl of the app * @return bool false if something required failed + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function checkHtAccess($baseurl) { @@ -576,30 +592,42 @@ class Installer /** * Checking the Database connection and if it is available for the current installation * - * @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 ConfigCache $configCache The configuration cache + * @param Profiler $profiler The profiler of this app * * @return bool true if the check was successful, otherwise false + * @throws Exception */ - public function checkDB($dbhost, $dbuser, $dbpass, $dbdata) + public function checkDB(ConfigCache $configCache, Profiler $profiler) { - require_once 'include/dba.php'; - if (!DBA::connect($dbhost, $dbuser, $dbpass, $dbdata)) { - $this->addCheck(L10n::t('Could not connect to database.'), false, true, ''); - - return false; - } + $database = DBFactory::init($configCache, $profiler, [], new VoidLogger()); - if (DBA::connected()) { + if ($database->connected()) { if (DBStructure::existsTable('user')) { $this->addCheck(L10n::t('Database already in use.'), false, true, ''); return false; } + } else { + $this->addCheck(L10n::t('Could not connect to database.'), false, true, ''); + + return false; } return true; } + + /** + * Setup the default cache for a new installation + * + * @param ConfigCache $configCache The configuration cache + * @param string $basePath The determined basepath + * + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + */ + public function setUpCache(ConfigCache $configCache, $basePath) + { + $configCache->set('config', 'php_path' , $this->getPHPPath()); + $configCache->set('system', 'basepath' , $basePath); + } }