Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / install.php

diff --git a/mod/install.php b/mod/install.php
index b5af1373a443703b7ec35b862cc4cf84fdbc5c66..92b136c338d02bb4177ccf72cca0060421d82c0b 100755 (executable)
--- a/mod/install.php
+++ b/mod/install.php
@@ -4,7 +4,7 @@ require_once "include/Photo.php";
 $install_wizard_pass=1;
 
 
-function install_init(&$a){
+function install_init(App &$a){
 
        // $baseurl/install/testrwrite to test if rewite in .htaccess is working
        if ($a->argc==2 && $a->argv[1]=="testrewrite") {
@@ -15,7 +15,7 @@ function install_init(&$a){
        // We overwrite current theme css, because during install we could not have a working mod_rewrite
        // so we could not have a css at all. Here we set a static css file for the install procedure pages
        $a->config['system']['theme'] = "../install";
-       $a->theme['stylesheet'] = $a->get_baseurl()."/view/install/style.css";
+       $a->theme['stylesheet'] = App::get_baseurl()."/view/install/style.css";
        
        
        
@@ -25,7 +25,7 @@ function install_init(&$a){
 
 }
 
-function install_post(&$a) {
+function install_post(App &$a) {
        global $install_wizard_pass, $db;
 
        switch($install_wizard_pass) {
@@ -131,7 +131,7 @@ function get_db_errno() {
                return mysql_errno();
 }
 
-function install_content(&$a) {
+function install_content(App &$a) {
 
        global $install_wizard_pass, $db;
        $o = '';
@@ -231,7 +231,7 @@ function install_content(&$a) {
                                '$next' => t('Next'),
                                '$reload' => t('Check again'),
                                '$phpath' => $phpath,
-                               '$baseurl' => $a->get_baseurl(),
+                               '$baseurl' => App::get_baseurl(),
                        ));
                        return $o;
                }; break;
@@ -265,7 +265,7 @@ function install_content(&$a) {
 
                                '$lbl_10' => t('Please select a default timezone for your website'),
 
-                               '$baseurl' => $a->get_baseurl(),
+                               '$baseurl' => App::get_baseurl(),
 
                                '$phpath' => $phpath,
 
@@ -305,7 +305,7 @@ function install_content(&$a) {
 
                                '$timezone' => field_timezone('timezone', t('Please select a default timezone for your website'), $timezone, ''),
                                '$language' => array('language', t('System Language:'), 'en', t('Set the default language for your Friendica installation interface and to send emails.'), $lang_choices),
-                               '$baseurl' => $a->get_baseurl(),
+                               '$baseurl' => App::get_baseurl(),
 
 
 
@@ -518,14 +518,13 @@ function check_smarty3(&$checks) {
 }
 
 function check_htaccess(&$checks) {
-       $a = get_app();
        $status = true;
        $help = "";
        if (function_exists('curl_init')){
-               $test = fetch_url($a->get_baseurl()."/install/testrewrite");
+               $test = fetch_url(App::get_baseurl()."/install/testrewrite");
 
                if ($test!="ok")
-                       $test = fetch_url(normalise_link($a->get_baseurl()."/install/testrewrite"));
+                       $test = fetch_url(normalise_link(App::get_baseurl()."/install/testrewrite"));
 
                if ($test!="ok") {
                        $status = false;
@@ -561,7 +560,7 @@ function check_imagik(&$checks) {
 
 
 
-function manual_config(&$a) {
+function manual_config(App &$a) {
        $data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8');
        $o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');
        $o .= "<textarea rows=\"24\" cols=\"80\" >$data</textarea>";
@@ -599,8 +598,7 @@ function load_database($db) {
 }
 
 function what_next() {
-       $a = get_app();
-       $baseurl = $a->get_baseurl();
+       $baseurl = App::get_baseurl();
        return
                t('<h1>What next</h1>')
                ."<p>".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.')