Changeset 761 for trunk/services

Timestamp:

Feb 12, 2022 12:44:13 AM (2 years ago)

Author:

anonymous

Message:

Turn off 'You are now logged in' message

File:

• trunk/services/login.php (modified) (2 diffs)

trunk/services/login.php

@@ -33 +33 @@
 // We may want to use the add/edit interface from another script, so this
 // allows us to remember which page we came from so we can go back there.
-if (getFormData('boomerang', false) && isset($_SERVER['HTTP_REFERER'])) {
-    $app->setBoomerangURL($_SERVER['HTTP_REFERER'], 'login');
+if (getFormData('boomerang', false) && isset($_SERVER['HTTP_REFERER']) || preg_match('!^(https?://\w+|/\w+)!', getFormData('boomerang'))) {
+    $url = preg_match('!^(https?://\w+|/\w+)!', getFormData('boomerang')) ? getFormData('boomerang') : $_SERVER['HTTP_REFERER'];
+    $app->setBoomerangURL($url, 'login');
 }
 $app->sslOn();
@@ -56 +57 @@
             $login_prefs->set('username', '');
         }
-        $app->raiseMsg(_("You are now logged in."), MSG_SUCCESS, __FILE__, __LINE__);
+        // $app->raiseMsg(_("You are now logged in."), MSG_SUCCESS, __FILE__, __LINE__);
         $app->logMsg(sprintf('User %s successfully logged in.', $frm['username']), LOG_INFO, __FILE__, __LINE__);
-        $app->dieBoomerangURL('login');
+
+        if ($app->validBoomerangURL('login')) {
+            $app->dieBoomerangURL('login');
+        }
     } else {
         $app->raiseMsg(_("Login failed, please try again."), MSG_NOTICE, __FILE__, __LINE__);