Merge pull request #10040 from annando/file-permissions

[friendica.git] / src / Core / Installer.php

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index b780776cc100cd29a1fe0718d43ee47af835baf9..2824b072c414e853d1abe51a19aa1d35946c75bd 100644 (file)
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -1,7 +1,24 @@
 <?php
 /**
- * @file src/Core/Install.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Core;
 
 use DOMDocument;
@@ -11,7 +28,6 @@ use Friendica\Database\Database;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
 use Friendica\Util\Images;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 /**
@@ -176,11 +192,11 @@ class Installer
         */
        public function installDatabase($basePath)
        {
-               $result = DBStructure::update($basePath, false, true, true);
+               $result = DBStructure::install($basePath);
 
                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('Please see the file "INSTALL.txt".');
+                       $txt .= DI::l10n()->t('Please see the file "doc/INSTALL.md".');
 
                        $this->addCheck($txt, false, true, htmlentities($result, ENT_COMPAT, 'UTF-8'));
 
@@ -242,7 +258,7 @@ 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 <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>") . 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 <a href='https://github.com/friendica/friendica/blob/stable/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>") . EOL;
                        $help .= EOL . EOL;
                        $tpl = Renderer::getMarkupTemplate('field_input.tpl');
                        /// @todo Separate backend Installer class and presentation layer/view
@@ -447,6 +463,13 @@ class Installer
                );
                $returnVal = $returnVal ? $status : false;
 
+               $status = $this->checkFunction('proc_open',
+                       DI::l10n()->t('Program execution functions'),
+                       DI::l10n()->t('Error: Program execution functions required but not enabled.'),
+                       true
+               );
+               $returnVal = $returnVal ? $status : false;
+
                $status = $this->checkFunction('json_encode',
                        DI::l10n()->t('JSON PHP module'),
                        DI::l10n()->t('Error: JSON PHP module required but not installed.'),
@@ -482,7 +505,7 @@ class Installer
                        $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;
+                       $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;
                }
 
                $this->addCheck(DI::l10n()->t('config/local.config.php is writable'), $status, false, $help);
@@ -531,11 +554,11 @@ 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) {