]> git.mxchange.org Git - friendica.git/blobdiff - mod/install.php
Merge pull request #2471 from annando/1604-diaspora-always-on
[friendica.git] / mod / install.php
index e30c30689308ae4e9c41c39154b24376c621e481..2339124469ef220c8373de7d48c7ada6a3b88524 100755 (executable)
@@ -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,7 +77,16 @@ 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']));
+                       // In step 4 of the installer, we passed the  check for mcrypt
+                       // already, so we can activate RINO, make RINO2 the default
+                       // and only fall back if the mcrypt_create_iv function is
+                       // not available on the system.
+                       $rino = 2;
+                       if (! function_exists('mcrypt_create_iv')) {
+                               $rino = 1;
+                       ]
 
                        // connect to db
                        $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
@@ -81,9 +98,11 @@ function install_post(&$a) {
                                '$dbpass' => $dbpass,
                                '$dbdata' => $dbdata,
                                '$timezone' => $timezone,
+                               '$language' => $language,
                                '$urlpath' => $urlpath,
                                '$phpath' => $phpath,
-                               '$adminmail' => $adminmail
+                               '$adminmail' => $adminmail,
+                               '$rino' => $rino
                        ));
 
 
@@ -265,6 +284,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 +304,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(),
 
 
@@ -437,7 +458,7 @@ function check_funcs(&$checks) {
        if ($ck_funcs[5]['status']) {
                if (function_exists('mcrypt_create_iv')) {
                        $__status = true;
-                       $__help = "If you are using php_cli, please make sure that mcrypt module is enabled in its config file";
+                       $__help = t("If you are using php_cli, please make sure that mcrypt module is enabled in its config file");
                } else {
                        $__status = false;
                        $__help = t('Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer.');