[179] Display correct urls with cyrillic symbols in search.php and ac…

…hievement-firsts.php
Shadez · May 1, 2010 · 2548150 · 2548150
1 parent c80a781
commit 2548150
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/_layout/serverfirsts.xsl b/_layout/serverfirsts.xsl
@@ -140,6 +140,9 @@
 <xsl:param name="frstrlm">
 <xsl:choose><xsl:when test="guild/@realm"><xsl:value-of select="guild/@realm"/></xsl:when><xsl:otherwise><xsl:value-of select="character/@realm"/></xsl:otherwise></xsl:choose>
 </xsl:param>
+<xsl:param name="realmUrl">
+<xsl:choose><xsl:when test="character/@realmUrl"><xsl:value-of select="character/@realmUrl"></xsl:value-of></xsl:when></xsl:choose>
+</xsl:param>
 
 <div class="firsts_achievement firsts_closed" onclick="toggle_first(this)">
 <div class="expand_btn"><xsl:comment/></div>
@@ -237,7 +240,7 @@
 	<xsl:text> </xsl:text>
 	<xsl:value-of select="$loc/strs/achievements/str[@id='achv.on']"/>
 	<xsl:text> </xsl:text>
-	<xsl:if test="not(../@realm)">[<a href="achievement-firsts.xml?r={$frstrlm}"><xsl:value-of select="$frstrlm"/></a>] </xsl:if>
+	<xsl:if test="not(../@realm)">[<a href="achievement-firsts.xml?r={$realmUrl}"><xsl:value-of select="$frstrlm"/></a>] </xsl:if>
 	<b class="timestamp-firsts"><xsl:value-of select="@dateCompleted"/></b></div>
 <br clear="all"/>
 </div>

diff --git a/achievement-firsts.php b/achievement-firsts.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 172
+ * @revision 179
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -27,7 +27,6 @@
     die('<b>Fatal error:</b> unable to load system files.');
 }
 header('Content-type: text/xml');
-
 if($armory->armoryconfig['useCache'] == true && !isset($_GET['skipCache'])) {
     $cache_id = $utils->GenerateCacheId('achievement-firsts', $armory->currentRealmInfo['name']);
     if($cache_data = $utils->GetCache($cache_id)) {
@@ -38,12 +37,11 @@
 }
 // Load XSLT template
 $xml->LoadXSLT('serverfirsts.xsl');
-
 $xml->XMLWriter()->startElement('page');
 $xml->XMLWriter()->writeAttribute('globalSearch', 1);
 $xml->XMLWriter()->writeAttribute('lang', $armory->_locale);
 $xml->XMLWriter()->writeAttribute('requestUrl', 'achievement-firsts.xml');
-$realmName = (isset($_GET['r'])) ? $_GET['r'] : $armory->currentRealmInfo['name'];
+$realmName = (isset($_GET['r'])) ? urldecode($_GET['r']) : $armory->currentRealmInfo['name'];
 $isRealm = $armory->aDB->selectCell("SELECT `id` FROM `armory_realm_data` WHERE `name`=?", $realmName);
 if($isRealm) {
     $xml->XMLWriter()->startElement('realmInfo');
@@ -68,12 +66,12 @@
             $xml->XMLWriter()->writeAttribute('name', $achievement_info['charname']);
             $xml->XMLWriter()->writeAttribute('raceId', $achievement_info['race']);
             $xml->XMLWriter()->writeAttribute('realm', $armory->currentRealmInfo['name']);
+            $xml->XMLWriter()->writeAttribute('realmUrl', urlencode($armory->currentRealmInfo['name']));
             $xml->XMLWriter()->writeAttribute('url', sprintf('r=%s&cn=%s', urlencode($armory->currentRealmInfo['name']), urlencode($achievement_info['charname'])));
-            $xml->XMLWriter()->endElement();  // character
-            $xml->XMLWriter()->endElement(); // achievement
+            $xml->XMLWriter()->endElement();  //character
+            $xml->XMLWriter()->endElement(); //achievement
         }
     }
-
     $xml->XMLWriter()->endElement();  //realmInfo
 }
 else {
@@ -88,9 +86,6 @@
     // Write cache to file
     $cache_data = $utils->GenerateCacheData(0, 0, 'achievement-firsts');
     $cache_handler = $utils->WriteCache($cache_id, $cache_data, $xml_cache_data);
-    if($cache_handler != 0x01) {
-        echo sprintf('<!-- Error occured while cache write: %s -->', $cache_handler); //debug
-    }
 }
 exit;
 ?>
diff --git a/search.php b/search.php
@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 137
+ * @revision 179
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -57,7 +57,7 @@
 $xml->XMLWriter()->writeAttribute('globalSearch', 1);
 $xml->XMLWriter()->writeAttribute('lang', $armory->_locale);
 $xml->XMLWriter()->writeAttribute('requestUrl', 'search.xml');
-$xml->XMLWriter()->writeAttribute('requestQuery', ($search->searchQuery) ? $search->searchQuery.'&amp;searchType='.$_GET['searchType'] : '');
+$xml->XMLWriter()->writeAttribute('requestQuery', ($search->searchQuery) ? $search->searchQuery.'&amp;searchType='.$_GET['searchType'] : null);
 $xml->XMLWriter()->startElement('armorySearch');
 $selected = 'characters';
 if($count_characters = $search->SearchCharacters(true)) {
@@ -118,8 +118,9 @@
 $xml->XMLWriter()->endElement();  //tab
 $xml->XMLWriter()->endElement(); //tabs
 
+$searchType = (isset($_GET['searchType'])) ? $_GET['searchType'] : 'characters';
 $xml->XMLWriter()->startElement('searchResults');
-$results_info = array('pageCount' => 1, 'pageCurrent' => 1, 'searchError' => '', 'searchMsg' => '', 'searchFilter' => '', 'searchText' => $search->searchQuery, 'searchType' => $_GET['searchType'], 'url' => 'searchType='.$_GET['searchType'].'&amp;searchQuery='.$search->searchQuery, 'version' => '1.0');
+$results_info = array('pageCount' => 1, 'pageCurrent' => 1, 'searchError' => '', 'searchMsg' => '', 'searchFilter' => '', 'searchText' => urlencode($search->searchQuery), 'searchType' => $searchType, 'url' => 'searchType='.$searchType.'&amp;searchQuery='.$search->searchQuery, 'version' => '1.0');
 foreach($results_info as $result_key => $result_value) {
     $xml->XMLWriter()->writeAttribute($result_key, $result_value);
 }