From de70007a463e45095e840cafa1130a7f69a7b048 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 18 Jan 2018 20:15:56 -0500 Subject: [PATCH] Update RINO settings --- htconfig.php | 4 ++-- include/network.php | 2 +- mod/admin.php | 2 +- util/htconfig.vagrant.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htconfig.php b/htconfig.php index 67db66e86f..86f2d14321 100644 --- 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 fe502bdb54..de7069a6d9 100644 --- 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 eabbe36d3e..dfa6d627d2 100644 --- 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 cc4ade758a..5b50b9f399 100644 --- 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