Update RINO settings

diff --git a/htconfig.php b/htconfig.php
index 67db66e86fad5b591322d3efe021de041e5290a2..86f2d1432144282597e28fcb834442bb50243e94 100644 (file)
--- a/htconfig.php
+++ b/htconfig.php
@@ -62,9 +62,9 @@ $a->config['php_path'] = 'php';
 
 // Server-to-server private message encryption (RINO) is allowed by default.
 // Encryption will only be provided if this setting is set to a non zero value
-// set to 0 to disable, 2 to enable, 1 is deprecated
+// set to 0 to disable, 3 to enable
 
-$a->config['system']['rino_encrypt'] = 2;
+$a->config['system']['rino_encrypt'] = 3;
 
 // allowed themes (change this from admin panel after installation)
 

diff --git a/include/network.php b/include/network.php
index fe502bdb54f8e71653819263318698add57273bf..de7069a6d964b250bd00a2677c0ca301e4693408 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -488,7 +488,7 @@ function validate_url($url)
        /// @TODO Really suppress function outcomes? Why not find them + debug them?
        $h = @parse_url($url);
 
-       if ((is_array($h)) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
+       if ((is_array($h)) && (@dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
                return $url;
        }
 

diff --git a/mod/admin.php b/mod/admin.php
index eabbe36d3e33da532326d087562346394de71691..dfa6d627d2863839748cdaa5f34aa62c6cf769ec 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1336,7 +1336,7 @@ function admin_page_site(App $a)
 
                '$relocate_url'         => ['relocate_url', t("New base url"), System::baseUrl(), t("Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.")],
 
-               '$rino'                 => ['rino', t("RINO Encryption"), intval(Config::get('system','rino_encrypt')), t("Encryption layer between nodes."), ["Disabled", "RINO1 (deprecated)", "RINO2"]],
+               '$rino'                 => ['rino', t("RINO Encryption"), intval(Config::get('system','rino_encrypt')), t("Encryption layer between nodes."), ["Disabled", "RINO3"]],
 
                '$worker_queues'        => ['worker_queues', t("Maximum number of parallel workers"), Config::get('system','worker_queues'), t("On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4.")],
                '$worker_dont_fork'     => ['worker_dont_fork', t("Don't use 'proc_open' with the worker"), Config::get('system','worker_dont_fork'), t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of worker calls in your crontab.")],

diff --git a/util/htconfig.vagrant.php b/util/htconfig.vagrant.php
index cc4ade758a190811e8b22d56949b2ad1c4c9a128..5b50b9f3995ce5ee28da7c571e61921912e34a01 100644 (file)
--- a/util/htconfig.vagrant.php
+++ b/util/htconfig.vagrant.php
@@ -52,7 +52,7 @@ $a->config['php_path'] = '/usr/bin/php';
 // 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'] = 3;
 
 // default system theme