Frio - Bring back some padding space (#5585)

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

diff --git a/src/Core/Install.php b/src/Core/Install.php
index 65ef1db2417d4ca23eb4e86adec546fe3c43ebca..ec33ef9634d77c0440dc74a4aac4b7111f263435 100644 (file)
--- a/src/Core/Install.php
+++ b/src/Core/Install.php
@@ -42,7 +42,7 @@ class Install extends BaseObject
 \r
                self::checkImagick($checks);\r
 \r
-               self::checkHtConfig($checks);\r
+               self::checkLocalIni($checks);\r
 \r
                self::checkSmarty3($checks);\r
 \r
@@ -54,7 +54,7 @@ class Install extends BaseObject
 \r
                $checkspassed = array_reduce($checks,\r
                        function ($v, $c) {\r
-                               if ($c['require']) {\r
+                               if (!empty($c['require'])) {\r
                                        $v = $v && $c['status'];\r
                                }\r
                                return $v;\r
@@ -66,7 +66,7 @@ class Install extends BaseObject
 \r
        /**\r
         * Executes the installation of Friendica in the given environment.\r
-        * - Creates `.htconfig.php`\r
+        * - Creates `config/local.ini.php`\r
         * - Installs Database Structure\r
         *\r
         * @param string        $urlpath        Path based on the URL of Friendica (e.g. '/friendica')\r
@@ -80,9 +80,9 @@ class Install extends BaseObject
         * @param string        $adminmail      Mail-Adress of the administrator\r
         * @param int           $rino           Rino-enabled (1 = true, 0 = false)\r
         */\r
-       public static function install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail, $rino = 1)\r
+       public static function install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail)\r
        {\r
-               $tpl = get_markup_template('htconfig.tpl');\r
+               $tpl = get_markup_template('local.ini.tpl');\r
                $txt = replace_macros($tpl,[\r
                        '$dbhost' => $dbhost,\r
                        '$dbuser' => $dbuser,\r
@@ -93,10 +93,9 @@ class Install extends BaseObject
                        '$urlpath' => $urlpath,\r
                        '$phpath' => $phpath,\r
                        '$adminmail' => $adminmail,\r
-                       '$rino' => $rino\r
                ]);\r
 \r
-               $result = file_put_contents('.htconfig.php', $txt);\r
+               $result = file_put_contents('config/local.ini.php', $txt);\r
                if (! $result) {\r
                        self::getApp()->data['txt'] = $txt;\r
                }\r
@@ -303,27 +302,27 @@ class Install extends BaseObject
        }\r
 \r
        /**\r
-        * ".htconfig.php" - Check\r
+        * "config/local.ini.php" - Check\r
         *\r
-        * Checks if it's possible to create the ".htconfig.php"\r
+        * Checks if it's possible to create the "config/local.ini.php"\r
         *\r
         * @param array $checks The list of all checks (by-ref parameter!)\r
         */\r
-       public static function checkHtConfig(&$checks)\r
+       public static function checkLocalIni(&$checks)\r
        {\r
                $status = true;\r
                $help = "";\r
-               if ((file_exists('.htconfig.php') && !is_writable('.htconfig.php')) ||\r
-                       (!file_exists('.htconfig.php') && !is_writable('.'))) {\r
+               if ((file_exists('config/local.ini.php') && !is_writable('config/local.ini.php')) ||\r
+                       (!file_exists('config/local.ini.php') && !is_writable('.'))) {\r
 \r
                        $status = false;\r
-                       $help = L10n::t('The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.') . EOL;\r
+                       $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;\r
                        $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;\r
-                       $help .= L10n::t('At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder.') . EOL;\r
+                       $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;\r
                        $help .= L10n::t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" for instructions.') . EOL;\r
                }\r
 \r
-               self::addCheck($checks, L10n::t('.htconfig.php is writable'), $status, false, $help);\r
+               self::addCheck($checks, L10n::t('config/local.ini.php is writable'), $status, false, $help);\r
 \r
        }\r
 \r
@@ -376,7 +375,7 @@ class Install extends BaseObject
                                $error_msg = [];\r
                                $error_msg['head'] = L10n::t('Error message from Curl when fetching');\r
                                $error_msg['url'] = $test['redirect_url'];\r
-                               $error_msg['msg'] = $test['error'];\r
+                               $error_msg['msg'] = defaults($test, 'error', '');\r
                        }\r
                        self::addCheck($checks, L10n::t('Url rewrite is working'), $status, true, $help, $error_msg);\r
                } else {\r