Экспорт. Коммит №27. Удаляем мега-замыслы товарища dj_maxx. _Xz_. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@29 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
glix08 2011-06-27 21:45:30 +00:00
commit 151c9d8119
3 changed files with 2 additions and 33 deletions

View file

@ -114,7 +114,6 @@ define('COOKIE_DATA', $c .'data');
define('COOKIE_FORUM', $c .'f'); define('COOKIE_FORUM', $c .'f');
define('COOKIE_LOAD', $c .'isl'); define('COOKIE_LOAD', $c .'isl');
define('COOKIE_MARK', $c .'mark_read'); define('COOKIE_MARK', $c .'mark_read');
define('COOKIE_TEST', $c .'test');
define('COOKIE_TOPIC', $c .'t'); define('COOKIE_TOPIC', $c .'t');
unset($c); unset($c);

View file

@ -488,30 +488,10 @@ class user_common
COOKIE_DATA, COOKIE_DATA,
COOKIE_LOAD, COOKIE_LOAD,
COOKIE_DBG, COOKIE_DBG,
//COOKIE_TEST, // dj_maxx: add visual confirmation to login form
'torhelp', 'torhelp',
'phpbb2mysql_data',
'kb_layout', 'kb_layout',
); );
// dj_maxx: add visual confirmation to login form
if (!defined('IN_PROFILE'))
{
$delete_cookies[] = COOKIE_TEST;
}
// end of
}
else
{
$delete_cookies = array('phpbb2mysql_data');
if (!(defined('IN_LOGIN') || defined('IN_PROFILE')))
{
$delete_cookies[] = COOKIE_TEST;
}
}
if ($delete_cookies)
{
foreach ($delete_cookies as $cookie) foreach ($delete_cookies as $cookie)
{ {
if (isset($_COOKIE[$cookie])) if (isset($_COOKIE[$cookie]))

View file

@ -50,20 +50,10 @@ if (!$redirect_url || strstr(urldecode($redirect_url), "\n") || strstr(urldecode
$redirect_url = "index.php"; $redirect_url = "index.php";
} }
if (!empty($_POST['login']) && !empty($_POST['cookie_test']))
{
if (empty($_COOKIE[COOKIE_TEST]) || $_COOKIE[COOKIE_TEST] !== $_POST['cookie_test'])
{
$login_error = 'cookie';
}
}
$redirect_url = str_replace("&sid={$user->data['session_id']}", '', $redirect_url); $redirect_url = str_replace("&sid={$user->data['session_id']}", '', $redirect_url);
if (isset($_REQUEST['admin']) && !IS_AM) if (isset($_REQUEST['admin']) && !IS_AM) bb_die($lang['NOT_ADMIN']);
{
bb_die($lang['NOT_ADMIN']);
}
$mod_admin_login = (IS_AM && !$user->data['session_admin']); $mod_admin_login = (IS_AM && !$user->data['session_admin']);
// login username & password // login username & password