Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-18 15:03:41 +00:00
Code Issues Projects Releases Packages 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) {
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, [

30
src/Core/Install.php
View file

@ -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;
}
@ -97,6 +98,7 @@ class Install extends BaseObject
'status' => $status,
'required' => $required,
'help' => $help,
'error_msg' => $error_msg,
];
}
@ -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('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 "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;
}
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);
}
@ -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 {