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