From 0f0d160ded7fd129d40a4ec0372cab11d7ce7a88 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 6 Oct 2006 18:43:55 +0000
Subject: - support re-caching of theme data if stylesheet.css changed and
 load_tplcompile enabled - mcp fixes - fixed some usability issues

git-svn-id: file:///svn/phpbb/trunk@6447 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/session.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'phpBB/includes/session.php')

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 41708d19ab..0489bdba38 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -785,6 +785,7 @@ class session
 
 		$result = $db->sql_query($sql);
 
+		$ban_triggered_by = 'user';
 		while ($row = $db->sql_fetchrow($result))
 		{
 			if ((!empty($row['ban_userid']) && intval($row['ban_userid']) == $user_id) ||
@@ -800,6 +801,20 @@ class session
 				{
 					$banned = true;
 					$ban_row = $row;
+
+					if (!empty($row['ban_userid']) && intval($row['ban_userid']) == $user_id)
+					{
+						$ban_triggered_by = 'user';
+					}
+					else if (!empty($row['ban_ip']) && preg_match('#^' . str_replace('*', '.*?', $row['ban_ip']) . '$#i', $user_ip))
+					{
+						$ban_triggered_by = 'ip';
+					}
+					else
+					{
+						$ban_triggered_by = 'email';
+					}
+
 					// Don't break. Check if there is an exclude rule for this user
 				}
 			}
@@ -823,6 +838,8 @@ class session
 
 			$message = sprintf($this->lang[$message], $till_date, '<a href="mailto:' . $config['board_contact'] . '">', '</a>');
 			$message .= ($ban_row['ban_give_reason']) ? '<br /><br />' . sprintf($this->lang['BOARD_BAN_REASON'], $ban_row['ban_give_reason']) : '';
+			$message .= '<br /><br /><em>' . $user->lang['BAN_TRIGGERED_BY_' . strtoupper($ban_triggered_by)] . '</em>';
+
 			trigger_error($message);
 		}
 
-- 
cgit v1.2.1