Menu
▾
▴
[mxbb-commits] core/includes mx_functions.php,1.108,1.109
|
From: Florin C B. <ory...@us...> - 2012-10-08 09:05:10
|
Update of /cvsroot/mxbb/core/includes
In directory vz-cvs-4.sog:/tmp/cvs-serv14313
Modified Files:
mx_functions.php
Log Message:
fix for login page
Index: mx_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** mx_functions.php 8 Oct 2012 08:59:27 -0000 1.108
--- mx_functions.php 8 Oct 2012 09:05:08 -0000 1.109
***************
*** 467,472 ****
$session_id = $_SID;
}
!
! if ( !empty($url) && preg_match('#'.PORTAL_URL.'#', $url) && !defined('IN_ADMIN') )
{
$url = preg_replace('#' . PORTAL_URL . '#', '', $url);
--- 467,473 ----
$session_id = $_SID;
}
!
! //Fix for login page
! if ( !empty($url) && preg_match('#'.PORTAL_URL.'#', $url) && defined('IN_LOGIN') )
{
$url = preg_replace('#' . PORTAL_URL . '#', '', $url);
***************
*** 555,559 ****
global $SID, $_SID, $mx_mod_rewrite, $userdata;
! if ( !empty($url) && preg_match('#'.PORTAL_URL.'#', $url) && !defined('IN_ADMIN') )
{
$url = preg_replace('#' . PORTAL_URL . '#', '', $url);
--- 556,561 ----
global $SID, $_SID, $mx_mod_rewrite, $userdata;
! //Fix for login page
! if ( !empty($url) && preg_match('#'.PORTAL_URL.'#', $url) && defined('IN_LOGIN') )
{
$url = preg_replace('#' . PORTAL_URL . '#', '', $url);
***************
*** 646,650 ****
}
! if (defined('IN_ADMIN'))
{
$url = PORTAL_URL . $url;
--- 648,653 ----
}
! //Fix for login page
! if (!defined('IN_LOGIN'))
{
$url = PORTAL_URL . $url;
***************
*** 654,658 ****
if ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) )
{
- //header('Refresh: 0; URL=' . PORTAL_URL . $url);
header('Refresh: 0; URL=' . $url);
echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta http-equiv="refresh" content="0; url=' . PORTAL_URL . $url . '"><title>Redirect</title></head><body><div align="center">If your browser does not support meta redirection please click <a href="' . PORTAL_URL . $url . '">HERE</a> to be redirected</div></body></html>';
--- 657,660 ----
***************
*** 661,665 ****
// Behave as per HTTP/1.1 spec for others
- //header('Location: ' . PORTAL_URL . $url);
header('Location: ' . $url);
exit;
--- 663,666 ----
|
