Remove extraneous SQL condition part in mod/unfollow

[friendica.git] / mod / install.php

diff --git a/mod/install.php b/mod/install.php
index 59dcf92c56cba012850c7ef2e365b55038a99310..d2d322b3b93cdb7eb83805c72bded8e636d64029 100644 (file)
--- a/mod/install.php
+++ b/mod/install.php
@@ -7,8 +7,7 @@ use Friendica\App;
 use Friendica\Core\Install;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\dba;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Util\Temporal;
 
 $install_wizard_pass = 1;
@@ -27,8 +26,6 @@ function install_init(App $a) {
        $a->setConfigValue('system', 'value', '../install');
        $a->theme['stylesheet'] = System::baseUrl()."/view/install/style.css";
 
-       Install::setInstallMode();
-
        global $install_wizard_pass;
        if (x($_POST, 'pass')) {
                $install_wizard_pass = intval($_POST['pass']);
@@ -53,7 +50,7 @@ function install_post(App $a) {
                        $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;
                        }
 
@@ -71,9 +68,22 @@ function install_post(App $a) {
                        $adminmail = notags(trim($_POST['adminmail']));
 
                        // connect to db
-                       dba::connect($dbhost, $dbuser, $dbpass, $dbdata);
+                       DBA::connect($dbhost, $dbuser, $dbpass, $dbdata);
+
+                       $errors = Install::createConfig($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail);
+
+                       if ($errors) {
+                               $a->data['db_failed'] = $errors;
+                               return;
+                       }
+
+                       $errors = Install::installDatabaseStructure();
 
-                       Install::install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail);
+                       if ($errors) {
+                               $a->data['db_failed'] = $errors;
+                       } else {
+                               $a->data['db_installed'] = true;
+                       }
 
                        return;
                break;
@@ -112,9 +122,9 @@ function install_content(App $a) {
                $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,