*/
use Friendica\App;
-use Friendica\Core\L10n;
use Friendica\Core\Install;
+use Friendica\Core\L10n;
use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
use Friendica\Util\Temporal;
$install_wizard_pass = 1;
$phpath = notags(trim($_POST['phpath']));
require_once("include/dba.php");
- if (!dba::connect($dbhost, $dbuser, $dbpass, $dbdata)) {
+ if (!DBA::connect($dbhost, $dbuser, $dbpass, $dbdata)) {
$a->data['db_conn_failed'] = true;
}
$adminmail = notags(trim($_POST['adminmail']));
// connect to db
- dba::connect($dbhost, $dbuser, $dbpass, $dbdata);
+ DBA::connect($dbhost, $dbuser, $dbpass, $dbdata);
- Install::install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail);
+ $errors = Install::createConfig($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail);
+
+ if ($errors) {
+ $a->data['db_failed'] = $errors;
+ return;
+ }
+
+ $errors = Install::installDatabaseStructure();
+
+ if ($errors) {
+ $a->data['db_failed'] = $errors;
+ } else {
+ $a->data['db_installed'] = true;
+ }
return;
break;
$db_return_text .= $txt;
}
- if (dba::$connected) {
+ if (DBA::$connected) {
$r = q("SELECT COUNT(*) as `total` FROM `user`");
- if (DBM::is_result($r) && $r[0]['total']) {
+ if (DBA::isResult($r) && $r[0]['total']) {
$tpl = get_markup_template('install.tpl');
return replace_macros($tpl, [
'$title' => $install_title,