From 6695cd988f7c053bf98df29913f833ad445bfdad Mon Sep 17 00:00:00 2001
From: glix08 <glix08@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Mon, 27 Jun 2011 21:44:41 +0000
Subject: [PATCH] r28
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Экспорт. Коммит №26. Мелочи. _Xz_. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@28 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/admin/admin_extensions.php       | 3 +--
 upload/admin/admin_reports.php          | 4 ++--
 upload/includes/ucp/usercp_attachcp.php | 4 ++--
 upload/login.php                        | 6 +++---
 upload/report.php                       | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/upload/admin/admin_extensions.php b/upload/admin/admin_extensions.php
index 85689bf5b..4973e10b8 100644
--- a/upload/admin/admin_extensions.php
+++ b/upload/admin/admin_extensions.php
@@ -58,8 +58,7 @@ $submit = (isset($_POST['submit'])) ? TRUE : FALSE;
 // Get Attachment Config
 $attach_config = array();
 
-$sql = 'SELECT *
-FROM ' . bb_ATTACH_CONFIG;
+$sql = 'SELECT * FROM '. BB_ATTACH_CONFIG;
 
 if ( !($result = DB()->sql_query($sql)) )
 {
diff --git a/upload/admin/admin_reports.php b/upload/admin/admin_reports.php
index 3a003922b..971d2e5f6 100644
--- a/upload/admin/admin_reports.php
+++ b/upload/admin/admin_reports.php
@@ -275,7 +275,7 @@ else if (isset($_POST[POST_CAT_URL]) || isset($_GET[POST_CAT_URL]))
 						print_confirmation(array(
 							'CONFIRM_TITLE' => $lang['DELETE_REASON'],
 							'QUESTION'      => $lang['DELETE_REPORT_REASON_EXPLAIN'],
-							'FORM_ACTION'   => "admin_reports.php",,
+							'FORM_ACTION'   => "admin_reports.php",
 							'HIDDEN_FIELDS' => $hidden_fields,
 						));
 					break;
@@ -430,7 +430,7 @@ else if (isset($_POST[POST_CAT_URL]) || isset($_GET[POST_CAT_URL]))
 			print_confirmation(array(
 				'CONFIRM_TITLE' => $lang['UNINSTALL_REPORT_MODULE'],
 				'QUESTION'      => $lang['UNINSTALL_REPORT_MODULE_EXPLAIN'],
-				'FORM_ACTION'   => "admin_reports.php",,
+				'FORM_ACTION'   => "admin_reports.php",
 				'HIDDEN_FIELDS' => $hidden_fields,
 			));
 		break;
diff --git a/upload/includes/ucp/usercp_attachcp.php b/upload/includes/ucp/usercp_attachcp.php
index 7d5ba5f4b..1e37d3042 100644
--- a/upload/includes/ucp/usercp_attachcp.php
+++ b/upload/includes/ucp/usercp_attachcp.php
@@ -32,12 +32,12 @@ if ($profiledata['user_id'] != $userdata['user_id'] && !IS_ADMIN)
 }
 
 $language = $bb_cfg['default_lang'];
-if (!file_exists(LANG_ROOT_DIR ."lang_$language/lang_admin_attach.php";))
+if (!file_exists(LANG_ROOT_DIR ."lang_$language/lang_admin_attach.php"))
 {
 	$language = $attach_config['board_lang'];
 }
 
-include(LANG_ROOT_DIR ."lang_$language/lang_admin_attach.php";);
+include(LANG_ROOT_DIR ."lang_$language/lang_admin_attach.php");
 
 $start      = request_var('start', 0);
 $sort_order = request_var('order', 'ASC');
diff --git a/upload/login.php b/upload/login.php
index 1e38e93d5..264813c7b 100644
--- a/upload/login.php
+++ b/upload/login.php
@@ -84,14 +84,14 @@ if (isset($_POST['login']))
 		}
 		if ($login_username == '' || $login_password == '')
 		{
-			$login_errors[] = 'Вы должны ввести имя и пароль';
+			$login_errors[] = $lang['ENTER_PASSWORD'];
 		}
 	}
 
 	// Captcha
 	if ($need_captcha && !CAPTCHA()->verify_code())
 	{
-		$login_errors[] = 'Вы должны правильно ввести код подтверждения';
+		$login_errors[] = $lang['CONFIRM_CODE_WRONG'];
 	}
 
 	if (!$login_errors)
@@ -102,7 +102,7 @@ if (isset($_POST['login']))
 			redirect($redirect_url);
 		}
 
-		$login_errors[] = 'Вы ввели неверное/неактивное имя пользователя или неверный пароль';
+		$login_errors[] = $lang['ERROR_LOGIN'];
 
 		$need_captcha = (!$mod_admin_login) ? CACHE('bb_login_err')->set('l_err_'. USER_IP, 1, 3600) : false;
 	}
diff --git a/upload/report.php b/upload/report.php
index 582d07057..4289a1dc3 100644
--- a/upload/report.php
+++ b/upload/report.php
@@ -386,7 +386,7 @@ else
                 print_confirmation(array(
 					'CONFIRM_TITLE' => ($single_report) ? $lang['DELETE_REPORT'] : $lang['DELETE_REPORTS'],
 					'QUESTION'      => ($single_report) ? $lang['DELETE_REPORT_EXPLAIN'] : $lang['DELETE_REPORTS_EXPLAIN'],
-					'FORM_ACTION'   => "report.php",,
+					'FORM_ACTION'   => "report.php",
 					'HIDDEN_FIELDS' => $hidden_fields,
 				));
 			}