From c3c5a2837be379eeb8933a0b361f2e3d0b905461 Mon Sep 17 00:00:00 2001
From: osaajani <pierre.lin@free.fr>
Date: Thu, 7 Nov 2019 17:52:33 +0100
Subject: [PATCH] Fix all templates indentations

---
 templates/account/show.php                | 10 +--
 templates/command/add.php                 |  8 +--
 templates/command/edit.php                | 17 ++---
 templates/command/list.php                | 17 ++---
 templates/connect/forget-password.php     |  4 +-
 templates/connect/login.php               |  4 +-
 templates/connect/reset-password-done.php |  2 +-
 templates/contact/add.php                 |  8 +--
 templates/contact/edit.php                | 17 ++---
 templates/contact/list.php                | 17 ++---
 templates/dashboard/show.php              | 54 +++++---------
 templates/discussion/list.php             |  2 +-
 templates/discussion/show.php             |  4 +-
 templates/event/list.php                  | 21 +++---
 templates/group/add.php                   | 10 +--
 templates/group/edit.php                  | 10 +--
 templates/group/list.php                  | 17 ++---
 templates/incs/footer.php                 |  4 +-
 templates/incs/head.php                   | 17 +++--
 templates/incs/nav.php                    | 36 +++++-----
 templates/internalIncs/nav.php            | 85 -----------------------
 templates/received/list.php               | 37 +++-------
 templates/scheduled/add.php               | 12 ++--
 templates/scheduled/edit.php              | 16 ++---
 templates/scheduled/list.php              | 17 ++---
 templates/sended/list.php                 |  8 +--
 templates/setting/show.php                | 16 ++---
 templates/smsstop/list.php                | 49 +++++--------
 templates/user/add.php                    |  8 +--
 templates/user/list.php                   | 27 +++----
 templates/webhook/add.php                 |  8 +--
 templates/webhook/edit.php                | 17 ++---
 templates/webhook/list.php                | 19 ++---
 33 files changed, 213 insertions(+), 385 deletions(-)
 delete mode 100755 templates/internalIncs/nav.php

diff --git a/templates/account/show.php b/templates/account/show.php
index 295452e..20f9bf1 100755
--- a/templates/account/show.php
+++ b/templates/account/show.php
@@ -17,7 +17,7 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-user"></i> Profil
@@ -49,7 +49,7 @@
 										<h4 class="panel-title"><i class="fa fa-key fa-fw"></i> Modifier mot de passe</h4>
 									</div>
 									<div class="panel-body">
-										<form action="<?php echo \Router::url('Account', 'change_password', ['csrf' => $_SESSION['csrf']]); ?>" method="POST">
+										<form action="<?php echo \descartes\Router::url('Account', 'change_password', ['csrf' => $_SESSION['csrf']]); ?>" method="POST">
 											<div class="form-group">
 												<label>Mot de passe :</label>
 												<input name="password" type="password" class="form-control" placeholder="Nouveau mot de passe" />
@@ -65,7 +65,7 @@
 										<h4 class="panel-title"><i class="fa fa-trash-o fa-fw"></i> Supprimer ce compte</h4>
 									</div>
 									<div class="panel-body">
-										<form action="<?php echo \Router::url('Account', 'delete', ['csrf' => $_SESSION['csrf']]); ?>" method="POST">
+										<form action="<?php echo \descartes\Router::url('Account', 'delete', ['csrf' => $_SESSION['csrf']]); ?>" method="POST">
 											<div class="checkbox">
 												<label>
 													<input name="delete_account" type="checkbox" value="1" /> Je suis totalement sûr de vouloir supprimer ce compte 
@@ -84,7 +84,7 @@
 										<h4 class="panel-title"><i class="fa fa-at fa-fw"></i> Modifier e-mail</h4>
 									</div>
 									<div class="panel-body">
-										<form action="<?php echo \Router::url('Account', 'change_email', ['csrf' => $_SESSION['csrf']]); ?>" method="POST">
+										<form action="<?php echo \descartes\Router::url('Account', 'change_email', ['csrf' => $_SESSION['csrf']]); ?>" method="POST">
 											<div class="form-group">
 												<label>Adresse e-mail :</label>
 												<input name="email" type="email" class="form-control" placeholder="Nouvelle adresse e-mail" />
@@ -100,7 +100,7 @@
 										<h4 class="panel-title"><i class="fa fa-share fa-fw"></i> Transfert des SMS par e-mail</h4>
 									</div>
 									<div class="panel-body">
-										<form action="<?php echo \Router::url('Account', 'change_transfer', ['csrf' => $_SESSION['csrf']]); ?>" method="POST">
+										<form action="<?php echo \descartes\Router::url('Account', 'change_transfer', ['csrf' => $_SESSION['csrf']]); ?>" method="POST">
 											<div class="form-group">
 												<label>Transfert activé : </label>
 												<select name="transfer" class="form-control">
diff --git a/templates/command/add.php b/templates/command/add.php
index c8043dd..2cdae44 100755
--- a/templates/command/add.php
+++ b/templates/command/add.php
@@ -17,10 +17,10 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li>
-							<i class="fa fa-terminal"></i> <a href="<?php echo \Router::url('Command', 'list'); ?>">Commandes</a>
+							<i class="fa fa-terminal"></i> <a href="<?php echo \descartes\Router::url('Command', 'list'); ?>">Commandes</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-plus"></i> Nouveau
@@ -37,7 +37,7 @@
 							<h3 class="panel-title"><i class="fa fa-terminal fa-fw"></i> Ajout d'une nouvelle commande</h3>
 						</div>
 						<div class="panel-body">
-							<form action="<?php echo \Router::url('Command', 'create', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
+							<form action="<?php echo \descartes\Router::url('Command', 'create', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
 								<div class="form-group">
 									<label>Nom commande</label>
 									<div class="form-group">
@@ -58,7 +58,7 @@
 										<input name="admin" type="radio" value="0" required /> Non
 									</div>
 								</div>
-								<a class="btn btn-danger" href="<?php echo \Router::url('Command', 'list'); ?>">Annuler</a>
+								<a class="btn btn-danger" href="<?php echo \descartes\Router::url('Command', 'list'); ?>">Annuler</a>
 								<input type="submit" class="btn btn-success" value="Enregistrer la commande" /> 	
 							</form>
 						</div>
diff --git a/templates/command/edit.php b/templates/command/edit.php
index 448a1ee..4a5805d 100755
--- a/templates/command/edit.php
+++ b/templates/command/edit.php
@@ -17,10 +17,10 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li>
-							<i class="fa fa-terminal"></i> <a href="<?php echo \Router::url('Command', 'list'); ?>">Commandes</a>
+							<i class="fa fa-terminal"></i> <a href="<?php echo \descartes\Router::url('Command', 'list'); ?>">Commandes</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-edit"></i> Modifier
@@ -37,11 +37,8 @@
 							<h3 class="panel-title"><i class="fa fa-edit fa-fw"></i>Modification de commandes</h3>
 						</div>
 						<div class="panel-body">
-							<form action="<?php echo \Router::url('Command', 'update', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
-								<?php
-									foreach ($commands as $command)
-									{
-?>
+							<form action="<?php echo \descartes\Router::url('Command', 'update', ['csrf' => $_SESSION['csrf']]); ?>" method="POST">
+								<?php foreach ($commands as $command) { ?>
                                         <input type="hidden" value="<?php $this->s($command['id']); ?>" name="commands[<?php $this->s($command['id']); ?>][id]" />
 										<div class="form-group">
 											<label>Nom commande</label>
@@ -64,10 +61,8 @@
 											</div>
 										</div>
 										<hr/>
-									<?php
-									}
-								?>
-								<a class="btn btn-danger" href="<?php echo \Router::url('Command', 'list'); ?>">Annuler</a>
+                                <?php }	?>
+								<a class="btn btn-danger" href="<?php echo \descartes\Router::url('Command', 'list'); ?>">Annuler</a>
 								<input type="submit" class="btn btn-success" value="Enregistrer la commande" /> 	
 							</form>
 						</div>
diff --git a/templates/command/list.php b/templates/command/list.php
index a6c00c5..2d57e03 100755
--- a/templates/command/list.php
+++ b/templates/command/list.php
@@ -17,7 +17,7 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-terminal"></i> Commandes
@@ -50,10 +50,7 @@
                                                 </tr>
                                             </thead>
                                             <tbody>
-                                            <?php
-                                                foreach ($commands as $command)
-                                                {
-                                                    ?>
+                                            <?php foreach ($commands as $command) { ?>
                                                     <tr>
                                                         <td><?php $this->s($command['id']); ?></td>
                                                         <td><?php $this->s($command['name']); ?></td>
@@ -61,22 +58,20 @@
                                                         <td><?php echo $command['admin'] ? 'Oui' : 'Non' ; ?></td>
                                                         <td><input type="checkbox" name="ids[]" value="<?php $this->s($command['id']); ?>"></td>
                                                     </tr>
-                                                    <?php
-                                                }
-                                            ?>
+                                            <?php } ?>
                                             </tbody>
                                         </table>
                                     </div>
                                 <?php } ?>
                                 <div>
                                     <div class="col-xs-6 no-padding">
-                                        <a class="btn btn-success" href="<?php echo \Router::url('Command', 'add'); ?>"><span class="fa fa-plus"></span> Ajouter une commande</a>
+                                        <a class="btn btn-success" href="<?php echo \descartes\Router::url('Command', 'add'); ?>"><span class="fa fa-plus"></span> Ajouter une commande</a>
                                     </div>
                                     <?php if ($commands) { ?>
                                         <div class="text-right col-xs-6 no-padding">
                                             <strong>Action pour la séléction :</strong>
-                                            <button class="btn btn-default" type="submit" formaction="<?php echo \Router::url('Command', 'edit'); ?>"><span class="fa fa-edit"></span> Modifier</button>
-                                            <button class="btn btn-default" type="submit" formaction="<?php echo \Router::url('Command', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
+                                            <button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('Command', 'edit'); ?>"><span class="fa fa-edit"></span> Modifier</button>
+                                            <button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('Command', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
                                         </div>
                                     <?php } ?>
                                 </div>
diff --git a/templates/connect/forget-password.php b/templates/connect/forget-password.php
index f1a92d5..996126a 100755
--- a/templates/connect/forget-password.php
+++ b/templates/connect/forget-password.php
@@ -5,7 +5,7 @@
 ?>
 <div class="container-fluid">
 	<div class="row">
-		<form class="col-xs-10 col-xs-offset-1 col-md-4 col-md-offset-4 connexion-form" action="<?php echo \Router::url('connect', 'send_reset_password', ['csrf' => $_SESSION['csrf']]); ?>" method="POST">
+		<form class="col-xs-10 col-xs-offset-1 col-md-4 col-md-offset-4 connexion-form" action="<?php echo \descartes\Router::url('connect', 'send_reset_password', ['csrf' => $_SESSION['csrf']]); ?>" method="POST">
 			<h2>Mot de passe oublié</h2>
 			<div class="form-group">
 				<label>Adresse e-mail</label>
@@ -15,7 +15,7 @@
 				</div>
 			</div>	
 
-			<a class="forget-password-link" href="<?php echo \Router::url('Connect', 'login'); ?>">Se connecter ?</a>
+			<a class="forget-password-link" href="<?php echo \descartes\Router::url('Connect', 'login'); ?>">Se connecter ?</a>
 			<button class="btn btn-primary btn-lg btn-block">Renvoyer nouveau mot de passe</button>
 		</form>
 	</div>
diff --git a/templates/connect/login.php b/templates/connect/login.php
index ea4410e..a9b6f52 100755
--- a/templates/connect/login.php
+++ b/templates/connect/login.php
@@ -5,7 +5,7 @@
 ?>
 <div class="container-fluid">
 	<div class="row">
-		<form class="col-xs-10 col-xs-offset-1 col-md-4 col-md-offset-4 connexion-form" action="<?php echo \Router::url('Connect', 'connection'); ?>" method="POST">
+		<form class="col-xs-10 col-xs-offset-1 col-md-4 col-md-offset-4 connexion-form" action="<?php echo \descartes\Router::url('Connect', 'connection'); ?>" method="POST">
 			<h2>Connexion - RaspiSMS</h2>
 			<div class="form-group">
 				<label>Adresse e-mail</label>
@@ -22,7 +22,7 @@
 				</div>
 			</div>	
 
-			<a class="forget-password-link" href="<?php echo \Router::url('Connect', 'forget_password'); ?>">Mot de passe oublié ?</a>
+			<a class="forget-password-link" href="<?php echo \descartes\Router::url('Connect', 'forget_password'); ?>">Mot de passe oublié ?</a>
 			<button class="btn btn-primary btn-lg btn-block">Connexion</button>
 		</form>
 	</div>
diff --git a/templates/connect/reset-password-done.php b/templates/connect/reset-password-done.php
index 559cee8..4951954 100755
--- a/templates/connect/reset-password-done.php
+++ b/templates/connect/reset-password-done.php
@@ -15,7 +15,7 @@
 </div>
 <script>
     window.setTimeout(function () {
-        location.href = "<?php echo \Router::url('Connect', 'login'); ?>";
+        location.href = "<?php echo \descartes\Router::url('Connect', 'login'); ?>";
     }, 5000);
 </script>
 <?php
diff --git a/templates/contact/add.php b/templates/contact/add.php
index 210f67c..25df89b 100755
--- a/templates/contact/add.php
+++ b/templates/contact/add.php
@@ -17,10 +17,10 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li>
-							<i class="fa fa-user"></i> <a href="<?php echo \Router::url('Contact', 'list'); ?>">Contacts</a>
+							<i class="fa fa-user"></i> <a href="<?php echo \descartes\Router::url('Contact', 'list'); ?>">Contacts</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-plus"></i> Nouveau
@@ -37,7 +37,7 @@
 							<h3 class="panel-title"><i class="fa fa-user fa-fw"></i> Ajout d'un contact</h3>
 						</div>
 						<div class="panel-body">
-							<form action="<?php echo \Router::url('Contact', 'create', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
+							<form action="<?php echo \descartes\Router::url('Contact', 'create', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
 								<div class="form-group">
 									<label>Nom contact</label>
 									<div class="form-group input-group">
@@ -52,7 +52,7 @@
 										<input name="number" type="hidden" id="phone-hidden-input" required>
 									</div>
 								</div>
-								<a class="btn btn-danger" href="<?php echo \Router::url('Contact', 'list'); ?>">Annuler</a>
+								<a class="btn btn-danger" href="<?php echo \descartes\Router::url('Contact', 'list'); ?>">Annuler</a>
 								<input type="submit" class="btn btn-success" value="Enregistrer le contact" /> 	
 							</form>
 						</div>
diff --git a/templates/contact/edit.php b/templates/contact/edit.php
index bc95bb3..d048c4b 100755
--- a/templates/contact/edit.php
+++ b/templates/contact/edit.php
@@ -17,10 +17,10 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li>
-							<i class="fa fa-user"></i> <a href="<?php echo \Router::url('Contact', 'list'); ?>">Contacts</a>
+							<i class="fa fa-user"></i> <a href="<?php echo \descartes\Router::url('Contact', 'list'); ?>">Contacts</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-edit"></i> Modifier
@@ -37,11 +37,8 @@
 							<h3 class="panel-title"><i class="fa fa-edit fa-fw"></i> Modification de contacts</h3>
 						</div>
 						<div class="panel-body">
-							<form action="<?php echo \Router::url('Contact', 'update', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
-							<?php
-								foreach ($contacts as $contact)
-								{
-									?>
+							<form action="<?php echo \descartes\Router::url('Contact', 'update', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
+                            <?php foreach ($contacts as $contact) } ?>
 									<div class="form-group">
                                         <input name="contacts[<?php $this->s($contact['id']); ?>][id]" type="hidden" value="<?php $this->s($contact['id']); ?>">
 										<label>Nom contact</label>
@@ -58,10 +55,8 @@
 										</div>
 									</div>
 									<hr/>
-									<?php
-								}
-							?>
-								<a class="btn btn-danger" href="<?php echo \Router::url('Contact', 'list'); ?>">Annuler</a>
+                                <?php } ?>
+                                <a class="btn btn-danger" href="<?php echo \descartes\Router::url('Contact', 'list'); ?>">Annuler</a>
 								<input type="submit" class="btn btn-success" value="Enregistrer le contact" /> 	
 							</form>
 						</div>
diff --git a/templates/contact/list.php b/templates/contact/list.php
index 9dad913..85ef4cb 100755
--- a/templates/contact/list.php
+++ b/templates/contact/list.php
@@ -17,7 +17,7 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-user"></i> Contacts
@@ -49,32 +49,27 @@
                                                 </tr>
                                             </thead>
                                             <tbody>
-                                            <?php
-                                                foreach ($contacts as $contact)
-                                                {
-                                                    ?>
+                                            <?php foreach ($contacts as $contact) } ?>
                                                     <tr>
                                                         <td><?php $this->s($contact['id']); ?></td>
                                                         <td><?php $this->s($contact['name']); ?></td>
                                                         <td><?php $this->s($contact['number']); ?></td>
                                                         <td><input type="checkbox" name="ids[]" value="<?php $this->s($contact['id']); ?>"></td>
                                                     </tr>
-                                                    <?php
-                                                }
-                                            ?>
+                                            <?php } ?>
                                             </tbody>
                                         </table>
                                     </div>
                                 <?php } ?>
                                 <div>
                                     <div class="col-xs-6 no-padding">
-                                        <a class="btn btn-success" href="<?php echo \Router::url('Contact', 'add'); ?>"><span class="fa fa-plus"></span> Ajouter un contact</a>
+                                        <a class="btn btn-success" href="<?php echo \descartes\Router::url('Contact', 'add'); ?>"><span class="fa fa-plus"></span> Ajouter un contact</a>
                                     </div>
                                     <?php if ($contacts) { ?>
                                         <div class="text-right col-xs-6 no-padding">
                                                 <strong>Action pour la séléction :</strong>
-                                                <button class="btn btn-default" type="submit" formaction="<?php echo \Router::url('Contact', 'edit'); ?>"><span class="fa fa-edit"></span> Modifier</button>
-                                                <button class="btn btn-default" type="submit" formaction="<?php echo \Router::url('Contact', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
+                                                <button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('Contact', 'edit'); ?>"><span class="fa fa-edit"></span> Modifier</button>
+                                                <button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('Contact', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
                                         </div>
                                     <?php } ?>
                                 </div>
diff --git a/templates/dashboard/show.php b/templates/dashboard/show.php
index 1acdcae..33b8bdd 100755
--- a/templates/dashboard/show.php
+++ b/templates/dashboard/show.php
@@ -38,7 +38,7 @@
 								</div>
 							</div>
 						</div>
-						<a href="<?php echo \Router::url('Contact', 'list') ?>">
+						<a href="<?php echo \descartes\Router::url('Contact', 'list') ?>">
 							<div class="panel-footer">
 								<span class="pull-left">Voir vos contacts</span>
 								<span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
@@ -60,7 +60,7 @@
 								</div>
 							</div>
 						</div>
-						<a href="<?php echo \Router::url('Groupe', 'list') ?>">
+						<a href="<?php echo \descartes\Router::url('Groupe', 'list') ?>">
 							<div class="panel-footer">
 								<span class="pull-left">Voir les groupes</span>
 								<span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
@@ -82,7 +82,7 @@
 								</div>
 							</div>
 						</div>
-						<a href="<?php echo \Router::url('Scheduled', 'list') ?>">
+						<a href="<?php echo \descartes\Router::url('Scheduled', 'list') ?>">
 							<div class="panel-footer">
 								<span class="pull-left">Voir les SMS programmés</span>
 								<span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
@@ -104,7 +104,7 @@
 								</div>
 							</div>
 						</div>
-						<a href="<?php echo \Router::url('Command', 'list') ?>">
+						<a href="<?php echo \descartes\Router::url('Command', 'list') ?>">
 							<div class="panel-footer">
 								<span class="pull-left">Voir les commandes</span>
 								<span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
@@ -151,22 +151,17 @@
                                             </tr>
                                         </thead>
                                         <tbody>
-                                        <?php
-                                            foreach ($sendeds as $sended)
-                                            {
-                                                ?>
+                                        <?php foreach ($sendeds as $sended) { ?>
                                                 <tr>
                                                     <td><?php $this->s($sended['target']); ?></td>
                                                     <td><?php $this->s($sended['at']); ?></td>
                                                 </tr>
-                                                <?php
-                                            }
-                                        ?>
+                                        <?php } ?>
                                         </tbody>
                                     </table>
                                 </div>
                                 <div class="text-right">
-                                    <a href="<?php echo \Router::url('Sended', 'list'); ?>">Voir tous les SMS envoyés <i class="fa fa-arrow-circle-right"></i></a>
+                                    <a href="<?php echo \descartes\Router::url('Sended', 'list'); ?>">Voir tous les SMS envoyés <i class="fa fa-arrow-circle-right"></i></a>
                                 </div>
                             <?php } ?>
 						</div>
@@ -191,23 +186,18 @@
                                             </tr>
                                         </thead>
                                         <tbody>
-                                        <?php
-                                            foreach ($receiveds as $received)
-                                            {
-                                                ?>
-                                                <tr>
-                                                    <td><?php $this->s($received['send_by']); ?></td>
-                                                    <td><?php $this->s($received['at']); ?></td>
-                                                    <td><?php echo ($received['is_command']) ? 'Oui' : 'Non'; ?></td>
-                                                </tr>
-                                                <?php
-                                            }
-                                        ?>
+                                        <?php foreach ($receiveds as $received) { ?>
+                                            <tr>
+                                                <td><?php $this->s($received['send_by']); ?></td>
+                                                <td><?php $this->s($received['at']); ?></td>
+                                                <td><?php echo ($received['is_command']) ? 'Oui' : 'Non'; ?></td>
+                                            </tr>
+                                        <?php } ?>
                                         </tbody>
                                     </table>
                                 </div>
                                 <div class="text-right">
-                                    <a href="<?php echo \Router::url('Received', 'list'); ?>">Voir tous les SMS reçus <i class="fa fa-arrow-circle-right"></i></a>
+                                    <a href="<?php echo \descartes\Router::url('Received', 'list'); ?>">Voir tous les SMS reçus <i class="fa fa-arrow-circle-right"></i></a>
                                 </div>
                             <?php } ?>
 						</div>
@@ -223,21 +213,15 @@
                                 Aucun évènement n'est encore survenus.
                             <?php } else { ?>
                                 <div class="list-group">
-                                    <?php
-                                        foreach ($events as $event)
-                                        {
-                                            $logo = \controllers\internals\Tool::event_type_to_icon($event['type']);
-                                            ?>
+                                    <?php foreach ($events as $event) { ?>
                                             <a href="#" class="list-group-item">
                                                 <span class="badge"><?php $this->s($event['at']); ?></span>
-                                                <i class="fa fa-fw <?php echo $logo; ?>"></i> <?php $this->s($event['text']); ?>
+                                                <i class="fa fa-fw <?php echo \controllers\internals\Tool::event_type_to_icon($event['type']); ?>"></i> <?php $this->s($event['text']); ?>
                                             </a>
-                                            <?php
-                                        }
-                                    ?>
+                                    <?php } ?>
                                 </div>
                                 <div class="text-right">
-                                    <a href="<?php echo \Router::url('Event', 'list'); ?>">Voirs tous les évènements survenus <i class="fa fa-arrow-circle-right"></i></a>
+                                    <a href="<?php echo \descartes\Router::url('Event', 'list'); ?>">Voirs tous les évènements survenus <i class="fa fa-arrow-circle-right"></i></a>
                                 </div>
                             <?php } ?>
 						</div>
diff --git a/templates/discussion/list.php b/templates/discussion/list.php
index 150a7da..7a5575d 100755
--- a/templates/discussion/list.php
+++ b/templates/discussion/list.php
@@ -17,7 +17,7 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'list'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'list'); ?>">Dashboard</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-comments-o"></i> Discussions
diff --git a/templates/discussion/show.php b/templates/discussion/show.php
index 35524c3..d9a9bd0 100755
--- a/templates/discussion/show.php
+++ b/templates/discussion/show.php
@@ -17,10 +17,10 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li>
-							<i class="fa fa-comments-o"></i> <a href="<?php echo \Router::url('Discussion', 'list'); ?>">Discussions</a>
+							<i class="fa fa-comments-o"></i> <a href="<?php echo \descartes\Router::url('Discussion', 'list'); ?>">Discussions</a>
 						</li>
 						<li class="active">
 							<?php $this->s($number); ?>
diff --git a/templates/event/list.php b/templates/event/list.php
index 3b3480d..c4ad187 100755
--- a/templates/event/list.php
+++ b/templates/event/list.php
@@ -17,7 +17,7 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-clock-o"></i> Évènements
@@ -50,20 +50,17 @@
                                                 </tr>
                                             </thead>
                                             <tbody>
-                                            <?php
-                                                foreach ($events as $event)
-                                                {
-                                                    ?>
+                                            <?php foreach ($events as $event) { ?>
                                                     <tr>
                                                         <td><?php $this->s($event['id']); ?></td>
                                                         <td><span class="fa fa-fw <?php echo \controllers\internals\Tool::event_type_to_icon($event['type']); ?>"></span></td>
                                                         <td><?php $this->s($event['at']); ?></td>
                                                         <td><?php $this->s($event['text']); ?></td>
-                                                        <?php if ($_SESSION['user']['admin']) { ?><td><input name="ids[]" type="checkbox" value="<?php $this->s($event['id']); ?>"></td><?php } ?>
+                                                        <?php if ($_SESSION['user']['admin']) { ?>
+                                                            <td><input name="ids[]" type="checkbox" value="<?php $this->s($event['id']); ?>"></td>
+                                                        <?php } ?>
                                                     </tr>
-                                                    <?php
-                                                }
-                                            ?>
+                                            <?php } ?>
                                             </tbody>
                                         </table>
                                     </div>
@@ -71,18 +68,18 @@
                                         <?php if ($_SESSION['user']['admin']) { ?>
                                             <div class="text-right col-xs-12 no-padding">
                                                 <strong>Action pour la séléction :</strong>
-                                                <button class="btn btn-default" type="submit" formaction="<?php echo \Router::url('Event', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
+                                                <button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('Event', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
                                             </div>
                                         <?php } ?>
                                         <ul class="pager">
                                             <?php if ($page) { ?>
-                                                <li><a href="<?php echo \Router::url('events', 'showAll', array('page' => $page - 1)); ?>"><span aria-hidden="true">&larr;</span> Précèdents</a></li>
+                                                <li><a href="<?php echo \descartes\Router::url('events', 'showAll', array('page' => $page - 1)); ?>"><span aria-hidden="true">&larr;</span> Précèdents</a></li>
                                             <?php } ?>
                                             
                                             Page : <?php $this->s($page + 1); ?>
 
                                             <?php if ($limit == $nb_results) { ?>
-                                                <li><a href="<?php echo \Router::url('events', 'showAll', array('page' => $page + 1)); ?>">Suivants <span aria-hidden="true">&rarr;</span></a></li>
+                                                <li><a href="<?php echo \descartes\Router::url('events', 'showAll', array('page' => $page + 1)); ?>">Suivants <span aria-hidden="true">&rarr;</span></a></li>
                                             <?php } ?>
                                         </ul>
                                     </div>
diff --git a/templates/group/add.php b/templates/group/add.php
index 0d96fc8..683ec3b 100755
--- a/templates/group/add.php
+++ b/templates/group/add.php
@@ -17,10 +17,10 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li>
-							<i class="fa fa-group"></i> <a href="<?php echo \Router::url('Groupe', 'list'); ?>">Groupes</a>
+							<i class="fa fa-group"></i> <a href="<?php echo \descartes\Router::url('Groupe', 'list'); ?>">Groupes</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-plus"></i> Nouveau
@@ -37,7 +37,7 @@
 							<h3 class="panel-title"><i class="fa fa-group fa-fw"></i> Ajout d'un groupe</h3>
 						</div>
 						<div class="panel-body">
-							<form action="<?php echo \Router::url('Groupe', 'create', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
+							<form action="<?php echo \descartes\Router::url('Groupe', 'create', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
 								<div class="form-group">
 									<label>Nom du groupe</label>
 									<div class="form-group input-group">
@@ -49,7 +49,7 @@
 									<label>Contacts au groupe</label>
 									<input class="add-contacts form-control" name="contacts[]"/>
 								</div>
-								<a class="btn btn-danger" href="<?php echo \Router::url('Groupe', 'list'); ?>">Annuler</a>
+								<a class="btn btn-danger" href="<?php echo \descartes\Router::url('Groupe', 'list'); ?>">Annuler</a>
 								<input type="submit" class="btn btn-success" value="Enregistrer le groupe" /> 	
 							</form>
 						</div>
@@ -65,7 +65,7 @@
 		jQuery('.add-contacts').each(function()
 		{
 			jQuery(this).magicSuggest({
-				data: '<?php echo \Router::url('Contact', 'json_list'); ?>',
+				data: '<?php echo \descartes\Router::url('Contact', 'json_list'); ?>',
 				valueField: 'id',
 				displayField: 'name',
 				name: 'contacts[]'
diff --git a/templates/group/edit.php b/templates/group/edit.php
index 69e9105..cd6e84a 100755
--- a/templates/group/edit.php
+++ b/templates/group/edit.php
@@ -17,10 +17,10 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li>
-							<i class="fa fa-group"></i> <a href="<?php echo \Router::url('Groupe', 'list'); ?>">Groupes</a>
+							<i class="fa fa-group"></i> <a href="<?php echo \descartes\Router::url('Groupe', 'list'); ?>">Groupes</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-edit"></i> Modifier
@@ -37,7 +37,7 @@
 							<h3 class="panel-title"><i class="fa fa-edit fa-fw"></i> Modification de groupes</h3>
 						</div>
 						<div class="panel-body">
-							<form action="<?php echo \Router::url('Groupe', 'update', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
+							<form action="<?php echo \descartes\Router::url('Groupe', 'update', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
 							<?php
 								foreach ($groupes as $groupe)
 								{
@@ -65,7 +65,7 @@
 									<?php
 								}
 							?>
-								<a class="btn btn-danger" href="<?php echo \Router::url('Groupe', 'list'); ?>">Annuler</a>
+								<a class="btn btn-danger" href="<?php echo \descartes\Router::url('Groupe', 'list'); ?>">Annuler</a>
 								<input type="submit" class="btn btn-success" value="Enregistrer le groupe" /> 	
 							</form>
 						</div>
@@ -81,7 +81,7 @@
 		jQuery('.add-contacts').each(function()
 		{
 			jQuery(this).magicSuggest({
-				data: '<?php echo \Router::url('Contact', 'json_list'); ?>',
+				data: '<?php echo \descartes\Router::url('Contact', 'json_list'); ?>',
 				valueField: 'id',
 				displayField: 'name',
 			});
diff --git a/templates/group/list.php b/templates/group/list.php
index dbb857b..3e06262 100755
--- a/templates/group/list.php
+++ b/templates/group/list.php
@@ -17,7 +17,7 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-group"></i> Groupes
@@ -49,32 +49,27 @@
                                                 </tr>
                                             </thead>
                                             <tbody>
-                                            <?php
-                                                foreach ($groupes as $groupe)
-                                                {
-                                                    ?>
+                                                <?php foreach ($groupes as $groupe) { ?>
                                                     <tr>
                                                         <td><?php $this->s($groupe['id']); ?></td>
                                                         <td><?php $this->s($groupe['name']); ?></td>
                                                         <td><?php $this->s($groupe['nb_contacts']); ?></td>
                                                         <td><input type="checkbox" name="ids[]" value="<?php $this->s($groupe['id']); ?>"></td>
                                                     </tr>
-                                                    <?php
-                                                }
-                                            ?>
+                                                <?php } ?>
                                             </tbody>
                                         </table>
                                     </div>
                                 <?php } ?>
                                 <div>
                                     <div class="col-xs-6 no-padding">
-                                        <a class="btn btn-success" href="<?php echo \Router::url('Groupe', 'add'); ?>"><span class="fa fa-plus"></span> Ajouter un groupe</a>
+                                        <a class="btn btn-success" href="<?php echo \descartes\Router::url('Groupe', 'add'); ?>"><span class="fa fa-plus"></span> Ajouter un groupe</a>
                                     </div>
                                     <?php if ($groupes) { ?>
                                         <div class="text-right col-xs-6 no-padding">
                                             <strong>Action pour la séléction :</strong>
-                                            <button class="btn btn-default" type="submit" formaction="<?php echo \Router::url('Groupe', 'edit'); ?>"><span class="fa fa-edit"></span> Modifier</button>
-                                            <button class="btn btn-default" type="submit" formaction="<?php echo \Router::url('Groupe', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
+                                            <button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('Groupe', 'edit'); ?>"><span class="fa fa-edit"></span> Modifier</button>
+                                            <button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('Groupe', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
                                         </div>
                                     <?php } ?>
                                 </div>
diff --git a/templates/incs/footer.php b/templates/incs/footer.php
index 0bc59b5..2d35a1b 100755
--- a/templates/incs/footer.php
+++ b/templates/incs/footer.php
@@ -1,7 +1,8 @@
 	<footer class="text-center">
 		RaspiSMS a été créé pour vous par le site <a href="http://raspbian-france.fr">Raspbian-France</a>, site dédié à la Raspberry Pi<br/>
 		Copyright 2014. RaspiSMS est un programme sous <a href="https://www.gnu.org/licenses/gpl.txt" rel="nofollow">licence GNU GPL</a>.<br/>
-	</footer>
+    </footer>
+
 	<?php if (RASPISMS_SETTINGS_SMS_RECEPTION_SOUND) { ?>
 		<audio id="reception-sound">
 			<source src="<?php echo HTTP_PWD_SOUND; ?>/sounds/receptionSound.ogg" type="audio/ogg">
@@ -17,5 +18,6 @@
 			<?php } ?>
 		</script>
     <?php } ?>
+
     </body>
 </html>
diff --git a/templates/incs/head.php b/templates/incs/head.php
index 06c1459..7aefc19 100755
--- a/templates/incs/head.php
+++ b/templates/incs/head.php
@@ -2,10 +2,13 @@
 <html>
 	<head>
 		<title><?php echo !empty($title) ? $title . ' - ' . WEBSITE_TITLE : WEBSITE_TITLE; ?></title>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 		<meta name="author" content="<?php echo WEBSITE_AUTHOR; ?>" />
-		<link rel="icon" type="image/png" href="<?php echo HTTP_PWD_IMG; ?>/favicon.png" />
-		<!-- Bootstrap Core CSS -->
+        
+        <link rel="icon" type="image/png" href="<?php echo HTTP_PWD_IMG; ?>/favicon.png" />
+    
+        <!-- Bootstrap Core CSS -->
 		<link href="<?php echo HTTP_PWD_CSS; ?>/css/bootstrap.min.css" rel="stylesheet">
 		<!-- Custom CSS Theme -->
 		<link href="<?php echo HTTP_PWD_CSS; ?>/css/sb-admin.css" rel="stylesheet">
@@ -15,10 +18,10 @@
 		<link href="<?php echo HTTP_PWD_FONT; ?>/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
 		<!-- Custom CSS site -->
 		<link href="<?php echo HTTP_PWD_CSS; ?>/css/style.css" rel="stylesheet">
-		<?php
-			$this->render('incs/phptojs');
-		?>
-		<script src="<?php echo HTTP_PWD_JS; ?>/js/jquery.js"></script>
+        
+        <?php $this->render('incs/phptojs'); ?>
+        
+        <script src="<?php echo HTTP_PWD_JS; ?>/js/jquery.js"></script>
 		<script src="<?php echo HTTP_PWD_JS; ?>/js/bootstrap.min.js"></script>
 		<script src="<?php echo HTTP_PWD_JS; ?>/js/plugins/morris/raphael.min.js"></script>
 		<script src="<?php echo HTTP_PWD_JS; ?>/js/plugins/morris/morris.min.js"></script>
diff --git a/templates/incs/nav.php b/templates/incs/nav.php
index af9c4bd..f012122 100755
--- a/templates/incs/nav.php
+++ b/templates/incs/nav.php
@@ -8,46 +8,48 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="<?php echo \Router::url('Dashboard', 'show'); ?>">RaspiSMS</a>
+				<a class="navbar-brand" href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">RaspiSMS</a>
 			</div>
-			<!-- Top Menu Items -->
+
+            <!-- Top Menu Items -->
 			<ul class="nav navbar-right top-nav">
 				<li class="dropdown">
 					<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-fw fa-user"></i> <?php $this->s($_SESSION['user']['email'] ?? 'Mon compte'); ?> <b class="caret"></b></a>
 					<ul class="dropdown-menu">
 						<li>
-							<a href="<?php echo \Router::url('Account', 'show'); ?>"><i class="fa fa-fw fa-user"></i> Profil</a>
+							<a href="<?php echo \descartes\Router::url('Account', 'show'); ?>"><i class="fa fa-fw fa-user"></i> Profil</a>
 						</li>
 						<li class="divider"></li>
 						<li>
-							<a href="<?php echo \Router::url('Account', 'logout'); ?>"><i class="fa fa-fw fa-power-off"></i> Déconnexion</a>
+							<a href="<?php echo \descartes\Router::url('Account', 'logout'); ?>"><i class="fa fa-fw fa-power-off"></i> Déconnexion</a>
 						</li>
 					</ul>
 				</li>
 			</ul>
-			<!-- Sidebar Menu Items - These collapse to the responsive navigation menu on small screens -->
+
+            <!-- Sidebar Menu Items - These collapse to the responsive navigation menu on small screens -->
 			<div class="collapse navbar-collapse navbar-ex1-collapse">
                 <ul class="nav navbar-nav side-nav">
 					<li <?php echo $page == 'dashboard' ? 'class="active"' : ''; ?>>
-						<a href="<?php echo \Router::url('Dashboard', 'show'); ?>"><i class="fa fa-fw fa-dashboard"></i> Dashboard</a>
+						<a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>"><i class="fa fa-fw fa-dashboard"></i> Dashboard</a>
 					</li>
 					<li <?php echo $page == 'scheduleds' ? 'class="active"' : ''; ?>>
-						<a href="<?php echo \Router::url('Scheduled', 'list'); ?>"><i class="fa fa-fw fa-envelope"></i> SMS</a>
+						<a href="<?php echo \descartes\Router::url('Scheduled', 'list'); ?>"><i class="fa fa-fw fa-envelope"></i> SMS</a>
 					</li>
 					<li <?php echo $page == 'discussions' ? 'class="active"' : ''; ?>>
-						<a href="<?php echo \Router::url('Discussion', 'list'); ?>"><i class="fa fa-fw fa-comments"></i> Discussions</a>
+						<a href="<?php echo \descartes\Router::url('Discussion', 'list'); ?>"><i class="fa fa-fw fa-comments"></i> Discussions</a>
 					</li>
 					<li <?php echo $page == 'commands' ? 'class="active"' : ''; ?>>
-						<a href="<?php echo \Router::url('Command', 'list'); ?>"><i class="fa fa-fw fa-terminal"></i> Commandes</a>
+						<a href="<?php echo \descartes\Router::url('Command', 'list'); ?>"><i class="fa fa-fw fa-terminal"></i> Commandes</a>
 					</li>
 					<li>
 						<a href="javascript:;" data-toggle="collapse" data-target="#repertoire"><i class="fa fa-fw fa-book"></i> Répertoire <i class="fa fa-fw fa-caret-down"></i></a>
 						<ul id="repertoire" class="collapse <?php echo in_array($page, array('contacts', 'groupes')) ? 'in' : ''; ?>">
 							<li <?php echo $page == 'contacts' ? 'class="active"' : ''; ?>>
-								<a href="<?php echo \Router::url('Contact', 'list'); ?>"><i class="fa fa-fw fa-user"></i> Contacts</a>
+								<a href="<?php echo \descartes\Router::url('Contact', 'list'); ?>"><i class="fa fa-fw fa-user"></i> Contacts</a>
 							</li>
 							<li <?php echo $page == 'groupes' ? 'class="active"' : ''; ?>>
-								<a href="<?php echo \Router::url('Groupe', 'list'); ?>"><i class="fa fa-fw fa-group"></i> Groupes</a>
+								<a href="<?php echo \descartes\Router::url('Groupe', 'list'); ?>"><i class="fa fa-fw fa-group"></i> Groupes</a>
 							</li>
 						</ul>
 					</li>
@@ -55,25 +57,25 @@
 						<a href="javascript:;" data-toggle="collapse" data-target="#logs"><i class="fa fa-fw fa-file-text"></i> Logs <i class="fa fa-fw fa-caret-down"></i></a>
 						<ul id="logs" class="collapse <?php echo in_array($page, array('sendeds', 'receiveds', 'events', 'smsstop')) ? 'in' : ''; ?>">
 							<li <?php echo $page == 'sendeds' ? 'class="active"' : ''; ?>>
-								<a href="<?php echo \Router::url('Sended', 'list'); ?>"><i class="fa fa-fw fa-send"></i> SMS envoyés</a>
+								<a href="<?php echo \descartes\Router::url('Sended', 'list'); ?>"><i class="fa fa-fw fa-send"></i> SMS envoyés</a>
 							</li>
 							<li <?php echo $page == 'receiveds' ? 'class="active"' : ''; ?>>
-								<a href="<?php echo \Router::url('Received', 'list'); ?>"><i class="fa fa-fw fa-download"></i> SMS reçus</a>
+								<a href="<?php echo \descartes\Router::url('Received', 'list'); ?>"><i class="fa fa-fw fa-download"></i> SMS reçus</a>
 							</li>
 							<li <?php echo $page == 'smsstop' ? 'class="active"' : ''; ?>>
-								<a href="<?php echo \Router::url('SmsStop', 'list'); ?>"><i class="fa fa-fw fa-ban"></i> SMS STOP</a>
+								<a href="<?php echo \descartes\Router::url('SmsStop', 'list'); ?>"><i class="fa fa-fw fa-ban"></i> SMS STOP</a>
 							</li>
 							<li <?php echo $page == 'events' ? 'class="active"' : ''; ?>>
-								<a href="<?php echo \Router::url('Event', 'list'); ?>"><i class="fa fa-fw fa-clock-o"></i> Évènements</a>
+								<a href="<?php echo \descartes\Router::url('Event', 'list'); ?>"><i class="fa fa-fw fa-clock-o"></i> Évènements</a>
 							</li>
 						</ul>
 					</li>
 					<li <?php echo $page == 'users' ? 'class="active"' : ''; ?>>
-						<a href="<?php echo \Router::url('User', 'list'); ?>"><i class="fa fa-fw fa-user"></i> Utilisateurs</a>
+						<a href="<?php echo \descartes\Router::url('User', 'list'); ?>"><i class="fa fa-fw fa-user"></i> Utilisateurs</a>
 					</li>
 					<?php if ($_SESSION['user']['admin']) { ?>
 						<li <?php echo $page == 'settings' ? 'class="active"' : ''; ?>>
-							<a href="<?php echo \Router::url('Setting', 'show'); ?>"><i class="fa fa-fw fa-cogs"></i> Réglages</a>
+							<a href="<?php echo \descartes\Router::url('Setting', 'show'); ?>"><i class="fa fa-fw fa-cogs"></i> Réglages</a>
 						</li>
 					<?php } ?>
 				</ul>
diff --git a/templates/internalIncs/nav.php b/templates/internalIncs/nav.php
deleted file mode 100755
index a69466d..0000000
--- a/templates/internalIncs/nav.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<!-- Navigation -->
-		<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-			<!-- Brand and toggle get grouped for better mobile display -->
-			<div class="navbar-header">
-				<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
-					<span class="sr-only">Toggle navigation</span>
-					<span class="icon-bar"></span>
-					<span class="icon-bar"></span>
-					<span class="icon-bar"></span>
-				</button>
-				<a class="navbar-brand" href="<?php echo \Router::url('Dashboard', 'show'); ?>">RaspiSMS</a>
-			</div>
-			<!-- Top Menu Items -->
-			<ul class="nav navbar-right top-nav">
-				<li class="dropdown">
-					<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-fw fa-user"></i> <?php $this->s($email); ?> <b class="caret"></b></a>
-					<ul class="dropdown-menu">
-						<li>
-							<a href="<?php echo \Router::url('profile'); ?>"><i class="fa fa-fw fa-user"></i> Profil</a>
-						</li>
-						<li class="divider"></li>
-						<li>
-							<a href="<?php echo \Router::url('connect', 'logout'); ?>"><i class="fa fa-fw fa-power-off"></i> Déconnexion</a>
-						</li>
-					</ul>
-				</li>
-			</ul>
-			<!-- Sidebar Menu Items - These collapse to the responsive navigation menu on small screens -->
-			<div class="collapse navbar-collapse navbar-ex1-collapse">
-				<ul class="nav navbar-nav side-nav">
-					<li <?php echo $page == 'dashboard' ? 'class="active"' : ''; ?>>
-						<a href="<?php echo \Router::url('Dashboard', 'show'); ?>"><i class="fa fa-fw fa-dashboard"></i> Dashboard</a>
-					</li>
-					<li <?php echo $page == 'scheduleds' ? 'class="active"' : ''; ?>>
-						<a href="<?php echo \Router::url('scheduleds'); ?>"><i class="fa fa-fw fa-envelope"></i> SMS</a>
-					</li>
-					<li <?php echo $page == 'discussions' ? 'class="active"' : ''; ?>>
-						<a href="<?php echo \Router::url('discussions'); ?>"><i class="fa fa-fw fa-comments"></i> Discussions</a>
-					</li>
-					<li <?php echo $page == 'commands' ? 'class="active"' : ''; ?>>
-						<a href="<?php echo \Router::url('Command', 'list'); ?>"><i class="fa fa-fw fa-terminal"></i> Commandes</a>
-					</li>
-					<li>
-						<a href="javascript:;" data-toggle="collapse" data-target="#repertoire"><i class="fa fa-fw fa-book"></i> Répertoire <i class="fa fa-fw fa-caret-down"></i></a>
-						<ul id="repertoire" class="collapse <?php echo in_array($page, array('contacts', 'groupes')) ? 'in' : ''; ?>">
-							<li <?php echo $page == 'contacts' ? 'class="active"' : ''; ?>>
-								<a href="<?php echo \Router::url('contacts'); ?>"><i class="fa fa-fw fa-user"></i> Contacts</a>
-							</li>
-							<li <?php echo $page == 'groupes' ? 'class="active"' : ''; ?>>
-								<a href="<?php echo \Router::url('groupes'); ?>"><i class="fa fa-fw fa-group"></i> Groupes</a>
-							</li>
-						</ul>
-					</li>
-					<li>
-						<a href="javascript:;" data-toggle="collapse" data-target="#logs"><i class="fa fa-fw fa-file-text"></i> Logs <i class="fa fa-fw fa-caret-down"></i></a>
-						<ul id="logs" class="collapse <?php echo in_array($page, array('sendeds', 'receiveds', 'events', 'smsstop')) ? 'in' : ''; ?>">
-							<li <?php echo $page == 'sendeds' ? 'class="active"' : ''; ?>>
-								<a href="<?php echo \Router::url('sendeds'); ?>"><i class="fa fa-fw fa-send"></i> SMS envoyés</a>
-							</li>
-							<li <?php echo $page == 'receiveds' ? 'class="active"' : ''; ?>>
-								<a href="<?php echo \Router::url('receiveds'); ?>"><i class="fa fa-fw fa-download"></i> SMS reçus</a>
-							</li>
-							<li <?php echo $page == 'smsstop' ? 'class="active"' : ''; ?>>
-								<a href="<?php echo \Router::url('smsstop'); ?>"><i class="fa fa-fw fa-ban"></i> SMS STOP</a>
-							</li>
-							<li <?php echo $page == 'events' ? 'class="active"' : ''; ?>>
-								<a href="<?php echo \Router::url('events'); ?>"><i class="fa fa-fw fa-clock-o"></i> Évènements</a>
-							</li>
-						</ul>
-					</li>
-					<li <?php echo $page == 'users' ? 'class="active"' : ''; ?>>
-						<a href="<?php echo \Router::url('users'); ?>"><i class="fa fa-fw fa-user"></i> Utilisateurs</a>
-					</li>
-					<?php if ($admin) { ?>
-						<li <?php echo $page == 'webhooks' ? 'class="active"' : ''; ?>>
-							<a href="<?php echo \Router::url('webhooks'); ?>"><i class="fa fa-fw fa-plug"></i> Webhooks</a>
-						</li>
-						<li <?php echo $page == 'settings' ? 'class="active"' : ''; ?>>
-							<a href="<?php echo \Router::url('settings'); ?>"><i class="fa fa-fw fa-cogs"></i> Réglages</a>
-						</li>
-					<?php } ?>
-				</ul>
-			</div>
-			<!-- /.navbar-collapse -->
-		</nav>
diff --git a/templates/received/list.php b/templates/received/list.php
index 2d95aa8..f46eb6e 100755
--- a/templates/received/list.php
+++ b/templates/received/list.php
@@ -17,7 +17,7 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-download "></i> SMS reçus
@@ -51,10 +51,7 @@
                                                 </tr>
                                             </thead>
                                             <tbody>
-                                            <?php
-                                                foreach ($receiveds as $received)
-                                                {
-                                                    ?>
+                                            <?php foreach ($receiveds as $received) { ?>
                                                     <tr>
                                                         <td><?php $this->s($received['id']); ?></td>
                                                         <td><?php $this->s($received['send_by']); ?></td>
@@ -63,9 +60,7 @@
                                                         <td><?php echo $received['is_command'] ? 'Oui' : 'Non'; ?></td>
                                                         <?php if ($_SESSION['user']['admin']) { ?><td><input name="ids[]" type="checkbox" value="<?php $this->s($received['id']); ?>"></td><?php } ?>
                                                     </tr>
-                                                    <?php
-                                                }
-                                            ?>
+                                            <?php } ?>
                                             </tbody>
                                         </table>
                                     </div>
@@ -73,28 +68,18 @@
                                         <?php if ($_SESSION['user']['admin']) { ?>
                                             <div class="text-right col-xs-12 no-padding">
                                                 <strong>Action pour la séléction :</strong>
-                                                <button class="btn btn-default" type="submit" formaction="<?php echo \Router::url('Received', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
+                                                <button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('Received', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
                                             </div>
                                         <?php } ?>
                                         <ul class="pager">
-                                            <?php
-                                                if ($page)
-                                                {
-                                                ?>
-                                                    <li><a href="<?php echo \Router::url('receiveds', 'showAll', array('page' => $page - 1)); ?>"><span aria-hidden="true">&larr;</span> Précèdents</a></li>
-                                                <?php
-                                                }
+                                            <?php if ($page) { ?>
+                                                    <li><a href="<?php echo \descartes\Router::url('receiveds', 'showAll', array('page' => $page - 1)); ?>"><span aria-hidden="true">&larr;</span> Précèdents</a></li>
+                                            <?php } ?>
+                                            <?php $this->s('Page : ' . ($page + 1)); ?>
 
-                                                $numero_page = 'Page : ' . ($page + 1);
-                                                $this->s($numero_page);
-
-                                                if ($limit == $nb_results)
-                                                {
-                                                ?>
-                                                    <li><a href="<?php echo \Router::url('receiveds', 'showAll', array('page' => $page + 1)); ?>">Suivants <span aria-hidden="true">&rarr;</span></a></li>
-                                                <?php
-                                                }
-                                            ?>
+                                            <?php if ($limit == $nb_results) { ?>
+                                                    <li><a href="<?php echo \descartes\Router::url('receiveds', 'showAll', array('page' => $page + 1)); ?>">Suivants <span aria-hidden="true">&rarr;</span></a></li>
+                                            <?php } ?>
                                         </ul>
                                     </div>
                                 <?php } ?>
diff --git a/templates/scheduled/add.php b/templates/scheduled/add.php
index 5f29f61..7215e90 100755
--- a/templates/scheduled/add.php
+++ b/templates/scheduled/add.php
@@ -17,10 +17,10 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'list'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'list'); ?>">Dashboard</a>
 						</li>
 						<li>
-							<i class="fa fa-calendar"></i> <a href="<?php echo \Router::url('Scheduled', 'list'); ?>">Scheduleds</a>
+							<i class="fa fa-calendar"></i> <a href="<?php echo \descartes\Router::url('Scheduled', 'list'); ?>">Scheduleds</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-plus"></i> Nouveau
@@ -37,7 +37,7 @@
 							<h3 class="panel-title"><i class="fa fa-calendar fa-fw"></i> Ajout d'un SMS programmé</h3>
 						</div>
 						<div class="panel-body">
-							<form action="<?php echo \Router::url('Scheduled', 'create', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
+							<form action="<?php echo \descartes\Router::url('Scheduled', 'create', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
 								<div class="form-group">
 									<label>Texte du SMS</label>
 									<textarea name="content" class="form-control" required></textarea>
@@ -74,7 +74,7 @@
 										</div>
 									</div>
 								<?php } ?>
-								<a class="btn btn-danger" href="<?php echo \Router::url('Scheduled', 'list'); ?>">Annuler</a>
+								<a class="btn btn-danger" href="<?php echo \descartes\Router::url('Scheduled', 'list'); ?>">Annuler</a>
 								<input type="submit" class="btn btn-success" value="Enregistrer le SMS" /> 	
 							</form>
 						</div>
@@ -90,7 +90,7 @@
 		jQuery('.add-contacts').each(function()
 		{
 			jQuery(this).magicSuggest({
-				data: '<?php echo \Router::url('Contact', 'json_list'); ?>',
+				data: '<?php echo \descartes\Router::url('Contact', 'json_list'); ?>',
 				valueField: 'id',
 				displayField: 'name',
 			});
@@ -99,7 +99,7 @@
 		jQuery('.add-groupes').each(function()
 		{
 			jQuery(this).magicSuggest({
-				data: '<?php echo \Router::url('Groupe', 'json_list'); ?>',
+				data: '<?php echo \descartes\Router::url('Groupe', 'json_list'); ?>',
 				valueField: 'id',
 				displayField: 'name',
 			});
diff --git a/templates/scheduled/edit.php b/templates/scheduled/edit.php
index 3a0de57..adfb7d3 100755
--- a/templates/scheduled/edit.php
+++ b/templates/scheduled/edit.php
@@ -17,10 +17,10 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li>
-							<i class="fa fa-calendar"></i> <a href="<?php echo \Router::url('Scheduled', 'list'); ?>">Scheduleds</a>
+							<i class="fa fa-calendar"></i> <a href="<?php echo \descartes\Router::url('Scheduled', 'list'); ?>">Scheduleds</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-edit"></i> Modifier
@@ -37,7 +37,7 @@
 							<h3 class="panel-title"><i class="fa fa-edit fa-fw"></i> Modification des SMS programmés</h3>
 						</div>
 						<div class="panel-body">
-							<form action="<?php echo \Router::url('Scheduled', 'update', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
+							<form action="<?php echo \descartes\Router::url('Scheduled', 'update', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
 							<?php foreach ($scheduleds as $scheduled) { ?>
                                     <div class="form-group">
 										<label>Texte du SMS</label>
@@ -78,10 +78,8 @@
 										</div>
 									<?php } ?>
 									<hr/>
-								<?php
-								}
-							?>
-								<a class="btn btn-danger" href="<?php echo \Router::url('Scheduled', 'list'); ?>">Annuler</a>
+                                <?php } ?>
+								<a class="btn btn-danger" href="<?php echo \descartes\Router::url('Scheduled', 'list'); ?>">Annuler</a>
 								<input type="submit" class="btn btn-success" value="Enregistrer le SMS" /> 	
 							</form>
 						</div>
@@ -105,7 +103,7 @@
 		jQuery('.add-contacts').each(function()
 		{
 			jQuery(this).magicSuggest({
-				data: '<?php echo \Router::url('Contact', 'json_list'); ?>',
+				data: '<?php echo \descartes\Router::url('Contact', 'json_list'); ?>',
 				valueField: 'id',
 				displayField: 'name',
 			});
@@ -114,7 +112,7 @@
 		jQuery('.add-groupes').each(function()
 		{
 			jQuery(this).magicSuggest({
-				data: '<?php echo \Router::url('Groupe', 'json_list'); ?>',
+				data: '<?php echo \descartes\Router::url('Groupe', 'json_list'); ?>',
 				valueField: 'id',
 				displayField: 'name',
 			});
diff --git a/templates/scheduled/list.php b/templates/scheduled/list.php
index 281076d..dcada97 100755
--- a/templates/scheduled/list.php
+++ b/templates/scheduled/list.php
@@ -17,7 +17,7 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'list'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'list'); ?>">Dashboard</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-calendar"></i> Scheduleds
@@ -49,32 +49,27 @@
                                                 </tr>
                                             </thead>
                                             <tbody>
-                                            <?php
-                                                foreach ($scheduleds as $scheduled)
-                                                {
-                                                    ?>
+                                            <?php foreach ($scheduleds as $scheduled) { ?>
                                                     <tr>
                                                         <td><?php $this->s($scheduled['id']); ?></td>
                                                         <td><?php $this->s($scheduled['at']); ?></td>
                                                         <td><?php $this->s($scheduled['content']); ?></td>
                                                         <td><input type="checkbox" name="ids[]" value="<?php $this->s($scheduled['id']); ?>"></td>
                                                     </tr>
-                                                    <?php
-                                                }
-                                            ?>
+                                            <?php } ?>
                                             </tbody>
                                         </table>
                                     </div>
                                 <?php } ?>
                                 <div>
                                     <div class="col-xs-6 no-padding">
-                                        <a class="btn btn-success" href="<?php echo \Router::url('Scheduled', 'add'); ?>"><span class="fa fa-plus"></span> Ajouter un SMS programmé</a>
+                                        <a class="btn btn-success" href="<?php echo \descartes\Router::url('Scheduled', 'add'); ?>"><span class="fa fa-plus"></span> Ajouter un SMS programmé</a>
                                     </div>
                                     <?php if ($scheduleds) { ?>
                                         <div class="text-right col-xs-6 no-padding">
                                             <strong>Action pour la séléction :</strong>
-                                            <button class="btn btn-default" type="submit" formaction="<?php echo \Router::url('Scheduled', 'edit'); ?>"><span class="fa fa-edit"></span> Modifier</button>
-                                            <button class="btn btn-default" type="submit" formaction="<?php echo \Router::url('Scheduled', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
+                                            <button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('Scheduled', 'edit'); ?>"><span class="fa fa-edit"></span> Modifier</button>
+                                            <button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('Scheduled', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
                                         </div>
                                     <?php } ?>
                                 </div>
diff --git a/templates/sended/list.php b/templates/sended/list.php
index 894af56..41eaa56 100755
--- a/templates/sended/list.php
+++ b/templates/sended/list.php
@@ -17,7 +17,7 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-send"></i> SMS envoyés
@@ -72,18 +72,18 @@
                                         <?php if ($_SESSION['user']['admin']) { ?>
                                             <div class="text-right col-xs-12 no-padding">
                                                 <strong>Action pour la séléction :</strong>
-                                                <button class="btn btn-default" type="submit" formaction="<?php echo \Router::url('Sended', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
+                                                <button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('Sended', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
                                             </div>
                                         <?php } ?>
                                         <ul class="pager">
                                             <?php if ($page) { ?>
-                                                    <li><a href="<?php echo \Router::url('Sended', 'list', array('page' => $page - 1)); ?>"><span aria-hidden="true">&larr;</span> Précèdents</a></li>
+                                                    <li><a href="<?php echo \descartes\Router::url('Sended', 'list', array('page' => $page - 1)); ?>"><span aria-hidden="true">&larr;</span> Précèdents</a></li>
                                             <?php } ?>
 
                                             Page : <?php $this->s($page + 1); ?>
 
                                             <?php if ($limit == $nb_results) { ?>
-                                                    <li><a href="<?php echo \Router::url('sendeds', 'showAll', array('page' => $page + 1)); ?>">Suivants <span aria-hidden="true">&rarr;</span></a></li>
+                                                    <li><a href="<?php echo \descartes\Router::url('sendeds', 'showAll', array('page' => $page + 1)); ?>">Suivants <span aria-hidden="true">&rarr;</span></a></li>
                                             <?php } ?>
                                         </ul>
                                     </div>
diff --git a/templates/setting/show.php b/templates/setting/show.php
index d483eb4..d4355a2 100755
--- a/templates/setting/show.php
+++ b/templates/setting/show.php
@@ -17,7 +17,7 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-cogs"></i> Réglages
@@ -40,7 +40,7 @@
 										<h4 class="panel-title"><i class="fa fa-share fa-fw"></i> Transfert des SMS par e-mail</h4>
 									</div>
 									<div class="panel-body">
-										<form action="<?php echo \Router::url('Setting', 'update', ['setting_name' => 'transfer', 'csrf' => $_SESSION['csrf']]); ?>" method="POST">
+										<form action="<?php echo \descartes\Router::url('Setting', 'update', ['setting_name' => 'transfer', 'csrf' => $_SESSION['csrf']]); ?>" method="POST">
 											<div class="form-group">
 												<label>Transfert activé : </label>
 												<select name="setting_value" class="form-control">
@@ -59,7 +59,7 @@
 										<h4 class="panel-title"><i class="fa fa-link fa-fw"></i> Détection des URL dans les discussions</h4>
 									</div>
 									<div class="panel-body">
-										<form action="<?php echo \Router::url('Setting', 'update', ['setting_name' => 'detect_url', 'csrf' => $_SESSION['csrf']]); ?>" method="POST">
+										<form action="<?php echo \descartes\Router::url('Setting', 'update', ['setting_name' => 'detect_url', 'csrf' => $_SESSION['csrf']]); ?>" method="POST">
 											<div class="form-group">
 												<label>Détection activé : </label>
 												<select name="setting_value" class="form-control">
@@ -78,7 +78,7 @@
 										<h4 class="panel-title"><i class="fa fa-phone fa-fw"></i> Pays préférés numéros internationaux</h4>
 									</div>
 									<div class="panel-body">
-										<form action="<?php echo \Router::url('Setting', 'update', ['setting_name' => 'preferred_phone_country', 'csrf' => $_SESSION['csrf']]); ?>" method="POST">
+										<form action="<?php echo \descartes\Router::url('Setting', 'update', ['setting_name' => 'preferred_phone_country', 'csrf' => $_SESSION['csrf']]); ?>" method="POST">
 											<div class="form-group">
 												<label>Code des pays (norme ISO 3166-1 alpha-2) séparés par des virgules : </label>
 												<input name="setting_value" class="form-control" value="<?php $this->s(RASPISMS_SETTINGS_PREFERRED_PHONE_COUNTRY); ?>" />
@@ -94,7 +94,7 @@
 										<h4 class="panel-title"><i class="fa fa-music fa-fw"></i> Son sur reception d'un SMS</h4>
 									</div>
 									<div class="panel-body">
-										<form action="<?php echo \Router::url('Setting', 'update', ['setting_name' => 'sms_reception_sound', 'csrf' => $_SESSION['csrf']]); ?>" method="POST">
+										<form action="<?php echo \descartes\Router::url('Setting', 'update', ['setting_name' => 'sms_reception_sound', 'csrf' => $_SESSION['csrf']]); ?>" method="POST">
 											<div class="form-group">
 												<label>Jouer un son quand vous recevez un SMS : </label>
 												<select name="setting_value" class="form-control">
@@ -115,7 +115,7 @@
 										<h4 class="panel-title"><i class="fa fa-ban fa-fw"></i> Activation de SMS-STOP</h4>
 									</div>
 									<div class="panel-body">
-										<form action="<?php echo \Router::url('Setting', 'update', ['setting_name' => 'smsstop', 'csrf' => $_SESSION['csrf']]); ?>" method="POST">
+										<form action="<?php echo \descartes\Router::url('Setting', 'update', ['setting_name' => 'smsstop', 'csrf' => $_SESSION['csrf']]); ?>" method="POST">
 											<div class="form-group">
 												<label>SMS STOP activé : </label>
 												<select name="setting_value" class="form-control">
@@ -134,7 +134,7 @@
 										<h4 class="panel-title"><i class="fa fa-phone fa-fw"></i> Pays par défaut numéros internationaux</h4>
 									</div>
 									<div class="panel-body">
-										<form action="<?php echo \Router::url('Setting', 'update', ['setting_name' => 'default_phone_country', 'csrf' => $_SESSION['csrf']]); ?>" method="POST">
+										<form action="<?php echo \descartes\Router::url('Setting', 'update', ['setting_name' => 'default_phone_country', 'csrf' => $_SESSION['csrf']]); ?>" method="POST">
 											<div class="form-group">
 												<label>Code du pays (norme ISO 3166-1 alpha-2) : </label>
 												<input name="setting_value" class="form-control" value="<?php $this->s(RASPISMS_SETTINGS_DEFAULT_PHONE_COUNTRY); ?>" />
@@ -150,7 +150,7 @@
 										<h4 class="panel-title"><i class="fa fa-flash fa-fw"></i> Support des SMS Flash</h4>
 									</div>
 									<div class="panel-body">
-										<form action="<?php echo \Router::url('Setting', 'update', ['setting_name' => 'sms_flash', 'csrf' => $_SESSION['csrf']]); ?>" method="POST">
+										<form action="<?php echo \descartes\Router::url('Setting', 'update', ['setting_name' => 'sms_flash', 'csrf' => $_SESSION['csrf']]); ?>" method="POST">
 											<div class="form-group">
 												<label>SMS Flash activé : </label>
 												<select name="setting_value" class="form-control">
diff --git a/templates/smsstop/list.php b/templates/smsstop/list.php
index b067464..78d9354 100755
--- a/templates/smsstop/list.php
+++ b/templates/smsstop/list.php
@@ -17,7 +17,7 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-ban"></i> SMS STOP
@@ -48,18 +48,15 @@
                                                 </tr>
                                             </thead>
                                             <tbody>
-                                            <?php
-                                                foreach ($smsstops as $smsstop)
-                                                {
-                                                    ?>
-                                                    <tr>
-                                                        <td><?php $this->s($smsstop['id']); ?></td>
-                                                        <td><?php $this->s($smsstop['number']); ?></td>
-                                                        <?php if ($_SESSION['user']['admin']) { ?><td><input name="ids[]" type="checkbox" value="<?php $this->s($smsstop['id']); ?>"></td><?php } ?>
-                                                    </tr>
-                                                    <?php
-                                                }
-                                            ?>
+                                            <?php foreach ($smsstops as $smsstop) { ?>
+                                                <tr>
+                                                    <td><?php $this->s($smsstop['id']); ?></td>
+                                                    <td><?php $this->s($smsstop['number']); ?></td>
+                                                    <?php if ($_SESSION['user']['admin']) { ?>
+                                                        <td><input name="ids[]" type="checkbox" value="<?php $this->s($smsstop['id']); ?>"></td>
+                                                    <?php } ?>
+                                                </tr>
+                                            <?php } ?>
                                             </tbody>
                                         </table>
                                     </div>
@@ -67,28 +64,18 @@
                                         <?php if ($_SESSION['user']['admin']) { ?>
                                             <div class="text-right col-xs-12 no-padding">
                                                 <strong>Action pour la séléction :</strong>
-                                                <button class="btn btn-default" type="submit" formaction="<?php echo \Router::url('SmsStop', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
+                                                <button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('SmsStop', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
                                             </div>
                                         <?php } ?>
                                         <ul class="pager">
-                                            <?php
-                                                if ($page)
-                                                {
-                                                ?>
-                                                    <li><a href="<?php echo \Router::url('smsstop', 'showAll', array('page' => $page - 1)); ?>"><span aria-hidden="true">&larr;</span> Précèdents</a></li>
-                                                <?php
-                                                }
+                                            <?php if ($page) { ?>
+                                                    <li><a href="<?php echo \descartes\Router::url('smsstop', 'showAll', array('page' => $page - 1)); ?>"><span aria-hidden="true">&larr;</span> Précèdents</a></li>
+                                            <?php } ?>
+                                            <?php $this->s('Page : ' . ($page + 1)); ?>
 
-                                                $numero_page = 'Page : ' . ($page + 1);
-                                                $this->s($numero_page);
-
-                                                if ($limit == $nb_results)
-                                                {
-                                                ?>
-                                                    <li><a href="<?php echo \Router::url('smsstop', 'showAll', array('page' => $page + 1)); ?>">Suivants <span aria-hidden="true">&rarr;</span></a></li>
-                                                <?php
-                                                }
-                                            ?>
+                                            <?php if ($limit == $nb_results) { ?>
+                                                    <li><a href="<?php echo \descartes\Router::url('smsstop', 'showAll', array('page' => $page + 1)); ?>">Suivants <span aria-hidden="true">&rarr;</span></a></li>
+                                            <?php } ?>
                                         </ul>
                                     </div>
                                 <?php } ?>
diff --git a/templates/user/add.php b/templates/user/add.php
index 632b5f4..bfac493 100755
--- a/templates/user/add.php
+++ b/templates/user/add.php
@@ -17,10 +17,10 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li>
-							<i class="fa fa-user"></i> <a href="<?php echo \Router::url('User', 'list'); ?>">Utilisateurs</a>
+							<i class="fa fa-user"></i> <a href="<?php echo \descartes\Router::url('User', 'list'); ?>">Utilisateurs</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-plus"></i> Nouveau
@@ -37,7 +37,7 @@
 							<h3 class="panel-title"><i class="fa fa-user fa-fw"></i> Ajout d'un utilisateur</h3>
 						</div>
 						<div class="panel-body">
-							<form action="<?php echo \Router::url('User', 'create', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
+							<form action="<?php echo \descartes\Router::url('User', 'create', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
 								<div class="form-group">
 									<label>Adresse e-mail</label>
 									<div class="form-group input-group">
@@ -61,7 +61,7 @@
 										</div>
 									</div>
 								<?php } ?>	
-								<a class="btn btn-danger" href="<?php echo \Router::url('User', 'list'); ?>">Annuler</a>
+								<a class="btn btn-danger" href="<?php echo \descartes\Router::url('User', 'list'); ?>">Annuler</a>
 								<input type="submit" class="btn btn-success" value="Enregistrer le user" /> 	
 							</form>
 						</div>
diff --git a/templates/user/list.php b/templates/user/list.php
index 032f117..e9a2577 100755
--- a/templates/user/list.php
+++ b/templates/user/list.php
@@ -17,7 +17,7 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-user"></i> Utilisateurs
@@ -46,29 +46,24 @@
                                             </tr>
                                         </thead>
                                         <tbody>
-                                        <?php
-                                            foreach ($users as $user)
-                                            {
-                                                ?>
-                                                <tr>
-                                                    <td><?php $this->s($user['id']); ?></td>
-                                                    <td><?php $this->s($user['email']); ?></td>
-                                                    <td><?php $this->s($user['admin']); ?></td>
-                                                    <td><input type="checkbox" value="<?php $this->s($user['id']); ?>" name="ids[]"></td>
-                                                </tr>
-                                                <?php
-                                            }
-                                        ?>
+                                        <?php foreach ($users as $user) { ?>
+                                            <tr>
+                                                <td><?php $this->s($user['id']); ?></td>
+                                                <td><?php $this->s($user['email']); ?></td>
+                                                <td><?php $this->s($user['admin']); ?></td>
+                                                <td><input type="checkbox" value="<?php $this->s($user['id']); ?>" name="ids[]"></td>
+                                            </tr>
+                                        <?php } ?>
                                         </tbody>
                                     </table>
                                 </div>
                                     <div>
                                         <div class="col-xs-6 no-padding">
-                                            <a class="btn btn-success" href="<?php echo \Router::url('User', 'add'); ?>"><span class="fa fa-plus"></span> Ajouter un utilisateur</a>
+                                            <a class="btn btn-success" href="<?php echo \descartes\Router::url('User', 'add'); ?>"><span class="fa fa-plus"></span> Ajouter un utilisateur</a>
                                         </div>
                                         <div class="text-right col-xs-6 no-padding">
                                             <strong>Action pour la séléction :</strong>
-                                            <button class="btn btn-default" type="submit" formaction="<?php echo \Router::url('User', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
+                                            <button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('User', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
                                         </div>
                                     </div>
                                 </div>
diff --git a/templates/webhook/add.php b/templates/webhook/add.php
index 49b1717..fce75a8 100755
--- a/templates/webhook/add.php
+++ b/templates/webhook/add.php
@@ -17,10 +17,10 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li>
-							<i class="fa fa-plug"></i> <a href="<?php echo \Router::url('webhooks'); ?>">Webhooks</a>
+							<i class="fa fa-plug"></i> <a href="<?php echo \descartes\Router::url('webhooks'); ?>">Webhooks</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-plus"></i> Nouveau
@@ -37,7 +37,7 @@
 							<h3 class="panel-title"><i class="fa fa-plug fa-fw"></i> Ajout d'un nouveau webhook</h3>
 						</div>
 						<div class="panel-body">
-							<form action="<?php echo \Router::url('webhooks', 'create', [$_SESSION['csrf']]);?>" method="POST">
+							<form action="<?php echo \descartes\Router::url('webhooks', 'create', [$_SESSION['csrf']]);?>" method="POST">
 								<div class="form-group">
 									<label>URL cible</label>
 									<div class="form-group">
@@ -52,7 +52,7 @@
 										<?php } ?>
 									</select>
 								</div>	
-								<a class="btn btn-danger" href="<?php echo \Router::url('webhooks'); ?>">Annuler</a>
+								<a class="btn btn-danger" href="<?php echo \descartes\Router::url('webhooks'); ?>">Annuler</a>
 								<input type="submit" class="btn btn-success" value="Enregistrer le webhook" /> 	
 							</form>
 						</div>
diff --git a/templates/webhook/edit.php b/templates/webhook/edit.php
index 3a3d6f8..f93d726 100755
--- a/templates/webhook/edit.php
+++ b/templates/webhook/edit.php
@@ -17,10 +17,10 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li>
-							<i class="fa fa-plug"></i> <a href="<?php echo \Router::url('webhooks'); ?>">Webhooks</a>
+							<i class="fa fa-plug"></i> <a href="<?php echo \descartes\Router::url('webhooks'); ?>">Webhooks</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-edit"></i> Modifier
@@ -37,11 +37,8 @@
 							<h3 class="panel-title"><i class="fa fa-edit fa-fw"></i>Modification de webhooks</h3>
 						</div>
 						<div class="panel-body">
-							<form action="<?php echo \Router::url('webhooks', 'update', [$_SESSION['csrf']]);?>" method="POST">
-								<?php
-									foreach ($webhooks as $webhook)
-									{
-									?>
+							<form action="<?php echo \descartes\Router::url('webhooks', 'update', [$_SESSION['csrf']]);?>" method="POST">
+								<?php foreach ($webhooks as $webhook) { ?>
 										<div class="form-group">
 											<label>URL cible</label>
 											<div class="form-group">
@@ -57,10 +54,8 @@
 											</select>
 										</div>	
 										<hr/>
-									<?php
-									}
-								?>
-								<a class="btn btn-danger" href="<?php echo \Router::url('webhooks'); ?>">Annuler</a>
+                                <?php } ?>
+								<a class="btn btn-danger" href="<?php echo \descartes\Router::url('webhooks'); ?>">Annuler</a>
 								<input type="submit" class="btn btn-success" value="Enregistrer la webhook" /> 	
 							</form>
 						</div>
diff --git a/templates/webhook/list.php b/templates/webhook/list.php
index f08b78e..25e8654 100755
--- a/templates/webhook/list.php
+++ b/templates/webhook/list.php
@@ -17,7 +17,7 @@
 					</h1>
 					<ol class="breadcrumb">
 						<li>
-							<i class="fa fa-dashboard"></i> <a href="<?php echo \Router::url('Dashboard', 'show'); ?>">Dashboard</a>
+							<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
 						</li>
 						<li class="active">
 							<i class="fa fa-plug"></i> Webhooks
@@ -45,33 +45,28 @@
 										</tr>
 									</thead>
 									<tbody>
-									<?php
-										foreach ($webhooks as $webhook)
-										{
-											?>
+									<?php foreach ($webhooks as $webhook) { ?>
 											<tr>
 												<td><?php $this->s($webhook['id']); ?></td>
 												<td><?php $this->s($webhook['url']); ?></td>
 												<td><?php echo array_search($webhook['type'], internalConstants::WEBHOOK_TYPE); ?></td>
 												<td><input type="checkbox" value="<?php $this->s($webhook['id']); ?>"></td>
 											</tr>
-											<?php
-										}
-									?>
-									</tbody>
+                                    <?php } ?>
+                                    </tbody>
 								</table>
 							</div>
 							<div>
 								<div class="col-xs-6 no-padding">
-									<a class="btn btn-success" href="<?php echo \Router::url('webhooks', 'add'); ?>"><span class="fa fa-plus"></span> Ajouter un webhook</a>
+									<a class="btn btn-success" href="<?php echo \descartes\Router::url('webhooks', 'add'); ?>"><span class="fa fa-plus"></span> Ajouter un webhook</a>
 								</div>
 								<div class="text-right col-xs-6 no-padding">
 									<strong>Action pour la séléction :</strong> 
 									<div class="btn-groupe action-dropdown" target="#table-webhooks">
 										<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Action pour la sélection <span class="caret"></span></button>
 										<ul class="dropdown-menu pull-right" role="menu">
-											<li><a href="<?php echo \Router::url('webhooks', 'edit', [$_SESSION['csrf']]); ?>"><span class="fa fa-edit"></span> Modifier</a></li>
-											<li><a href="<?php echo \Router::url('webhooks', 'delete', [$_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</a></li>
+											<li><a href="<?php echo \descartes\Router::url('webhooks', 'edit', [$_SESSION['csrf']]); ?>"><span class="fa fa-edit"></span> Modifier</a></li>
+											<li><a href="<?php echo \descartes\Router::url('webhooks', 'delete', [$_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</a></li>
 										</ul>
 									</div>
 								</div>