Move forbidden_nicknames default to config file

[friendica.git] / mod / install.php

diff --git a/mod/install.php b/mod/install.php
index 4596f9a251a552573d31787ff11eeb8016953ece..6962ff2ddaf531ff87cb382ffc88ea01e03cd908 100644 (file)
--- a/mod/install.php
+++ b/mod/install.php
@@ -67,12 +67,11 @@ function install_post(App $a) {
                        $timezone = notags(trim($_POST['timezone']));
                        $language = notags(trim($_POST['language']));
                        $adminmail = notags(trim($_POST['adminmail']));
-                       $rino = 1;
 
                        // connect to db
                        dba::connect($dbhost, $dbuser, $dbpass, $dbdata);
 
-                       Install::install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail, $rino);
+                       Install::install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail);
 
                        return;
                break;
@@ -140,9 +139,7 @@ function install_content(App $a) {
        switch ($install_wizard_pass) {
                case 1: { // System check
 
-                       if (x($_POST, 'phpath')) {
-                               $phpath = notags(trim($_POST['phpath']));
-                       }
+                       $phpath = defaults($_POST, 'phpath', 'php');
 
                        list($checks, $checkspassed) = Install::check($phpath);
 
@@ -245,7 +242,7 @@ function install_content(App $a) {
 
 function manual_config(App $a) {
        $data = htmlentities($a->data['txt'],ENT_COMPAT, 'UTF-8');
-       $o = L10n::t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');
+       $o = L10n::t('The database configuration file "config/local.ini.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');
        $o .= "<textarea rows=\"24\" cols=\"80\" >$data</textarea>";
        return $o;
 }