[439] It`s about time to update headers. Happy New Year!

Shadez · Jan 1, 2011 · 25f0819 · 25f0819
1 parent 883db8d
commit 25f0819
Show file tree

Hide file tree

Showing 86 changed files with 192 additions and 195 deletions.
diff --git a/3DViewer_info.txt b/3DViewer_info.txt
@@ -1,33 +1,33 @@
 Attention!
-Currently 3D Viewer is not completed full - there's no animations, saving character poses 
+Currently 3D Viewer is not completed full - there's no saving character poses, full screen modes
 and some other features.
 
-For correctly work, you need to download an archive with textures (rather large file - 198 MB).
+For correct work, you need to download an archive with textures (rather large file - 198 MB).
 
-'models' folder from the archive should be placed in the root of the site. The unpacked file is approximately 420 megabytes.
+'models' folder from the archive should be placed in the root of the site. The unpacked files are approximately 420 megabytes.
 
 If you have some troubles, report on forum:
-http://getmangos.com/community/showthread.php?12096-World-of-Warcraft-Armory
+http://getmangos.com/community/topic/12096/world-of-warcraft-armory/
 
-You can find textures archive on filekeeper.org (when it will be uploaded on FTP server):
+You can find textures archive on filekeeper.org:
 http://filekeeper.org/download/browser.php?path=shadez1%2Fwowarmory/
 Direct link:
 http://filekeeper.org/download/shadez1/wowarmory/armory_3dviewer.7z
 
 -----------------------
 
 Внимание!
-На данный момент 3D Viewer не завершен полностью - отсутствует проигрывание анимаций, сохранение позы персонажа 
+На данный момент 3D Viewer не завершен полностью - отсутствует сохранение позы персонажа, поддержка проигрывания в полном экране
 и некоторые другие возможности.
 
 Для корректной работы необходимо скачать архив с текстурами (архив довольно большой - 198 мегабайт).
 
 Папку 'models' из архива необходимо поместить в корень сайта. Распакованные файлы занимают примерно 420 мегабайт.
 
 Если у вас возникли какие-либо затруднения, пишите на форум:
-http://getmangos.com/community/showthread.php?12096-World-of-Warcraft-Armory
+http://getmangos.com/community/topic/12096/world-of-warcraft-armory/
 
-Архив с текстурами можно найти на filekeeper.org (как только будет загружен на ФТП сервер):
+Архив с текстурами можно найти на filekeeper.org:
 http://filekeeper.org/download/browser.php?path=shadez1%2Fwowarmory/
 Прямая ссылка:
 http://filekeeper.org/download/shadez1/wowarmory/armory_3dviewer.7z
diff --git a/INSTALL b/INSTALL
@@ -3,14 +3,14 @@ How to install WoW Armory
 =========================
 
 SYSTEM REQUIREMENTS:
-1. Apache HTTP Server with Mod Rewrite
-2. PHP5 (PHP6 not supported) with XMLWriter package installed and enabled
-3. MySQL5 Server
+1. Apache HTTP Server with mod_rewrite
+2. PHP 5 (PHP 6 is not supported) with XMLWriter package installed and enabled
+3. MySQL 5 Server or higher
 
 INSTALLATION STEPS:
 1. Create new MySQL database (`armory`, for expample) with utf8_general_ci encoding;
-2. Unzip sql/wowarmory_rc1_r82.sql.7z to any folder;
-3. Upload unpacked wowarmory_rc1_r82.sql into `armory` database. 
+2. Unzip sql/wowarmory_rc1_r{LATEST_REVISION}.sql.7z to any folder;
+3. Upload unpacked wowarmory_rc1_r{LATEST_REVISION}.sql into `armory` database. 
    Attention! SQL Query will take a long time while uploading, be prepare for it!
    If you get error 'MySQL server has gone away', change Query limit in MySQL server config file (my.ini (or my.cnf)).
 	Google it, if you don't know what it is;
@@ -22,28 +22,27 @@ INSTALLATION STEPS:
    You should edit these values according with your MySQL configs (user/password/dbname).
 5. Downloads icons archive from "Downloads" on GitHub.com and unpack it to "wow-icons/_images/"
 6. Unzip htaccess.zip archive and place unpacked .htaccess file to root site dir for correct scripts work.
-7. If there are some sql updates in 'sql/updates' dir (rev. 82 or higher), you need to upload it to DB too.
+7. If there are some sql updates in 'sql/updates' dir (rev. {LATEST_REVISION} or higher), you need to upload it to DB too.
 8. For 3D Viewer installation info read 3DViewer_info.txt
-9. For full work you need to patch MaNGOS core with tools/armory_character_stats/wowarmory_character_stats_*.patch
+9. For full work you need to patch MaNGOS core with tools/{SERVER}/wowarmory_patch.patch
    and your characters DB with provided SQL update (characters.sql - in the same folder).
-   Trinity Core users: patch for TC is placed in tools/trinity_core folder.
 10. If you use UNIX system, you need to manage access rights to allow script write data to 'cache' folder.
 11. If you have diffirent servers (MaNGOS and Trinity Core):
-    Open 'includes/classes/configuration.php' and edit $ArmoryConfig['multiRealm'][REALM_ID]['type'] to 'trinity' or 'mangos'.
+    Open 'includes/classes/configuration.php' and edit $ArmoryConfig['multiRealm'][{REALM_ID}]['type'] to 'trinity' or 'mangos'.
 
 ========================
 Как установить Оружейную
 ========================
 
 СИСТЕМНЫЕ ТРЕБОВАНИЯ:
-1. Web-сервер Apache с подключенным Mod Rewrite
-2. PHP5 (PHP6 не поддерживается) с установленным и подключенным пакетом XMLWriter
-3. MySQL-сервер 5
+1. Web-сервер Apache с подключенным модулем mod_rewrite
+2. PHP 5 (PHP 6 не поддерживается) с установленным и подключенным пакетом XMLWriter
+3. MySQL-сервер 5 или выше.
 
 ПОРЯДОК УСТАНОВКИ:
 1. Создайте новую базу сервера MySQL (`armory`, к примеру) с кодировкой utf8_general_ci;
-2. Распакуйте архив sql/wowarmory_rc1_r82.sql.7z в любую папку;
-3. Залейте распакованный wowarmory_rc1_r82.sql в базу `armory`
+2. Распакуйте архив sql/wowarmory_rc1_r{ПОСЛЕДНЯЯ_РЕВИЗИЯ}.sql.7z в любую папку;
+3. Залейте распакованный wowarmory_rc1_r{ПОСЛЕДНЯЯ_РЕВИЗИЯ}.sql в базу `armory`
    Внимание! SQL запрос будет выполняться достаточно долгое время, будьте к этому готовы!
 	Если вы получаете ошибку 'MySQL Server has gone away', измените лимит запроса в конфигурационном файле сервера MySQL
 	(my.ini (или my.cnf)). Используйте Google, если не знаете что это и как менять;
@@ -56,11 +55,10 @@ INSTALLATION STEPS:
    Вы должны изменить значения этих параметров согласно вашим настройкам MySQL (пользователь/пароль/имя базы) 
 5. Скачайте архив иконок из раздела "Downloads" на GitHub.com и распакуйте в папку "wow-icons/_images/"
 6. Распакуйте архив htaccess.zip и поместите распакованный файл .htaccess в корень сайта для правильной работы скриптов.
-7. Если в папке 'sql/updates' присутствуют обновления для базы (ревизии 82 и выше), вам будет необходимо так же залить их базу. 
+7. Если в папке 'sql/updates' присутствуют обновления для базы (ревизии {ПОСЛЕДНЯЯ_РЕВИЗИЯ} и выше), вам будет необходимо так же залить их базу. 
 8. Как установить и настроить 3D просмотрщик читайте в файле 3DViewer_info.txt
-9. Для работы страниц персонажа вам необходимо пропатчить ядро MaNGOS файлом tools/armory_character_stats/wowarmory_character_stats_*.patch,
+9. Для работы страниц персонажа вам необходимо пропатчить ядро MaNGOS файлом tools/{СЕРВЕР}/wowarmory_patch.patch,
 	 а так же, базу персонажей файлом characters.sql (в папке патча).
-    Пользователи Trinity Core: патч для TC находится в папке tools/trinity_core
 10. Если вы используете UNIX-систему, вам необходимо изменить права доступа к папке cache чтобы скрипт мог записывать кэшированные файлы.
 11. Если у вас запущено несколько реалмов с разными серверами (MaNGOS и Trinity Core):
-    Откройте файл 'includes/classes/configuration.php' и измените параметр $ArmoryConfig['multiRealm'][REALM_ID]['type'] на 'trinity' или 'mangos'.
+    Откройте файл 'includes/classes/configuration.php' и измените параметр $ArmoryConfig['multiRealm'][{ИД_РЕАЛМА}]['type'] на 'trinity' или 'mangos'.
diff --git a/README b/README
@@ -1,7 +1,7 @@
   @package World of Warcraft Armory
   @version Release Candidate 1
   @revision 376
-  @copyright (c) 2009 Shadez  
+  @copyright (c) 2009-2011 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/achievement-firsts.php b/achievement-firsts.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 365
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 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 345
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 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-game.php b/arena-game.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 345
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 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 345
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 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-team-game-chart.php b/arena-team-game-chart.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 395
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 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-team-report-opposing-teams.php b/arena-team-report-opposing-teams.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 365
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 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/battlegroups.php b/battlegroups.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 345
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 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/bookmarks.php b/bookmarks.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 413
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 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/cache/_debug/index.php b/cache/_debug/index.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 438
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 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 411
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 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-arenateams.php b/character-arenateams.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 385
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 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-calendar.php b/character-calendar.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 385
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 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-feed-data.php b/character-feed-data.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 257
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify
@@ -42,7 +42,7 @@
     $_GET['r'] = false;
 }
 $realmId = $utils->GetRealmIdByName($_GET['r']);
-$characters->BuildCharacter($name, $realmId);
+$characters->BuildCharacter($name, $realmId, true, true);
 $isCharacter = $characters->CheckPlayer();
 if($_GET['r'] === false || !$armory->currentRealmInfo) {
     $isCharacter = false;

diff --git a/character-feed.php b/character-feed.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 385
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 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-model-embed.php b/character-model-embed.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 385
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 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-model.php b/character-model.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 412
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 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 385
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 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-json.php b/character-select-submit-json.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 413
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 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 413
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 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 345
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 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 398
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify
@@ -168,9 +168,10 @@
 $talent_data = $characters->CalculateCharacterTalents();
 $current_tree = array();
 $activeSpec = $characters->GetActiveSpec();
+$talent_spec = null;
 if($talent_data && is_array($talent_data)) {
     $specCount = $characters->GetSpecCount();
-    for($i=0;$i<$specCount;$i++) {
+    for($i = 0; $i < $specCount; $i++) {
         $current_tree[$i] = $utils->GetMaxArray($talent_data['points'][$i]);
         $talent_spec[$i] = array(
             'group' => $i+1,
@@ -184,20 +185,22 @@
             $talent_spec[$i]['active'] = 1;
         }
     }
-    foreach($talent_spec as $m_spec) {
-        if($utils->IsWriteRaw()) {
-            $xml->XMLWriter()->writeRaw('<talentSpec');
-            foreach($m_spec as $spec_key => $spec_value) {
-                $xml->XMLWriter()->writeRaw(' ' . $spec_key .'="' . $spec_value . '"');
+    if(is_array($talent_spec)) {
+        foreach($talent_spec as $m_spec) {
+            if($utils->IsWriteRaw()) {
+                $xml->XMLWriter()->writeRaw('<talentSpec');
+                foreach($m_spec as $spec_key => $spec_value) {
+                    $xml->XMLWriter()->writeRaw(' ' . $spec_key .'="' . $spec_value . '"');
+                }
+                $xml->XMLWriter()->writeRaw('/>');
             }
-            $xml->XMLWriter()->writeRaw('/>');
-        }
-        else {
-            $xml->XMLWriter()->startElement('talentSpec');
-            foreach($m_spec as $spec_key => $spec_value) {
-                $xml->XMLWriter()->writeAttribute($spec_key, $spec_value);
+            else {
+                $xml->XMLWriter()->startElement('talentSpec');
+                foreach($m_spec as $spec_key => $spec_value) {
+                    $xml->XMLWriter()->writeAttribute($spec_key, $spec_value);
+                }
+                $xml->XMLWriter()->endElement(); //talentSpec
             }
-            $xml->XMLWriter()->endElement(); //talentSpec
         }
     }
 }
@@ -411,5 +414,10 @@
     $cache_data = $utils->GenerateCacheData($characters->GetName(), $characters->GetGUID(), 'character-sheet');
     $cache_handler = $utils->WriteCache($cache_id, $cache_data, $xml_cache_data);
 }
+echo '<!-- Database statistics:
+';
+print_r($characters->GetDB()->GetStatistics());
+echo '
+--> ';
 exit;
 ?>
diff --git a/character-statistics.php b/character-statistics.php
@@ -4,7 +4,7 @@
  * @package World of Warcraft Armory
  * @version Release Candidate 1
  * @revision 397
- * @copyright (c) 2009-2010 Shadez
+ * @copyright (c) 2009-2011 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
  * This program is free software; you can redistribute it and/or modify