mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

Fixed annoyance. In membersonly mode, after login - users are now automatically taken to the previously attempted URL if previously attempted url was denied due to not being logged in.

Browse Source
This commit is contained in:
CaMer0n
2008-05-19 08:54:38 +00:00
parent f33ddafde6
commit 9ded9507ab
1 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
class2.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/class2.php,v $ | $Source: /cvs_backup/e107_0.8/class2.php,v $
| $Revision: 1.54 $ | $Revision: 1.55 $
| $Date: 2008-05-18 16:35:47 $ | $Date: 2008-05-19 08:54:38 $
| $Author: e107steved $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
// //
@@ -728,11 +728,49 @@ if ($pref['membersonly_enabled'] && !USER && e_SELF != SITEURL.e_SIGNUP && e_SEL
{ {
if(!isset($_E107['allow_guest'])) if(!isset($_E107['allow_guest']))
{ {
if($_POST['ajax_used'] || $_GET['ajax_used'] || e_PAGE == "e_ajax.php" || e_PAGE == "e_js.php")
{
exit;
}
// remember the url for after-login.
$afterlogin = $pref['cookie_name'].'_afterlogin';
$url = (e_QUERY) ? e_SELF."?".e_QUERY : e_SELF;
if ($pref['user_tracking'] == "session")
{
$_SESSION[$afterlogin] = $url;
}
else
{
setcookie($afterlogin, $url, time() + 60, "/");
$_COOKIE[$afterlogin] = $url;
}
header("Location: ".e_HTTP."membersonly.php"); header("Location: ".e_HTTP."membersonly.php");
exit; exit;
} }
} }
// ----- Redirect to previously logged-in page ---------------------------.
if(USER && $pref['membersonly_enabled'])
{
if($_SESSION[$pref['cookie_name'].'_afterlogin'])
{
$url = $_SESSION[$pref['cookie_name'].'_afterlogin'];
$_SESSION[$pref['cookie_name'].'_afterlogin']=FALSE;
header("Location: ".$url);
}
if($_COOKIE[$pref['cookie_name'].'_afterlogin'])
{
$url = $_COOKIE[$pref['cookie_name'].'_afterlogin'];
setcookie($pref['cookie_name'].'_afterlogin', FALSE,-1000, "/");
$_COOKIE[$pref['cookie_name'].'_afterlogin']=FALSE;
header("Location: ".$url);
}
}
// ------------------------------------------------------------------------
if(!isset($_E107['no_prunetmp'])) if(!isset($_E107['no_prunetmp']))
{ {
$sql->db_Delete("tmp", "tmp_time < ".(time() - 300)." AND tmp_ip!='data' AND tmp_ip!='submitted_link'"); $sql->db_Delete("tmp", "tmp_time < ".(time() - 300)." AND tmp_ip!='data' AND tmp_ip!='submitted_link'");