[NeatElves]

Перенес требование сторон в блок предмета, локализация, вывод в поиске типа квеста.)

Index: include/item_table.php
===================================================================
--- include/item_table.php	(revision 51)
+++ include/item_table.php	(working copy)
@@ -179,13 +179,18 @@
 
 function noBorderItemTable($item, $item_data=0)
 {
+ global $lang;
+ $flags2 = getItemFlags2($item['entry']);
  echo '<table class=item cellSpacing=0><tbody>';
  renderItemData($item, $item_data);
  // Extra data
+ if ($flags2 & ITEM_FLAGS2_HORDE_ONLY) echo '<tr><td>'.$lang['reqirement'].': '.$lang['Horde'].'</td></tr>';
+ if ($flags2 & ITEM_FLAGS2_ALLIANCE_ONLY) echo '<tr><td>'.$lang['reqirement'].': '.$lang['Alliance'].'</td></tr>';
+
  if ($item['SellPrice'])
-  echo '<tr><td class=sellprice>&nbsp;Sell Price:&nbsp;'.money($item['SellPrice'], 8).'</td></tr>';
+  echo '<tr><td class=sellprice>&nbsp;'.$lang['sell_price'].': '.money($item['SellPrice']).'</td></tr>';
  else
-  echo '<tr><td class=sellprice>&nbsp;No sell price</td></tr>';
+  echo '<tr><td class=sellprice>&nbsp;'.$lang['no_sell_price'].'</td></tr>';
 // echo '<tr><td class=bottom>This is from MaNGOS database!</td></tr>';
  echo '</tbody></table>';
 }
Index: include/report_generator.php
===================================================================
--- include/report_generator.php	(revision 51)
+++ include/report_generator.php	(working copy)
@@ -1029,7 +1029,22 @@
 //=================================================================
 // Quest list report functions and methods
 //=================================================================
-function r_questLvl($data)    {echo $data['QuestLevel'];}
+function r_questLvl($data)
+{
+global $lang;
+echo $data['QuestLevel'].'<br>';
+ if ($data['SpecialFlags'] & QUEST_SPECIAL_FLAG_MONTHLY)
+     echo '<FONT size=-5>'.$lang['quest_type3'];
+
+ if ($data['QuestFlags'] & QUEST_FLAGS_WEEKLY)
+     echo '<FONT size=-5>'.$lang['quest_type2'];
+
+ if ($data['QuestFlags'] & QUEST_FLAGS_DAILY)
+     echo '<FONT size=-5>'.$lang['quest_type1'];
+
+ if (($data['SpecialFlags'] & QUEST_SPECIAL_FLAG_REPEATABLE) && (($data['SpecialFlags'] & QUEST_SPECIAL_FLAG_MONTHLY) ==0) && ($data['QuestFlags'] & (QUEST_FLAGS_DAILY | QUEST_FLAGS_WEEKLY))  == 0)
+     echo '<FONT size=-5>'.$lang['quest_type0'];
+}
 function r_questReqLvl($data) {echo $data['MinLevel'];}
 function r_questName($data)
 {
@@ -1184,9 +1199,9 @@
  `RewOrReqMoney`, `RewMoneyMaxLevel`, `RewSpell`, `RewSpellCast`, `RewMailTemplateId`, `RewMailDelaySecs`';
 
 $quest_report = array(
-'QUEST_REPORT_LEVEL'   =>array('class'=>'small','sort'=>'level',  'text'=>$lang['quest_lvl'],     'draw'=>'r_questLvl',   'sort_str'=>'`QuestLevel` DESC',      'fields'=>'`QuestLevel`' ),
+'QUEST_REPORT_LEVEL'   =>array('class'=>'small','sort'=>'',  'text'=>$lang['quest_lvl'],     'draw'=>'r_questLvl',   'sort_str'=>'',      'fields'=>'`QuestLevel`, `QuestFlags`, `SpecialFlags`' ),
 'QUEST_REPORT_REQLEVEL'=>array('class'=>'small','sort'=>'req_lvl','text'=>$lang['quest_reqlvl'],  'draw'=>'r_questReqLvl','sort_str'=>'`MinLevel` DESC',        'fields'=>'`MinLevel`' ),
-'QUEST_REPORT_NAME'    =>array('class'=>'left', 'sort'=>'name',   'text'=>$lang['quest_name'],    'draw'=>'r_questName',  'sort_str'=>'`Title`',                'fields'=>'`Title`, `ZoneOrSort`, `RequiredSkill`, `RequiredSkillValue`, `RequiredClasses`'),
+'QUEST_REPORT_NAME'    =>array('class'=>'left', 'sort'=>'name',   'text'=>$lang['quest_name'],    'draw'=>'r_questName',  'sort_str'=>'`Title`',                'fields'=>'`Title`, `ZoneOrSort`, `RequiredSkill`, `RequiredSkillValue`, `RequiredClasses`, `RequiredRaces`'),
 'QUEST_REPORT_GIVER'   =>array('class'=>'left', 'sort'=>'',       'text'=>$lang['quest_giver'],   'draw'=>'r_questGiver', 'sort_str'=>'',                       'fields'=>''),
 'QUEST_REPORT_REWARD'  =>array('class'=>'full', 'sort'=>'reward', 'text'=>$lang['quest_rewards'], 'draw'=>'r_questReward','sort_str'=>'`RewMoneyMaxLevel` DESC','fields'=>&$quest_reward_fields),
 // loot
Index: lang/lang.en.php
===================================================================
--- lang/lang.en.php	(revision 51)
+++ lang/lang.en.php	(working copy)
@@ -156,6 +156,7 @@
 'next' => 'Next',
 'go' => 'Go',
 'compressed' => 'Main page',
+'no_sell_price' => 'No sell price',
 'sell_price' => 'Sell price',
 'buy_price' => 'Buy price',
 
Index: lang/lang.ru.php
===================================================================
--- lang/lang.ru.php	(revision 51)
+++ lang/lang.ru.php	(working copy)
@@ -156,10 +156,10 @@
 'next' => 'Дальше',
 'go' => 'Вперед',
 'compressed' => 'На главную',
+'no_sell_price' => 'Не для продажи',
+'sell_price' => 'Цена продажи',
+'buy_price' => 'Цена выкупа',
 
-'sell_price' => 'Цена за продажу',
-'buy_price' => 'Цена за покупку',
-
 // GO, NPC info
 'show_map' => 'На карте',
 'money' => 'Деньги',
@@ -509,7 +509,7 @@
 'prof_inscription'=>'Начертание',
 
 'prof_secondary'=>'Вторичные навыки',
-'prof_cooking'=>'Приготовление пищи',
+'prof_cooking'=>'Кулинария',
 'prof_first_aid'=>'Первая помощь',
 'prof_fishing'=>'Рыбная ловля',
 
Index: module/instance/inst_list.php
===================================================================
--- module/instance/inst_list.php	(revision 51)
+++ module/instance/inst_list.php	(working copy)
@@ -68,8 +68,9 @@
 $cacheFilename = 'inst_list_'.$config['lang'].'.html';
 if (checkUseCacheHtml($cacheFilename, 24*60*60))
 {
+ global $lang;
  echo "<table class=report width=100%>";
- echo "<td class=head colspan=4>Instances</td>";
+ echo '<td class=head colspan=4>$lang[instance]</td>';
  echo "<tr><th width=1px></th><th>$lang[level]</th><th>$lang[instances]</th><th>$lang[in_zone]</th></tr>";
  foreach($inst_list as $inst)
  {
Index: module/show/show_item.php
===================================================================
--- module/show/show_item.php	(revision 51)
+++ module/show/show_item.php	(working copy)
@@ -54,8 +54,6 @@
 // Получаем вещь
 $item = getItem($entry);
 
-$flags2 = getItemFlags2($entry);
-
 if (!$item)
 {
    RenderError("$lang[item_not_found]");
@@ -77,11 +75,8 @@
    if ($item['minMoneyLoot']) echo "$lang[Rew_money] ".money($item['minMoneyLoot']);
    if (($item['maxMoneyLoot']) && ($item['maxMoneyLoot']>$item['minMoneyLoot'])) echo " - ".money($item['maxMoneyLoot']);
 
-   if ($flags2&ITEM_FLAGS2_HORDE_ONLY) echo "<FONT color=#ff0000> $lang[reqirement]: $lang[Horde]</FONT>";
-   if ($flags2&ITEM_FLAGS2_ALLIANCE_ONLY) echo "<FONT color=#0000ff> $lang[reqirement]: $lang[Alliance]</FONT>";
+   if ($item['BuyPrice']) echo '<br>'.$lang['buy_price'].': '.money($item['BuyPrice']);
    echo "<br />";
-   if ($item['BuyPrice']) echo "$lang[buy_price]: ".money($item['BuyPrice']);
-   echo "<br />";
 
    //********************************************************************************
    // Если часть набора - выводим весь набор