Skip to content
Browse files

[413] Layout changes; max allowed selected characters updated to 5

  • Loading branch information...
1 parent 064a6ae commit 08c031974793c443e728dac2fe174d162abc1a0d @Shadez committed Oct 25, 2010
View
4 _css/character-select.css
@@ -49,7 +49,7 @@
.tabs {left:22px; margin:0;}
#charList {position:static; clear:both;}
-.topcharlist {height:287px; background:url(../images/select-topcharlist.gif) 0 0 no-repeat; position:relative; margin:0 0 -20px 0; top:0; left:0;}
+.topcharlist {height:357px; background:url(../images/select-topcharlist.jpg) 0 0 no-repeat; position:relative; margin:0 0 -20px 0; top:0; left:0;}
.topcharlist h5{font:bold 14px/26px Arial, Helvetica, sans-serif; margin:0 auto; text-align:center; display: block; letter-spacing:-1px; width:260px; height:26px; color:#724503; position:relative; top:23px;}
.sel-char { }
.sel-char h1 {color:#c3830a;padding:5px 0 10px 20px !important; background:url('../images/expand-tile.jpg') repeat-x 0 0; margin:0;}
@@ -87,4 +87,4 @@ border-width:1px 1px 1px 1px;border-style:solid;border-color:#5494bd;-moz-border
.hide div div {float:left; display:inline; position:relative;}
-.noSelectedChars { padding: 10px; border-top: 2px solid #935202; background-color: #e3c574; }
+.noSelectedChars { padding: 10px; border-top: 2px solid #935202; background-color: #e3c574; }
View
18 _js/armory.js
@@ -1054,6 +1054,24 @@ function checkArrows(){
$("#currPageTxt").html(currPage);
$("#totalPageTxt").html(totalPages);
}
+
+function changeMainCharacter(name, realm) {
+ $.ajax({
+ url: 'character-select-submit-json.xml',
+ data: {
+ cn: name,
+ r: realm
+ },
+ dataType: 'json',
+ type: 'GET',
+ success: function(data, status) {
+ if (data.success) {
+ location.reload(true);
+ }
+ }
+ });
+}
+
/*****************************************************
* End Bookmarks
*****************************************************/
View
66 _layout/character-select.xsl
@@ -2,6 +2,8 @@
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:include href="includes.xsl"/>
+
+
<xsl:template name="charactersTable"><style type="text/css" media="screen, projection">
@import "_css/character-select.css";
</style>
@@ -25,6 +27,24 @@
setTipText("<xsl:value-of select="$loc/strs/character/str[@id='character.tip.primary']"/>");
});
}
+
+ $(function() {
+ $('.selSecondaryChar').click(function() {
+ var that = $(this);
+ var name = that.parent().find('h6 a').html();
+ var realm = that.parent().find('.char-realm').html();
+
+ changeMainCharacter(name, realm);
+ });
+
+ $('.charListIcons').click(function() {
+ var that = $(this);
+ var name = that.parent().find('.menu-char-name').val();
+ var realm = that.parent().find('.menu-char-realm').val();
+
+ changeMainCharacter(name, realm);
+ });
+ });
</script>
<div class="sel-char">
@@ -64,9 +84,13 @@
<td style="text-align:left; padding-left: 3px;">
<span style="display: none;"><xsl:value-of select="@name" /></span>
- <xsl:call-template name="characterPromote" />
+ <xsl:call-template name="characterPromote">
+ <xsl:with-param name="char" select="current()" />
+ </xsl:call-template>
<a href="character-sheet.xml?{@url}"><xsl:value-of select="@name" /></a>
+ <input type="hidden" class="menu-char-name" value="{@name}" />
+ <input type="hidden" class="menu-char-realm" value="{@realm}" />
</td>
<td style="text-align:right; padding-right:3px; font-weight: bold; width: 50px;">
<span style="display: none;"><xsl:value-of select="@achPoints" /></span>
@@ -185,18 +209,20 @@
<!-- prints icon-link to add characters (gets called in table row) -->
<xsl:template name="characterPromote">
- <a href="javascript:void(0)">
- <xsl:choose>
- <xsl:when test="count(/page/characters/character/@selected) = 3">
- <!-- if we're at max character count, grey out links -->
+ <xsl:param name="char" />
+
+ <a href="javascript:void(0)" class="charListIcons add_on staticTip" onmouseover="setTipText('{$loc/strs/character-select/str[@id='makePrimary']}');">
+ <!--<xsl:choose>
+ <xsl:when test="count(/page/characters/character/@selected) = 5">
+ if we're at max character count, grey out links
<xsl:attribute name="class">charListIcons add_off staticTip</xsl:attribute>
<xsl:attribute name="onmouseover">setTipText("<xsl:value-of select="$loc/strs/character-select/str[@id='easyAccessLimit']"/>");</xsl:attribute>
</xsl:when>
<xsl:otherwise>
<xsl:attribute name="class">charListIcons add_on staticTip</xsl:attribute>
<xsl:attribute name="onmouseover">setTipText("<xsl:value-of select="$loc/strs/character-select/str[@id='addToEasyAccess']"/>");</xsl:attribute>
</xsl:otherwise>
- </xsl:choose>
+ </xsl:choose>-->
</a>
</xsl:template>
@@ -251,17 +277,20 @@
<!-- prints secondary characters in top character area -->
<xsl:template name="printSecondaryChars">
- <xsl:if test="count(/page/characters/character/@selected) &gt; 1">
+ <xsl:if test="count(/page/characters/character/@selected) &gt; 1">
+
<xsl:for-each select="/page/characters/character[@selected = '2']">
<div class="select-char2">
- <a id="{@url}" class="selChar selSecondaryChar staticTip" onmouseover="setTipText('{$loc/strs/character-select/str[@id='makePrimary']}');"
- href="javascript:void(0)"> </a>
- <a class="delChar staticTip" onmouseover="setTipText('{$loc/strs/character-select/str[@id='removeFromEasyAccess']}');" href="javascript:void(0)"></a>
- <img class="staticTip" onmouseover="setTipText('{$loc/strs/races/str[@id=concat('armory.races.race.',current()/@raceId)]}');"
+ <a id="{@url}" class="selChar selSecondaryChar staticTip" onmouseover="setTipText('{$loc/strs/character-select/str[@id='makePrimary']}');" href="javascript:void(0)"></a>
+
+ <!--<a class="delChar staticTip" onmouseover="setTipText('{$loc/strs/character-select/str[@id='removeFromEasyAccess']}');" href="javascript:void(0)"></a>-->
+
+ <img class="staticTip" onmouseover="setTipText('{$loc/strs/races/str[@id=concat('armory.races.race.',current()/@raceId)]}');"
src="images/icons/race/{current()/@raceId}-{current()/@genderId}.gif" />
<img class="staticTip" onmouseover="setTipText('{$loc/strs/classes/str[@id=concat('armory.classes.class.',current()/@classId)]}');"
src="images/icons/class/{current()/@classId}.gif" />
- <h6><a href="character-sheet.xml?{@url}"><xsl:value-of select="@name" /></a></h6>&#160;(<xsl:value-of select="@level" />) -
+
+ <h6><a href="character-sheet.xml?{@url}"><xsl:value-of select="@name" /></a></h6>&#160;(<xsl:value-of select="@level" />) -
<span class="char-realm"><xsl:value-of select="current()/@realm" /></span>
</div>
</xsl:for-each>
@@ -272,9 +301,20 @@
<xsl:when test="count(/page/characters/character/@selected) = '1'">
<div class="select-char2"><h6><xsl:value-of select="$loc/strs/character-select/str[@id='availableSlot']"/></h6></div>
<div class="select-char2"><h6><xsl:value-of select="$loc/strs/character-select/str[@id='availableSlot']"/></h6></div>
+ <div class="select-char2"><h6><xsl:value-of select="$loc/strs/character-select/str[@id='availableSlot']"/></h6></div>
+ <div class="select-char2"><h6><xsl:value-of select="$loc/strs/character-select/str[@id='availableSlot']"/></h6></div>
</xsl:when>
<xsl:when test="count(/page/characters/character/@selected) = '2'">
<div class="select-char2"><h6><xsl:value-of select="$loc/strs/character-select/str[@id='availableSlot']"/></h6></div>
+ <div class="select-char2"><h6><xsl:value-of select="$loc/strs/character-select/str[@id='availableSlot']"/></h6></div>
+ <div class="select-char2"><h6><xsl:value-of select="$loc/strs/character-select/str[@id='availableSlot']"/></h6></div>
+ </xsl:when>
+ <xsl:when test="count(/page/characters/character/@selected) = '3'">
+ <div class="select-char2"><h6><xsl:value-of select="$loc/strs/character-select/str[@id='availableSlot']"/></h6></div>
+ <div class="select-char2"><h6><xsl:value-of select="$loc/strs/character-select/str[@id='availableSlot']"/></h6></div>
+ </xsl:when>
+ <xsl:when test="count(/page/characters/character/@selected) = '4'">
+ <div class="select-char2"><h6><xsl:value-of select="$loc/strs/character-select/str[@id='availableSlot']"/></h6></div>
</xsl:when>
</xsl:choose>
</xsl:template>
@@ -298,4 +338,4 @@
</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
View
6 _layout/nav/bookmarks.xsl
@@ -126,8 +126,6 @@
<xsl:param name="charNode" />
- <xsl:variable name="txtClassbm" select="$loc/strs/classes/str[@id=concat('armory.classes.class.', $charNode/@classId,'.', $charNode/@genderId)]" />
-
<div class="menuItem bmlist">
<a href="javascript:void(0);" class="rmBookmark staticTip"
@@ -136,15 +134,15 @@
<a class="character-achievement staticTip" onMouseOver="setTipText('{$loc/strs/login/str[@id='armory.login.achievements']}');"
href="character-achievements.xml?{@url}"><xsl:value-of select="@achPoints"/></a>
- <em class="classId{@classId} staticTip" onmouseover="setTipText('{$txtClassbm}')"></em>
+ <em class="classId{@classId} staticTip" onmouseover="setTipText('{@classText}')"></em>
<a href="character-sheet.xml?{@url}" class="charName"><xsl:value-of select="@name"/></a>
<span>&#160;-&#160;<xsl:value-of select="@realm"/></span>
<p>
<xsl:apply-templates mode="printf" select="$loc/strs/character/str[@id='charLevelStr']">
<xsl:with-param name="param1" select="@level" />
<xsl:with-param name="param2" select="''" />
- <xsl:with-param name="param3" select="$txtClassbm" />
+ <xsl:with-param name="param3" select="@classText" />
</xsl:apply-templates>
</p>
</div>
View
4 _layout/nav/user-menu.xsl
@@ -137,7 +137,7 @@
<xsl:attribute name="style"></xsl:attribute>
</xsl:if>
- <img src="images/icons/icon-guildmaster.gif" alt="" class="staticTip" onmouseover="setTipText('{$loc/strs/character-select/str[@id='primaryChar']}')" />
+ <img src="images/icons/icon-guildmaster.gif" alt="Selected" class="staticTip" onmouseover="setTipText('{$loc/strs/character-select/str[@id='primaryChar']}')" />
</div>
<div class="menuItemAvatar">
@@ -158,7 +158,7 @@
</div>
<div class="menuItemMeta">
- <a href="/vault/character-calendar.xml?{@url}" class="user-alerts staticTip" style="display: none;" onmouseover="setTipText('{$loc/strs/login/str[@id='armory.login.calendar.pending']}')">0</a>
+ <a href="character-calendar.xml?{@url}" class="user-alerts staticTip" style="display: none;" onmouseover="setTipText('{$loc/strs/login/str[@id='armory.login.calendar.pending']}')">0</a>
<a href="character-sheet.xml?{@url}" class="charName js-character-name"><xsl:value-of select="@name" /></a> -
<span class="js-character-realm"><xsl:value-of select="@realm" /></span>
View
4 bookmarks.php
@@ -3,7 +3,7 @@
/**
* @package World of Warcraft Armory
* @version Release Candidate 1
- * @revision 345
+ * @revision 413
* @copyright (c) 2009-2010 Shadez
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
@@ -53,7 +53,7 @@
$bookmarks_count = $utils->GetBookmarksCount();
$xml->XMLWriter()->startElement('characters');
$xml->XMLWriter()->writeAttribute('count', $bookmarks_count);
-$xml->XMLWriter()->writeAttribute('max', 60);
+$xml->XMLWriter()->writeAttribute('max', MAX_BOOKMARKS_COUNT);
$character_bookmarks = $utils->GetBookmarks();
if(is_array($character_bookmarks)) {
foreach($character_bookmarks as $bookmark) {
View
66 character-select-submit-json.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * @package World of Warcraft Armory
+ * @version Release Candidate 1
+ * @revision 413
+ * @copyright (c) 2009-2010 Shadez
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ **/
+
+define('__ARMORY__', true);
+if(!@include('includes/armory_loader.php')) {
+ die('<b>Fatal error:</b> unable to load system files.');
+}
+$fail = false;
+if(!isset($_GET['cn']) || !isset($_GET['r'])) {
+ $fail = true;
+}
+else {
+ $charName = $utils->escape($_GET['cn']);
+ $realmName = $utils->escape($_GET['r']);
+ $realmId = $utils->GetRealmIdByName($realmName);
+ $charGuid = $utils->GetCharacterGUID($charName, $realmId);
+ if(!$charGuid) {
+ $fail = true;
+ }
+ else {
+ // Character was found, try to set him/her as primary character.
+ if(!$utils->SetNewPrimaryCharacter($charGuid, $realmId)) {
+ $fail = true;
+ }
+ else {
+ // Everything ok.
+ header('Content-type: text/plain');
+ die('{"success":true}');
+ }
+ }
+}
+if($fail) {
+ header('Content-type: text/xml');
+ // Load XSLT template
+ $xml->LoadXSLT('error/error.xsl');
+ $xml->XMLWriter()->startElement('page');
+ $xml->XMLWriter()->writeAttribute('globalSearch', 1);
+ $xml->XMLWriter()->writeAttribute('lang', $armory->GetLocale());
+ $xml->XMLWriter()->startElement('errorhtml');
+ $xml->XMLWriter()->endElement(); //errorhtml
+ $xml->XMLWriter()->endElement(); //page
+ echo $xml->StopXML();
+ exit;
+}
+?>
View
13 character-select-submit.php
@@ -3,7 +3,7 @@
/**
* @package World of Warcraft Armory
* @version Release Candidate 1
- * @revision 348
+ * @revision 413
* @copyright (c) 2009-2010 Shadez
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
@@ -27,13 +27,12 @@
die('<b>Fatal error:</b> unable to load system files.');
}
if(!isset($_SESSION['accountId'])) {
- $armory->Log()->writeLog('character-select-submit : session not found!');
exit;
}
if(isset($_GET)) {
- $totalCharsCount = $armory->aDB->selectCell("SELECT COUNT(`guid`) FROM `ARMORYDBPREFIX_login_characters` WHERE `account`=%d", $_SESSION['accountId']);
- $armory->aDB->query("DELETE FROM `ARMORYDBPREFIX_login_characters` WHERE `account`='%d'", $_SESSION['accountId']);
- for($i = 1; $i < 4; $i++) {
+ $totalCharsCount = $utils->CountSelectedCharacters();
+ $utils->DropAllSelectedCharacters(true);
+ for($i = 1; $i < MAX_SELECTED_CHARACTERS_COUNT+1; $i++) {
if(isset($_GET['cn' . $i]) && isset($_GET['r' . $i])) {
$realmName = urldecode($_GET['r' . $i]);
$realm_id = $utils->GetRealmIdByName($realmName);
@@ -48,7 +47,7 @@
$realm_info = $armory->realmData[$realm_id];
$db = new ArmoryDatabaseHandler($realm_info['host_characters'], $realm_info['user_characters'], $realm_info['pass_characters'], $realm_info['name_characters'], $realm_info['charset_characters'], $armory->Log());
if(!$db) {
- $armory->Log()->writeLog('character-select-submit : unable to connect to MySQL database (host: %s, user: %s, password: %s, name: %s)', $realm_info['host_characters'], $realm_infoa['user_characters'], $realm_info['pass_characters'], $realm_info['name_characters']);
+ // Error message will appear in ArmoryDatabaseHandler::ArmoryDatabaseHandler();
continue;
}
$char_data = $db->selectRow("SELECT `guid`, `name`, `class`, `race`, `gender`, `level`, `account` FROM `characters` WHERE `name`='%s' AND `account`=%d LIMIT 1", $utils->escape($_GET['cn' . $i]), $_SESSION['accountId']);
@@ -64,7 +63,7 @@
$char_data['selected'] = $i;
}
$char_data['num'] = $i;
- $armory->aDB->query("INSERT INTO `armory_login_characters` VALUES (%d, %d, %d, '%s', %d, %d, %d, %d, %d, %d)", $char_data['account'], $i, $char_data['guid'], $char_data['name'], $char_data['class'], $char_data['race'], $char_data['gender'], $char_data['level'], $realm_id, $char_data['selected']);
+ $utils->AddCharacterAsSelected($char_data, $realm_id, $i);
}
}
}
View
BIN images/select-topcharlist.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
93 includes/classes/class.utils.php
@@ -3,7 +3,7 @@
/**
* @package World of Warcraft Armory
* @version Release Candidate 1
- * @revision 410
+ * @revision 413
* @copyright (c) 2009-2010 Shadez
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
@@ -183,7 +183,7 @@ public function CountSelectedCharacters() {
if(!isset($_SESSION['accountId'])) {
return false;
}
- return $this->armory->aDB->selectCell("SELECT COUNT(`guid`) FROM `ARMORYDBPREFIX_login_characters` WHERE `account`=%d", $_SESSION['accountId']);
+ return $this->armory->aDB->selectCell("SELECT COUNT(*) FROM `ARMORYDBPREFIX_login_characters` WHERE `account`=%d", $_SESSION['accountId']);
}
/**
@@ -199,14 +199,45 @@ public function CountAllCharacters() {
$count_all = 0;
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 = $db->selectCell("SELECT COUNT(`guid`) FROM `characters` WHERE `account`=%d", $_SESSION['accountId']);
+ $current = $db->selectCell("SELECT COUNT(*) FROM `characters` WHERE `account`=%d", $_SESSION['accountId']);
$count_all += $current;
}
unset($realm_info, $db);
return $count_all;
}
/**
+ * Removes all characters from `armory_login_characters` table.
+ * @category Utils class
+ * @access public
+ * @param $allow = false
+ * @return bool
+ **/
+ public function DropAllSelectedCharacters($allow = false) {
+ if(!$allow || !isset($_SESSION['accountId'])) {
+ return false;
+ }
+ $this->armory->aDB->query("DELETE FROM `ARMORYDBPREFIX_login_characters` WHERE `account` = %d", $_SESSION['accountId']);
+ return true;
+ }
+
+ /**
+ * Add character to `armory_login_characters` table.
+ * @category Utils class
+ * @access public
+ * @param array $char_data
+ * @param int $realm_id
+ * @param int $count
+ * @return bool
+ **/
+ public function AddCharacterAsSelected($char_data, $realm_id, $count) {
+ if(!isset($_SESSION['accountId'])) {
+ return false;
+ }
+ return $this->armory->aDB->query("INSERT INTO `ARMORYDBPREFIX_login_characters` VALUES (%d, %d, %d, '%s', %d, %d, %d, %d, %d, %d)", $char_data['account'], $count, $char_data['guid'], $char_data['name'], $char_data['class'], $char_data['race'], $char_data['gender'], $char_data['level'], $realm_id, $char_data['selected']);
+ }
+
+ /**
* Returns array with all characters.
* @category Utils class
* @access public
@@ -251,7 +282,7 @@ public function GetAllCharacters() {
elseif($realm['level'] >= $this->armory->armoryconfig['minlevel'] && $realm['level'] <= 79) {
$realm['relevance'] = $realm['level'];
}
- elseif($realm['level'] == 80) {
+ elseif($realm['level'] == PLAYER_MAX_LEVEL) {
$realm['relevance'] = 100;
}
else {
@@ -265,7 +296,10 @@ public function GetAllCharacters() {
elseif($realm['selected'] == 0) {
unset($realm['selected']);
}
- unset($realm['guid']); // Do not show GUID in XML results
+ $ach = new Achievements($this->armory);
+ $ach->InitAchievements($realm['guid'], $db);
+ $realm['achPoints'] = $ach->CalculateAchievementPoints();
+ unset($realm['guid'], $ach); // Do not show GUID in XML results
$results[] = $realm;
}
}
@@ -300,6 +334,47 @@ public function GetActiveCharacter() {
}
/**
+ * Returns character GUID for $name@$realmId
+ * @category Utils class
+ * @access public
+ * @param string $name
+ * @param int $realmId
+ * @return int
+ **/
+ public function GetCharacterGUID($name, $realmId) {
+ if(!isset($_SESSION['accountId'])) {
+ return 0;
+ }
+ return $this->armory->aDB->selectCell("SELECT `guid` FROM `ARMORYDBPREFIX_login_characters` WHERE `name` = '%s' AND `realm_id` = %d AND `account` = %d LIMIT 1", $name, $realmId, $_SESSION['accountId']);
+ }
+
+ public function SetNewPrimaryCharacter($guid, $realm_id) {
+ if(!isset($_SESSION['accountId'])) {
+ return false;
+ }
+ $charactersInfo = $this->armory->aDB->select("SELECT `guid`, `realm_id`, `selected` FROM `ARMORYDBPREFIX_login_characters` WHERE `account` = %d", $_SESSION['accountId']);
+ if(!$charactersInfo) {
+ return false;
+ }
+ $new_data = array();
+ $counter = count($charactersInfo);
+ $last_num = 1;
+ for($i = 0; $i < $counter; $i++) {
+ if($charactersInfo[$i]['guid'] == $guid && $charactersInfo[$i]['realm_id'] == $realm_id) {
+ $charactersInfo[$i]['selected'] = 1;
+ }
+ else {
+ $last_num++;
+ $charactersInfo[$i]['selected'] = $last_num;
+ }
+ }
+ foreach($charactersInfo as $char) {
+ $this->armory->aDB->query("UPDATE `ARMORYDBPREFIX_login_characters` SET `selected` = %d WHERE `guid` = %d AND `realm_id` = %d AND `account` = %d LIMIT 1", $char['selected'], $char['guid'], $char['realm_id'], $_SESSION['accountId']);
+ }
+ return true;
+ }
+
+ /**
* Returns array with user bookmarks.
* @category Utils class
* @access public
@@ -329,13 +404,15 @@ public function GetBookmarks() {
if(!$db) {
continue;
}
- $guid = $db->selectCell("SELECT `guid` FROM `characters` WHERE `name`='%s'", $bookmark['name']);
- if(!$guid) {
+ $char_data = $db->selectRow("SELECT `guid`, `class` FROM `characters` WHERE `name`='%s'", $bookmark['name']);
+ if(!$char_data) {
continue;
}
+ $guid = $char_data['guid'];
+ $bookmark['classText'] = $this->armory->aDB->selectCell("SELECT `name_%s` FROM `ARMORYDBPREFIX_classes` WHERE `id` = %d", $this->armory->GetLocale(), $char_data['class']);
$bookmark['achPoints'] = $this->armory->aDB->selectCell("SELECT SUM(`points`) FROM `ARMORYDBPREFIX_achievement` WHERE `id` IN (SELECT `achievement` FROM `%s`.`character_achievement` WHERE `guid`=%d)", $realm_info['name_characters'], $guid);
$result[] = $bookmark;
- unset($db, $realm_info, $achievement_ids, $guid, $realm);
+ unset($db, $realm_info, $achievement_ids, $guid, $char_data, $realm);
}
return $result;
}
View
6 includes/defines.php
@@ -3,7 +3,7 @@
/**
* @package World of Warcraft Armory
* @version Release Candidate 1
- * @revision 412
+ * @revision 413
* @copyright (c) 2009-2010 Shadez
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
@@ -843,4 +843,8 @@
define('GUILD_BANK_RIGHT_UPDATE_TEXT', 0x04);
define('GUILD_BANK_RIGHT_DEPOSIT_ITEM', GUILD_BANK_RIGHT_VIEW_TAB | GUILD_BANK_RIGHT_PUT_ITEM);
define('GUILD_BANK_RIGHT_FULL', 0xFF);
+
+/** Bookmarks and selected characters **/
+define('MAX_BOOKMARKS_COUNT', 60);
+define('MAX_SELECTED_CHARACTERS_COUNT', 5);
?>
View
2 includes/revision_nr.php
@@ -1,5 +1,5 @@
<?php
-define('ARMORY_REVISION', 412);
+define('ARMORY_REVISION', 413);
define('DB_VERSION', 'armory_r398');
define('CONFIG_VERSION', '0708201001');
?>

5 comments on commit 08c0319

@silvermcd123

/home/silver/hg/src/server/game/Entities/Player/Player.cpp: In member function 'void Player::WriteWowArmoryDatabaseLog(uint 32, uint32)':
/home/silver/hg/src/server/game/Entities/Player/Player.cpp:24277: error: 'QueryResult_AutoPtr' was not declared in this sco pe
/home/silver/hg/src/server/game/Entities/Player/Player.cpp:24277: error: expected `;' before 'result'
/home/silver/hg/src/server/game/Entities/Player/Player.cpp:24278: error: 'result' was not declared in this scope

why this happens?

@silvermcd123

Shadez it seems that tc patch is outdated can you update it?

@Axxus
Axxus commented on 08c0319 Oct 27, 2010

$ArmoryConfig['settings']['minGmLevelToShow'] = 0; param is not working properly since rev 404

@silvermcd123

how to clone a older rev with git?

Please sign in to comment.
Something went wrong with that request. Please try again.