fbrowser: Take the picture as that mostly fits

[friendica.git] / mod / install.php

diff --git a/mod/install.php b/mod/install.php
index e30c30689308ae4e9c41c39154b24376c621e481..b1c2010eef5da0f65f8f37ae468824db0046df16 100755 (executable)
--- a/mod/install.php
+++ b/mod/install.php
@@ -11,6 +11,14 @@ function install_init(&$a){
                echo "ok";
                killme();
        }
+       
+       // 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";
+       
+       
+       
        global $install_wizard_pass;
        if (x($_POST,'pass'))
                $install_wizard_pass = intval($_POST['pass']);
@@ -69,6 +77,7 @@ function install_post(&$a) {
                        $dbdata = notags(trim($_POST['dbdata']));
                        $phpath = notags(trim($_POST['phpath']));
                        $timezone = notags(trim($_POST['timezone']));
+                       $language = notags(trim($_POST['language']));
                        $adminmail = notags(trim($_POST['adminmail']));
 
                        // connect to db
@@ -81,6 +90,7 @@ function install_post(&$a) {
                                '$dbpass' => $dbpass,
                                '$dbdata' => $dbdata,
                                '$timezone' => $timezone,
+                               '$language' => $language,
                                '$urlpath' => $urlpath,
                                '$phpath' => $phpath,
                                '$adminmail' => $adminmail
@@ -265,6 +275,8 @@ function install_content(&$a) {
 
                        $adminmail = notags(trim($_POST['adminmail']));
                        $timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
+                       /* Installed langs */
+                       $lang_choices = get_avaiable_languages();
 
                        $tpl = get_markup_template('install_settings.tpl');
                        $o .= replace_macros($tpl, array(
@@ -283,7 +295,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(),