From 32c2ea43395fe0a4b82c2c2e59e093d21543f26d Mon Sep 17 00:00:00 2001
From: Graham Eames <grahamje@users.sourceforge.net>
Date: Sat, 7 Oct 2006 20:11:45 +0000
Subject: [PATCH] View profile now shows relevant add/remove links

git-svn-id: file:///svn/phpbb/trunk@6462 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/ucp/ucp_zebra.php |  4 ++--
 phpBB/language/en/install.php    |  1 +
 phpBB/language/en/memberlist.php |  2 ++
 phpBB/memberlist.php             | 21 ++++++++++++++++++---
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/phpBB/includes/ucp/ucp_zebra.php b/phpBB/includes/ucp/ucp_zebra.php
index acea2cf965..7af77c7331 100644
--- a/phpBB/includes/ucp/ucp_zebra.php
+++ b/phpBB/includes/ucp/ucp_zebra.php
@@ -20,7 +20,7 @@ class ucp_zebra
 	{
 		global $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx;
 
-		$submit	= (isset($_POST['submit']) || isset($_GET['add'])) ? true : false;
+		$submit	= (isset($_POST['submit']) || isset($_GET['add']) || isset($_GET['remove'])) ? true : false;
 		$s_hidden_fields = '';
 
 		$l_mode = strtoupper($mode);
@@ -32,7 +32,7 @@ class ucp_zebra
 
 			$var_ary = array(
 				'usernames'	=> array(0),
-				'add'		=> '', 
+				'add'		=> '',
 			);
 
 			foreach ($var_ary as $var => $default)
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index dcb96a1c7c..d1db579302 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -251,6 +251,7 @@ $lang = array_merge($lang, array(
 	'TESTS_PASSED'				=> 'Tests passed',
 	'TESTS_FAILED'				=> 'Tests failed',
 
+	'UNABLE_WRITE_LOCK'			=> 'Unable to write lock file',
 	'UNAVAILABLE'				=> 'Unavailable',
 	'UNWRITEABLE'				=> 'Unwriteable',
 
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 8157388c85..a4d825c17f 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -103,6 +103,8 @@ $lang = array_merge($lang, array(
 	'RANK'					=> 'Rank',
 	'REAL_NAME'				=> 'Recipient name',
 	'RECIPIENT'				=> 'Recipient',
+	'REMOVE_FOE'			=> 'Remove foe',
+	'REMOVE_FRIEND'			=> 'Remove friend',
 
 	'SEARCH_USER_POSTS'		=> 'Search user’s posts',
 	'SELECT_MARKED'			=> 'Select marked',
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 521121fc59..3e52a2cf6a 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -367,6 +367,19 @@ switch ($mode)
 		{
 			$group_options .= '<option value="' . $row['group_id'] . '"' . (($row['group_id'] == $member['group_id']) ? ' selected="selected"' : '') . '>' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
 		}
+		$db->sql_freeresult($result);
+
+		// What colour is the zebra
+		$sql = 'SELECT friend, foe
+			FROM ' . ZEBRA_TABLE . "
+			WHERE zebra_id = $user_id
+				AND user_id = {$user->data['user_id']}";
+
+		$result = $db->sql_query($sql);
+		$row = $db->sql_fetchrow($result);
+		$foe = ($row['foe']) ? true : false;
+		$friend = ($row['friend']) ? true : false;
+		$db->sql_freeresult($result);
 
 		if ($config['load_onlinetrack'])
 		{
@@ -484,9 +497,11 @@ switch ($mode)
 			'U_SWITCH_PERMISSIONS'	=> ($auth->acl_get('a_switchperm') && $user->data['user_id'] != $user_id) ? append_sid("{$phpbb_root_path}ucp.$phpEx", "mode=switch_perm&amp;u={$user_id}") : '',
 
 			'S_ZEBRA'			=> ($user->data['user_id'] != $user_id && $user->data['is_registered'] && $zebra_enabled) ? true : false,
-			'U_ADD_FRIEND'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=zebra&amp;add=' . urlencode($member['username'])),
-			'U_ADD_FOE'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=zebra&amp;mode=foes&amp;add=' . urlencode($member['username'])))
-		);
+			'U_ADD_FRIEND'		=> (!$friend) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=zebra&amp;add=' . urlencode($member['username'])) : '',
+			'U_ADD_FOE'			=> (!$foe) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=zebra&amp;mode=foes&amp;add=' . urlencode($member['username'])) : '',
+			'U_REMOVE_FRIEND'	=> ($friend) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=zebra&amp;remove=1&amp;usernames[]=' . $user_id) : '',
+			'U_REMOVE_FOE'		=> ($foe) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=zebra&amp;remove=1&amp;usernames[]=' . $user_id) : '',
+		));
 
 		if (!empty($profile_fields['row']))
 		{