Issue 10640: Use consistent settings to enable protocol support

diff --git a/mod/settings.php b/mod/settings.php
index 3ff27e98404362101a2d21176290682a03592f0d..8f48f66862732fca1753abeb9d2c3c0e6a82eb12 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -92,11 +92,7 @@ function settings_post(App $a)
                        $mail_replyto      =                 $_POST['mail_replyto']      ?? '';
                        $mail_pubmail      =                 $_POST['mail_pubmail']      ?? '';
 
-                       if (
-                               !DI::config()->get('system', 'dfrn_only')
-                               && function_exists('imap_open')
-                               && !DI::config()->get('system', 'imap_disabled')
-                       ) {
+                       if (function_exists('imap_open') && !DI::config()->get('system', 'imap_disabled')) {
                                $failed = false;
                                $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
                                        intval(local_user())
@@ -513,9 +509,6 @@ function settings_content(App $a)
                }
 
                $mail_disabled = ((function_exists('imap_open') && (!DI::config()->get('system', 'imap_disabled'))) ? 0 : 1);
-               if (DI::config()->get('system', 'dfrn_only')) {
-                       $mail_disabled = 1;
-               }
                if (!$mail_disabled) {
                        $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
                                local_user()

diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php
index 9d0e9c9dad3a329f148411683ab007cfe283d1b6..af276a3f4cc19dabb4730d29678100e709b4cf54 100644 (file)
--- a/src/Module/Admin/Site.php
+++ b/src/Module/Admin/Site.php
@@ -183,8 +183,8 @@ class Site extends BaseAdmin
                $poco_discovery         = (!empty($_POST['poco_discovery'])         ? intval(trim($_POST['poco_discovery']))         : false);
                $poco_local_search      = !empty($_POST['poco_local_search']);
                $nodeinfo               = !empty($_POST['nodeinfo']);
-               $dfrn_only              = !empty($_POST['dfrn_only']);
-               $ostatus_disabled       = !empty($_POST['ostatus_disabled']);
+               $mail_enabled           = !empty($_POST['mail_enabled']);
+               $ostatus_enabled        = !empty($_POST['ostatus_enabled']);
                $diaspora_enabled       = !empty($_POST['diaspora_enabled']);
                $ssl_policy             = (!empty($_POST['ssl_policy'])             ? intval($_POST['ssl_policy'])                    : 0);
                $force_ssl              = !empty($_POST['force_ssl']);
@@ -340,8 +340,8 @@ class Site extends BaseAdmin
                DI::config()->set('system', 'proxyuser'              , $proxyuser);
                DI::config()->set('system', 'proxy'                  , $proxy);
                DI::config()->set('system', 'curl_timeout'           , $timeout);
-               DI::config()->set('system', 'dfrn_only'              , $dfrn_only);
-               DI::config()->set('system', 'ostatus_disabled'       , $ostatus_disabled);
+               DI::config()->set('system', 'imap_disabled'          , !$mail_enabled && function_exists('imap_open'));
+               DI::config()->set('system', 'ostatus_disabled'       , !$ostatus_enabled);
                DI::config()->set('system', 'diaspora_enabled'       , $diaspora_enabled);
 
                DI::config()->set('config', 'private_addons'         , $private_addons);
@@ -560,12 +560,11 @@ class Site extends BaseAdmin
                        '$no_regfullname'         => ['no_regfullname', DI::l10n()->t('No Fullname check'), DI::config()->get('system', 'no_regfullname'), DI::l10n()->t('Allow users to register without a space between the first name and the last name in their full name.')],
                        '$community_page_style'   => ['community_page_style', DI::l10n()->t('Community pages for visitors'), DI::config()->get('system', 'community_page_style'), DI::l10n()->t('Which community pages should be available for visitors. Local users always see both pages.'), $community_page_style_choices],
                        '$max_author_posts_community_page' => ['max_author_posts_community_page', DI::l10n()->t('Posts per user on community page'), DI::config()->get('system', 'max_author_posts_community_page'), DI::l10n()->t('The maximum number of posts per user on the community page. (Not valid for "Global Community")')],
-                       '$ostatus_disabled'       => ['ostatus_disabled', DI::l10n()->t('Disable OStatus support'), DI::config()->get('system', 'ostatus_disabled'), DI::l10n()->t('Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.')],
-                       '$ostatus_not_able'       => DI::l10n()->t('OStatus support can only be enabled if threading is enabled.'),
+                       '$mail_enabled'           => ['mail_enabled', DI::l10n()->t('Enable Mail support'), !DI::config()->get('system', 'imap_disabled', !function_exists('imap_open')), DI::l10n()->t('Enable built-in mail support to poll IMAP folders and to reply via mail.')],
+                       '$ostatus_enabled'        => ['ostatus_enabled', DI::l10n()->t('Enable OStatus support'), !DI::config()->get('system', 'ostatus_disabled'), DI::l10n()->t('Enable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public.')],
                        '$diaspora_able'          => $diaspora_able,
                        '$diaspora_not_able'      => DI::l10n()->t('Diaspora support can\'t be enabled because Friendica was installed into a sub directory.'),
-                       '$diaspora_enabled'       => ['diaspora_enabled', DI::l10n()->t('Enable Diaspora support'), DI::config()->get('system', 'diaspora_enabled', $diaspora_able), DI::l10n()->t('Provide built-in Diaspora network compatibility.')],
-                       '$dfrn_only'              => ['dfrn_only', DI::l10n()->t('Only allow Friendica contacts'), DI::config()->get('system', 'dfrn_only'), DI::l10n()->t('All contacts must use Friendica protocols. All other built-in communication protocols disabled.')],
+                       '$diaspora_enabled'       => ['diaspora_enabled', DI::l10n()->t('Enable Diaspora support'), DI::config()->get('system', 'diaspora_enabled', $diaspora_able), DI::l10n()->t('Enable built-in Diaspora network compatibility for communicating with diaspora servers.')],
                        '$verifyssl'              => ['verifyssl', DI::l10n()->t('Verify SSL'), DI::config()->get('system', 'verifyssl'), DI::l10n()->t('If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.')],
                        '$proxyuser'              => ['proxyuser', DI::l10n()->t('Proxy user'), DI::config()->get('system', 'proxyuser'), ''],
                        '$proxy'                  => ['proxy', DI::l10n()->t('Proxy URL'), DI::config()->get('system', 'proxy'), ''],

diff --git a/src/Module/NodeInfo120.php b/src/Module/NodeInfo120.php
index 7ff7282d14dccffd9573108c1596c0e2dbb4234d..0eb6e793f90de42655e683cfcdc316e9cdb1cf00 100644 (file)
--- a/src/Module/NodeInfo120.php
+++ b/src/Module/NodeInfo120.php
@@ -72,7 +72,7 @@ class NodeInfo120 extends BaseModule
                $nodeinfo['services']['inbound'][]  = 'rss2.0';
                $nodeinfo['services']['outbound'][] = 'atom1.0';
 
-               if (function_exists('imap_open') && !$config->get('system', 'imap_disabled') && !$config->get('system', 'dfrn_only')) {
+               if (function_exists('imap_open') && !$config->get('system', 'imap_disabled')) {
                        $nodeinfo['services']['inbound'][] = 'imap';
                }
 

diff --git a/src/Module/NodeInfo210.php b/src/Module/NodeInfo210.php
index 2e0262f03d796f362d1e4ff60b8daa861dcf61a5..5ea9c0e6833ec846a45042937bb489581cb93698 100644 (file)
--- a/src/Module/NodeInfo210.php
+++ b/src/Module/NodeInfo210.php
@@ -72,7 +72,7 @@ class NodeInfo210 extends BaseModule
                $nodeinfo['services']['inbound'][]  = 'rss2.0';
                $nodeinfo['services']['outbound'][] = 'atom1.0';
 
-               if (function_exists('imap_open') && !$config->get('system', 'imap_disabled') && !$config->get('system', 'dfrn_only')) {
+               if (function_exists('imap_open') && !$config->get('system', 'imap_disabled')) {
                        $nodeinfo['services']['inbound'][] = 'imap';
                }
 

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index e42b5a10195f4c5035ffedbdc949873f38f0d857..55a0cf96d012cd201f93542436de31c569201fb9 100644 (file)
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -394,7 +394,7 @@ class Delivery
 
                Logger::notice('Deliver via Diaspora', ['target' => $target_item['id'], 'guid' => $target_item['guid'], 'to' => $loc]);
 
-               if (DI::config()->get('system', 'dfrn_only') || !DI::config()->get('system', 'diaspora_enabled')) {
+               if (!DI::config()->get('system', 'diaspora_enabled')) {
                        return;
                }
 
@@ -477,7 +477,7 @@ class Delivery
         */
        private static function deliverMail($cmd, $contact, $owner, $target_item, $thr_parent)
        {
-               if (DI::config()->get('system','dfrn_only')) {
+               if (DI::config()->get('system','imap_disabled')) {
                        return;
                }
 

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index bec0c55f116ec72df4b7d41df56007cfd2e2bc83..ef2d8983978c90b4ff71714c47aedf805ce98340 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -615,7 +615,7 @@ class Notifier
                $url_recipients = array_filter($url_recipients);
                // send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
                // They are especially used for notifications to OStatus users that don't follow us.
-               if (!DI::config()->get('system', 'dfrn_only') && count($url_recipients) && ($public_message || $push_notify) && !empty($target_item)) {
+               if (count($url_recipients) && ($public_message || $push_notify) && !empty($target_item)) {
                        $slap = OStatus::salmon($target_item, $owner);
                        foreach ($url_recipients as $url) {
                                Logger::info('Salmon delivery', ['item' => $target_id, 'to' => $url]);

diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index 493abef61ec4150697a5016c13622e70b9f49de7..d69d920a0cc003a93443830894b60cd36678c937 100644 (file)
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@@ -56,7 +56,8 @@
                {{include file="field_select.tpl" field=$community_page_style}}
                {{include file="field_input.tpl" field=$max_author_posts_community_page}}
 
-               {{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+               {{include file="field_checkbox.tpl" field=$mail_enabled}}
+               {{include file="field_checkbox.tpl" field=$ostatus_enabled}}
 
                {{if $diaspora_able}}
                        {{include file="field_checkbox.tpl" field=$diaspora_enabled}}
@@ -66,7 +67,6 @@
                                <span id='id_{{$diaspora_enabled.0}}'>{{$diaspora_not_able}}</span>
                        </div>
                {{/if}}
-               {{include file="field_checkbox.tpl" field=$dfrn_only}}
                {{include file="field_input.tpl" field=$global_directory}}
                <div class="submit"><input type="submit" name="republish_directory" value="{{$republish}}"/></div>
                {{include file="field_checkbox.tpl" field=$newuser_private}}

diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl
index ef8ef9786dbe43134c9a52f99710ee87602258de..2432e271a1fd606ed7f1d804aed507e5ecbf0aad 100644 (file)
--- a/view/theme/frio/templates/admin/site.tpl
+++ b/view/theme/frio/templates/admin/site.tpl
@@ -135,7 +135,8 @@
                                                {{include file="field_select.tpl" field=$community_page_style}}
                                                {{include file="field_input.tpl" field=$max_author_posts_community_page}}
 
-                                               {{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+                                               {{include file="field_checkbox.tpl" field=$mail_enabled}}
+                                               {{include file="field_checkbox.tpl" field=$ostatus_enabled}}
 
                                                {{if $diaspora_able}}
                                                        {{include file="field_checkbox.tpl" field=$diaspora_enabled}}
@@ -145,7 +146,6 @@
                                                                <span id="id_{{$diaspora_enabled.0}}">{{$diaspora_not_able}}</span>
                                                        </div>
                                                {{/if}}
-                                               {{include file="field_checkbox.tpl" field=$dfrn_only}}
                                                {{include file="field_input.tpl" field=$global_directory}}
                                                <p>
                                                        <input type="submit" name="republish_directory" class="btn btn-primary" value="{{$republish}}"/>

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index e357f2c043ec4877d7a58d1f913a5fbd8280ed15..c1562983812416cab64d99939fbf78051582ee94 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -285,7 +285,7 @@ function vier_community_info()
                        $r[] = ["photo" => "images/wordpress.png", "name" => "Wordpress"];
                }
 
-               if (function_exists("imap_open") && !DI::config()->get("system", "imap_disabled") && !DI::config()->get("system", "dfrn_only")) {
+               if (function_exists("imap_open") && !DI::config()->get("system", "imap_disabled")) {
                        $r[] = ["photo" => "images/mail.png", "name" => "E-Mail"];
                }