diff --git a/onyx2/tpl/cms/header.tpl b/onyx2/tpl/cms/header.tpl
index c1df5aa..6c2a267 100644
--- a/onyx2/tpl/cms/header.tpl
+++ b/onyx2/tpl/cms/header.tpl
@@ -25,4 +25,4 @@
 		<div class="bannerleft"{if $info.color} style="color: {$info.color};"{/if}>{$info.texte}</div>
 	{/foreach}
 		<span id="bannerright">{$LANG.cntRaces|sprintf:$header.count.1:$header.count.0:$header.count.2}</span></div>
-	<div id="corps">
\ No newline at end of file
+	<div id="corps">
diff --git a/onyx2/tpl/cms/inscription.tpl b/onyx2/tpl/cms/inscription.tpl
index bd52013..12aaca0 100644
--- a/onyx2/tpl/cms/inscription.tpl
+++ b/onyx2/tpl/cms/inscription.tpl
@@ -9,7 +9,8 @@
 			<div class="header">Formulaire d&#39;inscription</div>
 			<div class="corpsi">
 				<form action="{$menu.inscription}" method="post">
-						<span><label for="pseudo">Pseudo :</label> <input class="text" name="HB_pseudo" id="pseudo" type="text" maxlength="16" value="{$smarty.post.HB_pseudo}" />
+						<span><label for="codeact">Code d'activation :</label> <input class="text" name="codeact" id="codeact" type="text" maxlength="16" value="{$smarty.post.codeact}" /><br />
+						<br /><span><label for="pseudo">Pseudo :</label> <input class="text" name="HB_pseudo" id="pseudo" type="text" maxlength="16" value="{$smarty.post.HB_pseudo}" />
 						<br /><label for="mdp">Mot de passe :</label> <input class="text" name="HB_mdp" id="mdp" type="password" maxlength="32" />
 						<br /><label for="conf">Confirmation :</label> <input class="text" name="HB_conf" id="conf" type="password" maxlength="32" />
 						<br /><label for="mail">Adresse &eacute;lectronique :</label> <input class="text" name="HB_mail" id="mail" type="text" value="{$smarty.post.HB_mail}" maxlength="64" />
diff --git a/onyx2/tpl/game/accueil.tpl b/onyx2/tpl/game/accueil.tpl
index 3d30ac7..a17d21b 100644
--- a/onyx2/tpl/game/accueil.tpl
+++ b/onyx2/tpl/game/accueil.tpl
@@ -26,8 +26,8 @@
 {/if}
 			<h2>Infos</h2>
 		{if $smarty.const.SURFACE == "planete"}
-			<h4>{dDonnees::nameVilles($planete->batiments[17])}</h4>
-			<h4>Diamètre: {$diametre|separerNombres} km <ins>({$planete->casesRest} case{if $planete->casesRest > 1}s{/if} disponible{if $planete->casesRest > 1}s{/if} sur {dDonnees::capaciteVilles($planete)|separerNombres})</ins></h4>
+			<h4>{php}dDonnees::nameVilles($this->_tpl_vars['planete']->batiments[17]){/php}</h4>
+			<h4>Diamètre: {$diametre|separerNombres} km <ins>({$planete->casesRest} case{if $planete->casesRest > 1}s{/if} disponible{if $planete->casesRest > 1}s{/if} sur {php}dDonnees::capaciteVilles($this->_tpl_vars['planete']){/php})</ins></h4>
 		{/if}
 			<h4>Race : {$planete->race}</h4>
 			<h4>position: <a href="?p=carte&amp;galaxie={$planete->galaxie}&amp;ss={$planete->ss}">{$planete->galaxie}.{$planete->ss}.{$planete->position}</a></h4>
diff --git a/onyx2/tpl/game/caserne.tpl b/onyx2/tpl/game/caserne.tpl
index 9040af1..cfd7766 100644
--- a/onyx2/tpl/game/caserne.tpl
+++ b/onyx2/tpl/game/caserne.tpl
@@ -1,8 +1,9 @@
 {include file='game/header.tpl'}
 		<ul class="onglets">
-		{for $i=0; $i<$planete->batiments.9; $i++}
+		{section name=nb start=0 loop=$planete->batiments.9}
+                         {assign var=i value=$smarty.section.nb.index}
 			<li{if $lieu == $i} class="hilight"{/if}><a href="{$menu.caserne}&amp;k={$i}">Caserne {$i+1}</a></li>
-		{/for}
+		{/section}
 		</ul>
 
 		<h2>File d'attente</h2>
diff --git a/onyx2/tpl/game/chantierspatial.tpl b/onyx2/tpl/game/chantierspatial.tpl
index 66b8c7d..f46a024 100644
--- a/onyx2/tpl/game/chantierspatial.tpl
+++ b/onyx2/tpl/game/chantierspatial.tpl
@@ -5,9 +5,10 @@
 	{assign var='max' value=$planete->batiments.3}
 {/if}
 		<ul class="onglets">
-		{for $i=0; $i<$max; $i++}
+		{section name=nb start=0 loop=$max}
+                         {assign var=i value=$smarty.section.nb.index}
 			<li{if $lieu == $i} class="hilight"{/if}><a href="{$menu.chantierspatial}&amp;k={$i}">Chantier {$i+1}</a></li>
-		{/for}
+		{/section}
 		</ul>
 
 		<h2>File d'attente</h2>
diff --git a/onyx2/tpl/game/chantierterrestre.tpl b/onyx2/tpl/game/chantierterrestre.tpl
index 48662db..e278bad 100644
--- a/onyx2/tpl/game/chantierterrestre.tpl
+++ b/onyx2/tpl/game/chantierterrestre.tpl
@@ -1,8 +1,9 @@
 {include file='game/header.tpl'}
 		<ul class="onglets">
-		{for $i=0; $i<$planete->batiments.7; $i++}
+		{section name=nb start=0 loop=$planete->batiments.7}
+                         {assign var=i value=$smarty.section.nb.index}
 			<li{if $lieu == $i} class="hilight"{/if}><a href="{$menu.chantierterrestre}&amp;k={$i}&amp;n={$onglet}">Chantier {$i+1}</a></li>
-		{/for}
+		{/section}
 		</ul>
 
 		<ul class="onglets">
diff --git a/onyx2/tpl/game/header.tpl b/onyx2/tpl/game/header.tpl
index 8403b86..edd4393 100644
--- a/onyx2/tpl/game/header.tpl
+++ b/onyx2/tpl/game/header.tpl
@@ -55,7 +55,7 @@
 		<span class="bottom"></span></div>
         </div>
 
-{if $page != "admin" && $page != "vide" && $page != "amis" && $page != "flotten" && $page != "messagerie" && $page != "pilori" && $page != "envoyer" && $page != "bugs" && $page != "carte" && $page != "classement" && $page != "options" && $page != "simulation" && $page != "vp" && $page != "operateur" && !ereg("alliance/", $page) && !ereg("diplomatie/", $page)}
+{if $page != "admin" && $page != "vide" && $page != "amis" && $page != "flotten" && $page != "messagerie" && $page != "pilori" && $page != "envoyer" && $page != "bugs" && $page != "carte" && $page != "classement" && $page != "options" && $page != "simulation" && $page != "vp" && $page != "operateur" && !preg_match("#alliance/#", $page) && !preg_match("#diplomatie/#", $page)}
 	<div id="head">
 		<span class="top"></span>
 
@@ -91,4 +91,4 @@
 	{if $page != "admin" && $page != "operateur"}<div id="pub">{$pub}</div>{/if}
 
 	<div id="body">
-		<span class="top"></span>
\ No newline at end of file
+		<span class="top"></span>
diff --git a/onyx2/tpl/game/menu_asteroide.tpl b/onyx2/tpl/game/menu_asteroide.tpl
index dcce2f5..7ad05e7 100644
--- a/onyx2/tpl/game/menu_asteroide.tpl
+++ b/onyx2/tpl/game/menu_asteroide.tpl
@@ -3,11 +3,11 @@
 	<li><a href="{$menu.alli_chat}"{if $page == "alliance/chat_ajax" || $page == "alliance/chat_irc"} class="hilight"{/if}>Chat de l'alliance</a></li>
 	{if $planete->url_forum}<li><a href="{$planete->url_forum}" class="external">Forum de l'alliance</a></li>{/if}
 	<li>
-		<a href="{$menu.alli_messagerie}"{if ereg("Messagerie d'alliance", $titre)} class="hilight"{/if}>Messagerie d'alliance</a>
+		<a href="{$menu.alli_messagerie}"{if preg_match("#Messagerie d'alliance#", $titre)} class="hilight"{/if}>Messagerie d'alliance</a>
 		<ul>
-			<li><a href="{$menu.alli_messagerie}&amp;n=recus"{if ereg("Messagerie  d'alliance", $titre) && $onglet != "rapports" && $onglet != "send" && $onglet != "envoyer"} class="hilight"{/if}>Reçus{if $alertMail.0} ({$alertMail.0}){/if}</a></li>
-			<li><a href="{$menu.alli_messagerie}&amp;n=rapports"{if $onglet == "rapports" && ereg("Messagerie  d'alliance", $titre)} class="hilight"{/if}>Rapports{if $alertMail.1} ({$alertMail.1}){/if}</a></li>
-			<li><a href="{$menu.alli_messagerie}&amp;n=send"{if $onglet == "send" && ereg("Messagerie  d'alliance", $titre)} class="hilight"{/if}>Envoyés</a></li>
+			<li><a href="{$menu.alli_messagerie}&amp;n=recus"{if preg_match("#Messagerie  d'alliance#", $titre) && $onglet != "rapports" && $onglet != "send" && $onglet != "envoyer"} class="hilight"{/if}>Reçus{if $alertMail.0} ({$alertMail.0}){/if}</a></li>
+			<li><a href="{$menu.alli_messagerie}&amp;n=rapports"{if $onglet == "rapports" && preg_match("#Messagerie  d'alliance#", $titre)} class="hilight"{/if}>Rapports{if $alertMail.1} ({$alertMail.1}){/if}</a></li>
+			<li><a href="{$menu.alli_messagerie}&amp;n=send"{if $onglet == "send" && preg_match("#Messagerie  d'alliance#", $titre)} class="hilight"{/if}>Envoyés</a></li>
 			<li><a href="{$menu.alli_messagerie}&amp;n=envoyer"{if $onglet == "envoyer"} class="hilight"{/if}>Ecrire</a></li>
 		</ul>
 	</li>
@@ -22,44 +22,44 @@
 	<li><a href="{$menu.ressources}"{if $page == "ressources_alli"} class="hilight"{/if}>Ressources</a></li>
 {if $planete->permissions_alliance &32 || $planete->permissions_alliance &64 || $planete->permissions_alliance &128}
 	<li>
-		<a href="{$menu.gestion}"{if ereg("gestion", $page)} class="hilight"{/if}>Gestion</a>
+		<a href="{$menu.gestion}"{if preg_match("#gestion#", $page)} class="hilight"{/if}>Gestion</a>
 		<ul>
-			{if $planete->permissions_alliance & 32}<li><a href="{$menu.gestion}&amp;g=membres"{if $onglet == "membres" && ereg("gestion", $page)} class="hilight"{/if}>Membres</a></li>{/if}
-			{if $planete->permissions_alliance & 128}<li><a href="{$menu.gestion}&amp;g=grades"{if $onglet == "grades" && ereg("gestion", $page)} class="hilight"{/if}>Grades</a></li>{/if}
-			{if $planete->permissions_alliance & 64}<li><a href="{$menu.gestion}&amp;g=wings"{if $onglet == "wings" && ereg("gestion", $page)} class="hilight"{/if}>Wings</a></li>{/if}
-			{if $planete->permissions_alliance & 128 && !$planete->wing}<li><a href="{$menu.gestion}&amp;g=alliance"{if $onglet == "alliance" && ereg("gestion", $page)} class="hilight"{/if}>Alliance</a></li>{/if}
+			{if $planete->permissions_alliance & 32}<li><a href="{$menu.gestion}&amp;g=membres"{if $onglet == "membres" && preg_match("#gestion#", $page)} class="hilight"{/if}>Membres</a></li>{/if}
+			{if $planete->permissions_alliance & 128}<li><a href="{$menu.gestion}&amp;g=grades"{if $onglet == "grades" && preg_match("#gestion#", $page)} class="hilight"{/if}>Grades</a></li>{/if}
+			{if $planete->permissions_alliance & 64}<li><a href="{$menu.gestion}&amp;g=wings"{if $onglet == "wings" && preg_match("#gestion#", $page)} class="hilight"{/if}>Wings</a></li>{/if}
+			{if $planete->permissions_alliance & 128 && !$planete->wing}<li><a href="{$menu.gestion}&amp;g=alliance"{if $onglet == "alliance" && preg_match("#gestion#", $page)} class="hilight"{/if}>Alliance</a></li>{/if}
 		</ul>
 	</li>
 {/if}
 	<li>
-		<a href="{$menu.diplomatie}"{if ereg("diplomatie/", $page)} class="hilight"{/if}>Diplomatie</a>
+		<a href="{$menu.diplomatie}"{if preg_match("#diplomatie/#", $page)} class="hilight"{/if}>Diplomatie</a>
 		<ul>
-			<li><a href="{$menu.diplomatie}&amp;o=actus"{if $onglet == "actus" && ereg("diplomatie/", $page)} class="hilight"{/if}>Actualités</a></li>
-			<li><a href="{$menu.diplomatie}&amp;o=encours"{if $onglet == "encours" && ereg("diplomatie/", $page)} class="hilight"{/if}>En place</a></li>
-			<li><a href="{$menu.diplomatie}&amp;o=archives"{if $onglet == "archives" && ereg("diplomatie/", $page)} class="hilight"{/if}>Résiliés/annulés</a></li>
-			{if $planete->permissions_alliance & 8}<li><a href="{$menu.diplomatie}&amp;o=new"{if $onglet == "new" && ereg("diplomatie/", $page)} class="hilight"{/if}>Nouveau</a></li>{/if}
+			<li><a href="{$menu.diplomatie}&amp;o=actus"{if $onglet == "actus" && preg_match("#diplomatie/#", $page)} class="hilight"{/if}>Actualités</a></li>
+			<li><a href="{$menu.diplomatie}&amp;o=encours"{if $onglet == "encours" && preg_match("#diplomatie/#", $page)} class="hilight"{/if}>En place</a></li>
+			<li><a href="{$menu.diplomatie}&amp;o=archives"{if $onglet == "archives" && preg_match("#diplomatie/#", $page)} class="hilight"{/if}>Résiliés/annulés</a></li>
+			{if $planete->permissions_alliance & 8}<li><a href="{$menu.diplomatie}&amp;o=new"{if $onglet == "new" && preg_match("#diplomatie/#", $page)} class="hilight"{/if}>Nouveau</a></li>{/if}
 		</ul>
 	</li>
 	<li><a href="{$menu.flotte}"{if $page == "flotte" || $page == "flotte1" || $page == "flotte2" || $page == "flotten"} class="hilight"{/if}>Flottes</a></li>
 	<!--<li><a href="?p=simulateur"{if $page == "simulateur_combat"} class="hilight"{/if}>Simulateur de combat</a></li>-->
 	<li><a href="{$menu.carte}"{if $page == "carte"} class="hilight"{/if}>Carte spatiale</a></li>
 	<li>
-		<a href="{$menu.options}"{if ereg("options/", $page)} class="hilight"{/if}>Options</a>
+		<a href="{$menu.options}"{if preg_match("#options/#", $page)} class="hilight"{/if}>Options</a>
 		<ul>
-			<li><a href="{$menu.options}&amp;n=ext"{if $onglet == "ext" && ereg("options/", $page)} class="hilight"{/if}>Extérieures</a></li>
-			<li><a href="{$menu.options}&amp;n=compte"{if $onglet == "compte" && ereg("options/", $page)} class="hilight"{/if}>Compte</a></li>
-			<li><a href="{$menu.options}&amp;n=jeu"{if $onglet == "jeu" && ereg("options/", $page)} class="hilight"{/if}>Jeu</a></li>
-			<li><a href="{$menu.options}&amp;n=notif"{if $onglet == "notif" && ereg("options/", $page)} class="hilight"{/if}>Notifications</a></li>
+			<li><a href="{$menu.options}&amp;n=ext"{if $onglet == "ext" && preg_match("#options/#", $page)} class="hilight"{/if}>Extérieures</a></li>
+			<li><a href="{$menu.options}&amp;n=compte"{if $onglet == "compte" && preg_match("#options/#", $page)} class="hilight"{/if}>Compte</a></li>
+			<li><a href="{$menu.options}&amp;n=jeu"{if $onglet == "jeu" && preg_match("#options/#", $page)} class="hilight"{/if}>Jeu</a></li>
+			<li><a href="{$menu.options}&amp;n=notif"{if $onglet == "notif" && preg_match("#options/#", $page)} class="hilight"{/if}>Notifications</a></li>
 		</ul>
 	</li>
 </ul>
 <ul>
-	<li><a href="{$menu.messages}"{if ereg("Messagerie - ", $titre) || $page == "envoyer"} class="hilight"{/if}>
+	<li><a href="{$menu.messages}"{if preg_match("#Messagerie - #", $titre) || $page == "envoyer"} class="hilight"{/if}>
 		{if $alertMail.0 + $alertMail.1 >= 1}<b>Messages {if $alertMail.0}({$alertMail.0}) {/if}et rapports{if $alertMail.1} ({$alertMail.1}){/if}</b>{else}Messages et rapports{/if}</a>
 		<ul>
-			<li><a href="{$menu.messages}&amp;n=recus"{if ereg("Messagerie - ", $titre) && $onglet != "rapports" && $onglet != "send" && $onglet != "envoyer"} class="hilight"{/if}>Reçus{if $alertMail.0} ({$alertMail.0}){/if}</a></li>
-			<li><a href="{$menu.messages}&amp;n=rapports"{if $onglet == "rapports" && ereg("Messagerie - ", $titre)} class="hilight"{/if}>Rapports{if $alertMail.1} ({$alertMail.1}){/if}</a></li>
-			<li><a href="{$menu.messages}&amp;n=send"{if $onglet == "send" && ereg("Messagerie - ", $titre)} class="hilight"{/if}>Envoyés</a></li>
+			<li><a href="{$menu.messages}&amp;n=recus"{if preg_match("#Messagerie - #", $titre) && $onglet != "rapports" && $onglet != "send" && $onglet != "envoyer"} class="hilight"{/if}>Reçus{if $alertMail.0} ({$alertMail.0}){/if}</a></li>
+			<li><a href="{$menu.messages}&amp;n=rapports"{if $onglet == "rapports" && preg_match("#Messagerie - #", $titre)} class="hilight"{/if}>Rapports{if $alertMail.1} ({$alertMail.1}){/if}</a></li>
+			<li><a href="{$menu.messages}&amp;n=send"{if $onglet == "send" && preg_match("#Messagerie - #", $titre)} class="hilight"{/if}>Envoyés</a></li>
 			<li><a href="{$menu.messages}&amp;n=envoyer"{if $onglet == "envoyer"} class="hilight"{/if}>Ecrire</a></li>
 		</ul>
 	</li>
@@ -67,6 +67,6 @@
 	<li><a href="{$menu.chat}"{if $page == "chat"} class="hilight"{else} class="external"{/if}>Chat</a></li>
 	<li><a href="{$menu.forums}" class="external">Forums</a></li>
 	<li><a href="{$menu.bugs}"{if $page == "bugs"} class="hilight"{/if}>Rapports de bug</a></li>
-	<li><a href="{$menu.faq}"{if $page == "faq" || ereg('/aide/', $page)} class="hilight"{/if}>F.A.Q.</a></li>
+	<li><a href="{$menu.faq}"{if $page == "faq" || preg_match('/aide/', $page)} class="#hilight#"{/if}>F.A.Q.</a></li>
 	<li><a href="{$menu.deconnexion}">Déconnexion</a></li>
 </ul>
\ No newline at end of file
diff --git a/onyx2/tpl/game/menu_joueurs.tpl b/onyx2/tpl/game/menu_joueurs.tpl
index a3f91aa..578040d 100644
--- a/onyx2/tpl/game/menu_joueurs.tpl
+++ b/onyx2/tpl/game/menu_joueurs.tpl
@@ -41,12 +41,12 @@
 	<!--<li><a href="?p=simulateur"{if $page == "simulateur_combat"} class="hilight"{/if}>Simulateur de combat</a></li>-->
 	<li><a href="{$menu.carte}"{if $page == "carte"} class="hilight"{/if}>Carte spatiale</a></li>
 	<li>
-		<a href="{$menu.options}"{if ereg("options/", $page)} class="hilight"{/if}>Options</a>
+		<a href="{$menu.options}"{if preg_match("#options/#", $page)} class="hilight"{/if}>Options</a>
 		<ul>
-			<li><a href="{$menu.options}&amp;n=ext"{if $onglet == "ext" && ereg("options/", $page)} class="hilight"{/if}>Extérieures</a></li>
-			<li><a href="{$menu.options}&amp;n=compte"{if $onglet == "compte" && ereg("options/", $page)} class="hilight"{/if}>Compte</a></li>
-			<li><a href="{$menu.options}&amp;n=jeu"{if $onglet == "jeu" && ereg("options/", $page)} class="hilight"{/if}>Jeu</a></li>
-			<li><a href="{$menu.options}&amp;n=notif"{if $onglet == "notif" && ereg("options/", $page)} class="hilight"{/if}>Notifications</a></li>
+			<li><a href="{$menu.options}&amp;n=ext"{if $onglet == "ext" && preg_match("#options/#", $page)} class="hilight"{/if}>Extérieures</a></li>
+			<li><a href="{$menu.options}&amp;n=compte"{if $onglet == "compte" && preg_match("#options/#", $page)} class="hilight"{/if}>Compte</a></li>
+			<li><a href="{$menu.options}&amp;n=jeu"{if $onglet == "jeu" && preg_match("#options/#", $page)} class="hilight"{/if}>Jeu</a></li>
+			<li><a href="{$menu.options}&amp;n=notif"{if $onglet == "notif" && preg_match("#options/#", $page)} class="hilight"{/if}>Notifications</a></li>
 		</ul>
 	</li>
 </ul>
@@ -60,11 +60,11 @@
 			<li><a href="{$menu.messages}&amp;n=envoyer"{if $onglet == "envoyer"} class="hilight"{/if}>Ecrire</a></li>
 		</ul>
 	</li>
-	<li><a href="{$menu.alliance}"{if ereg("alliance/", $page)} class="hilight"{/if}>Alliance</a></li>
+	<li><a href="{$menu.alliance}"{if preg_match("#alliance/#", $page)} class="hilight"{/if}>Alliance</a></li>
 	<li><a href="{$menu.classement}"{if $page == "classement"} class="hilight"{/if}>Classement</a></li>
 	<li><a href="{$menu.chat}"{if $page == "chat"} class="hilight"{else} class="external"{/if}>Chat</a></li>
 	<li><a href="{$menu.forums}" class="external">Forums</a></li>
 	<li><a href="{$menu.bugs}"{if $page == "bugs"} class="hilight"{/if}>Rapports de bug</a></li>
-	<li><a href="{$menu.faq}"{if $page == "faq" || ereg('/aide/', $page)} class="hilight"{/if}>F.A.Q.</a></li>
+	<li><a href="{$menu.faq}"{if $page == "faq" || preg_match('/aide/', $page)} class="#hilight#"{/if}>F.A.Q.</a></li>
 	<li><a href="{$menu.deconnexion}">Déconnexion</a></li>
 </ul>
\ No newline at end of file
diff --git a/onyx2/tpl/game/ressources.tpl b/onyx2/tpl/game/ressources.tpl
index 2c56bf0..7fe20d4 100644
--- a/onyx2/tpl/game/ressources.tpl
+++ b/onyx2/tpl/game/ressources.tpl
@@ -19,7 +19,7 @@
 			<h2>{$LANG[$race].batiments.noms_sing.4|ucfirst} : augmentation de la capacité</h2>
 			<form method="post" action="{$menu.ressources}">
 				<fieldset class="form">
-					<label for="nb">Capacité à acheter pour {7000-$planete->batiments[4]*1250} {$LANG[$race].ressources.noms.hydrogene} : <input type="text" id="nb" name="anb" value="0" size="2" /></label>
+					<label for="nb">Capacité à acheter pour {math equation="7000-x*1250" x=$planete->batiments[4]} {$LANG[$race].ressources.noms.hydrogene} : <input type="text" id="nb" name="anb" value="0" size="2" /></label>
 					<input type="submit" class="submit" value="GO" />
 				</fieldset>
 			</form>