From 9e5c25504e275d8de071f2efafa349ebee21063c Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 24 Jan 2007 11:29:56 +0000
Subject: - added confirm box to ucp zebra (adding fried/foe) - permission
 fixes for conversions - use more appropiate error message within convertor if
 source tables could not be found - other tiny fixes

git-svn-id: file:///svn/phpbb/trunk@6925 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/acp/acp_ban.php      | 14 ++++++++++----
 phpBB/includes/acp/acp_language.php | 11 ++++++++++-
 2 files changed, 20 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes/acp')

diff --git a/phpBB/includes/acp/acp_ban.php b/phpBB/includes/acp/acp_ban.php
index d28319c731..bd05cf7b1c 100644
--- a/phpBB/includes/acp/acp_ban.php
+++ b/phpBB/includes/acp/acp_ban.php
@@ -40,17 +40,23 @@ class acp_ban
 			$ban_reason			= request_var('banreason', '', true);
 			$ban_give_reason	= request_var('bangivereason', '', true);
 
-			user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reason, $ban_give_reason);
+			if ($ban)
+			{
+				user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reason, $ban_give_reason);
 
-			trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . adm_back_link($this->u_action));
+				trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . adm_back_link($this->u_action));
+			}
 		}
 		else if ($unbansubmit)
 		{
 			$ban = request_var('unban', array(''));
 
-			user_unban($mode, $ban);
+			if ($ban)
+			{
+				user_unban($mode, $ban);
 
-			trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . adm_back_link($this->u_action));
+				trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . adm_back_link($this->u_action));
+			}
 		}
 
 		// Define language vars
diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php
index 153c200aeb..5064e1848f 100644
--- a/phpBB/includes/acp/acp_language.php
+++ b/phpBB/includes/acp/acp_language.php
@@ -320,7 +320,16 @@ class acp_language
 					}
 
 					$transfer->rename($lang_path . $file, $lang_path . $file . '.bak');
-					$transfer->copy_file('store/' . $lang_path . $file, $lang_path . $file);
+					$result = $transfer->copy_file('store/' . $lang_path . $file, $lang_path . $file);
+
+					if ($result === false)
+					{
+						// If failed, try to rename again and print error out...
+						$transfer->rename($lang_path . $file . '.bak', $lang_path . $file);
+
+						trigger_error($user->lang['UPLOAD_FAILED'] . adm_back_link($this->u_action . '&amp;action=details&amp;id=' . $lang_id . '&amp;language_file=' . urlencode($selected_lang_file)), E_USER_WARNING);
+					}
+
 					$transfer->close_session();
 
 					// Remove from storage folder
-- 
cgit v1.2.1