Only perform OAuth when no login data are provided

[friendica.git] / mod / settings.php

diff --git a/mod/settings.php b/mod/settings.php
index 3bc0b20a6de07a56fe8bbec81dbb2ee590a62bed..9a73b83e6bf6b412d37754fdf317650f0bf16f8e 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -251,6 +251,8 @@ function settings_post(App $a)
                                unlink($_FILES['importcontact-filename']['tmp_name']);
                        }
                }
+
+               return;
        }
 
        if (!empty($_POST['resend_relocate'])) {
@@ -316,6 +318,7 @@ function settings_post(App $a)
        $cntunkmail       = (!empty($_POST['cntunkmail']) ? intval($_POST['cntunkmail']) : 0);
        $hide_friends     = (($_POST['hide-friends'] == 1) ? 1: 0);
        $hidewall         = (($_POST['hidewall'] == 1) ? 1: 0);
+       $unlisted         = (($_POST['unlisted'] == 1) ? 1: 0);
 
        $email_textonly   = (($_POST['email_textonly'] == 1) ? 1 : 0);
        $detailed_notif   = (($_POST['detailed_notif'] == 1) ? 1 : 0);
@@ -362,17 +365,17 @@ function settings_post(App $a)
 
        if ($username != $a->user['username']) {
                if (strlen($username) > 40) {
-                       $err .= DI::l10n()->t(' Please use a shorter name.');
+                       $err .= DI::l10n()->t('Please use a shorter name.');
                }
                if (strlen($username) < 3) {
-                       $err .= DI::l10n()->t(' Name too short.');
+                       $err .= DI::l10n()->t('Name too short.');
                }
        }
 
        if ($email != $a->user['email']) {
                //  check for the correct password
                if (!User::authenticate(intval(local_user()), $_POST['mpassword'])) {
-                       $err .= DI::l10n()->t('Wrong Password') . EOL;
+                       $err .= DI::l10n()->t('Wrong Password.');
                        $email = $a->user['email'];
                }
                //  check the email is valid
@@ -390,7 +393,7 @@ function settings_post(App $a)
        }
 
        if (strlen($err)) {
-               notice($err . EOL);
+               notice($err);
                return;
        }
 
@@ -413,6 +416,7 @@ function settings_post(App $a)
 
        DI::pConfig()->set(local_user(), 'system', 'email_textonly', $email_textonly);
        DI::pConfig()->set(local_user(), 'system', 'detailed_notif', $detailed_notif);
+       DI::pConfig()->set(local_user(), 'system', 'unlisted', $unlisted);
 
        if ($page_flags == User::PAGE_FLAGS_PRVGROUP) {
                $hidewall = 1;
@@ -835,6 +839,10 @@ function settings_content(App $a)
                '$field' => ['hidewall', DI::l10n()->t('Hide your profile details from anonymous viewers?'), $a->user['hidewall'], DI::l10n()->t('Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Your public posts and replies will still be accessible by other means.')],
        ]);
 
+       $unlisted = Renderer::replaceMacros($opt_tpl, [
+               '$field' => ['unlisted', DI::l10n()->t('Make public posts unlisted'), DI::pConfig()->get(local_user(), 'system', 'unlisted'), DI::l10n()->t('Your public posts will not appear on the community pages or in search results, nor be sent to relay servers. However they can still appear on public feeds on remote servers.')],
+       ]);
+
        $blockwall = Renderer::replaceMacros($opt_tpl, [
                '$field' => ['blockwall', DI::l10n()->t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), DI::l10n()->t('Your contacts may write posts on your profile wall. These posts will be distributed to your contacts')],
        ]);
@@ -948,6 +956,7 @@ function settings_content(App $a)
                '$profile_in_net_dir' => $profile_in_net_dir,
                '$hide_friends' => $hide_friends,
                '$hide_wall' => $hide_wall,
+               '$unlisted' => $unlisted,
                '$unkmail' => $unkmail,
                '$cntunkmail'   => ['cntunkmail', DI::l10n()->t('Maximum private messages per day from unknown people:'), $cntunkmail , DI::l10n()->t("\x28to prevent spam abuse\x29")],