Issue 10293: mention the required function in the error message

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

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 4f2f2d99f3c9e0615781a6dff73b0ca4f8c9c676..b2b84c6182eaa76e3618c87463e21d4470631972 100644 (file)
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -133,9 +133,9 @@ class Installer
                        $returnVal = false;
                }
 
-               if (!$this->checkHtAccess($baseurl)) {
-                       $returnVal = false;
-               }
+               /// @TODO This check should not block installations because of containerization issues
+               /// @see https://github.com/friendica/docker/issues/134
+               $this->checkHtAccess($baseurl);
 
                return $returnVal;
        }
@@ -192,7 +192,7 @@ 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;
@@ -463,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 (proc_open) 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.'),
@@ -498,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);
@@ -539,7 +546,6 @@ class Installer
         *
         * @param string $baseurl The baseurl of the app
         * @return bool false if something required failed
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public function checkHtAccess($baseurl)
        {
@@ -556,14 +562,16 @@ class Installer
 
                        if ($fetchResult->getReturnCode() != 204) {
                                $status = false;
-                               $help = DI::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 seems not working. Make sure you copied .htaccess-dist to .htaccess.') . EOL;
+                               $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');
                                $error_msg['url'] = $fetchResult->getRedirectUrl();
                                $error_msg['msg'] = $fetchResult->getError();
                        }
 
-                       $this->addCheck(DI::l10n()->t('Url rewrite is working'), $status, true, $help, $error_msg);
+                       /// @TODO Required false because of cURL issues in containers - see https://github.com/friendica/docker/issues/134
+                       $this->addCheck(DI::l10n()->t('Url rewrite is working'), $status, false, $help, $error_msg);
                } else {
                        // cannot check modrewrite if libcurl is not installed
                        /// @TODO Maybe issue warning here?