From 4962db5f6715210d4e577fa843f82ffe61b47bc4 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 17 Mar 2006 12:51:32 +0000
Subject: - fix some bugs...

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

(limited to 'phpBB/includes/ucp/ucp_zebra.php')

diff --git a/phpBB/includes/ucp/ucp_zebra.php b/phpBB/includes/ucp/ucp_zebra.php
index 76311ea9e6..99abeb7133 100644
--- a/phpBB/includes/ucp/ucp_zebra.php
+++ b/phpBB/includes/ucp/ucp_zebra.php
@@ -108,6 +108,29 @@ class ucp_zebra
 							unset($perms);
 						}
 
+						// Do not let add users to friends if the user is within the foes list of the to-be-added users
+						if ($mode == 'friends' && sizeof($user_id_ary))
+						{
+							$sql = 'SELECT user_id
+								FROM ' . ZEBRA_TABLE . '
+								WHERE user_id IN (' . implode(', ', $user_id_ary) . ')
+									AND zebra_id = ' . $user->data['user_id'] . '
+									AND foe = 1';
+							$result = $db->sql_query($sql);
+
+							$remove_user_ids = array();
+							while ($row = $db->sql_fetchrow($result))
+							{
+								$remove_user_ids[] = $row['user_id'];
+							}
+
+							if (sizeof($remove_user_ids))
+							{
+								$user_id_ary = array_diff($user_id_ary, $remove_user_ids);
+							}
+							unset($remove_user_ids);
+						}
+
 						if (sizeof($user_id_ary))
 						{
 							$sql_mode = ($mode == 'friends') ? 'friend' : 'foe';
-- 
cgit v1.2.1