[65] Fixes in character achievements displaying

Shadez · Feb 8, 2010 · 3709217 · 3709217
1 parent 40c43ba
commit 3709217
Show file tree

Hide file tree

Showing 16 changed files with 2,915 additions and 151 deletions.
diff --git a/achievements-loader.php b/achievements-loader.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 61
+ * @revision 65
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -30,21 +30,24 @@
 if(!@include('includes/armory_loader.php')) {
     die('<b>Fatal error:</b> can not load main system files!');
 }
-
-$characters->name = Utils::escape($_GET['cn']);
-$achievementsCategory = (int) $_GET['c'];
-$characters->_structCharacter();
-$faction = ($characters->faction == 1) ? 0 : 1;    
-if(empty($characters->name) || empty($achievementsCategory)) {
+if(isset($_GET['cn'])) {
+    $characters->name = Utils::escape($_GET['cn']);
+}
+if(isset($_GET['c'])) {
+    $achievementsCategory = (int) $_GET['c'];
+}
+if(!$characters->name || !$achievementsCategory) {
     die('{"js":{"achievements":"' . $armory->tpl->get_config_vars('armory_character_achievements_unable_to_load') . '"},"text":""}');
 }
+$characters->_structCharacter();
+$faction = ($characters->faction == 1) ? 0 : 1;
 $query = $armory->aDB->select("
-    SELECT `id`, `parentAchievement`, `name_".$_locale."`, `description_".$_locale."`, `points`, `iconname`, `titleReward_".$_locale."`
+SELECT `id`, `parentAchievement`, `name_".$_locale."`, `description_".$_locale."`, `points`, `categoryId`, `iconname`, `titleReward_".$_locale."`
         FROM `armory_achievement`
             WHERE `categoryId`=? AND `factionFlag` IN (?, '-1')", $achievementsCategory, $faction);           
-$cc = $armory->aDB->selectPage($totalCount, 
-    "SELECT `id`
-        FROM `armory_achievement`
+$totalCount = $armory->aDB->selectCell("
+SELECT COUNT(`id`)
+    FROM `armory_achievement`
         WHERE `categoryId`=? AND `factionFlag` IN (?, '-1')", $achievementsCategory, $faction);
 $total = 0;
 $string = '';
@@ -56,7 +59,7 @@
     $completed = $achievements->GetAchievementDate();
     if(!empty($completed)) {
         $string .= "<div class='achievement' id='ach".$ach['id']."' onclick='Armory.Achievements.select(this, true)'>";
-        if($achievementsCategory!=81) {
+        if($achievementsCategory != 81) { // 'Feats of Strenght' category do not have achievement points
             $string .= "<div class='pointshield'><div>".$ach['points']."</div></div>";
         }
         $string .= "<div class='firsts_icon' style='background-image:url(&quot;/wow-icons/_images/51x51/".$ach['iconname'].".jpg&quot;)'><img class='p' src='images/achievements/fst_iconframe.png'/></div><div class='achv_title'>".$ach['name_'.$_locale]."</div><div class='achv_desc'>".$ach['description_'.$_locale]."</div>";
@@ -69,17 +72,30 @@
         $total++;
     }
     else {
-        if($achievementsCategory!=81) {
-                $uncompleted .= "<div class='achievement locked' id='ach".$ach['id']."' onclick='Armory.Achievements.select(this, true)'><div class='pointshield'><div>".$ach['points']."</div></div><div class='firsts_icon' style='background-image:url(&quot;/wow-icons/_images/51x51/".$ach['iconname'].".jpg&quot;)'><img class='p' src='images/achievements/fst_iconframe.png'/></div><div class='achv_title'>".$ach['name_'.$_locale]."</div><div class='achv_desc'>".$ach['description_'.$_locale]."</div>";
-                $uncompleted .= $achievements->AchievementProgress();
-                if(!empty($ach['titleReward_'.$_locale])) {
-                    $uncompleted .="<br clear='all' /><div class='achv_reward_bg'>".$ach['titleReward_'.$_locale]."</div>";
+        if($achievementsCategory != 81) { // Do not show incompleted achievements in 'Feats of Strenght' category
+                if($ach['parentAchievement'] > 0) {
+                    if($achievements->IsAchievementCompleted($ach['parentAchievement'])) {
+                        $uncompleted .= "<div class='achievement locked' id='ach".$ach['id']."' onclick='Armory.Achievements.select(this, true)'><div class='pointshield'><div>".$ach['points']."</div></div><div class='firsts_icon' style='background-image:url(&quot;/wow-icons/_images/51x51/".$ach['iconname'].".jpg&quot;)'><img class='p' src='images/achievements/fst_iconframe.png'/></div><div class='achv_title'>".$ach['name_'.$_locale]."</div><div class='achv_desc'>".$ach['description_'.$_locale]."</div>";
+                        $uncompleted .= $achievements->AchievementProgress();
+                        if(!empty($ach['titleReward_'.$_locale])) {
+                            $uncompleted .= "<br clear='all' /><div class='achv_reward_bg'>".$ach['titleReward_'.$_locale]."</div>";
+                        }
+                        $uncompleted .= "<br clear='all'/></div>";
+                    }
+                }
+                else {
+                    $uncompleted .= "<div class='achievement locked' id='ach".$ach['id']."' onclick='Armory.Achievements.select(this, true)'><div class='pointshield'><div>".$ach['points']."</div></div><div class='firsts_icon' style='background-image:url(&quot;/wow-icons/_images/51x51/".$ach['iconname'].".jpg&quot;)'><img class='p' src='images/achievements/fst_iconframe.png'/></div><div class='achv_title'>".$ach['name_'.$_locale]."</div><div class='achv_desc'>".$ach['description_'.$_locale]."</div>";
+                    $uncompleted .= $achievements->AchievementProgress();
+                    if(!empty($ach['titleReward_'.$_locale])) {
+                        $uncompleted .= "<br clear='all' /><div class='achv_reward_bg'>".$ach['titleReward_'.$_locale]."</div>";
+                    }
+                    $uncompleted .= "<br clear='all'/></div>";
                 }
-                $uncompleted .= "<br clear='all'/></div>";
+
         }
     }
 }
-if($achievementsCategory!=81) {
+if($achievementsCategory != 81) { // Do not show progress bar in 'Feats of Strenght' category
     $prestring = "<div><div><div><div class='prog_bar '><div class='progress_cap'><!----></div><div class='progress_cap_r' style='background-position:bottom'><!----></div><div class='progress_int'><div class='progress_fill' style='width:".$achievements->CountAchievementPercent($total, 1)."%'><!----></div><div class='prog_int_text'>".$total." / ".$totalCount."</div></div></div></div>";
 }
 echo '{"js":{"achievements":"'.$prestring.$string;

diff --git a/character-achievements.php b/character-achievements.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 48
+ * @revision 65
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -30,7 +30,7 @@
 if(!@include('includes/armory_loader.php')) {
     die('<b>Fatal error:</b> can not load main system files!');
 }
-// Доп. лист стилей
+// Additional CSS
 $armory->tpl->assign('addCssSheet', '@import "_css/int.css";');
 
 if(isset($_GET['n'])) {
@@ -40,16 +40,16 @@
     $charname = $_GET['cn'];
 }
 $characters->name = Utils::escape($charname);
-// Проверка
+// Check
 if(!$characters->IsCharacter()) {
     $armory->ArmoryError($armory->tpl->get_config_vars('armory_error_profile_unavailable_title'), $armory->tpl->get_config_vars('armory_error_profile_unavailable_text'));
 }
-// Все нормально, генерируем основные параметры чарактера
+// All ok, generate basic character info
 $characters->_structCharacter();
 $achievements->guid = $characters->guid;
 $guilds->guid = $characters->guid;
 
-// Передаем параметры шаблонизатору
+// Send data to Smarty
 $armory->tpl->assign('class', $characters->class);
 $armory->tpl->assign('race', $characters->race);
 $armory->tpl->assign('name', $characters->name);
@@ -77,9 +77,10 @@
 $armory->tpl->assign('achievementsTree', $achievements->buildAchievementsTree()); // Achievement categories
 $armory->tpl->assign('characterArenaTeamInfoButton', $characters->getCharacterArenaTeamInfo(true));
 
-/*** Звание ***/
+/*** Character Title ***/
 $charTitle = $characters->GetCharacterTitle();
 $armory->tpl->assign('character_title_'.$charTitle['place'], $charTitle['title']);
+$armory->tpl->assign('titleName', $characters->name);
 
 $armory->tpl->display('overall_header.tpl');
 $armory->tpl->display('character_sheet_start.tpl');

diff --git a/character-reputation.php b/character-reputation.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 48
+ * @revision 65
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -30,7 +30,7 @@
 if(!@include('includes/armory_loader.php')) {
     die('<b>Fatal error:</b> can not load main system files!');
 }
-// Доп. лист стилей
+// Additional CSS
 $armory->tpl->assign('addCssSheet', '@import "_css/int.css";');
 
 if(isset($_GET['n'])) {
@@ -40,16 +40,16 @@
     $charname = $_GET['cn'];
 }
 $characters->name = Utils::escape($charname);
-// Проверка
+// Check
 if(!$characters->IsCharacter()) {
     $armory->ArmoryError($armory->tpl->get_config_vars('armory_error_profile_unavailable_title'), $armory->tpl->get_config_vars('armory_error_profile_unavailable_text'));
 }
-// Все нормально, генерируем основные параметры чарактера
+// All ok, generate basic character info
 $characters->_structCharacter();
 $achievements->guid = $characters->guid;
 $guilds->guid = $characters->guid;
 
-// Передаем параметры шаблонизатору
+// Send data to Smarty
 $armory->tpl->assign('class', $characters->class);
 $armory->tpl->assign('race', $characters->race);
 $armory->tpl->assign('name', $characters->name);
@@ -63,7 +63,7 @@
     $armory->tpl->assign('guildName', $guilds->getGuildName());
 }
 
-/*** Звание ***/
+/*** Character Title ***/
 $charTitle = $characters->GetCharacterTitle();
 $armory->tpl->assign('character_title_'.$charTitle['place'], $charTitle['title']);
 
@@ -75,7 +75,7 @@ function cmp($a, $b) {
 usort($rep, "cmp");
 $armory->tpl->assign('repList', $rep);
 $armory->tpl->assign('characterArenaTeamInfoButton', $characters->getCharacterArenaTeamInfo(true));
-
+$armory->tpl->assign('titleName', $characters->name);
 $armory->tpl->assign('tpl2include', 'character_reputation');
 $armory->tpl->display('overall_header.tpl');
 $armory->tpl->display('character_sheet_start.tpl');

diff --git a/character-sheet.php b/character-sheet.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 59
+ * @revision 65
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -155,6 +155,7 @@
 /*** Character Title ***/
 // TODO: show commas
 $charTitle = $characters->GetCharacterTitle();
+$armory->tpl->assign('titleName', $characters->name);
 $armory->tpl->assign('characterArenaTeamInfo', $characters->getCharacterArenaTeamInfo());
 $armory->tpl->assign('characterArenaTeamInfoButton', $characters->getCharacterArenaTeamInfo(true));
 $armory->tpl->assign('character_title_'.$charTitle['place'], $charTitle['title']);

diff --git a/character-talents.php b/character-talents.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 61
+ * @revision 65
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -163,6 +163,7 @@
 $armory->tpl->assign('characterArenaTeamInfoButton', $characters->getCharacterArenaTeamInfo(true));
 
 $charTitle = $characters->GetCharacterTitle();
+$armory->tpl->assign('titleName', $characters->name);
 $armory->tpl->assign('character_title_'.$charTitle['place'], $charTitle['title']);
 
 $armory->tpl->display('overall_header.tpl');

diff --git a/guild-bank-contents.php b/guild-bank-contents.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 49
+ * @revision 65
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -38,7 +38,7 @@
     header('Location: login.xml?guild-bank-contents');
 }
 $guilds->_structGuildInfo();
-// Доп. лист стилей
+// Additional CSS
 $armory->tpl->assign('addCssSheet', '@import "_css/int.css";');
 
 $armory->tpl->assign('guildName', $guilds->guildName);
@@ -55,6 +55,7 @@
 $armory->tpl->assign('GuildBankMoney', $guilds->getGuildBankMoney());
 $armory->tpl->assign('GuildBankItemList', $guilds->BuildGuildBankItemList());
 
+$armory->tpl->assign('titleName', $guilds->guildName);
 $armory->tpl->assign('tpl2include', 'guild_bank_contents');
 $armory->tpl->display('overall_header.tpl');
 $armory->tpl->display('overall_start.tpl');

diff --git a/guild-info.php b/guild-info.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 30
+ * @revision 65
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -36,7 +36,7 @@
     die();
 }
 $guilds->_structGuildInfo();
-// Доп. лист стилей
+// Additional CSS
 $armory->tpl->assign('addCssSheet', '@import "_css/int.css";');
 
 $armory->tpl->assign('guildName', $guilds->guildName);
@@ -50,6 +50,7 @@
 $armory->tpl->assign('guildList', $guilds->buildGuildList());
 $armory->tpl->assign('gFaction', $guilds->guildFaction);
 
+$armory->tpl->assign('titleName', $guilds->guildName);
 $armory->tpl->assign('tpl2include', 'guild_sheet_info');
 $armory->tpl->display('overall_header.tpl');
 $armory->tpl->display('overall_start.tpl');

diff --git a/guild-stats.php b/guild-stats.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 30
+ * @revision 65
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -36,7 +36,7 @@
     die();
 }
 $guilds->_structGuildInfo();
-// Доп. лист стилей
+// Additional CSS
 $armory->tpl->assign('addCssSheet', '@import "_css/int.css";');
 
 $armory->tpl->assign('guildName', $guilds->guildName);
@@ -48,6 +48,7 @@
 $armory->tpl->assign('guildEmblemStyle', $guilds->guildtabard);
 $armory->tpl->assign('statList', $guilds->BuildStatsList());
 
+$armory->tpl->assign('titleName', $guilds->guildName);
 $armory->tpl->assign('tpl2include', 'guild_stats');
 $armory->tpl->display('overall_header.tpl');
 $armory->tpl->display('overall_start.tpl');

diff --git a/includes/UpdateFields330.php b/includes/UpdateFields330.php
@@ -1,6 +1,6 @@
 <?php
 
-// Auto generated for version 3.3.0.11159
+// Auto generated for version 3.3.2.11403
 
 define('OBJECT_FIELD_GUID', 0x0000); // Size: 2, Type: LONG, Flags: PUBLIC
 define('OBJECT_FIELD_TYPE', 0x0002); // Size: 1, Type: INT, Flags: PUBLIC

diff --git a/includes/armory_loader.php b/includes/armory_loader.php
@@ -31,7 +31,7 @@
     die('<b>Error:</b> can not load connector class!');
 }
 
-define('DB_VERSION', 'armory_r64');
+define('DB_VERSION', 'armory_r65');
 $armory = new Connector;
 $armory->tpl->template_dir    = 'includes/template/';
 $armory->tpl->compile_dir     = 'includes/cache/';