X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Finstall.php;h=99ebfc6bab3a792ace3514b68c8dcb3785eeb0b1;hb=836058c47745f502890a209dfd6efcb3596ace84;hp=ed07c4ea6a2192f08b1e00476cf440606d693d90;hpb=78321c2a43492447dd9336abfb4463bc6fe710ee;p=friendica.git diff --git a/mod/install.php b/mod/install.php index ed07c4ea6a..99ebfc6bab 100755 --- a/mod/install.php +++ b/mod/install.php @@ -73,7 +73,7 @@ function install_post(&$a) { // connect to db $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true); - $tpl = get_intltext_template('htconfig.tpl'); + $tpl = get_markup_template('htconfig.tpl'); $txt = replace_macros($tpl,array( '$dbhost' => $dbhost, '$dbuser' => $dbuser, @@ -84,13 +84,15 @@ function install_post(&$a) { '$phpath' => $phpath, '$adminmail' => $adminmail )); + $result = file_put_contents('.htconfig.php', $txt); if(! $result) { $a->data['txt'] = $txt; } - + $errors = load_database($db); + if($errors) $a->data['db_failed'] = $errors; @@ -148,7 +150,7 @@ function install_content(&$a) { return replace_macros($tpl, array( '$title' => $install_title, '$pass' => '', - '$status' => t('Permission denied.'), + '$status' => t('Database already in use.'), '$text' => '', )); }