Implement Smarty3

[friendica.git] / mod / install.php

diff --git a/mod/install.php b/mod/install.php
old mode 100644 (file)
new mode 100755 (executable)
index 6d6232a..ab6d7d2
--- a/mod/install.php
+++ b/mod/install.php
@@ -60,7 +60,7 @@ function install_post(&$a) {
 
                        return; 
                        break;
-               case 4;
+               case 4:
                        $urlpath = $a->get_path();
                        $dbhost = notags(trim($_POST['dbhost']));
                        $dbuser = notags(trim($_POST['dbuser']));
@@ -155,11 +155,11 @@ function install_content(&$a) {
        }
 
        if(x($a->data,'txt') && strlen($a->data['txt'])) {
-               $tpl = get_markup_template('install.tpl');
                $db_return_text .= manual_config($a);
        }
        
        if ($db_return_text!="") {
+               $tpl = get_markup_template('install.tpl');
                return replace_macros($tpl, array(
                        '$title' => $install_title,
                        '$pass' => "",
@@ -184,15 +184,16 @@ function install_content(&$a) {
 
                        check_php($phpath, $checks);
 
-                       check_htaccess($checks);
-                       
+            check_htaccess($checks);
+            
                        function check_passed($v, $c){
                                if ($c['required'])
                                        $v = $v && $c['status'];
                                return $v;
                        }
                        $checkspassed = array_reduce($checks, "check_passed", true);
-                       
+               
+
 
                        $tpl = get_markup_template('install_checks.tpl');
                        $o .= replace_macros($tpl, array(
@@ -219,7 +220,14 @@ function install_content(&$a) {
                        
 
                        $tpl = get_markup_template('install_db.tpl');
-                       $o .= replace_macros($tpl, array(
+
+                       $includes = array(
+                               '$field_input'  => 'field_input.tpl',
+                               '$field_password' => 'field_password.tpl',
+                       );
+                       $includes = set_template_includes($a->theme['template_engine'], $includes);
+
+                       $o .= replace_macros($tpl,$includes + array(
                                '$title' => $install_title,
                                '$pass' => t('Database connection'),
                                '$info_01' => t('In order to install Friendica we need to know how to connect to your database.'),
@@ -259,7 +267,13 @@ function install_content(&$a) {
                        $timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
                        
                        $tpl = get_markup_template('install_settings.tpl');
-                       $o .= replace_macros($tpl, array(
+
+                       $includes = array(
+                               '$field_input' => 'field_input.tpl',
+                       );
+                       $includes = set_template_includes($a->theme['template_engine'], $includes);
+
+                       $o .= replace_macros($tpl, $includes + array(
                                '$title' => $install_title,
                                '$pass' => t('Site settings'),
 
@@ -381,6 +395,7 @@ function check_funcs(&$checks) {
                        check_add($ck_funcs, t('Apache mod_rewrite module'), true, true, "");
                }
        }
+
        if(! function_exists('curl_init')){
                $ck_funcs[0]['status']= false;
                $ck_funcs[0]['help']= t('Error: libCURL PHP module required but not installed.');
@@ -421,26 +436,31 @@ function check_htconfig(&$checks) {
                $help .= t('At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder.').EOL;
                $help .= t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" for instructions.').EOL; 
        }
-
+    
        check_add($checks, t('.htconfig.php is writable'), $status, false, $help);
-       
+
 }
 
 function check_htaccess(&$checks) {
        $a = get_app();
        $status = true;
        $help = "";
-       $test = fetch_url($a->get_baseurl()."/install/testrewrite");
-       if ($test!="ok") {
-               $status = false;
-               $help = t('Url rewrite in .htconfig is not working. Check your server configuration.');
-       }
-       check_add($checks, t('Url rewrite is working'), $status, true, $help);
+       if (function_exists('curl_init')){
+        $test = fetch_url($a->get_baseurl()."/install/testrewrite");
+        if ($test!="ok") {
+            $status = false;
+            $help = t('Url rewrite in .htaccess is not working. Check your server configuration.');
+        }
+        check_add($checks, t('Url rewrite is working'), $status, true, $help); 
+    } else {
+        // cannot check modrewrite if libcurl is not installed
+    }
+       
 }
 
        
 function manual_config(&$a) {
-       $data = htmlentities($a->data['txt']);
+       $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>";
        return $o;
@@ -459,7 +479,6 @@ function load_database_rem($v, $i){
 function load_database($db) {
 
        $str = file_get_contents('database.sql');
-//     $str = array_reduce(explode("\n", $str),"load_database_rem","");
        $arr = explode(';',$str);
        $errors = false;
        foreach($arr as $a) {
@@ -481,7 +500,7 @@ function what_next() {
                ."<p>".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.')
                .t('Please see the file "INSTALL.txt".')                        
                ."</p><p>"
-               .t("Go to your new Firendica 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.")
+               .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.")
                ."</p>";
 }