Improve Addons documentation

[friendica.git] / mod / install.php

diff --git a/mod/install.php b/mod/install.php
index 323cb31fdd64ed93912cbb73a93c735b79f6d08e..4596f9a251a552573d31787ff11eeb8016953ece 100644 (file)
--- a/mod/install.php
+++ b/mod/install.php
@@ -51,7 +51,7 @@ function install_post(App $a) {
                        $phpath = notags(trim($_POST['phpath']));
 
                        require_once("include/dba.php");
-                       if (!dba::connect($dbhost, $dbuser, $dbpass, $dbdata, true)) {
+                       if (!dba::connect($dbhost, $dbuser, $dbpass, $dbdata)) {
                                $a->data['db_conn_failed'] = true;
                        }
 
@@ -140,37 +140,11 @@ function install_content(App $a) {
        switch ($install_wizard_pass) {
                case 1: { // System check
 
-
-                       $checks = [];
-
-                       check_funcs($checks);
-
-                       check_imagik($checks);
-
-                       check_htconfig($checks);
-
-                       check_smarty3($checks);
-
-                       check_keys($checks);
-
                        if (x($_POST, 'phpath')) {
                                $phpath = notags(trim($_POST['phpath']));
                        }
 
-                       check_php($phpath, $checks);
-
-                       check_htaccess($checks);
-
-                       /// @TODO Maybe move this out?
-                       function check_passed($v, $c) {
-                               if ($c['required']) {
-                                       $v = $v && $c['status'];
-                               }
-                               return $v;
-                       }
-                       $checkspassed = array_reduce($checks, "check_passed", true);
-
-
+                       list($checks, $checkspassed) = Install::check($phpath);
 
                        $tpl = get_markup_template('install_checks.tpl');
                        $o .= replace_macros($tpl, [