From 18051c397feb6b49c143d1842136cdfb735bb15a Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 17 Jan 2011 09:09:45 +0000
Subject: [PATCH]

---
 .../Controlleur/class.extranet.ajax.php       |   4 +-
 .../class.extranet.page.chiffres.php          |  16 +-
 .../Controlleur/class.extranet.url.php        | 208 +++++++++---------
 inc/ws/Controlleur/class.ws.stats.php         |  42 ++--
 inc/ws/Controlleur/class.ws.url.php           |  42 ++--
 5 files changed, 156 insertions(+), 156 deletions(-)

diff --git a/inc/extranet/Controlleur/class.extranet.ajax.php b/inc/extranet/Controlleur/class.extranet.ajax.php
index 7a357079a..7bd7d2148 100644
--- a/inc/extranet/Controlleur/class.extranet.ajax.php
+++ b/inc/extranet/Controlleur/class.extranet.ajax.php
@@ -8,7 +8,7 @@ class extranetAjax {
 		}
 		$bouton = is_null($bouton)?__('Enregister'):$bouton;
 		$colspan = $cols > 2?' colspan="' . ($cols-1) . '"':'';
-		$res = extranetPage::bh();
+		$res = commonPage::bh();
 		$res .= '<form action="' . $action . '" method="post">';
 		$res .= '<table class="form' . $class . '">';
 		$res .= '<tr><th' . $colspan . '><strong>' . $core->typo->Titre($titre) . '</strong></th><th class="right"><a href="#" class="closePopup">' . cubeMedia::image(IMG . '/close.png') . '</a></th></tr>';
@@ -19,7 +19,7 @@ class extranetAjax {
 		$res .= '</table>';
 		$res .= $extra;
 		$res .= '</form>';
-		$res .= extranetPage::bf();
+		$res .= commonPage::bf();
 		echo $res;
 		exit;
 	}
diff --git a/inc/extranet/Controlleur/class.extranet.page.chiffres.php b/inc/extranet/Controlleur/class.extranet.page.chiffres.php
index d1a38e1df..7e6015fb6 100644
--- a/inc/extranet/Controlleur/class.extranet.page.chiffres.php
+++ b/inc/extranet/Controlleur/class.extranet.page.chiffres.php
@@ -93,7 +93,7 @@ class extranetPageChiffres {
 
 		$encours = $total_projets - $total_factures;
 
-		$res = extranetPage::bh();
+		$res = commonPage::bh();
 		$res .= '<table class="liste">';
 		$res .= '<tr><th colspan="2"><strong>' . sprintf(__("Détails de l'année %s"), date('Y')) . '</strong></th><th colspan="2"><strong>' . __("Impayés") . '</strong></th></tr>';
 		$res .= '<tr class="odd"><td>' . __('Projets en cours') . ' : </td><td>' . self::format($encours) . '</td><td>' . __('Total des impayés') . ' : </td><td>' . self::format($impayes) . '</td></tr>';
@@ -102,7 +102,7 @@ class extranetPageChiffres {
 		// $res .= '<tr class="odd"><td>' . __('Total des charges') . ' ( <a href="#" class="popup" rel="chargesDetails">' . __('Voir le détail') . '</a> ) : </td><td>' . self::format($charges_payees) . '</td></tr>';
 		// $res .= '<tr><td>' . __('Projets payés - Charges') . ' : </td><td>' . self::format($r->paye - $charges_payees) . '</td></tr>';
 		$res .= '</table>';
-		$res .= extranetPage::bf();
+		$res .= commonPage::bf();
 		return $res;
 	}
 
@@ -115,7 +115,7 @@ class extranetPageChiffres {
 		while ($r->fetch()) {
 			$chiffres[$r->annee] = $r->ca;
 		}
-		$res = extranetPage::bh();
+		$res = commonPage::bh();
 		$res .= '<table class="liste">';
 		$res .= '<tr><td colspan="' . (count($chiffres) + 2) . '">';
 		$res .= self::caChart($chiffres, $encours);
@@ -137,7 +137,7 @@ class extranetPageChiffres {
 		$res .= '</tr>';
 
 		$res .= '</table>';
-		$res .= extranetPage::bf();
+		$res .= commonPage::bf();
 		return $res;
 	}
 
@@ -160,7 +160,7 @@ class extranetPageChiffres {
 			}
 		}
 		$annees = array_unique($annees);
-		$res = extranetPage::bh();
+		$res = commonPage::bh();
 		$res .= '<table class="liste">';
 
 		$res .= '<tr><td colspan="' . (count($annees) + 2) . '">';
@@ -201,7 +201,7 @@ class extranetPageChiffres {
 			$i++;
 		}
 		$res .= '</table>';
-		$res .= extranetPage::bf();
+		$res .= commonPage::bf();
 		return $res;
 	}
 
@@ -277,7 +277,7 @@ class extranetPageChiffres {
 		$annees = array_unique($annees);
 		sort($annees);
 
-		$res = extranetPage::bh();
+		$res = commonPage::bh();
 		$res .= '<table class="liste">';
 		$res .= '<tr><th><strong>' . __("Rapport Temps travaillé / Temps payé") . '</strong></th>';
 		foreach($annees as $annee) {
@@ -329,7 +329,7 @@ class extranetPageChiffres {
 		$res .= '<td><strong><em>' . self::format($c, false) . ' / ' . self::format($p, false) . ' (' . round(($c / $p) * 100) . ' %)</em></strong></td>';
 		$res .= '</tr>';
 		$res .= '</table>';
-		$res .= extranetPage::bf();
+		$res .= commonPage::bf();
 		return $res;
 	}
 
diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index afb8eb2f4..e1d1d2a57 100644
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -34,7 +34,7 @@ class extranetUrl {
 			$order = array('wsUrl', 'extranetUrl');
 		}
 
-		echo extranetPage::header($args);
+		echo commonPage::header($args);
 
 		foreach($order as $class) {
 			$cb = array($class, $f);
@@ -43,7 +43,7 @@ class extranetUrl {
 				break;
 			}
 		}
-		echo extranetPage::footer();
+		echo commonPage::footer();
 	}
 
 	public static function login($args)
@@ -57,9 +57,9 @@ class extranetUrl {
 
 		$message = $tentative?'<p class="message"><br />' . __('Identifiants incorrects') . '</p>':'';
 
-		$res = extranetPage::barre();
-		$res .= extranetPage::tMain();
-		$res .= extranetPage::bh();
+		$res = commonPage::barre();
+		$res .= commonPage::tMain();
+		$res .= commonPage::bh();
 		$res .= '<div class="form">';
 		$res .= '<form action="" method="post" class="notajax">';
 		$res .= '<h1>' . $core->typo->Titre(__('Veuillez vous identifier')) . '</h1>';
@@ -72,8 +72,8 @@ class extranetUrl {
 		$res .= '</table>';
 		$res .= '</form>';
 		$res .= '</div>';
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -156,14 +156,14 @@ class extranetUrl {
 		$filtres = array();
 		$filtres[] = new extranetFiltre(__('Ayant un projet'), 'status_client_projet', $settings['filtres']);
 		$filtres[] = new extranetFiltre(__('Ayant des impayés'), 'impaye', $settings['filtres']);
-		$res = extranetPage::barre($filtres, 'filtreClients', 'clients', $shortcuts);
-		$res .= extranetPage::tMain();
-		$res .= extranetPage::bh();
+		$res = commonPage::barre($filtres, 'filtreClients', 'clients', $shortcuts);
+		$res .= commonPage::tMain();
+		$res .= commonPage::bh();
 		$res .= '<div id="listeClients">';
 		$res .= self::listeClients();
 		$res .= '</div>';
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -230,7 +230,7 @@ class extranetUrl {
 		if (!isset($settings['search']) || is_null($settings['search'])) {
 			$odd = cubeMath::isOdd($i)?' class="odd"':'';
 			$res .= '<tr' . $odd . '><td colspan="10">';
-			$res .= extranetPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');
+			$res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');
 			$res .= self::formParPage('parPage' . $change, $settings['par_page'], __('clients'));
 			$res .= '</td></tr>';
 		}
@@ -426,14 +426,14 @@ class extranetUrl {
 		$filtres[] = new extranetFiltre(__('Status'), 'status_projet', $settings['filtres']);
 		$filtres[] = new extranetFiltre(__('Année'), 'annee', $settings['filtres']);
 
-		$res = extranetPage::barre($filtres, 'filtreProjet', 'projets', $shortcuts);
-		$res .= extranetPage::tMain();
-		$res .= extranetPage::bh();
+		$res = commonPage::barre($filtres, 'filtreProjet', 'projets', $shortcuts);
+		$res .= commonPage::tMain();
+		$res .= commonPage::bh();
 		$res .= '<div id="listeProjets">';
 		$res .= self::listeProjets();
 		$res .= '</div>';
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -533,7 +533,7 @@ class extranetUrl {
 		if (!isset($settings['search']) || is_null($settings['search'])) {
 			$odd = cubeMath::isOdd($i)?' class="odd"':'';
 			$res .= '<tr' . $odd . '><td colspan="11">';
-			$res .= extranetPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');
+			$res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');
 			$res .= self::formParPage('parPage' . $change, $settings['par_page'], __('projets'));
 			$res .= '</td></tr>';
 		}
@@ -550,14 +550,14 @@ class extranetUrl {
 		$shortcuts[] = '<a href="#" class="popup" rel="formTacheNormale/new/' . $args[1] . '">' . $core->typo->Ajouter('Créer une tâche') . '</a>';
 		$shortcuts[] = '<a href="#" class="popup" rel="formTacheSousTraitee/new/' . $args[1] . '">' . $core->typo->Ajouter('Créer une tâche sous-traitée') . '</a>';
 
-		$res = extranetPage::barre(null, null, null, $shortcuts);
-		$res .= extranetPage::tMain();
-		$res .= extranetPage::bh();
+		$res = commonPage::barre(null, null, null, $shortcuts);
+		$res .= commonPage::tMain();
+		$res .= commonPage::bh();
 		$res .= '<div id="listeProjet">';
 		$res .= self::listeProjet($args[1]);
 		$res .= '</div>';
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -764,14 +764,14 @@ class extranetUrl {
 		$settings = $core->user->getSettings('timereport');
 		$filtres = array();
 		$filtres[] = new extranetFiltre(__('Participants'), 'equipier_participe', $settings['filtres']);
-		$res = extranetPage::barre($filtres, 'filtreTimereport', 'timereport', null);
-		$res .= extranetPage::tMain();
-		$res .= extranetPage::bh();
+		$res = commonPage::barre($filtres, 'filtreTimereport', 'timereport', null);
+		$res .= commonPage::tMain();
+		$res .= commonPage::bh();
 		$res .= '<div id="listeTimereport">';
 		$res .= self::listeTimereport();
 		$res .= '</div>';
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -863,7 +863,7 @@ class extranetUrl {
 
 		if (!isset($settings['search']) || is_null($settings['search'])) {
 			$res .= '<tr><td colspan="22"> ';
-			$res .= extranetPage::pager($settings['page'], $dao->countActifs(), $settings['par_page'], 'page' . $change . '/%d');
+			$res .= commonPage::pager($settings['page'], $dao->countActifs(), $settings['par_page'], 'page' . $change . '/%d');
 			$res .= self::formParPage('parPage' . $change, $settings['par_page'], __('projets'));
 			$res .= ' </td></tr>';
 		}
@@ -905,14 +905,14 @@ class extranetUrl {
 		$filtres[] = new extranetFiltre(__('Status'), 'status_devis', $settings['filtres']);
 		$filtres[] = new extranetFiltre(__('Année'), 'annee_facture', $settings['filtres']);
 
-		$res = extranetPage::barre($filtres, 'filtreDevis', 'devis' , $shortcuts);
-		$res .= extranetPage::tMain();
-		$res .= extranetPage::bh();
+		$res = commonPage::barre($filtres, 'filtreDevis', 'devis' , $shortcuts);
+		$res .= commonPage::tMain();
+		$res .= commonPage::bh();
 		$res .= '<div id="listeDevis">';
 		$res .= self::listeDevis();
 		$res .= '</div>';
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -920,14 +920,14 @@ class extranetUrl {
 	{
 		global $core;
 
-		$res = extranetPage::barre();
-		$res .= extranetPage::tMain();
-		$res .= extranetPage::bh();
+		$res = commonPage::barre();
+		$res .= commonPage::tMain();
+		$res .= commonPage::bh();
 		$res .= '<div id="listeDevis">';
 		$res .= self::listeDevis();
 		$res .= '</div>';
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -1029,7 +1029,7 @@ class extranetUrl {
 		if (!isset($settings['search']) || is_null($settings['search'])) {
 			$odd = cubeMath::isOdd($i)?' class="odd"':'';
 			$res .= '<tr' . $odd . '><td colspan="10">';
-			$res .= extranetPage::pager($settings['page'], $dao->count(), $settings['par_page'], 'page' . $change . '/%d');
+			$res .= commonPage::pager($settings['page'], $dao->count(), $settings['par_page'], 'page' . $change . '/%d');
 			$res .= self::formParPage('parPage' . $change, $settings['par_page'], __('devis'));
 			$res .= '</td></tr>';
 		}
@@ -1086,12 +1086,12 @@ class extranetUrl {
 	{
 		global $core;
 		extranetDroits::min(1);
-		$res = extranetPage::barre();
-		$res .= extranetPage::tMain();
-		$res .= extranetPage::bh();
+		$res = commonPage::barre();
+		$res .= commonPage::tMain();
+		$res .= commonPage::bh();
 		$res .= self::formDevis($args[1]);
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -1232,12 +1232,12 @@ class extranetUrl {
 		$createur = $devis->createur = $daoUtilisateur->selectById($devis->createur_id);
 		$client = $devis->client = $daoUtilisateur->selectById($devis->client_id);
 
-		$res = extranetPage::barre();
-		$res .= extranetPage::tMain();
-		$res .= extranetPage::bh();
+		$res = commonPage::barre();
+		$res .= commonPage::tMain();
+		$res .= commonPage::bh();
 		$res .= '<iframe src="' . SITE_PATH . 'voirdevis/' . $devis->devis_id . '/?junk=' . TIME . '" width="960" height="1000" frameborder="0"></iframe>';
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bh();
+		$res .= commonPage::bf();
+		$res .= commonPage::bh();
 		$res .= '<div id="devis_email">';
 		$res .= '<table class="liste">';
 		$res .= '<tr><td>' . __('De') . '</td><td>' . $createur->prenom . ' ' . $createur->nom . '&lt;' . $createur->email . '&gt;</td></tr>';
@@ -1250,8 +1250,8 @@ class extranetUrl {
 		$res .= '<a href="#" rel="expedieDevis/1/' . $devis->devis_id . '" class="ajax" title="' . __("Le devis est sur le point d'être envoyé. Veuillez confirmer votre choix ?") . '">' . $core->typo->BoutonOK(__('Valider et envoyer le devis')) . '</a></td></tr>';
 		$res .= '</table>';
 		$res .= '</div>';
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -1274,28 +1274,28 @@ class extranetUrl {
 		$filtres[] = new extranetFiltre(__('Créées par'), 'equipier', $settings['filtres']);
 		$filtres[] = new extranetFiltre(__('Status'), 'status_facture', $settings['filtres']);
 		$filtres[] = new extranetFiltre(__('Année'), 'annee_facture', $settings['filtres']);
-		$res = extranetPage::barre($filtres , 'filtreFactures', 'factures', $shortcuts);
-		$res .= extranetPage::tMain();
-		$res .= extranetPage::bh();
+		$res = commonPage::barre($filtres , 'filtreFactures', 'factures', $shortcuts);
+		$res .= commonPage::tMain();
+		$res .= commonPage::bh();
 		$res .= '<div id="listeFactures">';
 		$res .= self::listeFactures();
 		$res .= '</div>';
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
 	public static function factures_client($args)
 	{
 		global $core;
-		$res = extranetPage::barre();
-		$res .= extranetPage::tMain();
-		$res .= extranetPage::bh();
+		$res = commonPage::barre();
+		$res .= commonPage::tMain();
+		$res .= commonPage::bh();
 		$res .= '<div id="listeFactures">';
 		$res .= self::listeFactures();
 		$res .= '</div>';
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -1420,9 +1420,9 @@ class extranetUrl {
 			$odd = cubeMath::isOdd($i)?' class="odd"':'';
 			$res .= '<tr' . $odd . '><td colspan="10">' ;
 			if ($core->user->grade != 3) {
-				$res .= extranetPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');
+				$res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');
 			} else {
-				$res .= extranetPage::pager($settings['page'], $dao->countCompta() , $settings['par_page'], 'page' . $change . '/%d');
+				$res .= commonPage::pager($settings['page'], $dao->countCompta() , $settings['par_page'], 'page' . $change . '/%d');
 			}
 			$res .= self::formParPage('parPage' . $change, $settings['par_page'], __('factures'));
 			$res .= '</td></tr>';
@@ -1496,16 +1496,16 @@ class extranetUrl {
 	{
 		global $core;
 		extranetDroits::min(1);
-		$res = extranetPage::barre();
-		$res .= extranetPage::tMain();
-		$res .= extranetPage::bh();
+		$res = commonPage::barre();
+		$res .= commonPage::tMain();
+		$res .= commonPage::bh();
 		if (isset($args[2])) {
 			$res .= self::formFacture($args[1], $args[2]);
 		} else {
 			$res .= self::formFacture($args[1]);
 		}
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -1647,9 +1647,9 @@ class extranetUrl {
 		$dao = new extranetDAOFacture($core->con);
 		$facture = $dao->selectById($args[1]);
 
-		$res = extranetPage::barre();
-		$res .= extranetPage::tMain();
-		$res .= extranetPage::bh();
+		$res = commonPage::barre();
+		$res .= commonPage::tMain();
+		$res .= commonPage::bh();
 		$res .= '<iframe src="' . SITE_PATH . 'voirfacture/' . $facture->facture_id . '" width="960" height="1000" frameborder="0"></iframe>';
 
 		$res .= '<div class="right">' . '<a href="' . SITE_PATH . 'editefacture/' . $facture->facture_id . '">' . $core->typo->BoutonOK(__('Editer la facture')) . '</a> ';
@@ -1659,8 +1659,8 @@ class extranetUrl {
 			$res .= '<a href="' . SITE_PATH . 'factures">' . $core->typo->BoutonOK(__('Valider la facture')) . '</a>';
 		}
 		$res .= '</div>';
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -1681,11 +1681,11 @@ class extranetUrl {
 	{
 		global $core;
 		extranetDroits::min(2);
-		// $res = extranetPage::barre(null, null, null, array('<a href="http://www.google.com/calendar/" class="blank">' . $core->typo->Favoris(__('Gérer les charges sur Google Agenda')) . '</a>'));
-		$res = extranetPage::barre(null, null, null, null);
-		$res .= extranetPage::tMain();
+		// $res = commonPage::barre(null, null, null, array('<a href="http://www.google.com/calendar/" class="blank">' . $core->typo->Favoris(__('Gérer les charges sur Google Agenda')) . '</a>'));
+		$res = commonPage::barre(null, null, null, null);
+		$res .= commonPage::tMain();
 		$res .= extranetPageChiffres::listeChiffres();
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -1712,10 +1712,10 @@ class extranetUrl {
 	{
 		extranetDroits::min(1);
 		cubePage::ui('Sortable');
-		$res = extranetPage::barre();
-		$res .= extranetPage::tMain('dash');
+		$res = commonPage::barre();
+		$res .= commonPage::tMain('dash');
 		$res .= self::listeDashboard($args);
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -1744,7 +1744,7 @@ class extranetUrl {
 		$res .= '<a href="#" rel="formDashboard/d/' . $r->dashboard_id . '" class="edit popup">' . cubeMedia::image(IMG . '/edit.png') . '</a>';
 		$res .= '<a href="#" rel="delDashboard/' . $r->dashboard_id . '" class="ajax delete" title="' . __('Êtes vous certain de vouloir supprimer cette liste de votre dashboard ?') . '">' . cubeMedia::image(IMG . '/delete.png') . '</a>';
 		$res .= '</div>';
-		$res .= extranetPage::bh();
+		$res .= commonPage::bh();
 		$res .= '<div' . $hide . '>';
 		if ($r->rubrique == 'projets') {
 			$res .= self::listeProjets($r->dashboard_id, self::getDashboardSettings($r->settings));
@@ -1758,7 +1758,7 @@ class extranetUrl {
 			$res .= self::listeTimereport($r->dashboard_id, self::getDashboardSettings($r->settings));
 		}
 		$res .= '</div>';
-		$res .= extranetPage::bf();
+		$res .= commonPage::bf();
 
 		return $res;
 	}
@@ -1841,17 +1841,17 @@ class extranetUrl {
 	{
 		global $core;
 		extranetDroits::min(1);
-		$res = extranetPage::barre();
-		$res .= extranetPage::tMain("traduction");
-		$res .= extranetPage::bh();
+		$res = commonPage::barre();
+		$res .= commonPage::tMain("traduction");
+		$res .= commonPage::bh();
 		$res .= '<form action="saveTrad" method="post">';
 		$res .= '<table class="liste">';
 		$res .= '<tr><th>' . __("Traduction de l'application en anglais") . '</th><th></th></tr>';
 		$res .= '</table>';
 		$res .= cubeLang::translationForm(ROOT . '/inc/extranet', 'en' , ROOT . '/l10n', '', array(), '<a href="#" class="submit">' . $core->typo->BoutonOK('Enregistrer') . '</a>');
 		$res .= '</form>';
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -1891,14 +1891,14 @@ class extranetUrl {
 	{
 		global $core;
 		extranetDroits::min(2);
-		$res = extranetPage::barre();
-		$res .= extranetPage::tMain("rh");
-		$res .= extranetPage::bh();
+		$res = commonPage::barre();
+		$res .= commonPage::tMain("rh");
+		$res .= commonPage::bh();
 		$res .= '<div id="listeEquipiers">';
 		$res .= extranetUrl::listeRh(null, null);
 		$res .= '</div>';
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -1940,7 +1940,7 @@ class extranetUrl {
 		/*if (!isset($settings['search']) || is_null($settings['search'])) {
 			$odd = cubeMath::isOdd($i)?' class="odd"':'';
 			$res .= '<tr' . $odd . '><td colspan="10">';
-			$res .= extranetPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');
+			$res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');
 			$res .= self::formParPage('parPage' . $change, $settings['par_page'], __('clients'));
 			$res .= '</td></tr>';
 		}*/
@@ -1965,22 +1965,22 @@ class extranetUrl {
 		$filtres = array();
 		$res = '';
 		if ($core->user->grade != 0) {
-			$res .= extranetPage::barre(null, null, null, array('<a href="ftp://' . $client->email . ':' . $client->password . '@extranet.cubedesigners.com/" class="blank">' . $core->typo->BoutonOK(__('Accès direct FTP')) . '</a>'));
+			$res .= commonPage::barre(null, null, null, array('<a href="ftp://' . $client->email . ':' . $client->password . '@extranet.cubedesigners.com/" class="blank">' . $core->typo->BoutonOK(__('Accès direct FTP')) . '</a>'));
 		} else {
-			$res .= extranetPage::barre();
+			$res .= commonPage::barre();
 		}
-		$res .= extranetPage::tMain();
+		$res .= commonPage::tMain();
 		if ($core->user->grade == 0) {
 			$res .= self::formFichier();
 		} else {
 			$res .= self::formFichier($args[1]);
 		}
-		$res .= extranetPage::bh();
+		$res .= commonPage::bh();
 		$res .= '<div id="listeFichiers">';
 		$res .= self::listeFichiers($settings);
 		$res .= '</div>';
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -2000,7 +2000,7 @@ class extranetUrl {
 
 		$res = '<div class="dashboard">';
 		$res .= '<div class="caption">' . $core->typo->OngletBlancNoDash($titre) . '</div>';
-		$res .= extranetPage::bh();
+		$res .= commonPage::bh();
 		$res .= '<div class="gris form">';
 		$res .= '<h1>' . $texte . '</h1>';
 
@@ -2018,7 +2018,7 @@ class extranetUrl {
 
 		$res .= cubeMedia::flash(WEBROOT . '/swf/uploader.swf', '970', '50', $fv, 'uploaderContainer', '', '9', '#ffffff', '', 'true', 'noscale', 'transparent');
 		$res .= '</div>';
-		$res .= extranetPage::bf();
+		$res .= commonPage::bf();
 		$res .= '</div>';
 		return $res;
 	}
@@ -2072,7 +2072,7 @@ class extranetUrl {
 		if (!isset($settings['search']) || is_null($settings['search'])) {
 			$odd = cubeMath::isOdd($i)?' class="odd"':'';
 			$res .= '<tr' . $odd . '><td colspan="12">' ;
-			$res .= extranetPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');
+			$res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');
 			$res .= self::formParPage('parPage' . $change, $settings['par_page'], __('fichiers'));
 			$res .= '</td></tr>';
 		}
diff --git a/inc/ws/Controlleur/class.ws.stats.php b/inc/ws/Controlleur/class.ws.stats.php
index 4e5518b40..8a42b618a 100644
--- a/inc/ws/Controlleur/class.ws.stats.php
+++ b/inc/ws/Controlleur/class.ws.stats.php
@@ -52,8 +52,8 @@ class wsStats {
 			$listeShortcuts[] = $listeMois;
 		}
 
-		$res = extranetPage::barre($listeShortcuts, 'filtreStats', 'stats', $actions);
-		$res .= extranetPage::tMain();
+		$res = commonPage::barre($listeShortcuts, 'filtreStats', 'stats', $actions);
+		$res .= commonPage::tMain();
 		if (is_null($annee) && is_null($mois)) {
 			$res .= self::vue_globale($bid);
 		} elseif (is_null($mois)) {
@@ -61,7 +61,7 @@ class wsStats {
 		} else {
 			$res .= self::vue_mensuelle($bid, $annee, $mois);
 		}
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -361,9 +361,9 @@ class wsStats {
 
 	public static function indisponible()
 	{
-		$res = extranetPage::bh('stats_global');
+		$res = commonPage::bh('stats_global');
 		$res .= '<p class="center">' . __('Les statistiques concernant cette période ne sont actuellement pas disponibles') . '</p>';
-		$res .= extranetPage::bf();
+		$res .= commonPage::bf();
 		return $res;
 	}
 
@@ -390,12 +390,12 @@ class wsStats {
 		}
 
 		self::getActives($stats, $book, $aextra, $adown, $adownp, $aprint, $afriend);
-		$res = extranetPage::bh('stats_global');
+		$res = commonPage::bh('stats_global');
 		$titre = __('Statistiques de la publication « %s »');
 		$date_creation = __('Date de création de la publication');
 		$res .= self::globalDatas(sprintf($titre, $book->nom), $date_creation, $book, $stats, $afriend, $aprint, $adown, $adownp, $aextra);
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bh();
+		$res .= commonPage::bf();
+		$res .= commonPage::bh();
 		$res .= '<table class="liste max">';
 		$res .= '<tr><th>' . $core->typo->Titre(__('Détail par mois')) . '</th></tr>';
 		$res .= '<tr><th>';
@@ -409,7 +409,7 @@ class wsStats {
 		$res .= '</th></tr>';
 		$res .= '</table>';
 		$res .= self::detailPeriode($book, $stats, $bid, $annee);
-		$res .= extranetPage::bf();
+		$res .= commonPage::bf();
 		return $res;
 	}
 
@@ -437,22 +437,22 @@ class wsStats {
 
 		self::getActives($stats, $book, $aextra, $adown, $adownp, $aprint, $afriend);
 		$time_page = mktime(0, 0, 0, $mois, 15, $annee);
-		$res = extranetPage::bh('stats_global');
+		$res = commonPage::bh('stats_global');
 		$titre = __('Statistiques de la publication « %s »');
 		$date_creation = __('Date de création de la publication');
 		$res .= self::globalDatas(sprintf($titre, $book->nom), $date_creation, $book, $stats, $afriend, $aprint, $adown, $adownp, $aextra);
-		$res .= extranetPage::bf();
+		$res .= commonPage::bf();
 		// .
-		$res .= extranetPage::bh('stats_detail_mois');
+		$res .= commonPage::bh('stats_detail_mois');
 		$res .= '<div class="center" style="width:944px;position:relative;">' ;
 		$res .= self::graph_mensuel($bid, $annee, $mois, $stats);
 		$res . '</div>';
 		$res .= self::detailJour($book, $stats);
-		$res .= extranetPage::bf();
+		$res .= commonPage::bf();
 		// .
-		$res .= extranetPage::bh('stats_detail_pages');
+		$res .= commonPage::bh('stats_detail_pages');
 		$res .= self::detailPages($book, $stats);
-		$res .= extranetPage::bf();
+		$res .= commonPage::bf();
 		// .
 		if ($book->parametres->search == 0) {
 			$idl = 'stats_links_2';
@@ -463,18 +463,18 @@ class wsStats {
 		}
 
 		$res .= '<div id="stats_30">';
-		$res .= extranetPage::bh($idl);
+		$res .= commonPage::bh($idl);
 		$res .= self::detailLiens($book, $stats);
-		$res .= extranetPage::bf();
+		$res .= commonPage::bf();
 		if ($book->parametres->search == 1) {
-			$res .= extranetPage::bh('stats_search');
+			$res .= commonPage::bh('stats_search');
 			$res .= self::detailSearch($book, $stats);
-			$res .= extranetPage::bf();
+			$res .= commonPage::bf();
 		}
 		// Origine
-		$res .= extranetPage::bh($idc);
+		$res .= commonPage::bh($idc);
 		$res .= self::detailOrigine($book, $stats);
-		$res .= extranetPage::bf();
+		$res .= commonPage::bf();
 		$res .= '</div>';
 		return $res;
 	}
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index abc398e24..db3e4e67d 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -12,14 +12,14 @@ class wsUrl {
 		$filtres = array();
 		$filtres[] = new extranetFiltre(__('Status'), 'status_book', $settings['filtres']);
 		$filtres[] = new extranetFiltre(__('Année'), 'annee_book', $settings['filtres']);
-		$res = extranetPage::barre($filtres , 'filtreBooks', 'books', $shortcuts);
-		$res .= extranetPage::tMain(null, true);
-		$res .= extranetPage::bh();
+		$res = commonPage::barre($filtres , 'filtreBooks', 'books', $shortcuts);
+		$res .= commonPage::tMain(null, true);
+		$res .= commonPage::bh();
 		$res .= '<div id="listeBooks">';
 		$res .= self::listeBooks();
 		$res .= '</div>';
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -78,7 +78,7 @@ class wsUrl {
 		if (!isset($settings['search']) || is_null($settings['search'])) {
 			$odd = cubeMath::isOdd($i)?' class="odd"':'';
 			$res .= '<tr' . $odd . '><td colspan="12">';
-			$res .= extranetPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');
+			$res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');
 			$res .= extranetUrl::formParPage('parPage' . $change, $settings['par_page'], __('publications'), false);
 			$res .= '</td></tr>';
 		}
@@ -110,22 +110,22 @@ class wsUrl {
 
 		$langs = array(__('Langues configurées') => array_flip($existingLangs), __('Autres langues') => array_flip($allLangs));
 
-		$res = extranetPage::barre();
-		$res .= extranetPage::tMain(null, false);
+		$res = commonPage::barre();
+		$res .= commonPage::tMain(null, false);
 
-		$res .= extranetPage::bh();
+		$res .= commonPage::bh();
 		$res .= '<form action="changeLang" method="post" class="submitonchange">';
 		$res .= '<table class="liste">';
 		$res .= '<tr><td class="center">' . __('Sélectionnez la langue à configurer') . ' : ' . form::combo('lang', $langs, $args[1]) . ' </td></tr>';
 		// $res .= '<tr class="odd"><td class="right"><a href="#" class="submit">' . $core->typo->Ajouter('OK') . '</a></td></tr>';
 		$res .= '</table>';
 		$res .= '</form>';
-		$res .= extranetPage::bf();
+		$res .= commonPage::bf();
 
 		$res .= '<div id="formLang">';
 		$res .= self::formLang($args[1]);
 		$res .= '</div>';
-		$res .= extranetPage::bMain(true);
+		$res .= commonPage::bMain(true);
 
 		return $res;
 	}
@@ -138,17 +138,17 @@ class wsUrl {
 
 		$res = '<form action="saveLang" method="post">';
 
-		$res .= extranetPage::bh();
+		$res .= commonPage::bh();
 		$res .= '<table class="liste">';
 		$res .= '<tr><td>' . __('Police de caractères') . ' : </td><td>' . form::hidden('lang', $lang_id) . form::combo('font', self::getFonts(), $lang->font) . '</td></tr>';
 		$res .= '<tr class="odd"><td>' . __('Jeux de caractères') . ' : </td><td>' . form::combo('charset', self::getCharsets(), $lang->charset) . '</td></tr>';
 		$res .= '<tr><td colspan="2" class="right"><a href="#" class="submit">' . $core->typo->Ajouter('Valider') . '</a></td></tr>';
 		$res .= '</table>';
-		$res .= extranetPage::bf();
+		$res .= commonPage::bf();
 
-		$res .= extranetPage::bh();
+		$res .= commonPage::bh();
 		$res .= cubeLang::translationForm(FLUIDBOOK_SOURCES, $lang_id , null, 'liste', array(), '<a href="#" class="submit">' . $core->typo->Ajouter(__('Enregistrer')) . '</a>', $lang->traductions);
-		$res .= extranetPage::bf();
+		$res .= commonPage::bf();
 		$res .= '</form>';
 		return $res;
 	}
@@ -382,14 +382,14 @@ html{height:100%}' . "\n";
 		$filtres = array();
 		$filtres[] = new extranetFiltre(__('Ayant un projet'), 'status_client_projet', $settings['filtres']);
 		$filtres[] = new extranetFiltre(__('Ayant des impayés'), 'impaye', $settings['filtres']);
-		$res = extranetPage::barre($filtres, 'filtreClients', 'clients', $shortcuts);
-		$res .= extranetPage::tMain();
-		$res .= extranetPage::bh();
+		$res = commonPage::barre($filtres, 'filtreClients', 'clients', $shortcuts);
+		$res .= commonPage::tMain();
+		$res .= commonPage::bh();
 		$res .= '<div id="listeClients">';
 		$res .= self::listeClients();
 		$res .= '</div>';
-		$res .= extranetPage::bf();
-		$res .= extranetPage::bMain();
+		$res .= commonPage::bf();
+		$res .= commonPage::bMain();
 		return $res;
 	}
 
@@ -437,7 +437,7 @@ html{height:100%}' . "\n";
 		if (!isset($settings['search']) || is_null($settings['search'])) {
 			$odd = cubeMath::isOdd($i)?' class="odd"':'';
 			$res .= '<tr' . $odd . '><td colspan="10">';
-			$res .= extranetPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');
+			$res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');
 			$res .= extranetUrl::formParPage('parPage' . $change, $settings['par_page'], __('clients'));
 			$res .= '</td></tr>';
 		}
-- 
2.39.5