From 25f08196b2b8ac5389904708d5139dcf81926454 Mon Sep 17 00:00:00 2001 From: Shadez Date: Sat, 1 Jan 2011 13:38:44 +0800 Subject: [PATCH] [439] It`s about time to update headers. Happy New Year! --- 3DViewer_info.txt | 16 +-- INSTALL | 34 +++--- README | 2 +- achievement-firsts.php | 2 +- arena-calculator.php | 2 +- arena-game.php | 2 +- arena-ladder.php | 2 +- arena-team-game-chart.php | 2 +- arena-team-report-opposing-teams.php | 2 +- battlegroups.php | 2 +- bookmarks.php | 2 +- cache/_debug/index.php | 2 +- character-achievements.php | 2 +- character-arenateams.php | 2 +- character-calendar.php | 2 +- character-feed-data.php | 4 +- character-feed.php | 2 +- character-model-embed.php | 2 +- character-model.php | 2 +- character-reputation.php | 2 +- character-select-submit-json.php | 2 +- character-select-submit.php | 2 +- character-select.php | 2 +- character-sheet.php | 36 ++++--- character-statistics.php | 2 +- character-talents.php | 2 +- dungeons.php | 2 +- dungeons0.php | 2 +- dungeons1.php | 2 +- factions.php | 2 +- factions0.php | 2 +- factions1.php | 2 +- faq-achievements.php | 2 +- faq-arena-calculator.php | 2 +- faq-arena-ladder.php | 2 +- faq-armory.php | 2 +- faq-auction-house.php | 2 +- faq-calendar-feed.php | 2 +- faq-calendar.php | 2 +- faq-character-feed.php | 2 +- faq-character-sheet.php | 2 +- faq-guild-info.php | 2 +- faq-item-info-recommended.php | 2 +- faq-item-info.php | 2 +- faq-login.php | 2 +- faq-team-info.php | 2 +- guild-bank-contents.php | 2 +- guild-bank-log.php | 2 +- guild-info.php | 2 +- guild-stats.php | 2 +- includes/armory_loader.php | 2 +- includes/classes/class.achievements.php | 18 ++-- includes/classes/class.arenateams.php | 115 ++++++++++----------- includes/classes/class.armory.php | 2 +- includes/classes/class.characters.php | 2 +- includes/classes/class.dbhandler.php | 6 +- includes/classes/class.debug.php | 2 +- includes/classes/class.guilds.php | 2 +- includes/classes/class.item.php | 2 +- includes/classes/class.itemprototype.php | 2 +- includes/classes/class.items.php | 2 +- includes/classes/class.mangos.php | 2 +- includes/classes/class.search.php | 2 +- includes/classes/class.utils.php | 2 +- includes/classes/class.xmlhandler.php | 2 +- includes/classes/configuration.php.default | 2 +- includes/defines.php | 2 +- includes/revision_nr.php | 2 +- index.php | 2 +- item-info.php | 2 +- item-search.php | 2 +- item-tooltip.php | 2 +- login-status.php | 2 +- login.php | 2 +- maintenance.php | 2 +- newsfeed.php | 2 +- pvprewards.php | 2 +- search.php | 2 +- talent-calc.php | 2 +- team-info.php | 2 +- tools/build_loot_tables.php | 2 +- tools/create_database_dump.php | 2 +- tools/rename_armory_tables.php | 2 +- updates-feed.php | 2 +- updates.php | 2 +- vault/character-calendar.php | 2 +- 86 files changed, 192 insertions(+), 195 deletions(-) diff --git a/3DViewer_info.txt b/3DViewer_info.txt index 91cdabf49..2144f15cb 100644 --- a/3DViewer_info.txt +++ b/3DViewer_info.txt @@ -1,15 +1,15 @@ 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 @@ -17,7 +17,7 @@ http://filekeeper.org/download/shadez1/wowarmory/armory_3dviewer.7z ----------------------- Внимание! -На данный момент 3D Viewer не завершен полностью - отсутствует проигрывание анимаций, сохранение позы персонажа +На данный момент 3D Viewer не завершен полностью - отсутствует сохранение позы персонажа, поддержка проигрывания в полном экране и некоторые другие возможности. Для корректной работы необходимо скачать архив с текстурами (архив довольно большой - 198 мегабайт). @@ -25,9 +25,9 @@ http://filekeeper.org/download/shadez1/wowarmory/armory_3dviewer.7z Папку '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 \ No newline at end of file diff --git a/INSTALL b/INSTALL index 8996b78b7..edb9e6e7a 100644 --- 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'. \ No newline at end of file + Откройте файл 'includes/classes/configuration.php' и измените параметр $ArmoryConfig['multiRealm'][{ИД_РЕАЛМА}]['type'] на 'trinity' или 'mangos'. \ No newline at end of file diff --git a/README b/README index ccb3f6caf..f9225a157 100644 --- 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 index 4453a07c6..26e98c714 100644 --- 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 index f73b6f21c..b807e7598 100644 --- 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 index 17f08f4f1..94aa8531b 100644 --- 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 index db62c5bd1..731beb181 100644 --- 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 index 7f99eae7f..847f0c1a7 100644 --- 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 index c962939b7..2b469ce97 100644 --- 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 index de3ac95da..3c318a41d 100644 --- 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 index 42edf120a..203039814 100644 --- 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 index ad277237f..7004811d7 100644 --- 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 index 9496b9b87..92e8b5795 100644 --- 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 index 730292b49..db9ad3973 100644 --- 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 index 4d74b3170..005297bc3 100644 --- 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 index fe28e052b..ea7f9f021 100644 --- 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 index e6f1f2705..f164bddcc 100644 --- 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 index f0b25c3ca..71f862443 100644 --- 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 index c0fbf3447..baaacdcfb 100644 --- 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 index 7b42fb3c5..4ccdf453e 100644 --- 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 index 1967aa1f0..4d38248fe 100644 --- 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 index f917fa73b..cbcec5a85 100644 --- 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 index 2912d8465..d10a37481 100644 --- 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 index a3da66103..6eb320d5b 100644 --- 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(' $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(' $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 ' '; exit; ?> \ No newline at end of file diff --git a/character-statistics.php b/character-statistics.php index 9de7119f2..37933cf0c 100644 --- 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 diff --git a/character-talents.php b/character-talents.php index 53eb46216..5da3c0d6f 100644 --- a/character-talents.php +++ b/character-talents.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 408 - * @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/dungeons.php b/dungeons.php index e9dc74ca4..167ea624c 100644 --- a/dungeons.php +++ b/dungeons.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/dungeons0.php b/dungeons0.php index f20a7bc0b..38444ab6a 100644 --- a/dungeons0.php +++ b/dungeons0.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/dungeons1.php b/dungeons1.php index fff922565..484fe1ad0 100644 --- a/dungeons1.php +++ b/dungeons1.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/factions.php b/factions.php index ba0d2805a..2556f7ad7 100644 --- a/factions.php +++ b/factions.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/factions0.php b/factions0.php index 7e05ab66c..f8fa45bca 100644 --- a/factions0.php +++ b/factions0.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/factions1.php b/factions1.php index e57a902ed..5d30cbe7d 100644 --- a/factions1.php +++ b/factions1.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/faq-achievements.php b/faq-achievements.php index e64bc5aa4..d1421c44c 100644 --- a/faq-achievements.php +++ b/faq-achievements.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/faq-arena-calculator.php b/faq-arena-calculator.php index 960c4c328..462acc73d 100644 --- a/faq-arena-calculator.php +++ b/faq-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/faq-arena-ladder.php b/faq-arena-ladder.php index 1ad69c483..942d2ad04 100644 --- a/faq-arena-ladder.php +++ b/faq-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/faq-armory.php b/faq-armory.php index 479311589..f6e3b3377 100644 --- a/faq-armory.php +++ b/faq-armory.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/faq-auction-house.php b/faq-auction-house.php index fff9a13fd..14404a240 100644 --- a/faq-auction-house.php +++ b/faq-auction-house.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/faq-calendar-feed.php b/faq-calendar-feed.php index d386830f2..8d70296fc 100644 --- a/faq-calendar-feed.php +++ b/faq-calendar-feed.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/faq-calendar.php b/faq-calendar.php index e763be9d4..f82e476d8 100644 --- a/faq-calendar.php +++ b/faq-calendar.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/faq-character-feed.php b/faq-character-feed.php index 6937f8833..429b08258 100644 --- a/faq-character-feed.php +++ b/faq-character-feed.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/faq-character-sheet.php b/faq-character-sheet.php index c8a7fc050..e90b56e16 100644 --- a/faq-character-sheet.php +++ b/faq-character-sheet.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/faq-guild-info.php b/faq-guild-info.php index 15d26dd56..38e6180bb 100644 --- a/faq-guild-info.php +++ b/faq-guild-info.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/faq-item-info-recommended.php b/faq-item-info-recommended.php index 48f187b41..c496bf1ef 100644 --- a/faq-item-info-recommended.php +++ b/faq-item-info-recommended.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/faq-item-info.php b/faq-item-info.php index a315f90f7..e96f2c8be 100644 --- a/faq-item-info.php +++ b/faq-item-info.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/faq-login.php b/faq-login.php index d90604fa1..92f50717f 100644 --- a/faq-login.php +++ b/faq-login.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/faq-team-info.php b/faq-team-info.php index 6d62c74cb..15f955ea4 100644 --- a/faq-team-info.php +++ b/faq-team-info.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/guild-bank-contents.php b/guild-bank-contents.php index abf4c47f5..7c5d4c115 100644 --- a/guild-bank-contents.php +++ b/guild-bank-contents.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 402 - * @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/guild-bank-log.php b/guild-bank-log.php index 4aac80712..506200b01 100644 --- a/guild-bank-log.php +++ b/guild-bank-log.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 402 - * @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/guild-info.php b/guild-info.php index 00cd57e61..e15272aca 100644 --- a/guild-info.php +++ b/guild-info.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 402 - * @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/guild-stats.php b/guild-stats.php index 99b937140..9c10ddef0 100644 --- a/guild-stats.php +++ b/guild-stats.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 402 - * @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/includes/armory_loader.php b/includes/armory_loader.php index 65bec5339..2a4f09f8c 100644 --- a/includes/armory_loader.php +++ b/includes/armory_loader.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 431 - * @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/includes/classes/class.achievements.php b/includes/classes/class.achievements.php index d27bf08e8..1ce306b1d 100644 --- 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 422 - * @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 @@ -518,7 +518,7 @@ public function LoadAchievementPage($page_id, $faction) { $return_data['incompleted'][$this->achId]['data'] = $achievement; $return_data['incompleted'][$this->achId]['data']['categoryId'] = $page_id; $return_data['incompleted'][$this->achId]['display'] = 1; - if(isset($return_data['incompleted'][$this->achId]['data']['titleReward']) && $return_data['incompleted'][$this->achId]['data']['titleReward'] != '') { + if(isset($return_data['incompleted'][$this->achId]['data']['titleReward']) && $return_data['incompleted'][$this->achId]['data']['titleReward'] != null) { $return_data['incompleted'][$this->achId]['data']['reward'] = $return_data['incompleted'][$this->achId]['data']['titleReward']; unset($return_data['incompleted'][$this->achId]['data']['titleReward']); } @@ -536,19 +536,19 @@ public function LoadAchievementPage($page_id, $faction) { * @return array **/ private function BuildAchievementCriteriaTable() { - if($this->armory->GetLocale() == 'es_es' || $this->armory->GetLocale() == 'es_mx') { + if(in_array($this->armory->GetLocale(), array('es_es', 'es_mx'))) { $locale = 'en_gb'; } else { $locale = $this->armory->GetLocale(); } if(!$this->guid || !$this->achId) { - $this->armory->Log()->writeError('%s : player guid or achievement id not defiend (guid: %s, achId: %d)', __METHOD__, $this->guid, $this->achId); + $this->armory->Log()->writeError('%s : player guid or achievement id is not defiend (GUID: %s, achId: %d)', __METHOD__, $this->guid, $this->achId); return false; } $data = $this->armory->aDB->select("SELECT * FROM `ARMORYDBPREFIX_achievement_criteria` WHERE `referredAchievement`=%d ORDER BY `showOrder`", $this->achId); if(!$data) { - $this->armory->Log()->writeError('%s : achievement criteria for achievement #%d not found', __METHOD__, $this->achId); + $this->armory->Log()->writeError('%s : achievement criteria for achievement #%d was not found', __METHOD__, $this->achId); return false; } $i = 0; @@ -566,7 +566,7 @@ private function BuildAchievementCriteriaTable() { $achievement_criteria[$i]['date'] = date('Y-m-d\TH:i:s\+01:00', $m_data['date']); } $achievement_criteria[$i]['name'] = $criteria['name_'.$locale]; - if($criteria['completionFlag']&ACHIEVEMENT_CRITERIA_FLAG_SHOW_PROGRESS_BAR || $criteria['completionFlag']&ACHIEVEMENT_FLAG_COUNTER) { + if($criteria['completionFlag']&ACHIEVEMENT_CRITERIA_FLAG_SHOW_PROGRESS_BAR || $criteria['completionFlag'] & ACHIEVEMENT_FLAG_COUNTER) { if($criteria['completionFlag']&ACHIEVEMENT_CRITERIA_FLAG_MONEY_COUNTER) { $achievement_criteria[$i]['maxQuantityGold'] = $criteria['value']; $money = Mangos::GetMoney($m_data['counter']); @@ -612,8 +612,8 @@ public function LoadStatisticsPage($page_id, $faction) { $this->armory->Log()->writeError('%s : player guid not defined', __METHOD__); return false; } - $achievements_data = $this->armory->aDB->select( - "SELECT `id`, `name_%s` AS `name`, `description_%s` AS `desc`, `categoryId` + $achievements_data = $this->armory->aDB->select(" + SELECT `id`, `name_%s` AS `name`, `description_%s` AS `desc`, `categoryId` FROM `ARMORYDBPREFIX_achievement` WHERE `categoryId`=%d AND `factionFlag` IN (%d, -1)", $this->armory->GetLocale(), $this->armory->GetLocale(), $page_id, $faction); if(!$achievements_data) { @@ -663,7 +663,7 @@ private function GetCriteriaValue() { if(!$criteria_ids) { return false; } - $tmp_criteria_value = '--'; + $tmp_criteria_value = null; foreach($criteria_ids as $criteria) { $tmp_criteria_value = $this->db->selectCell("SELECT `counter` FROM `character_achievement_progress` WHERE `guid`=%d AND `criteria`=%d LIMIT 1", $this->guid, $criteria['id']); if(!$tmp_criteria_value) { diff --git a/includes/classes/class.arenateams.php b/includes/classes/class.arenateams.php index e6728c40b..0baaa18a3 100644 --- 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 399 - * @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 @@ -38,11 +38,19 @@ public $guid; private $gameid = false; + /** + * Class constructor + * @category Arenateams class + * @access public + * @param object $armory + * @return bool + **/ public function Arenateams($armory) { if(!is_object($armory)) { die('Fatal Error: armory must be instance of Armory class!'); } $this->armory = $armory; + return true; } /** @@ -90,11 +98,11 @@ public function GetArenaTeamInfo() { $arenateaminfo['data'] = $this->armory->cDB->selectRow(" SELECT `rating`, - `games` AS `gamesPlayed`, - `wins` AS `gamesWon`, + `games_week` AS `gamesPlayed`, + `wins_week` AS `gamesWon`, `rank` AS `ranking`, - `played` AS `seasonGamesPlayed`, - `wins2` AS `seasonGamesWon` + `games_season` AS `seasonGamesPlayed`, + `wins_season` AS `seasonGamesWon` FROM `arena_team_stats` WHERE `arenateamid`=%d", $this->arenateamid); if(!$arenateaminfo) { $this->armory->Log()->writeError('%s : unable to get data from DB for arenateam %d (%s)', __METHOD__, $this->arenateamid, $this->teamname); @@ -133,14 +141,12 @@ public function IsTeam() { $this->armory->Log()->writeError('%s : teamname and arenateamid are not defined', __METHOD__); return false; } - $check = false; if($this->teamname != null) { - $check = $this->armory->cDB->selectCell("SELECT 1 FROM `arena_team` WHERE `name`='%s' LIMIT 1", $this->teamname); + return $this->armory->cDB->selectCell("SELECT 1 FROM `arena_team` WHERE `name`='%s' LIMIT 1", $this->teamname); } elseif($this->arenateamid != 0) { - $check = $this->armory->cDB->selectCell("SELECT 1 FROM `arena_team` WHERE `arenateamid`=%d LIMIT 1", $this->arenateamid); + return $this->armory->cDB->selectCell("SELECT 1 FROM `arena_team` WHERE `arenateamid`=%d LIMIT 1", $this->arenateamid); } - return $check; } /** @@ -172,7 +178,7 @@ public function GetCharacterArenaTeamInfo() { * Generates arena team member list * @category Arenateams class * @access public - * @return array + * @return bool **/ public function GetTeamList() { if($this->armory->currentRealmInfo['type'] == 'mangos') { @@ -233,6 +239,7 @@ public function GetTeamList() { $this->players[$i]['charUrl'] = sprintf('r=%s&cn=%s', urlencode($this->armory->currentRealmInfo['name']), urlencode($this->players[$i]['name'])); unset($this->players[$i]['guid']); } + return true; } /** @@ -266,11 +273,11 @@ public function BuildArenaLadderList($type, $page, $num = false, $order = 'ratin `arena_team`.`arenateamid`, `arena_team`.`name`, `arena_team_stats`.`rating`, - `arena_team_stats`.`games` AS `gamesPlayed`, - `arena_team_stats`.`wins` AS `gamesWon`, + `arena_team_stats`.`games_week` AS `gamesPlayed`, + `arena_team_stats`.`wins_week` AS `gamesWon`, `arena_team_stats`.`rank` AS `ranking`, - `arena_team_stats`.`played` AS `seasonGamesPlayed`, - `arena_team_stats`.`wins2` AS `seasonGamesWon`, + `arena_team_stats`.`games_season` AS `seasonGamesPlayed`, + `arena_team_stats`.`wins_season` AS `seasonGamesWon`, `characters`.`race`, `arena_team_stats`.`played`-`arena_team_stats`.`wins2` AS `lose` FROM `arena_team` AS `arena_team` @@ -285,11 +292,11 @@ public function BuildArenaLadderList($type, $page, $num = false, $order = 'ratin `arena_team`.`arenateamid`, `arena_team`.`name`, `arena_team_stats`.`rating`, - `arena_team_stats`.`games` AS `gamesPlayed`, - `arena_team_stats`.`wins` AS `gamesWon`, + `arena_team_stats`.`games_week` AS `gamesPlayed`, + `arena_team_stats`.`wins_week` AS `gamesWon`, `arena_team_stats`.`rank` AS `ranking`, - `arena_team_stats`.`played` AS `seasonGamesPlayed`, - `arena_team_stats`.`wins2` AS `seasonGamesWon`, + `arena_team_stats`.`games_season` AS `seasonGamesPlayed`, + `arena_team_stats`.`wins_season` AS `seasonGamesWon`, `characters`.`race` FROM `arena_team` AS `arena_team` LEFT JOIN `arena_team_stats` AS `arena_team_stats` ON `arena_team_stats`.`arenateamid`=`arena_team`.`arenateamid` @@ -341,16 +348,16 @@ public function GetArenaTeamEmblem($teamId = 0, $db = null) { } if($db == null) { $arenaTeamEmblem = $this->armory->cDB->selectRow("SELECT `BackgroundColor` AS `background`, `BorderColor` AS `borderColor`, `BorderStyle` AS `borderStyle`, `EmblemColor` AS `iconColor`, `EmblemStyle` AS `iconStyle` FROM `arena_team` WHERE `arenateamid`=%d", $teamId); - $arenaTeamEmblem['background'] = /*dechex(*/$arenaTeamEmblem['background']/*)*/; - $arenaTeamEmblem['borderColor'] = /*dechex(*/$arenaTeamEmblem['borderColor']/*)*/; - $arenaTeamEmblem['iconColor'] = /*dechex(*/$arenaTeamEmblem['iconColor']/*)*/; + $arenaTeamEmblem['background'] = $arenaTeamEmblem['background']; + $arenaTeamEmblem['borderColor'] = $arenaTeamEmblem['borderColor']; + $arenaTeamEmblem['iconColor'] = $arenaTeamEmblem['iconColor']; return $arenaTeamEmblem; } elseif(is_object($db)) { $arenaTeamEmblem = $db->selectRow("SELECT `BackgroundColor` AS `background`, `BorderColor` AS `borderColor`, `BorderStyle` AS `borderStyle`, `EmblemColor` AS `iconColor`, `EmblemStyle` AS `iconStyle` FROM `arena_team` WHERE `arenateamid`=%d", $teamId); - $arenaTeamEmblem['background'] = /*dechex(*/$arenaTeamEmblem['background']/*)*/; - $arenaTeamEmblem['borderColor'] = /*dechex(*/$arenaTeamEmblem['borderColor']/*)*/; - $arenaTeamEmblem['iconColor'] = /*dechex(*/$arenaTeamEmblem['iconColor']/*)*/; + $arenaTeamEmblem['background'] = $arenaTeamEmblem['background']; + $arenaTeamEmblem['borderColor'] = $arenaTeamEmblem['borderColor']; + $arenaTeamEmblem['iconColor'] = $arenaTeamEmblem['iconColor']; return $arenaTeamEmblem; } } @@ -367,7 +374,7 @@ public function CountArenaTeams($type) { foreach($this->armory->realmData as $realm_info) { $db = new ArmoryDatabaseHandler($realm_info['host_characters'], $realm_info['user_characters'], $realm_info['pass_characters'], $realm_info['name_characters'], $realm_info['charset_characters'], $this->armory->Log()); $current_count = $db->selectCell("SELECT COUNT(`arenateamid`) FROM `arena_team` WHERE `type`=%d", $type); - $summary = $summary+$current_count; + $summary += $current_count; } return $summary; } @@ -380,9 +387,7 @@ public function CountArenaTeams($type) { * @return int **/ public function CountPageNum($type) { - $all_teams = self::CountArenaTeams($type); - $result = round($all_teams/20); - return $result; + return round(self::CountArenaTeams($type) / 20); } /** @@ -393,9 +398,7 @@ public function CountPageNum($type) { * @return bool **/ public function SetGameID($gameid) { - if($gameid > 0) { - $this->gameid = $gameid; - } + $this->gameid = $gameid; return true; } @@ -475,8 +478,8 @@ public function GetGameInfo() { 'emblemIconColor' => $team_member['emblemIconColor'], 'emblemIconStyle' => $team_member['emblemIconStyle'], 'name' => $team_member['name'], - 'ratingDelta' => ($team_member['changeType'] == 1) ? $team_member['ratingChange'] : '-'.$team_member['ratingChange'], - 'ratingNew' => ($team_member['changeType'] == 1) ? $team_member['teamRating']+$team_member['ratingChange'] : $team_member['teamRating']-$team_member['ratingChange'], + 'ratingDelta' => ($team_member['changeType'] == 1) ? $team_member['ratingChange'] : '-' . $team_member['ratingChange'], + 'ratingNew' => ($team_member['changeType'] == 1) ? $team_member['teamRating']+$team_member['ratingChange'] : $team_member['teamRating'] - $team_member['ratingChange'], 'realm' => $this->armory->currentRealmInfo['name'], 'result' => ($team_member['changeType'] == 1) ? 'win' : 'loss', 'teamUrl' => sprintf('r=%s&ts=%d&t=%s', urlencode($this->armory->currentRealmInfo['name']), $team_member['type'], urlencode($team_member['name'])) @@ -528,18 +531,13 @@ public function BuildGameChart() { return false; } if(count($game_ids) < 2) { - $this->armory->Log()->writeLog('%s : arenateamid %d have less than 2 matches played. Showing results has been disabled to prevent browser crash.', __METHOD__, $this->arenateamid); + $this->armory->Log()->writeLog('%s : arenateamid %d has less than 2 matches played. Showing results has been disabled to prevent browser crash.', __METHOD__, $this->arenateamid); return false; } - $game_ids_str = null; + $all_games = array(); $counter = count($game_ids); - for($i = 0; $i < $counter; $i++) { - if($i) { - $game_ids_str .= ', ' . $game_ids[$i]['gameid']; - } - else { - $game_ids_str .= $game_ids[$i]['gameid']; - } + foreach($game_ids as $game) { + $all_games[] = $game['gameid']; } $game_chart = $this->armory->cDB->select(" SELECT @@ -554,21 +552,21 @@ public function BuildGameChart() { `arena_team`.`type` FROM `armory_game_chart` AS `armory_game_chart` LEFT JOIN `arena_team` AS `arena_team` ON `arena_team`.`arenateamid`=`armory_game_chart`.`teamid` - WHERE `armory_game_chart`.`gameid` IN (%s) AND `armory_game_chart`.`teamid` <> %d", $game_ids_str, $this->arenateamid); + WHERE `armory_game_chart`.`gameid` IN (%s) AND `armory_game_chart`.`teamid` <> %d", $all_games, $this->arenateamid); if(!$game_chart) { - $this->armory->Log()->writeError('%s : game_ids were fetched from DB, but script was unable to get data for these matches (%s) from characters DB (arenateamid:%d)', __METHOD__, $game_ids_str, $this->arenateamid); + $this->armory->Log()->writeError('%s : game_ids were fetched from DB, but script was unable to get data for these matches from characters DB (arenateamid:%d)', __METHOD__, $this->arenateamid); return false; } $chart_data = array(); foreach($game_chart as $team) { - if(!isset($chart_data[$team['gameid']])) { // Do not add same games more then 1 time + if(!isset($chart_data[$team['gameid']])) { // Do not add same games more than 1 time $chart_data[$team['gameid']] = array( 'deleted' => ($this->TeamExists($team['teamid'])) ? 'false' : 'true', 'id' => $team['gameid'], 'ot' => $team['name'], - 'r' => ($team['changeType'] == 1) ? $team['teamRating']+$team['ratingChange'] : $team['teamRating']-$team['ratingChange'], - 'reamOffset' => 3600000, // hardcode - 'st' => $team['start'], // need to be fixed (change to timestamp) + 'r' => ($team['changeType'] == 1) ? $team['teamRating'] + $team['ratingChange'] : $team['teamRating']-$team['ratingChange'], + 'reamOffset' => 3600000, // hardcoded + 'st' => $team['start'], // needs to be fixed (change to timestamp) 'teamUrl' => sprintf('r=%s&ts=%d&t=%s', urlencode($this->armory->currentRealmInfo['name']), $team['type'], urlencode($team['name'])) ); } @@ -592,15 +590,10 @@ public function BuildOpposingTeamList() { $this->armory->Log()->writeLog('%s : unable to find any game for teamId %d', __METHOD__, $this->arenateamid); return false; } - $game_ids_str = null; + $all_games = array(); $counter = count($game_ids); - for($i = 0 ; $i < $counter; $i++) { - if($i) { - $game_ids_str .= ', ' . $game_ids[$i]['gameid']; - } - else { - $game_ids_str .= $game_ids[$i]['gameid']; - } + foreach($game_ids as $game) { + $all_games[] = $game['gameid']; } $game_chart = $this->armory->cDB->select(" SELECT @@ -613,15 +606,15 @@ public function BuildOpposingTeamList() { FROM `armory_game_chart` AS `armory_game_chart` LEFT JOIN `arena_team` AS `arena_team` ON `arena_team`.`arenateamid`=`armory_game_chart`.`teamid` WHERE `armory_game_chart`.`gameid` IN (%s) AND `armory_game_chart`.`teamid` <> %d - GROUP BY `armory_game_chart`.`gameid`", $game_ids_str, $this->arenateamid); + GROUP BY `armory_game_chart`.`gameid`", $all_games, $this->arenateamid); if(!$game_chart) { - $this->armory->Log()->writeError('%s : game_ids were fetched from DB, but script was unable to get data for these matches (%s) from characters DB (arenateamid:%d)', __METHOD__, $game_ids_str, $this->arenateamid); + $this->armory->Log()->writeError('%s : game_ids were fetched from DB, but script was unable to get data for these matches from characters DB (arenateamid:%d)', __METHOD__, $this->arenateamid); return false; } $chart_data = array(); foreach($game_chart as $team) { - if(!isset($chart_data[$team['teamid']])) { // Add 1 team in 1 time - $rating_change = $this->armory->cDB->select("SELECT `gameid`, `changeType`, `ratingChange` FROM `armory_game_chart` WHERE `teamid`=%d AND `gameid` IN (%s)", $team['teamid'], $game_ids_str); + if(!isset($chart_data[$team['teamid']])) { // Do not add same teams more than 1 time + $rating_change = $this->armory->cDB->select("SELECT `gameid`, `changeType`, `ratingChange` FROM `armory_game_chart` WHERE `teamid`=%d AND `gameid` IN (%s)", $team['teamid'], $all_games); $rd = 0; if($rating_change) { $exists = array(); @@ -637,7 +630,7 @@ public function BuildOpposingTeamList() { } } } - $losses = $this->armory->cDB->selectCell("SELECT COUNT(`gameid`) FROM `armory_game_chart` WHERE `changeType`=1 AND `teamid`='%d' AND `gameid` IN (%s)", $team['teamid'], $game_ids_str); + $losses = $this->armory->cDB->selectCell("SELECT COUNT(`gameid`) FROM `armory_game_chart` WHERE `changeType`=1 AND `teamid`='%d' AND `gameid` IN (%s)", $team['teamid'], $all_games); $chart_data[$team['teamid']] = array( 'deleted' => ($this->TeamExists($team['teamid'])) ? 'false' : 'true', 'games' => $team['countTeam'], diff --git a/includes/classes/class.armory.php b/includes/classes/class.armory.php index 3403eada6..1e04c592b 100644 --- a/includes/classes/class.armory.php +++ b/includes/classes/class.armory.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 429 - * @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/includes/classes/class.characters.php b/includes/classes/class.characters.php index b9e3d030c..59bc5a9b3 100644 --- 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 433 - * @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/includes/classes/class.dbhandler.php b/includes/classes/class.dbhandler.php index dc48bab7a..8e3224d3f 100644 --- a/includes/classes/class.dbhandler.php +++ b/includes/classes/class.dbhandler.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 420 - * @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 @@ -99,7 +99,6 @@ public function ArmoryDatabaseHandler($host, $user, $password, $dbName, $charset $this->armory_prefix = $prefix; $this->server_version = $this->selectCell("SELECT VERSION()"); $this->connected = true; - //$this->logHandler->writeLog('%s : connection to MySQL database was successfully established.', __METHOD__); return true; } @@ -137,7 +136,6 @@ private function _query($safe_sql, $queryType) { $make_array = array(); $query_start = microtime(true); $this->queryCount++; - //$this->logHandler->writeSql('%s', $safe_sql); $performed_query = @mysql_query($safe_sql, $this->connectionLink); $this->errmsg = @mysql_error($this->connectionLink); $this->errno = @mysql_errno($this->connectionLink); @@ -292,7 +290,7 @@ public function __destruct() { @mysql_close($this->connectionLink); $this->DropLastErrors(); $this->DropCounters(); - //$this->logHandler->writeLog('%s : connection closed.', __METHOD__); + return true; } public function GetServerVersion() { diff --git a/includes/classes/class.debug.php b/includes/classes/class.debug.php index 976506f9f..f23e04fdb 100644 --- a/includes/classes/class.debug.php +++ b/includes/classes/class.debug.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 250 - * @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/includes/classes/class.guilds.php b/includes/classes/class.guilds.php index d08279dd2..6aed4eb0a 100644 --- 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 437 - * @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/includes/classes/class.item.php b/includes/classes/class.item.php index 83847eab6..9aaf9ed18 100644 --- a/includes/classes/class.item.php +++ b/includes/classes/class.item.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 436 - * @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/includes/classes/class.itemprototype.php b/includes/classes/class.itemprototype.php index a8902305a..c0ae87ed5 100644 --- a/includes/classes/class.itemprototype.php +++ b/includes/classes/class.itemprototype.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 400 - * @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/includes/classes/class.items.php b/includes/classes/class.items.php index bad6348cd..225f0d7ee 100644 --- a/includes/classes/class.items.php +++ b/includes/classes/class.items.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 437 - * @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/includes/classes/class.mangos.php b/includes/classes/class.mangos.php index 230d6839e..f68d47a37 100644 --- a/includes/classes/class.mangos.php +++ b/includes/classes/class.mangos.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 414 - * @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/includes/classes/class.search.php b/includes/classes/class.search.php index 0b57bbf9d..79b685299 100644 --- a/includes/classes/class.search.php +++ b/includes/classes/class.search.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 434 - * @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/includes/classes/class.utils.php b/includes/classes/class.utils.php index 3e46e45d2..95357140a 100644 --- a/includes/classes/class.utils.php +++ b/includes/classes/class.utils.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 433 - * @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/includes/classes/class.xmlhandler.php b/includes/classes/class.xmlhandler.php index 283ef34ef..a69dcebbe 100644 --- a/includes/classes/class.xmlhandler.php +++ b/includes/classes/class.xmlhandler.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 405 - * @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/includes/classes/configuration.php.default b/includes/classes/configuration.php.default index 5e25ee54a..502d402cc 100644 --- a/includes/classes/configuration.php.default +++ b/includes/classes/configuration.php.default @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 428 - * @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/includes/defines.php b/includes/defines.php index bfcb0e6f7..ad741da05 100644 --- a/includes/defines.php +++ b/includes/defines.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 433 - * @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/includes/revision_nr.php b/includes/revision_nr.php index 9bc1b60e5..12a8e6d9d 100644 --- a/includes/revision_nr.php +++ b/includes/revision_nr.php @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/index.php b/index.php index e0bf6ea7f..51d2491c5 100644 --- a/index.php +++ b/index.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/item-info.php b/item-info.php index 99d13294e..5c3219efb 100644 --- a/item-info.php +++ b/item-info.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 414 - * @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/item-search.php b/item-search.php index 073474378..8a8f30d2c 100644 --- a/item-search.php +++ b/item-search.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/item-tooltip.php b/item-tooltip.php index 2906638a0..c2819ce73 100644 --- a/item-tooltip.php +++ b/item-tooltip.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 diff --git a/login-status.php b/login-status.php index 80c5eb439..6db5f1d24 100644 --- a/login-status.php +++ b/login-status.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/login.php b/login.php index ae0d87c4d..56721a113 100644 --- a/login.php +++ b/login.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 371 - * @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/maintenance.php b/maintenance.php index 91848c673..d3126ae52 100644 --- a/maintenance.php +++ b/maintenance.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/newsfeed.php b/newsfeed.php index eb832d3d1..decea3f17 100644 --- a/newsfeed.php +++ b/newsfeed.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 391 - * @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/pvprewards.php b/pvprewards.php index ce179b589..d69b97cce 100644 --- a/pvprewards.php +++ b/pvprewards.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/search.php b/search.php index 6adcaaf87..2b308ac1b 100644 --- a/search.php +++ b/search.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 407 - * @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/talent-calc.php b/talent-calc.php index 5751b7275..87576d4f0 100644 --- a/talent-calc.php +++ b/talent-calc.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/team-info.php b/team-info.php index a79732e16..980b900e1 100644 --- a/team-info.php +++ b/team-info.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 384 - * @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/tools/build_loot_tables.php b/tools/build_loot_tables.php index 5dbca0b2f..ca47d03d3 100644 --- a/tools/build_loot_tables.php +++ b/tools/build_loot_tables.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 429 - * @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/tools/create_database_dump.php b/tools/create_database_dump.php index 1469e45df..025499bfc 100644 --- a/tools/create_database_dump.php +++ b/tools/create_database_dump.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 429 - * @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/tools/rename_armory_tables.php b/tools/rename_armory_tables.php index 5e10f9677..f36fe1f11 100644 --- a/tools/rename_armory_tables.php +++ b/tools/rename_armory_tables.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 357 - * @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/updates-feed.php b/updates-feed.php index 5364a6a8b..a0ef41d3b 100644 --- a/updates-feed.php +++ b/updates-feed.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 375 - * @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/updates.php b/updates.php index 75abcee3f..3ebca8720 100644 --- a/updates.php +++ b/updates.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 375 - * @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/vault/character-calendar.php b/vault/character-calendar.php index 9e3c0dac4..4747a6df3 100644 --- a/vault/character-calendar.php +++ b/vault/character-calendar.php @@ -4,7 +4,7 @@ * @package World of Warcraft Armory * @version Release Candidate 1 * @revision 122 - * @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