From d589f3179c33de435cf72aecc0f12bf2ea51d696 Mon Sep 17 00:00:00 2001
From: "neatelves@gmail.com"
 <neatelves@gmail.com@e451fad0-63ce-11de-bed1-e3a98b22654c>
Date: Sat, 27 Aug 2011 14:22:51 +0000
Subject: [PATCH] =?utf8?q?=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=B8=D0=BC?=
 =?utf8?q?=D0=B5=D0=BD=D0=B8=20=D0=B0=D1=83=D0=BA=D1=86=D0=B8=D0=BE=D0=BD?=
 =?utf8?q?=D0=B1=D0=BE=D1=82=D0=B0.)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://cswowd-fork.googlecode.com/svn/trunk@114 e451fad0-63ce-11de-bed1-e3a98b22654c
---
 lang/lang.en.php                |  1 +
 lang/lang.ru.php                |  1 +
 module/auction/auctionhouse.php | 13 +++++++------
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lang/lang.en.php b/lang/lang.en.php
index 7a66e2e..e5ab7ab 100644
--- a/lang/lang.en.php
+++ b/lang/lang.en.php
@@ -405,6 +405,7 @@ $lang = array(
 'auction_seller' => 'Seller',
 'auction_cost'   => 'Cost',
 'auction_bye'    => 'Bye',
+'auctionbot'    => 'Auction[bot]',
 
 # Guilds
 'guild_list'   => 'Guilds - ',
diff --git a/lang/lang.ru.php b/lang/lang.ru.php
index c6f1346..a70a011 100644
--- a/lang/lang.ru.php
+++ b/lang/lang.ru.php
@@ -409,6 +409,7 @@ $lang = array(
 'auction_cost'   => 'Стоимость',
 'auction_bye'    => 'Выкуп',
 'empty'          => 'Пусто',
+'auctionbot'    => 'Аукцион[бот]',
 
 # Guilds
 'guild_list'   => 'Гильдии - ',
diff --git a/module/auction/auctionhouse.php b/module/auction/auctionhouse.php
index 003ae93..954943f 100644
--- a/module/auction/auctionhouse.php
+++ b/module/auction/auctionhouse.php
@@ -12,8 +12,6 @@ switch ($type)
 	case "Horde":
 	$houseid="(houseid=4 or houseid=5 or houseid=6)";
 	break;
-	case "Blackwater":
-	$houseid="(houseid=7)";
 	default:
 	$type="Blackwater";
 	$houseid="(houseid=7)";
@@ -51,17 +49,17 @@ echo "<table class=report width=500>";
 echo "<tbody>";
 echo "<tr><td colspan=4 class=head>";
 echo "<img src=\"images/gold.gif\">";
-echo "<a href=\"?auction=Alliance\" style=\"Text-decoration: none; color:gold;\">$lang[Alliance]</a>";
+echo "<a href=\"?auction=Alliance\" style=\"Text-decoration: none; color:gold;\">&nbsp;$lang[Alliance]&nbsp;</a>";
 echo "<img src=\"images/gold.gif\">";
-echo "<a href=\"?auction=Horde\" style=\"Text-decoration: none; color:gold;\">$lang[Horde]</a>";
+echo "<a href=\"?auction=Horde\" style=\"Text-decoration: none; color:gold;\">&nbsp;$lang[Horde]&nbsp;</a>";
 echo "<img src=\"images/gold.gif\">";
-echo "<a href=\"?auction=Blackwater\" style=\"Text-decoration: none; color:gold;\">$lang[Blackwater]</a>";
+echo "<a href=\"?auction=Blackwater\" style=\"Text-decoration: none; color:gold;\">&nbsp;$lang[Blackwater]&nbsp;</a>";
 echo "<img src=\"images/gold.gif\">";
 echo "</td></tr>";
 
 if ($rows)
 {
- echo "<tr><td colspan=4 class=head><font color=gold>$lang[auction] $type: </font> $number $lang[items]</td></tr>";
+ echo "<tr><td colspan=4 class=head>$number $lang[items]</td></tr>";
  echo "<tr>";
  echo "<th width=1px></th>";
  echo "<th width=50%>".$lang['auction_seller']."</th>";
@@ -73,6 +71,9 @@ if ($rows)
    $item_data = explode(' ', $auc_data['data']);
    echo "<tr>";
    echo "<td>"; show_item_by_data($item_data, 'auction'); echo "</td>";
+ if ($auc_data['itemowner'] == 0)
+   echo "<td align=center><font color=#ff0000>".$lang['auctionbot']."</font></td>";
+ else
    echo "<td><a href=?player=$auc_data[itemowner]>".getCharacterName($auc_data['itemowner'])."</a></td>";
    echo "<td align=center>".money($auc_data['startbid'])."</td>";
    echo "<td align=center>".money($auc_data['buyoutprice'])."</td>";
-- 
2.11.4.GIT