4964-cache-country

explicit cache country setting overrides auto-detected county data
OpencachingDeutschland · Jan 29, 2013 · e22e1b2 · e22e1b2
1 parent 8a6bb77
commit e22e1b2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 22 deletions.
diff --git a/htdocs/templates2/ocstyle/viewcache.tpl b/htdocs/templates2/ocstyle/viewcache.tpl
@@ -120,19 +120,15 @@
 
 			<p>{t}by{/t}&nbsp;<a class="links" href="viewprofile.php?userid={$cache.userid}">{$cache.username|escape}</a>&nbsp;&nbsp;
 				<span style="color: rgb(88, 144, 168); font-weight: bold;">
-					{if $cache.code1==""}<img src="images/flags/{$cache.countryCode|lower}.gif" style="vertical-align:middle" />&nbsp;
+					{if $cache.code1=="" or $cache.code1 != $cache.countryCode}
+						<img src="images/flags/{$cache.countryCode|lower}.gif" style="vertical-align:middle" />&nbsp; {$cache.country|escape}
 					{else}
-					<img src="images/flags/{$cache.code1|lower}.gif" style="vertical-align:middle" />&nbsp;
+						<img src="images/flags/{$cache.code1|lower}.gif" style="vertical-align:middle" />&nbsp;
-					{/if} 
+						{$cache.adm1}{if $cache.adm2!=""},
-					{if $cache.adm1==""}
+							{$cache.adm2}{if $cache.adm4!=""}
-						{$cache.country|escape}
+								&nbsp;=>&nbsp;{$cache.adm4}
-					{else}
-						{$cache.adm1}
-					{/if} 
-					{if $cache.adm2!=""}
-				 		{$cache.adm2}
-				 			{if $cache.adm4!=""}&nbsp;=>&nbsp;{$cache.adm4}
 							{/if}
+						{/if}
 					{/if}
 				</span>
 			</p>

diff --git a/htdocs/templates2/ocstyle/viewcache_print.tpl b/htdocs/templates2/ocstyle/viewcache_print.tpl
@@ -109,20 +109,20 @@
 						{/if}
 					</td>
 					<td valign="top">
-						{if $cache.code1==""}
+						{if $cache.code1=="" or $cache.code1 != $cache.countryCode}
-							<img src="images/flags/{$cache.countryCode|lower}.gif" style="vertical-align:middle" />&nbsp;
+							<img src="images/flags/{$cache.countryCode|lower}.gif" style="vertical-align:middle" />&nbsp; <b>{$cache.country|escape}</b><br />
 						{else}
 							<img src="images/flags/{$cache.code1|lower}.gif" style="vertical-align:middle" />&nbsp;
-						{/if}
+							<b>{$cache.adm1}</b><br />
-						<b>{if $cache.adm1==""}{$cache.country|escape}{else}{$cache.adm1}{/if}</b><br />
+							{if $cache.adm2!=""}
-						{if $cache.adm2!=""}
+								<font size="1">
-							<font size="1">
+								{$cache.adm2}
-							{$cache.adm2}
+								{if $cache.adm4!=""}
-							{if $cache.adm4!=""}
+									&nbsp;=>&nbsp;{$cache.adm4}
-								&nbsp;=>&nbsp;{$cache.adm4}
+								{/if}
+								</font>
+								<br />
 							{/if}
-							</font>
-							<br />
 						{/if}
 
 						<!-- <a href="http://www.mapquest.com/maps/map.adp?latlongtype=decimal&latitude={$cache.latitude}&longitude={$cache.longitude}" target="_blank">Mapquest</a><br />    -->