[254] Added internal database handler to Characters class (for future…

… development)
Shadez · Jun 20, 2010 · bea7bd0 · bea7bd0
1 parent 24ea5cb
commit bea7bd0
Show file tree

Hide file tree

Showing 12 changed files with 84 additions and 47 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 217
+ * @revision 254
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -50,7 +50,8 @@
 else {
     $name = false;
 }
-$characters->BuildCharacter($name);
+$realmId = $utils->GetRealmIdByName($_GET['r']);
+$characters->BuildCharacter($name, $realmId);
 $isCharacter = $characters->CheckPlayer();
 $achievements->guid = $characters->GetGUID();
 if(!isset($_GET['r']) || !$armory->currentRealmInfo) {

diff --git a/character-arenateams.php b/character-arenateams.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 203
+ * @revision 254
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -41,7 +41,8 @@
 else {
     $name = false;
 }
-$characters->BuildCharacter($name);
+$realmId = $utils->GetRealmIdByName($_GET['r']);
+$characters->BuildCharacter($name, $realmId);
 $isCharacter = $characters->CheckPlayer();
 if(!isset($_GET['r']) || !$armory->currentRealmInfo) {
     $isCharacter = false;

diff --git a/character-calendar.php b/character-calendar.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 203
+ * @revision 254
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -38,7 +38,8 @@
 else {
     $name = false;
 }
-$characters->BuildCharacter($name);
+$realmId = $utils->GetRealmIdByName($_GET['r']);
+$characters->BuildCharacter($name, $realmId);
 $isCharacter = $characters->CheckPlayer();
 $achievements->guid = $characters->GetGUID();
 if(!isset($_GET['r']) || !$armory->currentRealmInfo) {

diff --git a/character-feed-data.php b/character-feed-data.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 195
+ * @revision 254
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -38,7 +38,8 @@
 else {
     $name = false;
 }
-$characters->BuildCharacter($name);
+$realmId = $utils->GetRealmIdByName($_GET['r']);
+$characters->BuildCharacter($name, $realmId);
 $isCharacter = $characters->CheckPlayer();
 if(!isset($_GET['r']) || !$armory->currentRealmInfo) {
     $isCharacter = false;

diff --git a/character-feed.php b/character-feed.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 203
+ * @revision 254
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -38,7 +38,8 @@
 else {
     $name = false;
 }
-$characters->BuildCharacter($name);
+$realmId = $utils->GetRealmIdByName($_GET['r']);
+$characters->BuildCharacter($name, $realmId);
 $isCharacter = $characters->CheckPlayer();
 if(!isset($_GET['r']) || !$armory->currentRealmInfo) {
     $isCharacter = false;

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 236
+ * @revision 254
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -38,7 +38,8 @@
 else {
     $name = false;
 }
-$characters->BuildCharacter($name);
+$realmId = $utils->GetRealmIdByName($_GET['r']);
+$characters->BuildCharacter($name, $realmId);
 $isCharacter = $characters->CheckPlayer();
 $achievements->guid = $characters->GetGUID();
 if(!isset($_GET['r']) || !$armory->currentRealmInfo) {

diff --git a/character-model.php b/character-model.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 237
+ * @revision 254
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -38,7 +38,8 @@
 else {
     $name = false;
 }
-$characters->BuildCharacter($name);
+$realmId = $utils->GetRealmIdByName($_GET['r']);
+$characters->BuildCharacter($name, $realmId);
 $isCharacter = $characters->CheckPlayer();
 if(!isset($_GET['r']) || !$armory->currentRealmInfo) {
     $isCharacter = false;
@@ -119,6 +120,9 @@
 );
 
 $xml->XMLWriter()->startElement('character');
+if($utils->IsAccountHaveCurrentCharacter($characters->GetGUID(), $armory->currentRealmInfo['id'])) {
+    $xml->XMLWriter()->writeAttribute('owned', 1);
+}
 $xml->XMLWriter()->startElement('models');
 $xml->XMLWriter()->startElement('model');
 foreach($model_data as $model_key => $model_value) {

diff --git a/character-reputation.php b/character-reputation.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 203
+ * @revision 254
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -38,7 +38,8 @@
 else {
     $name = false;
 }
-$characters->BuildCharacter($name);
+$realmId = $utils->GetRealmIdByName($_GET['r']);
+$characters->BuildCharacter($name, $realmId);
 $isCharacter = $characters->CheckPlayer();
 $achievements->guid = $characters->GetGUID();
 if(!isset($_GET['r']) || !$armory->currentRealmInfo) {

diff --git a/character-sheet.php b/character-sheet.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 203
+ * @revision 254
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -41,7 +41,8 @@
 else {
     $name = false;
 }
-$characters->BuildCharacter($name);
+$realmId = $utils->GetRealmIdByName($_GET['r']);
+$characters->BuildCharacter($name, $realmId);
 $isCharacter = $characters->CheckPlayer();
 // Get page cache
 if($isCharacter && $armory->armoryconfig['useCache'] == true && !isset($_GET['skipCache'])) {
@@ -111,7 +112,10 @@
     }
     $xml->XMLWriter()->endElement(); //arenaTeams
 }
-$xml->XMLWriter()->endElement();   //character
+$xml->XMLWriter()->startElement('modelBasePath');
+$xml->XMLWriter()->writeAttribute('value', 'http://eu.media.battle.net.edgesuite.net/');
+$xml->XMLWriter()->endElement();  //modelBasePath
+$xml->XMLWriter()->endElement(); //character
 /** Character tab **/
 $xml->XMLWriter()->startElement('characterTab');
 $xml->XMLWriter()->startElement('talentSpecs');

diff --git a/character-statistics.php b/character-statistics.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 203
+ * @revision 254
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -47,7 +47,8 @@
 else {
     $name = false;
 }
-$characters->BuildCharacter($name);
+$realmId = $utils->GetRealmIdByName($_GET['r']);
+$characters->BuildCharacter($name, $realmId);
 $isCharacter = $characters->CheckPlayer();
 $achievements->guid = $characters->GetGUID();
 if(!isset($_GET['r']) || !$armory->currentRealmInfo) {

diff --git a/character-talents.php b/character-talents.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 203
+ * @revision 254
  * @copyright (c) 2009-2010 Shadez
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -40,7 +40,8 @@
 else {
     $name = false;
 }
-$characters->BuildCharacter($name);
+$realmId = $utils->GetRealmIdByName($_GET['r']);
+$characters->BuildCharacter($name, $realmId);
 $isCharacter = $characters->CheckPlayer();
 if(!isset($_GET['r']) || !$armory->currentRealmInfo) {
     $isCharacter = false;
@@ -126,6 +127,10 @@
     $xml->XMLWriter()->endElement();  //glyphs    
     $xml->XMLWriter()->endElement(); //talentGroup
 }
+/* Hunter's pet talents */
+if($characters->GetClass() == CLASS_HUNTER && $characters->GetActivePetData() == true) {
+    // Talent counting here
+}
 $xml->XMLWriter()->endElement();   //talents
 $xml->XMLWriter()->endElement();  //characterInfo
 $xml->XMLWriter()->endElement(); //page