From e81b720ca07e34005c3600a5bd56e42521925d95 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 26 May 2004 18:22:06 +0000
Subject: [PATCH] blabla

git-svn-id: file:///svn/phpbb/trunk@4891 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/ucp.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 74d5956905..80d383e837 100755
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -36,7 +36,6 @@ $phpEx = substr(strrchr(__FILE__, '.'), 1);
 include($phpbb_root_path . 'common.'.$phpEx);
 include($phpbb_root_path . '/includes/functions_user.'.$phpEx);
 
-
 // ---------
 // FUNCTIONS
 //
@@ -168,6 +167,11 @@ class module
 
 			if ($run)
 			{
+				if (!isset($this->mode))
+				{
+					$this->mode = $mode;
+				}
+
 				eval("\$this->module = new {$this->type}_{$this->name}(\$this->id, \$this->mode);");
 				if (method_exists($this->module, 'init'))
 				{
@@ -249,7 +253,7 @@ switch ($mode)
 		break;
 
 	case 'register':
-		if ($user->data['user_id'] != ANONYMOUS)
+		if ($user->data['user_id'] != ANONYMOUS || isset($_REQUEST['not_agreed']))
 		{
 			redirect("index.$phpEx$SID");
 		}
@@ -327,7 +331,7 @@ while ($row = $db->sql_fetchrow($result))
 $db->sql_freeresult($result);
 
 // Output PM_TO box if message composing
-if ($mode == 'compose' && $_REQUEST['action'] != 'edit')
+if ($mode == 'compose' && request_var('action', '') != 'edit')
 {
 	if ($config['allow_mass_pm'])
 	{