[45] 3.3.0a support, more localizations for DB tables (itemsetinfo …

…& `maps`), you need to update you DB with SQL files from `sql/updates` folder.
Shadez · Jan 11, 2010 · 7cb913c · 7cb913c
1 parent fc8deaf
commit 7cb913c
Show file tree

Hide file tree

Showing 38 changed files with 1,196 additions and 470 deletions.
diff --git a/THANKS b/THANKS
@@ -0,0 +1,7 @@
+I would like to thank these peoples:
+	- Chestr (aka DiSlord),
+	- SUPERGADGET,
+	- Fog (aka LordJZ),
+	- Arcano,
+	- FearX
+for code examples, help & support.
diff --git a/achievement-firsts.php b/achievement-firsts.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 30
- * @copyright (c) 2009 Shadez  
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/achievements-loader.php b/achievements-loader.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 31
- * @copyright (c) 2009 Shadez  
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/arena-calculator.php b/arena-calculator.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 30
- * @copyright (c) 2009 Shadez  
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/arena-ladder.php b/arena-ladder.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 30
- * @copyright (c) 2009 Shadez  
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/character-achievements.php b/character-achievements.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 40
- * @copyright (c) 2009 Shadez  
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/character-reputation.php b/character-reputation.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 40
- * @copyright (c) 2009 Shadez  
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/character-select-submit.php b/character-select-submit.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 37
- * @copyright (c) 2009 Shadez  
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/character-select.php b/character-select.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 37
- * @copyright (c) 2009 Shadez  
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/character-sheet.php b/character-sheet.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 40
- * @copyright (c) 2009 Shadez  
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/character-talents.php b/character-talents.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 40
- * @copyright (c) 2009 Shadez  
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/guild-bank-contents.php b/guild-bank-contents.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 39
- * @copyright (c) 2009 Shadez  
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/guild-info.php b/guild-info.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 30
- * @copyright (c) 2009 Shadez  
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/guild-stats.php b/guild-stats.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 30
- * @copyright (c) 2009 Shadez  
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/includes/UpdateFields.php b/includes/UpdateFields.php
diff --git a/includes/armory_loader.php b/includes/armory_loader.php
@@ -3,8 +3,8 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 44
- * @copyright (c) 2009 Shadez  
+ * @revision 45
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,7 @@
     die('<b>Error:</b> can not load connector class!');
 }
 
-define('DB_VERSION', 'armory_r44');
+define('DB_VERSION', 'armory_r45');
 $armory = new Connector;
 $armory->tpl->template_dir    = 'includes/template/';
 $armory->tpl->compile_dir     = 'includes/cache/';

diff --git a/includes/classes/class.achievements.php b/includes/classes/class.achievements.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 40
- * @copyright (c) 2009 Shadez  
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/includes/classes/class.arenateams.php b/includes/classes/class.arenateams.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 30
- * @copyright (c) 2009 Shadez  
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/includes/classes/class.characters.php b/includes/classes/class.characters.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 37
- * @copyright (c) 2009 Shadez  
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/includes/classes/class.connector.php b/includes/classes/class.connector.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 30
- * @copyright (c) 2009 Shadez  
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/includes/classes/class.guilds.php b/includes/classes/class.guilds.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 39
- * @copyright (c) 2009 Shadez  
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify

diff --git a/includes/classes/class.items.php b/includes/classes/class.items.php
@@ -3,8 +3,8 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 43
- * @copyright (c) 2009 Shadez  
+ * @revision 45
+ * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify
@@ -227,25 +227,29 @@ public function BuildItemSetInfo($itemset) {
         $itemsName='';
         $query = $this->aDB->selectRow("
         SELECT *
-            FROM `itemset`
+            FROM `itemsetinfo`
                 WHERE `id`=? LIMIT 1", $itemset);
-        $itemSetName = $query['name'];
+        if(!$query) {
+            return false;
+        }
+        $itemSetName = $query['name_'.$locale];
         $itemsCount = 0;
         for($i=1; $i !=9; $i++) {
-            if($query['item_'.$i] > 0) {
+            if($query['item'.$i] > 0) {
                 $itemsCount++;
-                $curName = $this->getItemName($query['item_'.$i]);
+                $curName = $this->getItemName($query['item'.$i]);
                 if($curName) {	// TODO: разобраться с сетами гладиаторов
                     $itemsName .= '<span class="setItemGray">'.$curName.'</span><br />';
                 }
-                    //setItem
             }
         }
 
-        for($i=1; $i!=9; $i++) {
-            if($query['bonus_'.$i] > 0) {
-                $spell_tmp = $this->aDB->selectRow("SELECT * FROM `spell` WHERE `id`=?", $query['bonus_'.$i]);
-                $itemSetBonuses .= '<span class="setItemGray">('.$i.') Комплект:&nbsp;'.$this->spellReplace($spell_tmp, Utils::validateText($spell_tmp['Description'.$spell_locale])).'</span><br />';
+        for($i=1; $i<9; $i++) {
+            if($query['bonus'.$i] > 0) {
+                $spell_tmp = $this->aDB->selectRow("SELECT * FROM `spell` WHERE `id`=?", $query['bonus'.$i]);
+                $itemSetBonuses .= '<span class="setItemGray">('.$i.') ';
+                $itemSetBonuses .=  ($locale == 'ru_ru') ? 'Комплект' : 'Set';
+                $itemSetBonuses .=  ':&nbsp;'.$this->spellReplace($spell_tmp, Utils::validateText($spell_tmp['Description'.$spell_locale])).'</span><br />';
             }
 		}
 		$fullItemInfoString = sprintf('<span class="setNameYellow">%s (0/%s)</span><div class="setItemIndent"><br />%s<br />%s</div>', $itemSetName, $itemsCount, $itemsName, $itemSetBonuses);