forgotten templates

[friendica.git] / mod / install.php

diff --git a/mod/install.php b/mod/install.php
old mode 100755 (executable)
new mode 100644 (file)
index ae46291..81e4805
--- a/mod/install.php
+++ b/mod/install.php
@@ -1,9 +1,12 @@
 <?php
-
+/**
+ * @file mod/install.php
+ */
 use Friendica\App;
 use Friendica\Core\System;
-
-require_once "include/Photo.php";
+use Friendica\Database\DBM;
+use Friendica\Database\DBStructure;
+use Friendica\Object\Image;
 
 $install_wizard_pass = 1;
 
@@ -28,7 +31,7 @@ function install_init(App $a) {
 }
 
 function install_post(App $a) {
-       global $install_wizard_pass, $db;
+       global $install_wizard_pass;
 
        switch($install_wizard_pass) {
                case 1:
@@ -44,9 +47,7 @@ function install_post(App $a) {
                        $phpath = notags(trim($_POST['phpath']));
 
                        require_once("include/dba.php");
-                       unset($db);
-                       $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
-                       if (!$db->connected) {
+                       if (!dba::connect($dbhost, $dbuser, $dbpass, $dbdata, true)) {
                                $a->data['db_conn_failed'] = true;
                        }
 
@@ -65,7 +66,7 @@ function install_post(App $a) {
                        $rino = 2;
 
                        // connect to db
-                       $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
+                       dba::connect($dbhost, $dbuser, $dbpass, $dbdata, true);
 
                        $tpl = get_markup_template('htconfig.tpl');
                        $txt = replace_macros($tpl,array(
@@ -87,7 +88,7 @@ function install_post(App $a) {
                                $a->data['txt'] = $txt;
                        }
 
-                       $errors = load_database($db);
+                       $errors = load_database();
 
 
                        if ($errors) {
@@ -103,7 +104,7 @@ function install_post(App $a) {
 
 function install_content(App $a) {
 
-       global $install_wizard_pass, $db;
+       global $install_wizard_pass;
        $o = '';
        $wizard_status = "";
        $install_title = t('Friendica Communications Server - Setup');
@@ -133,9 +134,9 @@ function install_content(App $a) {
                $db_return_text .= $txt;
        }
 
-       if ($db && $db->connected) {
+       if (dba::$connected) {
                $r = q("SELECT COUNT(*) as `total` FROM `user`");
-               if (dbm::is_result($r) && $r[0]['total']) {
+               if (DBM::is_result($r) && $r[0]['total']) {
                        $tpl = get_markup_template('install.tpl');
                        return replace_macros($tpl, array(
                                '$title' => $install_title,
@@ -318,7 +319,7 @@ function check_php(&$phpath, &$checks) {
        $help = "";
        if (!$passed) {
                $help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL;
-               $help .= t("If you don't have a command line version of PHP installed on server, you will not be able to run the background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>") . EOL;
+               $help .= t("If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>") . EOL;
                $help .= EOL . EOL;
                $tpl = get_markup_template('field_input.tpl');
                $help .= replace_macros($tpl, array(
@@ -503,7 +504,7 @@ function check_imagik(&$checks) {
 
        if (class_exists('Imagick')) {
                $imagick = true;
-               $supported = Photo::supportedTypes();
+               $supported = Image::supportedTypes();
                if (array_key_exists('image/gif', $supported)) {
                        $gif = true;
                }
@@ -534,10 +535,8 @@ function load_database_rem($v, $i) {
        }
 }
 
-function load_database($db) {
-
-       require_once("include/dbstructure.php");
-       $errors = update_structure(false, true);
+function load_database() {
+       $errors = DBStructure::update(false, true);
 
        return $errors;
 }
@@ -546,7 +545,7 @@ function what_next() {
        $baseurl = System::baseUrl();
        return
                t('<h1>What next</h1>')
-               ."<p>".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.')
+               ."<p>".t('IMPORTANT: You will need to [manually] setup a scheduled task for the worker.')
                .t('Please see the file "INSTALL.txt".')
                ."</p><p>"
                .t("Go to your new Friendica node <a href='$baseurl/register'>registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.")