From 629e500fcacc4610c66f77b647c61507c95ecbf3 Mon Sep 17 00:00:00 2001
From: x2003bruneau <x2003bruneau@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Sun, 1 Apr 2007 16:26:04 +0000
Subject: [PATCH] Typo and charset fixes

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1646 839d8a87-29fc-0310-9880-83ba4fa771e5
---
 templates/geoloc/city.tpl      |  2 +-
 templates/geoloc/country.tpl   |  4 +-
 templates/geoloc/init.tpl      | 98 +++++++++++++++++++++---------------------
 templates/search/quick.tpl     |  2 +-
 upgrade/0.9.14/geoloc.utf8.php | 21 +++++----
 5 files changed, 65 insertions(+), 62 deletions(-)

diff --git a/templates/geoloc/city.tpl b/templates/geoloc/city.tpl
index 0636647..de51c16 100644
--- a/templates/geoloc/city.tpl
+++ b/templates/geoloc/city.tpl
@@ -22,6 +22,6 @@
 <city id="{$smarty.request.cityid}">
   {assign var="beginning" value=true}
   {assign var="nb_displayed" value=0}
-  {iterate from=$users item="user"}{if !$beginning}<br/>{/if}{if $nb_displayed < 10}<a href="javascript:ficheXorg('{$user.alias}');">{$user.prenom|utf8_encode} {$user.nom|strtolower|ucwords|utf8_encode} - {$user.promo}</a>{else}<a href="javascript:clickOnCity({$smarty.request.cityid})">...</a>{/if}{assign var="nb_displayed" value=$nb_displayed+1}{assign var="beginning" value=false}{/iterate}
+  {iterate from=$users item="user"}{if !$beginning}<br/>{/if}{if $nb_displayed < 10}<a href="javascript:ficheXorg('{$user.alias}');">{$user.prenom} {$user.nom|strtolower|ucwords} - {$user.promo}</a>{else}<a href="javascript:clickOnCity({$smarty.request.cityid})">...</a>{/if}{assign var="nb_displayed" value=$nb_displayed+1}{assign var="beginning" value=false}{/iterate}
 </city>
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}
diff --git a/templates/geoloc/country.tpl b/templates/geoloc/country.tpl
index 4aa9c2df..1201862 100644
--- a/templates/geoloc/country.tpl
+++ b/templates/geoloc/country.tpl
@@ -23,13 +23,13 @@
 <country id="{$smarty.request.mapid}">
   <countries>
     {foreach from=$countries item="country"}
-    <country id="{$country.id}" name="{$country.name|utf8_encode}">
+    <country id="{$country.id}" name="{$country.name}">
       <file swf="{$country.swf}" scale="{$country.scale}" xclip="{$country.xclip}" yclip="{$country.yclip}">
         <color value="{$country.color}"/>
       </file>
       {if $country.nbPop > 0 or $country.id eq 0}
       <map x="{$country.x}" y="{$country.y}" height="{$country.height}" width="{$country.width}" ratio="{$country.rat}"/>
-      <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"/>
+      <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"/>
       <moreinfos url="country?{$searchvars}mapid={$country.id}"/>
       {/if}
     </country>
diff --git a/templates/geoloc/init.tpl b/templates/geoloc/init.tpl
index 78d1336..7cb6d85 100644
--- a/templates/geoloc/init.tpl
+++ b/templates/geoloc/init.tpl
@@ -1,50 +1,50 @@
-{**************************************************************************}
-{*                                                                        *}
-{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
-{*  http://opensource.polytechnique.org/                                  *}
-{*                                                                        *}
-{*  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               *}
-{*                                                                        *}
-{**************************************************************************}
-<config
-grandOncleVisibility="-1"
-tooltipSize="0"
-tooltipDX="0"
-tooltipDY="20"
-panelSize="28"
-citySize="6"
-radius100="1.6"
-radius0="3"
-select="aim"
-aimTween="5"
-transition="2"
-textLookInCity="Rechercher les x dans cette ville"
-textZoomIn="Zoom"
-textGoTo="Va à "
-textZoomBackTo="Revient à "
-textLoading="Chargement"
-textYouAreIn="Tu es dans "
-textSeeMapOfCity="Voir la carte de "
-textYouHaveSelected="Tu as sélectionné "
-{if $background}
-background="{$background}"
-zoomBarBackgroundColor="{$background}"
-{/if} 
-textCopyright="Les rÚgles de l'annuaire s'appliquent aussi à cette application"
-autofolder="true"
-iconSwf="icon.swf"
-scriptInfosArea="country?{$querystring}"/>
+{**************************************************************************}
+{*                                                                        *}
+{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
+{*  http://opensource.polytechnique.org/                                  *}
+{*                                                                        *}
+{*  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               *}
+{*                                                                        *}
+{**************************************************************************}
+<config
+grandOncleVisibility="-1"
+tooltipSize="0"
+tooltipDX="0"
+tooltipDY="20"
+panelSize="28"
+citySize="6"
+radius100="1.6"
+radius0="3"
+select="aim"
+aimTween="5"
+transition="2"
+textLookInCity="Rechercher les x dans cette ville"
+textZoomIn="Zoom"
+textGoTo="Va à "
+textZoomBackTo="Revient à "
+textLoading="Chargement"
+textYouAreIn="Tu es dans "
+textSeeMapOfCity="Voir la carte de "
+textYouHaveSelected="Tu as sélectionné "
+{if $background}
+background="{$background}"
+zoomBarBackgroundColor="{$background}"
+{/if} 
+textCopyright="Les règles de l'annuaire s'appliquent aussi à cette application"
+autofolder="true"
+iconSwf="icon.swf"
+scriptInfosArea="country?{$querystring}"/>
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}
diff --git a/templates/search/quick.tpl b/templates/search/quick.tpl
index 15a9e61..13a4b02 100644
--- a/templates/search/quick.tpl
+++ b/templates/search/quick.tpl
@@ -94,7 +94,7 @@ notre base de données.
 <div id="searchbar" style="display: none">
 <h2>Barre de recherche pour ton navigateur</h2>
 <p>
-  Si tu utilises un navigateur moderne tel que Firefox ou Internet Explore 7, tu peux ajouter un module de recherche
+  Si tu utilises un navigateur moderne tel que Firefox ou Internet Explorer 7, tu peux ajouter un module de recherche
   directement dans ton navigateur. Pour ceci, <a href="javascript:addSearchEngine()">installe</a> la barre de recherche
   rapide.
 </p>
diff --git a/upgrade/0.9.14/geoloc.utf8.php b/upgrade/0.9.14/geoloc.utf8.php
index 32d07cd..2c772f4 100755
--- a/upgrade/0.9.14/geoloc.utf8.php
+++ b/upgrade/0.9.14/geoloc.utf8.php
@@ -5,13 +5,12 @@ global $globals;
 require_once 'connect.db.inc.php';
 $globals->dbcharset = 'latin1';
 
-function is_utf8($s)
-{
-    return @iconv('utf-8', 'utf-8', $s) == $s;
-}
-
-$tables = array ('city', 'city_in_maps', 'maps', 'pays', 'region');
-foreach ($tables as $table) {
+$tables = array ('city' => array('id', 'alias'),
+                 'city_in_maps' => array('city_id', 'map_id', 'infos'),
+                 'maps' => array('map_id'),
+                 'pays' => array('a2'),
+                 'region' => array('a2', 'region'));
+foreach ($tables as $table => $keys) {
     $res = XDB::query("SELECT * FROM geoloc_$table");
     if (!$res) {
         echo "$table\n";
@@ -22,10 +21,12 @@ foreach ($tables as $table) {
         $from = array();
         $to   = array();
         foreach ($array as $key=>$value) {
-            $from[] = $key . '="' . XDB::escape($value) . '"';
+            if (in_array($key, $keys)) {
+                $from[] = $key . '=' . XDB::escape($value);
+            }
             $valued = utf8_decode($value);
             if (is_utf8($value) && $valued != $value) {
-                $to[] = $key . '="' . XDB::escape($valued) .'"';
+                $to[] = $key . '=' . XDB::escape($valued);
             }
         }
         if (!empty($to)) {
@@ -34,6 +35,8 @@ foreach ($tables as $table) {
             $sql = "UPDATE geoloc_$table SET $to WHERE $from";
             if (!XDB::execute($sql)) {
                 echo "Echec : $sql\n";
+            } elseif (XDB::affectedRows() == 0) {
+                echo "$sql\n";
             }
         }
     }
-- 
2.1.4