diff --git a/account.php b/account.phpx similarity index 100% rename from account.php rename to account.phpx diff --git a/comment.php b/comment.phpx similarity index 100% rename from comment.php rename to comment.phpx diff --git a/item.php b/item.php index 0615066..fb3f70b 100644 --- a/item.php +++ b/item.php @@ -44,8 +44,8 @@ if (!$item = load_cache(5, $id)) { $rows = $DB->select(' SELECT c.?#, c.entry { - , l.name_loc?d as `name_loc` - , l.subname_loc' . $_SESSION['locale'] . ' as `subname_loc` + , l.name?d as `name` + , l.subname' . ' as `subname` } FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_factiontemplate, ?_creature_template c { LEFT JOIN (?_locales_creature l) ON l.entry=c.entry AND ? } diff --git a/npc.php b/npc.php index 4680322..1d15866 100644 --- a/npc.php +++ b/npc.php @@ -83,7 +83,7 @@ if (!$npc = load_cache(1, intval($id))) { $npc['faction_num'] = $row['factionID']; $npc['faction'] = $row['faction-name']; // Деньги - $money = ($row['mingold'] + $row['maxgold']) / 2; + $money = ($row['MinLootGold'] + $row['MaxLootGold']) / 2; $npc['moneygold'] = floor($money / 10000); $npc['moneysilver'] = floor(($money - ($npc['moneygold'] * 10000)) / 100); $npc['moneycopper'] = floor($money - ($npc['moneygold'] * 10000) - ($npc['moneysilver'] * 100)); diff --git a/search.php b/search.php index 22f8914..a29a117 100644 --- a/search.php +++ b/search.php @@ -161,7 +161,7 @@ foreach ($rows as $numRow => $row) $rows = $DB->select(' SELECT * FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_itemset - WHERE name_loc' . $_SESSION['locale'] . ' LIKE ? + WHERE name' . ' LIKE ? ', $nsearch ); foreach ($rows as $numRow => $row) @@ -172,7 +172,7 @@ $rows = $DB->select(' SELECT ?#, spellID FROM '.$UDWBaseconf['aowow']['db'].'.?_aowow_spell s, '.$UDWBaseconf['aowow']['db'].'.?_aowow_spellicons i WHERE - s.spellname_loc' . $_SESSION['locale'] . ' like ? + s.spellname' . ' like ? AND i.id = s.spellicon ', $spell_cols[2], $nsearch ); diff --git a/templates/wowhead/bricks/contribute.tpl b/templates/wowhead/bricks/contribute.tplx similarity index 100% rename from templates/wowhead/bricks/contribute.tpl rename to templates/wowhead/bricks/contribute.tplx diff --git a/templates/wowhead/faction.tpl b/templates/wowhead/faction.tpl index 548de53..1f8b81e 100644 --- a/templates/wowhead/faction.tpl +++ b/templates/wowhead/faction.tpl @@ -43,8 +43,6 @@ new Listview({ldelim}template: 'comment', id: 'comments', name: LANG.tab_comment tabsRelated.flush(); - {include file='bricks/contribute.tpl'} - diff --git a/templates/wowhead/header.tpl b/templates/wowhead/header.tpl index af13aa8..ab7514c 100644 --- a/templates/wowhead/header.tpl +++ b/templates/wowhead/header.tpl @@ -25,16 +25,6 @@ - -
diff --git a/templates/wowhead/item.tpl b/templates/wowhead/item.tpl index 5c27a0a..bc9a544 100644 --- a/templates/wowhead/item.tpl +++ b/templates/wowhead/item.tpl @@ -93,7 +93,6 @@ new Listview({ldelim}template: 'comment', id: 'comments', name: LANG.tab_comment tabsRelated.flush(); - {include file='bricks/contribute.tpl'}
diff --git a/templates/wowhead/itemset.tpl b/templates/wowhead/itemset.tpl index a8885e2..ca1b05e 100644 --- a/templates/wowhead/itemset.tpl +++ b/templates/wowhead/itemset.tpl @@ -62,8 +62,6 @@ new Listview({ldelim}template: 'comment', id: 'comments', name: LANG.tab_comment tabsRelated.flush(); - {include file='bricks/contribute.tpl'} -
diff --git a/templates/wowhead/js/locale_enus.js b/templates/wowhead/js/locale_enus.js index 00d6385..e5e3c08 100644 --- a/templates/wowhead/js/locale_enus.js +++ b/templates/wowhead/js/locale_enus.js @@ -6,7 +6,7 @@ var mn_quests = [[0, "Eastern Kingdoms", , [[36, "Alterac Mountains"], [45, "Ara var mn_spells = [[7, "Class Skills", , [[11, "Druid", , [[574, "Balance"], [134, "Feral Combat"], [573, "Restoration"]]], [3, "Hunter", , [[50, "Beast Mastery"], [163, "Marksmanship"], [51, "Survival"]]], [8, "Mage", , [[237, "Arcane"], [8, "Fire"], [6, "Frost"]]], [2, "Paladin", , [[594, "Holy"], [267, "Protection"], [184, "Retribution"]]], [5, "Priest", , [[613, "Discipline"], [56, "Holy"], [78, "Shadow Magic"]]], [4, "Rogue", , [[253, "Assassination"], [38, "Combat"], [633, "Lockpicking"], [40, "Poisons"], [39, "Subtlety"]]], [7, "Shaman", , [[375, "Elemental Combat"], [373, "Enhancement"], [374, "Restoration"]]], [9, "Warlock", , [[355, "Affliction"], [354, "Demonology"], [593, "Destruction"]]], [1, "Warrior", , [[26, "Arms"], [256, "Fury"], [257, "Protection"]]]]], /*[ - 2, "Talents", , [[11, "Druid", , [[574, "Balance"], [134, "Feral Combat"], [573, "Restoration"]]], [3, "Hunter", , [[50, "Beast Mastery"], [163, "Marksmanship"], [51, "Survival"]]], [8, "Mage", , [[237, "Arcane"], [8, "Fire"], [6, "Frost"]]], [2, "Paladin", , [[594, "Holy"], [267, "Protection"], [184, "Retribution"]]], [5, "Priest", , [[613, "Discipline"], [56, "Holy"], [78, "Shadow"]]], [4, "Rogue", , [[253, "Assassination"], [38, "Combat"], [39, "Subtlety"]]], [7, "Shaman", , [[375, "Elemental Combat"], [373, "Enhancement"], [374, "Restoration"]]], [9, "Warlock", , [[355, "Affliction"], [354, "Demonology"], [593, "Destruction"]]], [1, "Warrior", , [[26, "Arms"], [256, "Fury"], [257, "Protection"]]]]],*/ [ - 3, "Pet Skills", , [[, "Hunter"], [270, "Generic"], [653, "Bat"], [210, "Bear"], [211, "Boar"], [213, "Carrion Bird"], [209, "Cat"], [214, "Crab"], [212, "Crocolisk"], [763, "Dragonhawk"], [215, "Gorilla"], [654, "Hyena"], [764, "Nether Ray"], [655, "Owl"], [217, "Raptor"], [767, "Ravager"], [236, "Scorpid"], [768, "Serpent"], [203, "Spider"], [218, "Tallstrider"], [251, "Turtle"], [766, "Warp Stalker"], [656, "Wind Serpent"], [208, "Wolf"], [, "Warlock"], [761, "Felguard"], [189, "Felhunter"], [188, "Imp"], [205, "Succubus"], [204, "Voidwalker"]]], [11, "Professions", , [[171, "Alchemy"], [164, "Blacksmithing", , [[9788, "Armorsmithing"], [9787, "Weaponsmithing"], [17041, "Master Axesmithing"], [17040, "Master Hammersmithing"], [17039, "Master Swordsmithing"]]], [333, "Enchanting"], [202, "Engineering", , [[20219, "Gnomish Engineering"], [20222, "Goblin Engineering"]]], [182, "Herbalism"], [755, "Jewelcrafting"], [165, "Leatherworking", , [[10656, "Dragonscale Leatherworking"], [10658, "Elemental Leatherworking"], [10660, "Tribal Leatherworking"]]], [186, "Mining"], [393, "Skinning"], [197, "Tailoring", , [[26798, "Mooncloth Tailoring"], [26801, "Shadoweave Tailoring"], [26797, "Spellfire Tailoring"]]]]], [9, "Secondary Skills", , [[185, "Cooking"], [129, "First Aid"], [356, "Fishing"], [762, "Riding"]]], [6, "Weapon Skills"], [8, "Armor Proficiencies"], [10, "Languages"], [ - 4, "Racial Traits"], [0, "Uncategorized"]]; var mn_zones = [[0, "Eastern Kingdoms"], [1, "Kalimdor"], [8, "Outland"], [2, "Dungeons"], [3, "Raids"], [6, "Battlegrounds"], [9, "Arenas"]]; var mn_talentCalc = [["0", "Druid"], ["c", "Hunter"], ["o", "Mage"], ["s", "Paladin"], ["b", "Priest"], ["f", "Rogue"], ["h", "Shaman"], ["I", "Warlock"], ["L", "Warrior"]]; -var mn_database = [[, "Browse"], [0, "Items", "?items", mn_items], [2, "Item Sets", "?itemsets"/*, mn_itemSets*/], [4, "NPCs", "?npcs", mn_npcs], [5, "Objects", "?objects", mn_objects], [3, "Quests", "?quests", mn_quests], [1, "Spells", "?spells", mn_spells], /*[6, "Zones", "?zones", mn_zones],*/ [7, "Factions", "?factions"], [, "Utilities"], /*[28, "Latest Additions", "?latest=additions"], [29, "Latest Articles", "?latest=articles"],*/ [30, "Latest Comments", "?latest=comments"]/*, [31, "Latest Screenshots", "?latest=screenshots"], [99, "Random Page", "?random"]*/]; +var mn_database = [[0, "Items", "?items", mn_items], [2, "Item Sets", "?itemsets"/*, mn_itemSets*/], [4, "NPCs", "?npcs", mn_npcs], [5, "Objects", "?objects", mn_objects], [3, "Quests", "?quests", mn_quests], [1, "Spells", "?spells", mn_spells], /*[6, "Zones", "?zones", mn_zones],*/ [7, "Factions", "?factions"], ]; var mn_tools = [/*[0, "Talent Calculator", "?talent", mn_talentCalc],*/ [1, "Maps", "?maps"]]; var mn_forums = [[, "Boards"], [0, "WoW General"], [16, "Beginners"], [14, "PvE"], [15, "PvP"], [ - 2, "Classes", "", [[18, "Death Knight"], [3, "Druid"], [4, "Hunter"], [6, "Mage"], [7, "Paladin"], [8, "Priest"], [5, "Rogue"], [9, "Shaman"], [10, "Warlock"], [11, "Warrior"]]], [13, "Professions"], [12, "UI & Macros"], [17, "Guild Recruitment"], [2, "Randomness"], [1, "Site Feedback"], [, "Utilities"], [81, "Latest Replies", "?forums&latest-replies"], [80, "Latest Topics", "?forums&latest-topics"], [82, "Unanswered Topics", "?forums&unanswered-topics"]]; var mn_more = [[, "All About Wowhead"], [0, "About Us & Contact", "?aboutus"], [3, "FAQ", "?faq"], [4, "IRC Channel", "?irc"], [6, "News & Announcements", "?news"], [7, "Under Development", "?underdev"], [2, "Wowhead Client", "?client"], [, "Goodies"], [1, "Contests", "?contests"], [10, "Powered by Wowhead", "?powered"], [9, "Spread Wowhead", "?spread"], [8, "Search Plugins (FF, IE7, ...)", "?searchplugins", , "Search Plugins"], [, "Even More"], [5, "Network Sites", , [[99, "Allakhazam", "http://www.allakhazam.com/", [[99, "Dark Age of Camelot", "http://camelot.allakhazam.com"], [99, "EVE Online", "http://eve.allakhazam.com"], [99, "EverQuest", "http://everquest.allakhazam.com"], [99, "EverQuest II", "http://eq2.allakhazam.com"], [99, "EverQuest Online Adventures", "http://eqoa.allakhazam.com"], [99, "Final Fantasy XI", "http://ffxi.allakhazam.com"], [99, "Lineage II", "http://l2.allakhazam.com"], [99, "Lord of the Rings Online", "http://lotr.allakhazam.com"], [99, "Star Wars Galaxies", "http://swg.allakhazam.com"], [99, "World of Warcraft", "http://wow.allakhazam.com"]]], [99, "MMO Interface", "http://www.mmointerface.com/", [[99, "EverQuest", "http://www.eqinterface.com"], [99, "EverQuest II", "http://www.eq2interface.com"], [99, "Lord of the Rings Online", "http://www.lotrointerface.com"], [99, "Vanguard: Saga of Heroes", "http://www.vginterface.com"], [99, "World of Warcraft", "http://www.wowinterface.com"]]], [99, "Online Gaming Radio", "http://www.onlinegamingradio.com/"], [99, "Thottbot", "http://www.thottbot.com/"]]]]; diff --git a/templates/wowhead/main.tpl b/templates/wowhead/main.tpl index 07978d2..36767b8 100644 --- a/templates/wowhead/main.tpl +++ b/templates/wowhead/main.tpl @@ -25,10 +25,6 @@
- -
@@ -37,18 +33,6 @@ -{if $news} -
-
- -
-
-{/if} - - {include file='bricks/contribute.tpl'} -
diff --git a/templates/wowhead/object.tpl b/templates/wowhead/object.tpl index ebbf4fd..2bb8c2c 100644 --- a/templates/wowhead/object.tpl +++ b/templates/wowhead/object.tpl @@ -108,8 +108,6 @@ new Listview({ldelim}template: 'comment', id: 'comments', name: LANG.tab_comment tabsRelated.flush(); -{include file='bricks/contribute.tpl'} - diff --git a/templates/wowhead/quest.tpl b/templates/wowhead/quest.tpl index 634e67d..fdf49a2 100644 --- a/templates/wowhead/quest.tpl +++ b/templates/wowhead/quest.tpl @@ -435,8 +435,6 @@ tabsRelated.flush(); - {include file='bricks/contribute.tpl'} - diff --git a/templates/wowhead/signin.tpl b/templates/wowhead/signin.tplx similarity index 100% rename from templates/wowhead/signin.tpl rename to templates/wowhead/signin.tplx diff --git a/templates/wowhead/signup.tpl b/templates/wowhead/signup.tplx similarity index 100% rename from templates/wowhead/signup.tpl rename to templates/wowhead/signup.tplx diff --git a/templates/wowhead/spell.tpl b/templates/wowhead/spell.tpl index af7b0bc..4531ac9 100644 --- a/templates/wowhead/spell.tpl +++ b/templates/wowhead/spell.tpl @@ -207,10 +207,9 @@ var tabsRelated = new Tabs({ldelim}parent: ge('tabs-generic'){rdelim}); {if isset($spell.usedbyitem)}{include file='bricks/item_table.tpl' id='used-by-item' tabsid='tabsRelated' data=$spell.usedbyitem name='usedby' }{/if} {if isset($spell.usedbyitemset)}{include file='bricks/itemset_table.tpl' id='itemsets' tabsid='tabsRelated' data=$spell.usedbyitemset name='usedby' }{/if} {if isset($spell.seealso)}{include file='bricks/spell_table.tpl' id='see-also-ability' tabsid='tabsRelated' data=$spell.seealso name='seealso' }{/if} -new Listview({ldelim}template: 'comment', id: 'comments', name: LANG.tab_comments, tabs: tabsRelated, parent: 'listview-generic', data: lv_comments{rdelim}); +//new Listview({ldelim}template: 'comment', id: 'comments', name: LANG.tab_comments, tabs: tabsRelated, parent: 'listview-generic', data: lv_comments{rdelim}); tabsRelated.flush(); - {include file='bricks/contribute.tpl'}