Merge pull request #4208 from annando/thr-parent

[friendica.git] / mod / install.php

diff --git a/mod/install.php b/mod/install.php
old mode 100755 (executable)
new mode 100644 (file)
index ed75e62..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;
 
@@ -133,7 +136,7 @@ function install_content(App $a) {
 
        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,
@@ -316,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(
@@ -501,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;
                }
@@ -533,9 +536,7 @@ function load_database_rem($v, $i) {
 }
 
 function load_database() {
-
-       require_once("include/dbstructure.php");
-       $errors = update_structure(false, true);
+       $errors = DBStructure::update(false, true);
 
        return $errors;
 }
@@ -544,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.")