Save return_url before login. Add login mask to many sites if not logged in.

diff --git a/mod/contacts.php b/mod/contacts.php
index c33e9b620607ded477f2c6418bf8e827b6548494..7597fd6432ce7786800ce94cd9b01f5df2038afb 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -22,6 +22,7 @@ use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Core\ACL;
+use Friendica\Module\Login;
 
 function contacts_init(App $a)
 {
@@ -375,7 +376,7 @@ function contacts_content(App $a, $update = 0)
 
        if (!local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
-               return;
+               return Login::form();
        }
 
        if ($a->argc == 3) {

diff --git a/mod/events.php b/mod/events.php
index d04aac3761267d05515e61d7d1d5e51a16e7b4ea..e5ebf8646531cf1e2688966a6e6171dea7928d1f 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -17,6 +17,7 @@ use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
+use Friendica\Module\Login;
 
 require_once 'include/items.php';
 
@@ -193,7 +194,7 @@ function events_content(App $a)
 {
        if (!local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
-               return;
+               return Login::form();
        }
 
        if ($a->argc == 1) {

diff --git a/mod/message.php b/mod/message.php
index 13ae2f75120e009dc37a97f2d64022e2876f6bf1..bb3000736aac6f7721dfb4541f6c0a53b2313c77 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -16,6 +16,7 @@ use Friendica\Model\Mail;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Temporal;
+use Friendica\Module\Login;
 
 require_once 'include/conversation.php';
 
@@ -97,7 +98,7 @@ function message_content(App $a)
 
        if (!local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
-               return;
+               return Login::form();
        }
 
        $myprofile = System::baseUrl() . '/profile/' . $a->user['nickname'];

diff --git a/mod/notifications.php b/mod/notifications.php
index 3934a32357b5c9989ab355bb9a237de758e53f6a..867c7260da5550b881b33da07c534122abc6511b 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -12,6 +12,7 @@ use Friendica\Core\NotificationsManager;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\Module\Login;
 
 function notifications_post(App $a)
 {
@@ -65,7 +66,7 @@ function notifications_content(App $a)
 {
        if (!local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
-               return;
+               return Login::form();
        }
 
        $page = defaults($_REQUEST, 'page', 1);

diff --git a/mod/profiles.php b/mod/profiles.php
index 7d0c3178cf0600831055aed9b20d906d7f4a6208..f41cb72af4ce86f0d7f5018b727137913cf5cc8f 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -20,6 +20,7 @@ use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
+use Friendica\Module\Login;
 
 function profiles_init(App $a) {
 
@@ -509,7 +510,7 @@ function profiles_content(App $a) {
 
        if (! local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
-               return;
+               return Login::form();
        }
 
        $o = '';

diff --git a/mod/settings.php b/mod/settings.php
index 78fa446ce0372dd0fa65a419db4286e79fd1848b..1e6ce1354e6676c04b11e49e05d706299b9b5da2 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -22,6 +22,7 @@ use Friendica\Model\User;
 use Friendica\Protocol\Email;
 use Friendica\Util\Network;
 use Friendica\Util\Temporal;
+use Friendica\Module\Login;
 
 function get_theme_config_file($theme)
 {
@@ -658,7 +659,7 @@ function settings_content(App $a)
 
        if (!local_user()) {
                //notice(L10n::t('Permission denied.') . EOL);
-               return;
+               return Login::form();
        }
 
        if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {

diff --git a/src/Module/Login.php b/src/Module/Login.php
index ad5d5ad0b6acbc66d5e6d9eb6a2294a54d3010b4..f1f728ae900a0b197dae34419d59d4514db5e2b6 100644 (file)
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -47,7 +47,10 @@ class Login extends BaseModule
 
        public static function post()
        {
+               $return_url = $_SESSION['return_url'];
                session_unset();
+               $_SESSION['return_url'] = $return_url;
+               
                // OpenId Login
                if (
                        empty($_POST['password'])