MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add Install Mode

Browse source 
- merged `friendica/develop` to `nupplaPhil/install_mode`
- content merged `mod/install.php` to `src/Class/`
This commit is contained in:
Philipp Holzer 2018-04-28 15:15:54 +02:00
parent 1ab965c944
commit 41c6d63052
2 changed files with 43 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
mod/install.php
View file

@ -140,37 +140,11 @@ function install_content(App $a) {
switch ($install_wizard_pass) { switch ($install_wizard_pass) {
case 1: { // System check case 1: { // System check
$checks = [];
check_funcs($checks);
check_imagik($checks);
check_htconfig($checks);
check_smarty3($checks);
check_keys($checks);
if (x($_POST, 'phpath')) { if (x($_POST, 'phpath')) {
$phpath = notags(trim($_POST['phpath'])); $phpath = notags(trim($_POST['phpath']));
} }
check_php($phpath, $checks); list($checks, $checkspassed) = Install::check($phpath);
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);
$tpl = get_markup_template('install_checks.tpl'); $tpl = get_markup_template('install_checks.tpl');
$o .= replace_macros($tpl, [ $o .= replace_macros($tpl, [

70
src/Core/Install.php
View file

@ -18,7 +18,8 @@ use DOMDocument;
*/ */
class Install extends BaseObject class Install extends BaseObject
{ {
public static function setInstallMode() { public static function setInstallMode()
{
self::getApp()->mode = App::MODE_INSTALL; 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) { if (! $result) {
self::getApp()->data['txt'] = $txt; self::getApp()->data['txt'] = $txt;
} }
@ -97,6 +98,7 @@ class Install extends BaseObject
'status' => $status, 'status' => $status,
'required' => $required, 'required' => $required,
'help' => $help, 'help' => $help,
'error_msg' => $error_msg,
]; ];
} }
@ -111,7 +113,7 @@ class Install extends BaseObject
} }
$help = ""; $help = "";
if (!$passed) { 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 <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>") . 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 <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>") . EOL;
$help .= EOL . EOL; $help .= EOL . EOL;
$tpl = get_markup_template('field_input.tpl'); $tpl = get_markup_template('field_input.tpl');
@ -126,12 +128,12 @@ class Install extends BaseObject
if ($passed) { if ($passed) {
$cmd = "$phpath -v"; $cmd = "$phpath -v";
$result = trim(shell_exec($cmd)); $result = trim(shell_exec($cmd));
$passed2 = ( strpos($result, "(cli)") !== false); $passed2 = (strpos($result, "(cli)") !== false);
list($result) = explode("\n", $result); list($result) = explode("\n", $result);
$help = ""; $help = "";
if (!$passed2) { if (!$passed2) {
$help .= L10n::t("PHP executable is not the php cli binary \x28could be cgi-fgci version\x29"). EOL; $help .= L10n::t("PHP executable is not the php cli binary \x28could be cgi-fgci version\x29") . EOL;
$help .= L10n::t('Found PHP version: ')."<tt>$result</tt>"; $help .= L10n::t('Found PHP version: ') . "<tt>$result</tt>";
} }
self::addCheck($checks, L10n::t('PHP cli binary'), $passed2, true, $help); self::addCheck($checks, L10n::t('PHP cli binary'), $passed2, true, $help);
} }
@ -144,7 +146,7 @@ class Install extends BaseObject
$passed3 = $result == $str; $passed3 = $result == $str;
$help = ""; $help = "";
if (!$passed3) { 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.'); $help .= L10n::t('This is required for message delivery to work.');
} }
self::addCheck($checks, L10n::t('PHP register_argc_argv'), $passed3, true, $help); self::addCheck($checks, L10n::t('PHP register_argc_argv'), $passed3, true, $help);
@ -170,8 +172,8 @@ class Install extends BaseObject
// Get private key // Get private key
if (! $res) { 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('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".'); $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); 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]['status'] = false;
$ck_funcs[0]['help'] = L10n::t('Error: libCURL PHP module required but not installed.'); $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]['status'] = false;
$ck_funcs[1]['help'] = L10n::t('Error: GD graphics PHP module with JPEG support required but not installed.'); $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]['status'] = false;
$ck_funcs[2]['help'] = L10n::t('Error: openssl PHP module required but not installed.'); $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]['status'] = false;
$ck_funcs[3]['help'] = L10n::t('Error: PDO or MySQLi PHP module required but not installed.'); $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]['status'] = false;
$ck_funcs[3]['help'] = L10n::t('Error: The MySQL driver for PDO is not installed.'); $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]['status'] = false;
$ck_funcs[4]['help'] = L10n::t('Error: mb_string PHP module required but not installed.'); $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]['status'] = false;
$ck_funcs[6]['help'] = L10n::t('Error: iconv PHP module required but not installed.'); $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]['status'] = false;
$ck_funcs[7]['help'] = L10n::t('Error: POSIX PHP module required but not installed.'); $ck_funcs[7]['help'] = L10n::t('Error: POSIX PHP module required but not installed.');
} }
@ -248,17 +250,17 @@ class Install extends BaseObject
{ {
$status = true; $status = true;
$help = ""; $help = "";
if ((file_exists('config/.htconfig.php') && !is_writable('.htconfig.php')) || if ((file_exists('.htconfig.php') && !is_writable('.htconfig.php')) ||
(!file_exists('config/.htconfig.php') && !is_writable('.'))) { (!file_exists('.htconfig.php') && !is_writable('.'))) {
$status = false; $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('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('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('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; $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')) { if (!is_writable('view/smarty3')) {
$status = false; $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('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('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("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("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); self::addCheck($checks, L10n::t('view/smarty3 is writable'), $status, true, $help);
@ -283,16 +285,22 @@ class Install extends BaseObject
{ {
$status = true; $status = true;
$help = ""; $help = "";
$error_msg = "";
if (function_exists('curl_init')) { if (function_exists('curl_init')) {
$test = Network::fetchUrl(System::baseUrl()."/install/testrewrite"); $test = Network::fetchUrlFull(System::baseUrl() . "/install/testrewrite");
if ($test != "ok") { $url = normalise_link(System::baseUrl() . "/install/testrewrite");
$test = Network::fetchUrl(normalise_link(System::baseUrl()."/install/testrewrite")); if ($test['body'] != "ok") {
$test = Network::fetchUrlFull($url);
} }
if ($test != "ok") { if ($test['body'] != "ok") {
$status = false; $status = false;
$help = L10n::t('Url rewrite in .htaccess is not working. Check your server configuration.'); $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); self::addCheck($checks, L10n::t('Url rewrite is working'), $status, true, $help);
} else { } else {