Better detection for remote user

[friendica.git] / mod / install.php

diff --git a/mod/install.php b/mod/install.php
index b1c2010eef5da0f65f8f37ae468824db0046df16..f36c91ef2aa0b4fc85303df74f9e2c5a1f8560c3 100755 (executable)
--- a/mod/install.php
+++ b/mod/install.php
@@ -79,6 +79,14 @@ function install_post(&$a) {
                        $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);
@@ -93,7 +101,8 @@ function install_post(&$a) {
                                '$language' => $language,
                                '$urlpath' => $urlpath,
                                '$phpath' => $phpath,
-                               '$adminmail' => $adminmail
+                               '$adminmail' => $adminmail,
+                               '$rino' => $rino
                        ));
 
 
@@ -408,7 +417,7 @@ function check_funcs(&$checks) {
        check_add($ck_funcs, t('mysqli PHP module'), true, true, "");
        check_add($ck_funcs, t('mb_string PHP module'), true, true, "");
        check_add($ck_funcs, t('mcrypt PHP module'), true, true, "");
-
+       check_add($ck_funcs, t('XML PHP module'), true, true, "");
 
        if(function_exists('apache_get_modules')){
                if (! in_array('mod_rewrite',apache_get_modules())) {
@@ -449,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.');
@@ -457,6 +466,13 @@ function check_funcs(&$checks) {
                check_add($checks, t('mcrypt_create_iv() function'), $__status, false, $__help);
        }
 
+       // check for XML DOM Documents being able to be generated
+       try {
+               $xml = new DOMDocument();
+       } catch (Exception $e) {
+               $ck_funcs[6]['status'] = false;
+               $ck_funcs[6]['help'] = t('Error, XML PHP module required but not installed.');
+       }
 
        /*if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg']))
                notice( t('Please see the file "INSTALL.txt".') . EOL);*/