Add Install Mode

- merged `friendica/develop` to `nupplaPhil/install_mode`
- content merged `mod/install.php` to `src/Class/`

diff --git a/mod/install.php b/mod/install.php
index 323cb31fdd64ed93912cbb73a93c735b79f6d08e..f8a0fd16fe1595ac5d268c2bcb7bb7de4ade024d 100644 (file)
--- a/mod/install.php
+++ b/mod/install.php
@@ -140,37 +140,11 @@ function install_content(App $a) {
        switch ($install_wizard_pass) {
                case 1: { // System check
 
-
-                       $checks = [];
-
-                       check_funcs($checks);
-
-                       check_imagik($checks);
-
-                       check_htconfig($checks);
-
-                       check_smarty3($checks);
-
-                       check_keys($checks);
-
                        if (x($_POST, 'phpath')) {
                                $phpath = notags(trim($_POST['phpath']));
                        }
 
-                       check_php($phpath, $checks);
-
-                       check_htaccess($checks);
-
-                       /// @TODO Maybe move this out?
-                       function check_passed($v, $c) {
-                               if ($c['required']) {
-                                       $v = $v && $c['status'];
-                               }
-                               return $v;
-                       }
-                       $checkspassed = array_reduce($checks, "check_passed", true);
-
-
+                       list($checks, $checkspassed) = Install::check($phpath);
 
                        $tpl = get_markup_template('install_checks.tpl');
                        $o .= replace_macros($tpl, [

diff --git a/src/Core/Install.php b/src/Core/Install.php
index ad600a70a2504dac37c2be44f491f2a63580cb44..8dd354eb91b291da750531b70110a23cc601127c 100644 (file)
--- a/src/Core/Install.php
+++ b/src/Core/Install.php
@@ -18,7 +18,8 @@ use DOMDocument;
  */\r
 class Install extends BaseObject\r
 {\r
-       public static function setInstallMode() {\r
+       public static function setInstallMode()\r
+       {\r
                self::getApp()->mode = App::MODE_INSTALL;\r
        }\r
 \r
@@ -69,7 +70,7 @@ class Install extends BaseObject
                ]);\r
 \r
 \r
-               $result = file_put_contents('config/.htconfig.php', $txt);\r
+               $result = file_put_contents('.htconfig.php', $txt);\r
                if (! $result) {\r
                        self::getApp()->data['txt'] = $txt;\r
                }\r
@@ -96,7 +97,8 @@ class Install extends BaseObject
                        'title' => $title,\r
                        'status' => $status,\r
                        'required' => $required,\r
-                       'help'  => $help,\r
+                       'help' => $help,\r
+                       'error_msg' => $error_msg,\r
                ];\r
        }\r
 \r
@@ -111,7 +113,7 @@ class Install extends BaseObject
                }\r
                $help = "";\r
                if (!$passed) {\r
-                       $help .= L10n::t('Could not find a command line version of PHP in the web server PATH.'). EOL;\r
+                       $help .= L10n::t('Could not find a command line version of PHP in the web server PATH.') . EOL;\r
                        $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 <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>") . EOL;\r
                        $help .= EOL . EOL;\r
                        $tpl = get_markup_template('field_input.tpl');\r
@@ -126,12 +128,12 @@ class Install extends BaseObject
                if ($passed) {\r
                        $cmd = "$phpath -v";\r
                        $result = trim(shell_exec($cmd));\r
-                       $passed2 = ( strpos($result, "(cli)") !== false);\r
+                       $passed2 = (strpos($result, "(cli)") !== false);\r
                        list($result) = explode("\n", $result);\r
                        $help = "";\r
                        if (!$passed2) {\r
-                               $help .= L10n::t("PHP executable is not the php cli binary \x28could be cgi-fgci version\x29"). EOL;\r
-                               $help .= L10n::t('Found PHP version: ')."<tt>$result</tt>";\r
+                               $help .= L10n::t("PHP executable is not the php cli binary \x28could be cgi-fgci version\x29") . EOL;\r
+                               $help .= L10n::t('Found PHP version: ') . "<tt>$result</tt>";\r
                        }\r
                        self::addCheck($checks, L10n::t('PHP cli binary'), $passed2, true, $help);\r
                }\r
@@ -144,7 +146,7 @@ class Install extends BaseObject
                        $passed3 = $result == $str;\r
                        $help = "";\r
                        if (!$passed3) {\r
-                               $help .= L10n::t('The command line version of PHP on your system does not have "register_argc_argv" enabled.'). EOL;\r
+                               $help .= L10n::t('The command line version of PHP on your system does not have "register_argc_argv" enabled.') . EOL;\r
                                $help .= L10n::t('This is required for message delivery to work.');\r
                        }\r
                        self::addCheck($checks, L10n::t('PHP register_argc_argv'), $passed3, true, $help);\r
@@ -162,16 +164,16 @@ class Install extends BaseObject
 \r
                if (function_exists('openssl_pkey_new')) {\r
                        $res = openssl_pkey_new([\r
-                               'digest_alg'       => 'sha1',\r
+                               'digest_alg' => 'sha1',\r
                                'private_key_bits' => 4096,\r
-                               'encrypt_key'      => false\r
+                               'encrypt_key' => false\r
                        ]);\r
                }\r
 \r
                // Get private key\r
 \r
-               if (! $res) {\r
-                       $help .= L10n::t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'). EOL;\r
+               if (!$res) {\r
+                       $help .= L10n::t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys') . EOL;\r
                        $help .= L10n::t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".');\r
                }\r
                self::addCheck($checks, L10n::t('Generate encryption keys'), $res, true, $help);\r
@@ -199,19 +201,19 @@ class Install extends BaseObject
                        }\r
                }\r
 \r
-               if (! function_exists('curl_init')) {\r
+               if (!function_exists('curl_init')) {\r
                        $ck_funcs[0]['status'] = false;\r
                        $ck_funcs[0]['help'] = L10n::t('Error: libCURL PHP module required but not installed.');\r
                }\r
-               if (! function_exists('imagecreatefromjpeg')) {\r
+               if (!function_exists('imagecreatefromjpeg')) {\r
                        $ck_funcs[1]['status'] = false;\r
                        $ck_funcs[1]['help'] = L10n::t('Error: GD graphics PHP module with JPEG support required but not installed.');\r
                }\r
-               if (! function_exists('openssl_public_encrypt')) {\r
+               if (!function_exists('openssl_public_encrypt')) {\r
                        $ck_funcs[2]['status'] = false;\r
                        $ck_funcs[2]['help'] = L10n::t('Error: openssl PHP module required but not installed.');\r
                }\r
-               if (! function_exists('mysqli_connect') && !class_exists('pdo')) {\r
+               if (!function_exists('mysqli_connect') && !class_exists('pdo')) {\r
                        $ck_funcs[3]['status'] = false;\r
                        $ck_funcs[3]['help'] = L10n::t('Error: PDO or MySQLi PHP module required but not installed.');\r
                }\r
@@ -219,15 +221,15 @@ class Install extends BaseObject
                        $ck_funcs[3]['status'] = false;\r
                        $ck_funcs[3]['help'] = L10n::t('Error: The MySQL driver for PDO is not installed.');\r
                }\r
-               if (! function_exists('mb_strlen')) {\r
+               if (!function_exists('mb_strlen')) {\r
                        $ck_funcs[4]['status'] = false;\r
                        $ck_funcs[4]['help'] = L10n::t('Error: mb_string PHP module required but not installed.');\r
                }\r
-               if (! function_exists('iconv_strlen')) {\r
+               if (!function_exists('iconv_strlen')) {\r
                        $ck_funcs[6]['status'] = false;\r
                        $ck_funcs[6]['help'] = L10n::t('Error: iconv PHP module required but not installed.');\r
                }\r
-               if (! function_exists('posix_kill')) {\r
+               if (!function_exists('posix_kill')) {\r
                        $ck_funcs[7]['status'] = false;\r
                        $ck_funcs[7]['help'] = L10n::t('Error: POSIX PHP module required but not installed.');\r
                }\r
@@ -248,17 +250,17 @@ class Install extends BaseObject
        {\r
                $status = true;\r
                $help = "";\r
-               if ((file_exists('config/.htconfig.php') && !is_writable('.htconfig.php')) ||\r
-                       (!file_exists('config/.htconfig.php') && !is_writable('.'))) {\r
+               if ((file_exists('.htconfig.php') && !is_writable('.htconfig.php')) ||\r
+                       (!file_exists('.htconfig.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 "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 "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
+                       $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('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('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('config/.htconfig.php is writable'), $status, false, $help);\r
+               self::addCheck($checks, L10n::t('.htconfig.php is writable'), $status, false, $help);\r
 \r
        }\r
 \r
@@ -269,10 +271,10 @@ class Install extends BaseObject
                if (!is_writable('view/smarty3')) {\r
 \r
                        $status = false;\r
-                       $help = L10n::t('Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') .EOL;\r
-                       $help .= L10n::t('In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder.').EOL;\r
-                       $help .= L10n::t("Please ensure that the user that your web server runs as \x28e.g. www-data\x29 has write access to this folder.").EOL;\r
-                       $help .= L10n::t("Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files \x28.tpl\x29 that it contains.").EOL;\r
+                       $help = L10n::t('Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') . EOL;\r
+                       $help .= L10n::t('In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder.') . EOL;\r
+                       $help .= L10n::t("Please ensure that the user that your web server runs as \x28e.g. www-data\x29 has write access to this folder.") . EOL;\r
+                       $help .= L10n::t("Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files \x28.tpl\x29 that it contains.") . EOL;\r
                }\r
 \r
                self::addCheck($checks, L10n::t('view/smarty3 is writable'), $status, true, $help);\r
@@ -283,16 +285,22 @@ class Install extends BaseObject
        {\r
                $status = true;\r
                $help = "";\r
+               $error_msg = "";\r
                if (function_exists('curl_init')) {\r
-                       $test = Network::fetchUrl(System::baseUrl()."/install/testrewrite");\r
+                       $test = Network::fetchUrlFull(System::baseUrl() . "/install/testrewrite");\r
 \r
-                       if ($test != "ok") {\r
-                               $test = Network::fetchUrl(normalise_link(System::baseUrl()."/install/testrewrite"));\r
+                       $url = normalise_link(System::baseUrl() . "/install/testrewrite");\r
+                       if ($test['body'] != "ok") {\r
+                               $test = Network::fetchUrlFull($url);\r
                        }\r
 \r
-                       if ($test != "ok") {\r
+                       if ($test['body'] != "ok") {\r
                                $status = false;\r
                                $help = L10n::t('Url rewrite in .htaccess is not working. Check your server configuration.');\r
+                               $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
                        }\r
                        self::addCheck($checks, L10n::t('Url rewrite is working'), $status, true, $help);\r
                } else {\r