{**************************************************************************}\r
{* *}\r
-{* Copyright (C) 2003-2007 Polytechnique.org *}\r
+{* Copyright (C) 2003-2008 Polytechnique.org *}\r
{* http://opensource.polytechnique.org/ *}\r
{* *}\r
{* This program is free software; you can redistribute it and/or modify *}\r
<country id="{$smarty.request.mapid}">\r
<countries>\r
{foreach from=$countries item="country"}\r
- <country id="{$country.id}" name="{$country.name|utf8_encode}">\r
+ <country id="{$country.id}" name="{$country.name}">\r
<file swf="{$country.swf}" scale="{$country.scale}" xclip="{$country.xclip}" yclip="{$country.yclip}">\r
<color value="{$country.color}"/>\r
</file>\r
{if $country.nbPop > 0 or $country.id eq 0}\r
<map x="{$country.x}" y="{$country.y}" height="{$country.height}" width="{$country.width}" ratio="{$country.rat}"/>\r
- <icon x="{$country.xPop}" y="{$country.yPop}" nb="{$country.nbPop}" size="{$country.rad}" name="{$country.name|utf8_encode}" green="{if $country.nbPop}{$country.yellow/$country.nbPop}{else}0{/if}" blue="0" alpha="0.7"/>\r
- <moreinfos url="country?{$searchvars}mapid={$country.id}"/>\r
+ <icon x="{$country.xPop}" y="{$country.yPop}" nb="{$country.nbPop}" size="{$country.rad}" name="{$country.name}" green="{if $country.nbPop}{$country.yellow/$country.nbPop}{else}0{/if}" blue="0" alpha="0.7"/>\r
+ <moreinfos url="country{$plset_search|escape_html}mapid={$country.id}"/>\r
{/if}\r
</country>\r
{/foreach}\r
{foreach from=$cities item="city"}\r
<city id="{$city.id}" name="{$city.name}">\r
<icon x="{$city.x}" y="{$city.y}" nb="{$city.pop}" size="{$city.size}" name="{$city.name}" green="{if $city.pop}{$city.yellow/$city.pop}{else}0{/if}" blue="0"/>\r
- <moreinfos url="city?{$searchvars}cityid={$city.id}"/>\r
+ <moreinfos url="city{$plset_search|escape_html}cityid={$city.id}"/>\r
</city>\r
{/foreach}\r
</cities>\r