X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FInstaller.php;h=4a287a885f50e9d5e47988de099608fe567f4e74;hb=4facd1dfdba93ede48ca40b5e146424e6701118b;hp=f7190b2f898ee5488b1c5a2d423b85c188639901;hpb=53e9203d37ee0c1a2afed0faf295e3c622ac2e17;p=friendica.git

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index f7190b2f89..4a287a885f 100644
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -6,7 +6,7 @@ namespace Friendica\Core;
 
 use DOMDocument;
 use Exception;
-use Friendica\Core\Renderer;
+use Friendica\Core\Config\ConfigCache;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\Object\Image;
@@ -47,6 +47,7 @@ class Installer
 	 * Returns the PHP path
 	 *
 	 * @return string the PHP Path
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function getPHPPath()
 	{
@@ -79,10 +80,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)
 	{
@@ -123,25 +125,26 @@ class Installer
 
 	/**
 	 * Executes the installation of Friendica in the given environment.
-	 * - Creates `config/local.ini.php`
+	 * - 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 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
 	 *
 	 * @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)
 	{
-		$tpl = Renderer::getMarkupTemplate('local.ini.tpl');
+		$tpl = Renderer::getMarkupTemplate('local.config.tpl');
 		$txt = Renderer::replaceMacros($tpl, [
 			'$phpath' => $phppath,
 			'$dbhost' => $dbhost,
@@ -154,10 +157,10 @@ class Installer
 			'$adminmail' => $adminmail,
 		]);
 
-		$result = file_put_contents($basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.ini.php', $txt);
+		$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.ini.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(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;
@@ -166,11 +169,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 +218,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)) {
@@ -266,7 +271,7 @@ class Installer
 
 		if ($passed2) {
 			$str = Strings::getRandomName(8);
-			$cmd = "$phppath util/testargs.php $str";
+			$cmd = "$phppath bin/testargs.php $str";
 			$result = trim(shell_exec($cmd));
 			$passed3 = $result == $str;
 			$help = "";
@@ -390,7 +395,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;
@@ -440,13 +445,20 @@ class Installer
 		);
 		$returnVal = $returnVal ? $status : false;
 
+		$status = $this->checkFunction('json_encode',
+			L10n::t('JSON PHP module'),
+			L10n::t('Error: JSON PHP module required but not installed.'),
+			true
+		);
+		$returnVal = $returnVal ? $status : false;
+
 		return $returnVal;
 	}
 
 	/**
-	 * "config/local.ini.php" - Check
+	 * "config/local.config.php" - Check
 	 *
-	 * Checks if it's possible to create the "config/local.ini.php"
+	 * Checks if it's possible to create the "config/local.config.php"
 	 *
 	 * @return bool false if something required failed
 	 */
@@ -454,17 +466,17 @@ class Installer
 	{
 		$status = true;
 		$help = "";
-		if ((file_exists('config/local.ini.php') && !is_writable('config/local.ini.php')) ||
-			(!file_exists('config/local.ini.php') && !is_writable('.'))) {
+		if ((file_exists('config/local.config.php') && !is_writable('config/local.config.php')) ||
+			(!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.ini.php" in the "config" folder of your web server and it is unable to do so.') . EOL;
+			$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.ini.php in your Friendica "config" folder.') . 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;
 		}
 
-		$this->addCheck(L10n::t('config/local.ini.php is writable'), $status, false, $help);
+		$this->addCheck(L10n::t('config/local.config.php is writable'), $status, false, $help);
 
 		// Local INI File is not required
 		return true;
@@ -500,8 +512,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)
 	{
@@ -569,17 +582,18 @@ 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 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
 	 *
 	 * @return bool true if the check was successful, otherwise false
+	 * @throws Exception
 	 */
-	public function checkDB($dbhost, $dbuser, $dbpass, $dbdata)
+	public function checkDB(ConfigCache $configCache, $dbhost, $dbuser, $dbpass, $dbdata)
 	{
-		require_once 'include/dba.php';
-		if (!DBA::connect($dbhost, $dbuser, $dbpass, $dbdata)) {
+		if (!DBA::connect($configCache, $dbhost, $dbuser, $dbpass, $dbdata)) {
 			$this->addCheck(L10n::t('Could not connect to database.'), false, true, '');
 
 			return false;