Changeset 1200

Timestamp:

08/03/2008 11:44:32 PM (2 years ago)

Author:

DotMG

Message:

refs #245

backporting [248] and [253] to milestone:1.1.6.6

Files:

• branches/1.1.6.6/actions/usersettings.php (modified) (5 diffs)

branches/1.1.6.6/actions/usersettings.php

@@ -99 +99 @@
 if (!defined('RETRIEVE_PASSWORD_MESSAGE')) define('RETRIEVE_PASSWORD_MESSAGE', "If you need a password reminder, click [[PasswordForgotten here]]. --- You can login here using your password reminder.");
 if (!defined('TEMP_PASSWORD_LABEL')) define('TEMP_PASSWORD_LABEL', "Password reminder:");
+if (!defined('USERSETTINGS_REDIRECT_AFTER_LOGIN_LABEL')) define('USERSETTINGS_REDIRECT_AFTER_LOGIN_LABEL', 'Redirect to %s after login');       // %s page to redirect to
 
 //initialize variables
@@ -133 +134 @@
 $params = ($this->config['rewrite_mode'] == 1) ? '?' : '&';
 
+$regex_referrer = '@^'.preg_quote($this->config['base_url'], '@').'([^\/\?&]*)@i';
+if (isset($_SERVER['HTTP_REFERER']) && preg_match($regex_referrer, $_SERVER['HTTP_REFERER'], $match))
+{
+        if (strcasecmp($this->tag, $match[1]))
+        {
+                $_SESSION['go_back'] = $_SERVER['HTTP_REFERER'];
+                //We save the tag of the referring page, this tag is to be shown in label <Go back to ...>. We must use a session here because if the user 
+                //Refresh the page by hitting <Enter> on the address bar, the value would be lost.
+                $_SESSION['go_back_tag'] = $match[1];
+        }
+}
+
 // BEGIN *** Logout ***
 // is user trying to log out?
@@ -404 +417 @@
                                 default:
                                         $this->SetUser($existingUser);
-                                        $this->Redirect($url, '');
+                                        if ((isset($_SESSION['go_back'])) && (isset($_POST['do_redirect'])))
+                                        {
+                                                $go_back = $_SESSION['go_back'];
+                                                unset($_SESSION['go_back']);
+                                                unset($_SESSION['go_back_tag']);
+                                                $this->Redirect($go_back);
+                                        }
+                                        else
+                                        {
+                                                $this->Redirect($url, '');
+                                        }
                         }
                 }
@@ -487 +510 @@
                                 // log in
                                 $this->SetUser($this->LoadUser($name));
-                                $params .= 'registered=true';
-                                $this->Redirect($url.$params);
+                                if ((isset($_SESSION['go_back'])) && (isset($_POST['do_redirect'])))
+                                {
+                                        $go_back = $_SESSION['go_back'];
+                                        unset($_SESSION['go_back']);
+                                        unset($_SESSION['go_back_tag']);
+                                        $this->Redirect($go_back);
+                                }
+                                else
+                                {
+                                        $params .= 'registered=true';
+                                        $this->Redirect($url.$params);
+                                }
                 }
                 // END *** Register ***
@@ -561 +594 @@
                 <td><input <?php echo $password_highlight; ?> type="password" name="password" size="40" /></td>
         </tr>
+        <?php
+                if (isset($_SESSION['go_back']))
+                {
+                ?>
+        <tr>
+                <td align="right"><?php printf(USERSETTINGS_REDIRECT_AFTER_LOGIN_LABEL, $_SESSION['go_back_tag']); ?></td>
+                <td><input type='checkbox' name='do_redirect' id='do_redirect'<?php if(isset($_POST['do_redirect']) || empty($_POST)) echo 'checked="checked"'; ?> />
+        </tr>
+        <?php
+                }
+        ?>
         <tr>
                 <td>&nbsp;</td>