From 151c9d8119e5b9d71d223166db8fb986b7290b47 Mon Sep 17 00:00:00 2001
From: glix08 <glix08@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Mon, 27 Jun 2011 21:45:30 +0000
Subject: [PATCH] r29
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Экспорт. Коммит №27. Удаляем мега-замыслы товарища dj_maxx. _Xz_. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@29 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/includes/init_bb.php  |  1 -
 upload/includes/sessions.php | 20 --------------------
 upload/login.php             | 14 ++------------
 3 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/upload/includes/init_bb.php b/upload/includes/init_bb.php
index 0d8010ec1..1943d71f6 100644
--- a/upload/includes/init_bb.php
+++ b/upload/includes/init_bb.php
@@ -114,7 +114,6 @@ define('COOKIE_DATA',  $c .'data');
 define('COOKIE_FORUM', $c .'f');
 define('COOKIE_LOAD',  $c .'isl');
 define('COOKIE_MARK',  $c .'mark_read');
-define('COOKIE_TEST',  $c .'test');
 define('COOKIE_TOPIC', $c .'t');
 unset($c);
 
diff --git a/upload/includes/sessions.php b/upload/includes/sessions.php
index 4795f8f54..978f0109f 100644
--- a/upload/includes/sessions.php
+++ b/upload/includes/sessions.php
@@ -488,30 +488,10 @@ class user_common
 				COOKIE_DATA,
 				COOKIE_LOAD,
 				COOKIE_DBG,
-				//COOKIE_TEST, // dj_maxx: add visual confirmation to login form
 				'torhelp',
-				'phpbb2mysql_data',
 				'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)
 			{
 				if (isset($_COOKIE[$cookie]))
diff --git a/upload/login.php b/upload/login.php
index 264813c7b..59cb91806 100644
--- a/upload/login.php
+++ b/upload/login.php
@@ -50,20 +50,10 @@ if (!$redirect_url || strstr(urldecode($redirect_url), "\n") || strstr(urldecode
 	$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);
 
-if (isset($_REQUEST['admin']) && !IS_AM)
-{
-	bb_die($lang['NOT_ADMIN']);
-}
+if (isset($_REQUEST['admin']) && !IS_AM) bb_die($lang['NOT_ADMIN']);
+
 $mod_admin_login = (IS_AM && !$user->data['session_admin']);
 
 // login username & password