during installation choose the highest RINO version possible

diff --git a/mod/install.php b/mod/install.php
index b1c2010eef5da0f65f8f37ae468824db0046df16..2339124469ef220c8373de7d48c7ada6a3b88524 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
                        ));
 
 
@@ -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.');

diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl
index 971bb504824ebb8b76acc8713c3ded5859ea3f4f..02ffa62c14e371736b31b88812bf48dbeaaa7a31 100644 (file)
--- a/view/templates/htconfig.tpl
+++ b/view/templates/htconfig.tpl
@@ -59,7 +59,7 @@ $a->config['system']['huburl'] = '[internal]';
 // Encryption will only be provided if this setting is true and the
 // PHP mcrypt extension is installed on both systems
 
-$a->config['system']['rino_encrypt'] = true;
+$a->config['system']['rino_encrypt'] = {{$rino}};
 
 // default system theme