From 94694aae86d38a8a609dc99e3eb9dc6170a0c350 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 1 Feb 2017 08:45:13 +0100 Subject: [PATCH] RInO is not true / false anymore --- htconfig.php | 6 +++--- view/templates/htconfig.tpl | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/htconfig.php b/htconfig.php index 222be83839..41317c4608 100644 --- a/htconfig.php +++ b/htconfig.php @@ -65,9 +65,9 @@ $a->config['php_path'] = 'php'; $a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) is allowed by default. -// Encryption will only be provided if this setting is true and the -// PHP mcrypt extension is installed on both systems -// needs the mcrypt PHP module, set to 0 to disable, 1 is deprecated +// Encryption will only be provided if this setting is set to a non zero +// value and the PHP mcrypt extension is installed on both systems +// set to 0 to disable, 2 to enable, 1 is deprecated but wont need mcrypt $a->config['system']['rino_encrypt'] = 2; diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl index 7c90ee0de4..78a2e47df2 100644 --- a/view/templates/htconfig.tpl +++ b/view/templates/htconfig.tpl @@ -80,8 +80,9 @@ $a->config['system']['maximagesize'] = 800000; $a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) is allowed by default. -// Encryption will only be provided if this setting is true and the -// PHP mcrypt extension is installed on both systems +// Encryption will only be provided if this setting is set to a non zero +// value and the PHP mcrypt extension is installed on both systems +// set to 0 to disable, 2 to enable, 1 is deprecated but wont need mcrypt $a->config['system']['rino_encrypt'] = {{$rino}};