[340] Store achievement class instance in Characters::$m_achievementMgr

Shadez · Aug 3, 2010 · ddf618a · ddf618a
1 parent 14fa391
commit ddf618a
Show file tree

Hide file tree

Showing 17 changed files with 287 additions and 194 deletions.
diff --git a/character-achievements.php b/character-achievements.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 299
+ * @revision 340
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -56,7 +56,7 @@
 $realmId = $utils->GetRealmIdByName($_GET['r']);
 $characters->BuildCharacter($name, $realmId);
 $isCharacter = $characters->CheckPlayer();
-$achievements->guid = $characters->GetGUID();
+$achievements = $characters->GetAchievementMgr();
 if($_GET['r'] === false || !$armory->currentRealmInfo) {
     $isCharacter = false;
 }
@@ -263,7 +263,7 @@
     exit;
 }
 $character_title = $characters->GetChosenTitleInfo();
-$character_element = $characters->GetHeader($achievements);
+$character_element = $characters->GetHeader();
 $xml->XMLWriter()->startElement('characterInfo');
 if($utils->IsWriteRaw()) {
     $xml->XMLWriter()->writeRaw('<character');

diff --git a/character-arenateams.php b/character-arenateams.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 298
+ * @revision 340
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -59,7 +59,7 @@
         exit;
     }
 }/** Basic info **/
-$achievements->guid = $characters->GetGUID();
+$achievements = $characters->GetAchievementMgr();
 $arenateams->guid   = $characters->GetGUID();
 $tabUrl = $characters->GetUrlString();
 /** Header **/
@@ -83,7 +83,7 @@
     exit;
 }
 $character_title = $characters->GetChosenTitleInfo();
-$character_element = $characters->GetHeader($achievements);
+$character_element = $characters->GetHeader();
 $character_arenateams = $arenateams->GetCharacterArenaTeamInfo();
 $xml->XMLWriter()->startElement('characterInfo');
 if($utils->IsWriteRaw()) {

diff --git a/character-calendar.php b/character-calendar.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 297
+ * @revision 340
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -44,7 +44,7 @@
 $realmId = $utils->GetRealmIdByName($_GET['r']);
 $characters->BuildCharacter($name, $realmId);
 $isCharacter = $characters->CheckPlayer();
-$achievements->guid = $characters->GetGUID();
+$achievements = $characters->GetAchievementMgr();
 if($_GET['r'] === false || !$armory->currentRealmInfo) {
     $isCharacter = false;
 }
@@ -81,7 +81,7 @@
     exit;
 }
 $character_title = $characters->GetChosenTitleInfo();
-$character_element = $characters->GetHeader($achievements);
+$character_element = $characters->GetHeader();
 $xml->XMLWriter()->startElement('characterInfo');
 if($utils->IsWriteRaw()) {
     $xml->XMLWriter()->writeRaw('<character');

diff --git a/character-model-embed.php b/character-model-embed.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 297
+ * @revision 340
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -44,7 +44,7 @@
 $realmId = $utils->GetRealmIdByName($_GET['r']);
 $characters->BuildCharacter($name, $realmId);
 $isCharacter = $characters->CheckPlayer();
-$achievements->guid = $characters->GetGUID();
+$achievements = $characters->GetAchievementMgr();
 if($_GET['r'] === false || !$armory->currentRealmInfo) {
     $isCharacter = false;
 }
@@ -81,7 +81,7 @@
     exit;
 }
 $character_title = $characters->GetChosenTitleInfo();
-$character_element = $characters->GetHeader($achievements);
+$character_element = $characters->GetHeader();
 $xml->XMLWriter()->startElement('characterInfo');
 if($utils->IsWriteRaw()) {
     $xml->XMLWriter()->writeRaw('<character');

diff --git a/character-reputation.php b/character-reputation.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 297
+ * @revision 340
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -44,7 +44,7 @@
 $realmId = $utils->GetRealmIdByName($_GET['r']);
 $characters->BuildCharacter($name, $realmId);
 $isCharacter = $characters->CheckPlayer();
-$achievements->guid = $characters->GetGUID();
+$achievements = $characters->GetAchievementMgr();
 if($_GET['r'] === false || !$armory->currentRealmInfo) {
     $isCharacter = false;
 }
@@ -81,7 +81,7 @@
     exit;
 }
 $character_title = $characters->GetChosenTitleInfo();
-$character_element = $characters->GetHeader($achievements);
+$character_element = $characters->GetHeader();
 $xml->XMLWriter()->startElement('characterInfo');
 if($utils->IsWriteRaw()) {
     $xml->XMLWriter()->writeRaw('<character');

diff --git a/character-sheet.php b/character-sheet.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 309
+ * @revision 340
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -62,7 +62,7 @@
 // Load XSLT template
 $xml->LoadXSLT('character/sheet.xsl');
 /** Basic info **/
-$achievements->guid = $characters->GetGUID();
+$achievements = $characters->GetAchievementMgr();
 $arenateams->guid   = $characters->GetGUID();
 $tabUrl = $characters->GetUrlString();
 /** Header **/
@@ -86,7 +86,7 @@
     exit;
 }
 $character_title = $characters->GetChosenTitleInfo();
-$character_element = $characters->GetHeader($achievements);
+$character_element = $characters->GetHeader();
 $character_arenateams = $arenateams->GetCharacterArenaTeamInfo();
 $xml->XMLWriter()->startElement('characterInfo');
 if($utils->IsWriteRaw()) {

diff --git a/character-statistics.php b/character-statistics.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 297
+ * @revision 340
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -53,7 +53,7 @@
 $realmId = $utils->GetRealmIdByName($_GET['r']);
 $characters->BuildCharacter($name, $realmId);
 $isCharacter = $characters->CheckPlayer();
-$achievements->guid = $characters->GetGUID();
+$achievements = $characters->GetAchievementMgr();
 if($_GET['r'] === false || !$armory->currentRealmInfo) {
     $isCharacter = false;
 }
@@ -126,7 +126,7 @@
     exit;
 }
 $character_title = $characters->GetChosenTitleInfo();
-$character_element = $characters->GetHeader($achievements);
+$character_element = $characters->GetHeader();
 $xml->XMLWriter()->startElement('characterInfo');
 if($utils->IsWriteRaw()) {
     $xml->XMLWriter()->writeRaw('<character');

diff --git a/character-talents.php b/character-talents.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 309
+ * @revision 340
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -59,7 +59,7 @@
     }
 }
 /** Basic info **/
-$achievements->guid = $characters->GetGUID();
+$achievements = $characters->GetAchievementMgr();
 $tabUrl = $characters->GetUrlString();
 /** Header **/
 $xml->XMLWriter()->startElement('page');
@@ -82,7 +82,7 @@
     exit;
 }
 $character_title = $characters->GetChosenTitleInfo();
-$character_element = $characters->GetHeader($achievements);
+$character_element = $characters->GetHeader();
 $xml->XMLWriter()->startElement('characterInfo');
 if($utils->IsWriteRaw()) {
     $xml->XMLWriter()->writeRaw('<character');

diff --git a/guild-info.php b/guild-info.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 309
+ * @revision 340
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -99,9 +99,7 @@
     'realmUrl'     => urlencode($armory->currentRealmInfo['name']),
     'url'          => sprintf('r=%s&gn=%s', urlencode($armory->currentRealmInfo['name']), urlencode($guilds->guildName))
 );
-// <guildInfo> start
 $xml->XMLWriter()->startElement('guildInfo');
-// <guildHeader> start
 $xml->XMLWriter()->startElement('guildHeader');
 foreach($guild_header as $header_key => $header_value) {
     $xml->XMLWriter()->writeAttribute($header_key, $header_value);
@@ -112,7 +110,6 @@
 }
 $xml->XMLWriter()->endElement();  //emblem
 $xml->XMLWriter()->endElement(); //guildHeader
-// <guild> start
 $xml->XMLWriter()->startElement('guild');
 $xml->XMLWriter()->startElement('members');
 $xml->XMLWriter()->writeAttribute('memberCount', $guilds->CountGuildMembers());

diff --git a/includes/armory_loader.php b/includes/armory_loader.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 301
+ * @revision 340
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -185,7 +185,7 @@
     if(!@include('classes/class.achievements.php')) {
         die('<b>Error:</b> can not load achievements class!');
     }
-    $achievements = new Achievements;
+    // Class instance will be created in Characters::GetAchievementMgr()
 }
 if(defined('load_items_class')) {
     if(!@include('classes/class.items.php')) {