From cc0b4ff0f98c3b38ec14cb77e5ca750f54c7882b Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Wed, 20 Apr 2016 14:17:48 +0200
Subject: [PATCH] during installation choose the highest RINO version possible

---
 mod/install.php             | 13 +++++++++++--
 view/templates/htconfig.tpl |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/mod/install.php b/mod/install.php
index b1c2010eef..2339124469 100755
--- 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 971bb50482..02ffa62c14 100644
--- 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
 
-- 
2.39.5