Merge remote-tracking branch 'upstream/master'

[friendica.git] / mod / install.php

diff --git a/mod/install.php b/mod/install.php
index 5c508e4f2c79f0c3d8990df3a7369636e1980eac..27cc6af840e654d10e6f1758120bd70876af415c 100644 (file)
--- a/mod/install.php
+++ b/mod/install.php
@@ -12,6 +12,7 @@ function install_post(&$a) {
        $dbdata = notags(trim($_POST['dbdata']));
        $timezone = notags(trim($_POST['timezone']));
        $phpath = notags(trim($_POST['phpath']));
+       $adminmail = notags(trim($_POST['adminmail']));
 
        require_once("dba.php");
        unset($db);
@@ -35,9 +36,9 @@ function install_post(&$a) {
                }
        }
 
-       notice( t('Connected to database.') . EOL);
+       info( t('Connected to database.') . EOL);
 
-       $tpl = load_view_file('view/htconfig.tpl');
+       $tpl = get_intltext_template('htconfig.tpl');
        $txt = replace_macros($tpl,array(
                '$dbhost' => $dbhost,
                '$dbuser' => $dbuser,
@@ -45,8 +46,10 @@ function install_post(&$a) {
                '$dbdata' => $dbdata,
                '$timezone' => $timezone,
                '$urlpath' => $urlpath,
-               '$phpath' => $phpath
+               '$phpath' => $phpath,
+               '$adminmail' => $adminmail
        ));
+
        $result = file_put_contents('.htconfig.php', $txt);
        if(! $result) {
                $a->data = $txt;
@@ -95,7 +98,7 @@ function install_content(&$a) {
                }
        }
 
-       notice( t('Welcome to Friendika.') . EOL);
+       info( t('Welcome to Friendika.') . EOL);
 
 
        check_funcs();
@@ -116,8 +119,19 @@ function install_content(&$a) {
 
        require_once('datetime.php');
 
-       $tpl = load_view_file('view/install_db.tpl');
+       $tpl = get_markup_template('install_db.tpl');
        $o .= replace_macros($tpl, array(
+               '$lbl_01' => t('Friendika Social Network'),
+               '$lbl_02' => t('Installation'),
+               '$lbl_03' => t('In order to install Friendika we need to know how to connect to your database.'),
+               '$lbl_04' => t('Please contact your hosting provider or site administrator if you have questions about these settings.'),
+               '$lbl_05' => t('The database you specify below should already exist. If it does not, please create it before continuing.'),
+               '$lbl_06' => t('Database Server Name'),
+               '$lbl_07' => t('Database Login Name'),
+               '$lbl_08' => t('Database Login Password'),
+               '$lbl_09' => t('Database Name'),
+               '$lbl_10' => t('Please select a default timezone for your website'),
+               '$lbl_11' => t('Site administrator email address. Your account email address must match this in order to use the web admin panel.'), 
                '$baseurl' => $a->get_baseurl(),
                '$tzselect' => ((x($_POST,'timezone')) ? select_timezone($_POST['timezone']) : select_timezone()),
                '$submit' => t('Submit'),
@@ -125,7 +139,8 @@ function install_content(&$a) {
                '$dbuser' => notags(trim($_POST['dbuser'])),
                '$dbpass' => notags(trim($_POST['dbpass'])),
                '$dbdata' => notags(trim($_POST['dbdata'])),
-               '$phpath' => $phpath
+               '$phpath' => $phpath,
+               '$adminmail' => notags(trim($_POST['adminmail']))
        ));
 
        return $o;
@@ -184,7 +199,10 @@ function check_funcs() {
        if(! function_exists('openssl_public_encrypt')) 
                notice( t('Error: openssl PHP module required but not installed.') . EOL);      
        if(! function_exists('mysqli_connect')) 
-               notice( t('Error: mysqli PHP module required but not installed.') . EOL);       
+               notice( t('Error: mysqli PHP module required but not installed.') . EOL);
+       if(! function_exists('mb_strlen'))
+               notice( t('Error: mb_string PHP module required but not installed.') . EOL);
+       
        if((x($_SESSION,'sysmsg')) && strlen($_SESSION['sysmsg']))
                notice( t('Please see the file "INSTALL.txt".') . EOL);
 }
@@ -228,4 +246,4 @@ function load_database($db) {
                }
        }
        return $errors;
-}
\ No newline at end of file
+}