1 files changed, 138 insertions, 123 deletions
diff --git a/phpBB/includes/ucp/ucp_zebra.php b/phpBB/includes/ucp/ucp_zebra.php
index a3155870d8..3c9abfe5b4 100644
--- a/phpBB/includes/ucp/ucp_zebra.php
+++ b/phpBB/includes/ucp/ucp_zebra.php
@@ -40,159 +40,174 @@ class ucp_zebra
 				$data[$var] = request_var($var, $default, true);
 			}
 
-			if ($data['add'])
+			if (!empty($data['add']) || sizeof($data['usernames']))
 			{
-				$data['add'] = array_map('trim', array_map('utf8_clean_string', explode("\n", $data['add'])));
-
-				// Do these name/s exist on a list already? If so, ignore ... we could be
-				// 'nice' and automatically handle names added to one list present on 
-				// the other (by removing the existing one) ... but I have a feeling this
-				// may lead to complaints
-				$sql = 'SELECT z.*, u.username, u.username_clean 
-					FROM ' . ZEBRA_TABLE . ' z, ' . USERS_TABLE . ' u 
-					WHERE z.user_id = ' . $user->data['user_id'] . '
-						AND u.user_id = z.zebra_id';
-				$result = $db->sql_query($sql);
-
-				$friends = $foes = array();
-				while ($row = $db->sql_fetchrow($result))
+				if (confirm_box(true))
 				{
-					if ($row['friend'])
+					if ($data['add'])
 					{
-						$friends[] = utf8_clean_string($row['username']);
-					}
-					else
-					{
-						$foes[] = utf8_clean_string($row['username']);
-					}
-				}
-				$db->sql_freeresult($result);
-
-				// remove friends from the username array
-				$n = sizeof($data['add']);
-				$data['add'] = array_diff($data['add'], $friends);
-
-				if (sizeof($data['add']) < $n && $mode == 'foes')
-				{
-					$error[] = $user->lang['NOT_ADDED_FOES_FRIENDS'];
-				}
-
-				// remove foes from the username array
-				$n = sizeof($data['add']);
-				$data['add'] = array_diff($data['add'], $foes);
-
-				if (sizeof($data['add']) < $n && $mode == 'friends')
-				{
-					$error[] = $user->lang['NOT_ADDED_FRIENDS_FOES'];
-				}
+						$data['add'] = array_map('trim', array_map('utf8_clean_string', explode("\n", $data['add'])));
+
+						// Do these name/s exist on a list already? If so, ignore ... we could be
+						// 'nice' and automatically handle names added to one list present on 
+						// the other (by removing the existing one) ... but I have a feeling this
+						// may lead to complaints
+						$sql = 'SELECT z.*, u.username, u.username_clean 
+							FROM ' . ZEBRA_TABLE . ' z, ' . USERS_TABLE . ' u 
+							WHERE z.user_id = ' . $user->data['user_id'] . '
+								AND u.user_id = z.zebra_id';
+						$result = $db->sql_query($sql);
+
+						$friends = $foes = array();
+						while ($row = $db->sql_fetchrow($result))
+						{
+							if ($row['friend'])
+							{
+								$friends[] = utf8_clean_string($row['username']);
+							}
+							else
+							{
+								$foes[] = utf8_clean_string($row['username']);
+							}
+						}
+						$db->sql_freeresult($result);
 
-				// remove the user himself from the username array
-				$n = sizeof($data['add']);
-				$data['add'] = array_diff($data['add'], array(utf8_clean_string($user->data['username'])));
+						// remove friends from the username array
+						$n = sizeof($data['add']);
+						$data['add'] = array_diff($data['add'], $friends);
 
-				if (sizeof($data['add']) < $n)
-				{
-					$error[] = $user->lang['NOT_ADDED_' . $l_mode . '_SELF'];
-				}
+						if (sizeof($data['add']) < $n && $mode == 'foes')
+						{
+							$error[] = $user->lang['NOT_ADDED_FOES_FRIENDS'];
+						}
 
-				unset($friends, $foes, $n);
+						// remove foes from the username array
+						$n = sizeof($data['add']);
+						$data['add'] = array_diff($data['add'], $foes);
 
-				if (sizeof($data['add']))
-				{
-					$sql = 'SELECT user_id, user_type
-						FROM ' . USERS_TABLE . ' 
-						WHERE ' . $db->sql_in_set('username_clean', $data['add']) . '
-							AND user_type <> ' . USER_INACTIVE;
-					$result = $db->sql_query($sql);
-
-					$user_id_ary = array();
-					while ($row = $db->sql_fetchrow($result))
-					{
-						if ($row['user_id'] != ANONYMOUS && $row['user_type'] != USER_IGNORE)
+						if (sizeof($data['add']) < $n && $mode == 'friends')
 						{
-							$user_id_ary[] = $row['user_id'];
+							$error[] = $user->lang['NOT_ADDED_FRIENDS_FOES'];
 						}
-						else
+
+						// remove the user himself from the username array
+						$n = sizeof($data['add']);
+						$data['add'] = array_diff($data['add'], array(utf8_clean_string($user->data['username'])));
+
+						if (sizeof($data['add']) < $n)
 						{
-							$error[] = $user->lang['NOT_ADDED_' . $l_mode . '_ANONYMOUS'];
+							$error[] = $user->lang['NOT_ADDED_' . $l_mode . '_SELF'];
 						}
-					}
-					$db->sql_freeresult($result);
 
-					if (sizeof($user_id_ary))
-					{
-						// Remove users from foe list if they are admins or moderators
-						if ($mode == 'foes')
+						unset($friends, $foes, $n);
+
+						if (sizeof($data['add']))
 						{
-							$perms = array();
-							foreach ($auth->acl_get_list($user_id_ary, array('a_', 'm_')) as $forum_id => $forum_ary)
+							$sql = 'SELECT user_id, user_type
+								FROM ' . USERS_TABLE . ' 
+								WHERE ' . $db->sql_in_set('username_clean', $data['add']) . '
+									AND user_type <> ' . USER_INACTIVE;
+							$result = $db->sql_query($sql);
+
+							$user_id_ary = array();
+							while ($row = $db->sql_fetchrow($result))
 							{
-								foreach ($forum_ary as $auth_option => $user_ary)
+								if ($row['user_id'] != ANONYMOUS && $row['user_type'] != USER_IGNORE)
 								{
-									$perms = array_merge($perms, $user_ary);
+									$user_id_ary[] = $row['user_id'];
+								}
+								else
+								{
+									$error[] = $user->lang['NOT_ADDED_' . $l_mode . '_ANONYMOUS'];
 								}
 							}
+							$db->sql_freeresult($result);
 
-							$perms = array_unique($perms);
-
-							if (sizeof($perms))
+							if (sizeof($user_id_ary))
 							{
-								$error[] = $user->lang['NOT_ADDED_FOES_MOD_ADMIN'];
-							}
+								// Remove users from foe list if they are admins or moderators
+								if ($mode == 'foes')
+								{
+									$perms = array();
+									foreach ($auth->acl_get_list($user_id_ary, array('a_', 'm_')) as $forum_id => $forum_ary)
+									{
+										foreach ($forum_ary as $auth_option => $user_ary)
+										{
+											$perms = array_merge($perms, $user_ary);
+										}
+									}
+
+									$perms = array_unique($perms);
+
+									if (sizeof($perms))
+									{
+										$error[] = $user->lang['NOT_ADDED_FOES_MOD_ADMIN'];
+									}
+
+									// This may not be right ... it may yield true when perms equate to deny
+									$user_id_ary = array_diff($user_id_ary, $perms);
+									unset($perms);
+								}
 
-							// This may not be right ... it may yield true when perms equate to deny
-							$user_id_ary = array_diff($user_id_ary, $perms);
-							unset($perms);
-						}
+								if (sizeof($user_id_ary))
+								{
+									$sql_mode = ($mode == 'friends') ? 'friend' : 'foe';
 
-						if (sizeof($user_id_ary))
-						{
-							$sql_mode = ($mode == 'friends') ? 'friend' : 'foe';
+									$sql_ary = array();
+									foreach ($user_id_ary as $zebra_id)
+									{
+										$sql_ary[] = array(
+											'user_id'		=> $user->data['user_id'],
+											'zebra_id'		=> (int) $zebra_id,
+											$sql_mode		=> 1
+										);
+									}
 
-							$sql_ary = array();
-							foreach ($user_id_ary as $zebra_id)
+									$db->sql_multi_insert(ZEBRA_TABLE, $sql_ary);
+
+									$updated = true;
+								}
+								unset($user_id_ary);
+							}
+							else if (!sizeof($error))
 							{
-								$sql_ary[] = array(
-									'user_id'		=> $user->data['user_id'],
-									'zebra_id'		=> (int) $zebra_id,
-									$sql_mode		=> 1
-								);
+								$error[] = $user->lang['USER_NOT_FOUND_OR_INACTIVE'];
 							}
-
-							$db->sql_multi_insert(ZEBRA_TABLE, $sql_ary);
-
-							$updated = true;
 						}
-						unset($user_id_ary);
 					}
-					else if (!sizeof($error))
+					else if (sizeof($data['usernames']))
 					{
-						$error[] = $user->lang['USER_NOT_FOUND_OR_INACTIVE'];
-					}
-				}
-			}
-			else if (sizeof($data['usernames']))
-			{
-				// Force integer values
-				$data['usernames'] = array_map('intval', $data['usernames']);
+						// Force integer values
+						$data['usernames'] = array_map('intval', $data['usernames']);
 
-				$sql = 'DELETE FROM ' . ZEBRA_TABLE . ' 
-					WHERE user_id = ' . $user->data['user_id'] . ' 
-						AND ' . $db->sql_in_set('zebra_id', $data['usernames']);
-				$db->sql_query($sql);
+						$sql = 'DELETE FROM ' . ZEBRA_TABLE . ' 
+							WHERE user_id = ' . $user->data['user_id'] . ' 
+								AND ' . $db->sql_in_set('zebra_id', $data['usernames']);
+						$db->sql_query($sql);
 
-				$updated = true;
-			}
+						$updated = true;
+					}
 
-			if ($updated)
-			{
-				meta_refresh(3, $this->u_action);
-				$message = $user->lang[$l_mode . '_UPDATED'] . '<br />' . implode('<br />', $error) . ((sizeof($error)) ? '<br />' : '') . '<br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
-				trigger_error($message);
-			}
-			else
-			{
-				$template->assign_var('ERROR', implode('<br />', $error));
+					if ($updated)
+					{
+						meta_refresh(3, $this->u_action);
+						$message = $user->lang[$l_mode . '_UPDATED'] . '<br />' . implode('<br />', $error) . ((sizeof($error)) ? '<br />' : '') . '<br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
+						trigger_error($message);
+					}
+					else
+					{
+						$template->assign_var('ERROR', implode('<br />', $error));
+					}
+				}
+				else
+				{
+					confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
+						'mode'		=> $mode,
+						'submit'	=> true,
+						'usernames'	=> $data['usernames'],
+						'add'		=> $data['add']))
+					);
+				}
 			}
 		}