X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FInstall.php;h=ec33ef9634d77c0440dc74a4aac4b7111f263435;hb=08fc86802a4ad2a265ed45d4e3a6603c65f6c70f;hp=663195e104f208602d07fe41253aea4aa2449aed;hpb=2503660f97c3f9588f1965c23b98d0c78109ee0b;p=friendica.git diff --git a/src/Core/Install.php b/src/Core/Install.php index 663195e104..ec33ef9634 100644 --- a/src/Core/Install.php +++ b/src/Core/Install.php @@ -42,7 +42,7 @@ class Install extends BaseObject self::checkImagick($checks); - self::checkHtConfig($checks); + self::checkLocalIni($checks); self::checkSmarty3($checks); @@ -54,7 +54,7 @@ class Install extends BaseObject $checkspassed = array_reduce($checks, function ($v, $c) { - if ($c['require']) { + if (!empty($c['require'])) { $v = $v && $c['status']; } return $v; @@ -80,7 +80,7 @@ class Install extends BaseObject * @param string $adminmail Mail-Adress of the administrator * @param int $rino Rino-enabled (1 = true, 0 = false) */ - public static function install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail, $rino = 1) + public static function install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail) { $tpl = get_markup_template('local.ini.tpl'); $txt = replace_macros($tpl,[ @@ -93,7 +93,6 @@ class Install extends BaseObject '$urlpath' => $urlpath, '$phpath' => $phpath, '$adminmail' => $adminmail, - '$rino' => $rino ]); $result = file_put_contents('config/local.ini.php', $txt); @@ -309,7 +308,7 @@ class Install extends BaseObject * * @param array $checks The list of all checks (by-ref parameter!) */ - public static function checkHtConfig(&$checks) + public static function checkLocalIni(&$checks) { $status = true; $help = ""; @@ -376,7 +375,7 @@ class Install extends BaseObject $error_msg = []; $error_msg['head'] = L10n::t('Error message from Curl when fetching'); $error_msg['url'] = $test['redirect_url']; - $error_msg['msg'] = $test['error']; + $error_msg['msg'] = defaults($test, 'error', ''); } self::addCheck($checks, L10n::t('Url rewrite is working'), $status, true, $help, $error_msg); } else {