Implement Smarty3

[friendica.git] / mod / install.php

diff --git a/mod/install.php b/mod/install.php
index 4e4631b85f170b323db9cd30ffb3c81b4f20b6c0..ab6d7d204f7044b9a051b77ea262ba84917b2495 100755 (executable)
--- a/mod/install.php
+++ b/mod/install.php
@@ -220,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.'),
@@ -260,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'),
 
@@ -447,7 +460,7 @@ function check_htaccess(&$checks) {
 
        
 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;
@@ -466,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) {
@@ -488,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>";
 }