From 2c627d75046056ad0d7560ca391d88b89b374b4a Mon Sep 17 00:00:00 2001
From: ojullien <ojullien@users.noreply.github.com>
Date: Wed, 20 Feb 2019 19:30:14 +0100
Subject: [PATCH] Improvement

Signed-off-by: ojullien <ojullien@users.noreply.github.com>
---
 README.md                                     |   2 +-
 src/404.html                                  |  37 ++--
 src/contact.php                               |   2 +-
 src/contactdelete.php                         |   2 +-
 src/contactnew.php                            |   2 +-
 src/contacts.php                              |   2 +-
 src/contactsexport.php                        | 181 ------------------
 src/css/mobile.css                            |   3 +-
 src/css/mobilize.css                          |   2 +
 src/css/style.css                             |   3 +-
 src/day.php                                   |   2 +-
 src/dayprint.php                              |   2 +-
 src/graphs.php                                |   2 +-
 src/graphs/agesyearcount.php                  |   2 +-
 src/graphs/arrhesyearcount.php                |   2 +-
 src/graphs/contactsmonthcount.php             |   4 +-
 src/graphs/contactsyearcount.php              |   4 +-
 src/graphs/rentsmonthcount.php                |   4 +-
 src/graphs/rentsmonthsum.php                  |   2 +-
 src/graphs/rentsyearcount.php                 |   2 +-
 src/graphs/rentsyearsum.php                   |   4 +-
 src/images/pbrmid.png                         | Bin 8794 -> 7807 bytes
 src/includes-install/database/data-config.sql |   2 +-
 src/includes-install/database/schema.sql      |   3 +-
 src/includes-install/welcome.php              |  18 +-
 src/includes/class/cheader.php                |  69 +++++++
 src/includes/display/calendar.php             |  29 +--
 src/includes/display/contact.php              |  42 ++--
 src/includes/display/contactdelete.php        |  15 +-
 src/includes/display/contactnew.php           |  37 ++--
 src/includes/display/contacts.php             |  27 +--
 src/includes/display/contactsexport.php       |   2 +-
 src/includes/display/day.php                  |  67 +++----
 src/includes/display/dayprint.php             |  12 +-
 src/includes/display/footer.php               |  14 +-
 src/includes/display/graphs.php               |  30 +--
 src/includes/display/header.php               |  70 ++++---
 src/includes/display/login.php                |  17 +-
 src/includes/display/logs.php                 |  23 ++-
 src/includes/display/logsdelete.php           |  13 +-
 src/includes/display/parameters.php           |  37 ++--
 src/includes/display/rent.php                 |  63 +++---
 src/includes/display/rentdelete.php           |  15 +-
 src/includes/display/rentsdelete.php          |  16 +-
 src/includes/display/select.php               |  31 +--
 src/includes/display/users.php                |  41 ++--
 src/includes/init/context.php                 |   4 +-
 src/index.php                                 |   2 +-
 src/install.php                               |   2 +-
 src/logs.php                                  |   2 +-
 src/logsdelete.php                            |   2 +-
 src/parameters.php                            |   2 +-
 src/rent.php                                  |   2 +-
 src/rentdelete.php                            |   2 +-
 src/rentsdelete.php                           |   2 +-
 src/select.php                                |   2 +-
 src/users.php                                 |   2 +-
 57 files changed, 484 insertions(+), 499 deletions(-)
 delete mode 100644 src/contactsexport.php

diff --git a/README.md b/README.md
index e91a83e..da689a4 100644
--- a/README.md
+++ b/README.md
@@ -40,4 +40,4 @@ Be sure to include a title and clear description,as much relevant information as
 
 ## License
 
-**PBRaiders Vanilla** is open-source and are licensed under the [MIT License](https://github.com/pbraiders/pbraiders.vanilla/blob/master/LICENSE).
+**PBRaiders Vanilla** is open-source and are licensed under the [GNU General Public License v3.0 License License](https://github.com/pbraiders/pbraiders.vanilla/blob/master/LICENSE).
diff --git a/src/404.html b/src/404.html
index a3cf56e..a663072 100644
--- a/src/404.html
+++ b/src/404.html
@@ -1,18 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="fr">
 <head>
  <title>PBRaiders - Error 404</title>
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
- <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
- <link rel="apple-touch-icon" href="apple-touch-icon.png" />
- <meta http-equiv="expires" content="Fri, 14 May 43 13:27:28 +0200" />
- <link rel="stylesheet" type="text/css" href="css/style.css" media="all" />
- <meta http-equiv="Content-Language" content="en" />
- <meta name="description" content="Error 404 - PBRaiders Page Not Found" />
- <meta name="keywords"  content="paintball,management,rent,gestion,location, erreur, 404, error" />
- <meta name="robots" content="NOINDEX,NOFOLLOW" />
- <meta name="copyright" content="Olivier JULLIEN" />
+ <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+ <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
+ <link rel="apple-touch-icon" href="apple-touch-icon.png">
+ <meta http-equiv="expires" content="Fri, 14 May 43 13:27:28 +0200">
+ <link rel="stylesheet" type="text/css" href="css/style.css" media="all">
+ <meta http-equiv="Content-Language" content="fr">
+<meta name="description" content="Erreur 404 - page non trouvée">
+<meta name="keywords"  content="paintball, système de gestion, réservation, réservations, location, locations, management, 404, erreur, error">
+ <meta name="robots" content="NOINDEX,NOFOLLOW">
+ <meta name="copyright" content="Olivier JULLIEN">
 </head>
 <body>
  <div id="PAGE" class="login">
@@ -20,13 +19,13 @@
   <div id="CONTENT">
    <div id="MESSAGE">
     <p class="error">Error 404</p>
-    <p>We’re sorry, we couldn’t find what you are looking for.</p>
-    <p><em>This may be because:</em></p>
+    <p>Nous sommes d&#233;sol&#233;s, nous ne pouvons pas trouver ce que vous cherchez.</p>
+    <p><em>Les raisons peuvent &#234;tre :</em></p>
     <ul>
-     <li><em>The page no longer exists</em></li>
-     <li><em>The page is under construction</em></li>
-     <li><em>The address you entered may have been mistyped</em></li>
-     <li><em>The page may have been moved</em></li>
+<li><em>La page n'existe plus.</em></li>
+<li><em>La page est en construction.</em></li>
+<li><em>L'adresse saisie n'est pas correcte.</em></li>
+<li><em>La page a été déplacée.</em></li>
     </ul>
    </div>
   </div>   <p id="FOOTER">©JOT 2010</p>
diff --git a/src/contact.php b/src/contact.php
index a5b43fa..901b14d 100644
--- a/src/contact.php
+++ b/src/contact.php
@@ -40,7 +40,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__));
 
     /** Include config
diff --git a/src/contactdelete.php b/src/contactdelete.php
index 6534c4a..6cdae7c 100644
--- a/src/contactdelete.php
+++ b/src/contactdelete.php
@@ -40,7 +40,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__));
 
     /** Include config
diff --git a/src/contactnew.php b/src/contactnew.php
index a18ca36..2e6dbb1 100644
--- a/src/contactnew.php
+++ b/src/contactnew.php
@@ -38,7 +38,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__));
 
     /** Include config
diff --git a/src/contacts.php b/src/contacts.php
index 940b880..06055fc 100644
--- a/src/contacts.php
+++ b/src/contacts.php
@@ -39,7 +39,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__));
 
     /** Include config
diff --git a/src/contactsexport.php b/src/contactsexport.php
deleted file mode 100644
index 0192cec..0000000
--- a/src/contactsexport.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-/*************************************************************************
- *                                                                       *
- * Copyright (C) 2010   Olivier JULLIEN - PBRAIDERS.COM                  *
- * Tous droits réservés - All rights reserved                            *
- *                                                                       *
- *************************************************************************
- *                                                                       *
- * Except if expressly provided in a dedicated License Agreement,you     *
- * are not authorized to:                                                *
- *                                                                       *
- * 1. Use,copy,modify or transfer this software component,module or      *
- * product,including any accompanying electronic or paper documentation  *
- * (together,the "Software").                                            *
- *                                                                       *
- * 2. Remove any product identification,copyright,proprietary notices    *
- * or labels from the Software.                                          *
- *                                                                       *
- * 3. Modify,reverse engineer,decompile,disassemble or otherwise         *
- * attempt to reconstruct or discover the source code,or any parts of    *
- * it,from the binaries of the Software.                                 *
- *                                                                       *
- * 4. Create derivative works based on the Software (e.g. incorporating  *
- * the Software in another software or commercial product or service     *
- * without a proper license).                                            *
- *                                                                       *
- * By installing or using the "Software",you confirm your acceptance     *
- * of the hereabove terms and conditions.                                *
- *                                                                       *
- *************************************************************************/
-/*************************************************************************
- * file encoding: UTF-8
- * description: build and display the contact export page.
- *         GET: act=export, ctl=<search>
- * author: Olivier JULLIEN - 2010-02-04
- * update: Olivier JULLIEN - 2010-05-24 - use ErrorLog instead of TraceWarning
- *************************************************************************/
-
-    /** Defines
-     **********/
-    define('PBR_VERSION','1.1.0');
-    define('PBR_PATH',dirname(__FILE__));
-
-    /** Include config
-     *****************/
-    require(PBR_PATH.'/config.php');
-
-    /** Include functions
-     ********************/
-    require(PBR_PATH.'/includes/function/functions.php');
-
-    /** Initialize
-     *************/
-    require(PBR_PATH.'/includes/init/init.php');
-    require(PBR_PATH.'/includes/init/initexport.php');
-    $sSearch='';
-    $sAction=null;
-    $sSended=FALSE;
-	$iPagingLimit=0;
-    $tCarriage=array("\r\n", "\r", "\n");
-
-    /** Authenticate
-     ***************/
-    require(PBR_PATH.'/includes/init/inituser.php');
-
-    /** Mandatory Parameters
-     ***********************/
-    if( CUser::GetInstance()->IsAuthenticated() && filter_has_var(INPUT_GET, 'act') )
-    {
-        // Get action
-        $sAction = trim( filter_input( INPUT_GET, 'act', FILTER_SANITIZE_SPECIAL_CHARS));
-        // Analyse
-        if( $sAction=='export' )
-        {
-            // Get search name
-            if( filter_has_var(INPUT_GET, 'ctl') )
-            {
-                $sSearch = rawurldecode( trim( filter_input( INPUT_GET, 'ctl', FILTER_UNSAFE_RAW)));
-            }//if( filter_has_var(INPUT_GET, 'ctl') )
-
-            /** Get contact count
-             ********************/
-            require(PBR_PATH.'/includes/db/'.PBR_DB_DIR.'/contactsgetcount.php');
-            $iPagingLimit=ContactsGetCount( CUser::GetInstance()->GetUsername()
-                                           ,CUser::GetInstance()->GetSession()
-                                           ,GetIP().GetUserAgent()
-                                           ,$sSearch);
-            if( $iPagingLimit<0 )
-            {
-            	// Failed
-            	RedirectError( $iPagingLimit, __FILE__, __LINE__ );
-				exit;
-            }//if( $iPagingLimit>0 )
-
-            // Get contact list
-            require(PBR_PATH.'/includes/db/'.PBR_DB_DIR.'/contactsget.php');
-            $tRecordset=ContactsGet( CUser::GetInstance()->GetUsername()
-                                    ,CUser::GetInstance()->GetSession()
-                                    ,GetIP().GetUserAgent()
-                                    ,$sSearch
-                                    ,0
-                                    ,$iPagingLimit);
-            if( is_array($tRecordset) )
-            {
-                /** Refactoring
-                 **************/
-                $tCSV=array();
-                $tCSV[]=array('nom','prénom','téléphone','email','adresse','ville','code postal','commentaire','date de création');
-                foreach( $tRecordset as $tRecord )
-                {
-                    $tCSV[]=array( $tRecord['contact_lastname'],
-                                   $tRecord['contact_firstname'],
-                                   $tRecord['contact_tel'],
-                                   $tRecord['contact_email'],
-                                   $tRecord['contact_address'].' '.$tRecord['contact_addressmore'],
-                                   $tRecord['contact_addresscity'],
-                                   $tRecord['contact_addresszip'],
-                                   str_replace($tCarriage, ' ', $tRecord['contact_comment']),
-                                   $tRecord['creation_date']);
-                }//foreach( $tRecordset as $tRecord )
-
-                /** Open file
-                 ************/
-                if( CCSV::GetInstance()->Open()===FALSE )
-                {
-		            $sTitle='fichier: '.basename(__FILE__).', ligne:'.__LINE__;
-			        ErrorLog( CUser::GetInstance()->GetUsername(), $sTitle, 'impossible d\'ouvrir le fichier', E_USER_WARNING, TRUE);
-                }//if( CCSV::GetInstance()->Open($sExportDir)===FALSE )
-
-                /** Write data
-                 *************/
-                if( CCSV::GetInstance()->IsOpen()===TRUE )
-                {
-                    $sSended=CCSV::GetInstance()->Write($tCSV);
-                    CCSV::GetInstance()->Close();
-
-                    if( $sSended===FALSE )
-                    {
-			            $sTitle='fichier: '.basename(__FILE__).', ligne:'.__LINE__;
-				        ErrorLog( CUser::GetInstance()->GetUsername(), $sTitle, 'impossible d\'exporter le fichier '.CCSV::GetInstance()->GetFilename(), E_USER_WARNING, TRUE);
-                    }
-                    else
-                    {
-                        /** Send data
-                         ************/
-                        header("Content-disposition: attachment; filename=export.csv");
-                        header("Content-Type: application/force-download");
-                        header("Content-Transfer-Encoding: text/csv\n"); // ne pas enlever le \n
-                        header("Content-Length: ".filesize(CCSV::GetInstance()->GetFilename()));
-                        header("Pragma: no-cache");
-                        header("Cache-Control: must-revalidate, post-check=0, pre-check=0, public");
-                        header("Expires: 0");
-                        readfile(CCSV::GetInstance()->GetFilename());
-                    }//if( CCSV::GetInstance()->Write($tCSV))===FALSE )
-                }//if( CCSV::GetInstance()->IsOpen()===TRUE )
-
-                /** Display
-                 **********/
-                if( $sSended===FALSE )
-                {
-                     require(PBR_PATH.'/includes/display/displaycontactsexport.php');
-                }//if( $sSended===FALSE )
-            }
-            else
-            {
-                echo 'Liste vide.',"\n";
-            }//if( is_array($tRecordset) )
-        }
-        else
-        {
-            // Parameters are not good
-            $sTitle='fichier: '.basename(__FILE__).', ligne:'.__LINE__;
-	        ErrorLog( CUser::GetInstance()->GetUsername(), $sTitle, 'possible tentative de piratage', E_USER_WARNING, FALSE);
-        }//if( $sAction=='export' )
-    }//if( filter_has_var(...
-
-    /** Delete objects
-     *****************/
-    CCSV::DeleteInstance();
-    include(PBR_PATH.'/includes/init/initclean.php');
-?>
diff --git a/src/css/mobile.css b/src/css/mobile.css
index cfc0b00..871577f 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -5,6 +5,7 @@ Style sheet name: PBRaiders mobile browser
          Version: 1.1
           Author: Olivier JULLIEN - 2010-02-03
           Update: Olivier JULLIEN - 2010-06-15 - improvement
+          Update: Olivier JULLIEN - 2010-09-01 - improvement
 The 'PBRaiders mobile browser style sheet' is released under: private licence.
 The logos 'PBRaiders' are under copyrights.
 W3C: This document was successfully checked as CSS level 3!
@@ -49,7 +50,7 @@ fieldset legend.legendmain{font-weight:700;}
 .inputText,.inputTextS,.inputSelect,.inputParam{margin:2px;}
 .inputText,.inputTextS,.inputTextarea,.inputRadio,.inputSelect,.inputButton,.inputParam{font-size:1.7em;}
 .inputText,.inputTextarea,.inputSelect{width:95%;}
-.inputButton{font-weight:700;}
+.inputButton{font-weight:700;width:45%;}
 .graph{height:470px;overflow:auto;white-space:nowrap;overflow-y:hidden;}
 /** LIST **/
 .records li{font-size:larger;line-height:1.875;text-align:justify;border-top:1px solid #346B9E;}
diff --git a/src/css/mobilize.css b/src/css/mobilize.css
index 446d6fd..5647c89 100644
--- a/src/css/mobilize.css
+++ b/src/css/mobilize.css
@@ -5,6 +5,7 @@ Style sheet name: PBRaiders mobile browser
          Version: 1.1
           Author: Olivier JULLIEN - 2010-02-03
           Update: Olivier JULLIEN - 2010-06-15 - improvement
+          Update: Olivier JULLIEN - 2010-09-01 - improvement
 The 'PBRaiders mobile browser style sheet' is released under: private licence.
 The logos 'PBRaiders' are under copyrights.
 W3C: This document was successfully checked as CSS level 3!
@@ -18,6 +19,7 @@ body{font-size:106.3%;}
 .label,.labelF{float:none;width:auto;text-align:left;clear:none;}
 .inputText,.inputTextS,.inputTextarea,.inputRadio,.inputSelect,.inputButton,.inputParam{font-size:1.7em;}
 .inputSelect{width:95%;}
+.inputButton{width:45% !important;}
 .listbuttons,.listbuttonitem{clear:none;}
 .fieldsetformgroup{float:none;width:auto;}
 .records li{font-size:larger;font-weight:400;}
diff --git a/src/css/style.css b/src/css/style.css
index 26f3d3e..34a144d 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -5,6 +5,7 @@ Style sheet name: PBRaiders desktop browser
          Version: 1.1
           Author: Olivier JULLIEN - 2010-02-03
           Update: Olivier JULLIEN - 2010-06-15 - improvement
+          Update: Olivier JULLIEN - 2010-09-01 - improvement
 The 'PBRaiders desktop browser style sheet' is released under: private licence.
 The logos 'PBRaiders' are under copyrights.
 W3C: This document was successfully checked as CSS level 3!
@@ -54,7 +55,7 @@ fieldset legend.legendmain{font-weight:700;}
 .inputText,.inputTextS,.inputSelect,.inputParam{margin:2px;}
 .inputText,.inputTextS,.inputTextarea,.inputRadio,.inputSelect,.inputButton,.inputParam{font-size:1em;}
 .inputText,.inputTextarea{width:95%;}
-.inputButton{font-weight:700;}
+.inputButton{font-weight:700;width:113px;}
 .fieldsetformgroup{float:left;width:33%;}
 .graph{height:470px;overflow:auto;white-space:nowrap;overflow-y:hidden;}
 /** LIST **/
diff --git a/src/day.php b/src/day.php
index 458509c..518a8e9 100644
--- a/src/day.php
+++ b/src/day.php
@@ -39,7 +39,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__));
 
     /** Include config
diff --git a/src/dayprint.php b/src/dayprint.php
index 3478f9c..5e26664 100644
--- a/src/dayprint.php
+++ b/src/dayprint.php
@@ -38,7 +38,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__));
 
     /** Include config
diff --git a/src/graphs.php b/src/graphs.php
index 481400c..8b52f62 100644
--- a/src/graphs.php
+++ b/src/graphs.php
@@ -37,7 +37,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__));
 
     /** Include config
diff --git a/src/graphs/agesyearcount.php b/src/graphs/agesyearcount.php
index d682ca2..7d120df 100644
--- a/src/graphs/agesyearcount.php
+++ b/src/graphs/agesyearcount.php
@@ -37,7 +37,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__).'/..');
     define('PBR_FONT_PATH',dirname(__FILE__));
 
diff --git a/src/graphs/arrhesyearcount.php b/src/graphs/arrhesyearcount.php
index 0b3db54..8e1083d 100644
--- a/src/graphs/arrhesyearcount.php
+++ b/src/graphs/arrhesyearcount.php
@@ -37,7 +37,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__).'/..');
     define('PBR_FONT_PATH',dirname(__FILE__));
 
diff --git a/src/graphs/contactsmonthcount.php b/src/graphs/contactsmonthcount.php
index 3167907..37dd6c8 100644
--- a/src/graphs/contactsmonthcount.php
+++ b/src/graphs/contactsmonthcount.php
@@ -38,7 +38,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__).'/..');
     define('PBR_FONT_PATH',dirname(__FILE__));
 
@@ -137,4 +137,4 @@
      *****************/
     unset( $pGraph, $pCCSV);
     include(PBR_PATH.'/includes/init/clean.php');
-?>
\ No newline at end of file
+?>
diff --git a/src/graphs/contactsyearcount.php b/src/graphs/contactsyearcount.php
index 4ddd1d9..d4cd16d 100644
--- a/src/graphs/contactsyearcount.php
+++ b/src/graphs/contactsyearcount.php
@@ -38,7 +38,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__).'/..');
     define('PBR_FONT_PATH',dirname(__FILE__));
 
@@ -133,4 +133,4 @@
      *****************/
     unset( $pGraph, $pCCSV);
     include(PBR_PATH.'/includes/init/clean.php');
-?>
\ No newline at end of file
+?>
diff --git a/src/graphs/rentsmonthcount.php b/src/graphs/rentsmonthcount.php
index cc50a18..69b4418 100644
--- a/src/graphs/rentsmonthcount.php
+++ b/src/graphs/rentsmonthcount.php
@@ -38,7 +38,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__).'/..');
     define('PBR_FONT_PATH',dirname(__FILE__));
 
@@ -137,4 +137,4 @@
      *****************/
     unset( $pGraph, $pCCSV);
     include(PBR_PATH.'/includes/init/clean.php');
-?>
\ No newline at end of file
+?>
diff --git a/src/graphs/rentsmonthsum.php b/src/graphs/rentsmonthsum.php
index 5276a08..992f638 100644
--- a/src/graphs/rentsmonthsum.php
+++ b/src/graphs/rentsmonthsum.php
@@ -37,7 +37,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__).'/..');
     define('PBR_FONT_PATH',dirname(__FILE__));
 
diff --git a/src/graphs/rentsyearcount.php b/src/graphs/rentsyearcount.php
index 8603170..fe0cd2b 100644
--- a/src/graphs/rentsyearcount.php
+++ b/src/graphs/rentsyearcount.php
@@ -38,7 +38,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__).'/..');
     define('PBR_FONT_PATH',dirname(__FILE__));
 
diff --git a/src/graphs/rentsyearsum.php b/src/graphs/rentsyearsum.php
index d7a4451..7fc8ec4 100644
--- a/src/graphs/rentsyearsum.php
+++ b/src/graphs/rentsyearsum.php
@@ -37,7 +37,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__).'/..');
     define('PBR_FONT_PATH',dirname(__FILE__));
 
@@ -133,4 +133,4 @@
      *****************/
     unset( $pGraph, $pCCSV);
     include(PBR_PATH.'/includes/init/clean.php');
-?>
\ No newline at end of file
+?>
diff --git a/src/images/pbrmid.png b/src/images/pbrmid.png
index 6b2c983603ceee89b07998c5434709e89d5e8ce9..ead934ed3f960ec85f51decde1a2a23dfdeb93b4 100644
GIT binary patch
literal 7807
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
KO^K9Q(Ek8oOO*xy

literal 8794
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

diff --git a/src/includes-install/database/data-config.sql b/src/includes-install/database/data-config.sql
index c590ccb..7d3c1ac 100644
--- a/src/includes-install/database/data-config.sql
+++ b/src/includes-install/database/data-config.sql
@@ -33,7 +33,7 @@ USE `_PBR_DB_DBN_`;
 -- -----------------------------------------------------
 SET AUTOCOMMIT=0;
 INSERT INTO `config` (`name`,`value`,`role`) VALUES
-('data_version','1.2.0-SD',10),
+('data_version','1.2.0',10),
 ('max_rent_1','300',10),
 ('max_rent_2','300',10),
 ('max_rent_3','300',10),
diff --git a/src/includes-install/database/schema.sql b/src/includes-install/database/schema.sql
index c9f8a4f..f91182b 100644
--- a/src/includes-install/database/schema.sql
+++ b/src/includes-install/database/schema.sql
@@ -124,6 +124,7 @@ CREATE INDEX `fk_contact_user_update` ON `_PBR_DB_DBN_`.`contact` (`update_iduse
 
 CREATE INDEX `ix_contact_lastname` ON `_PBR_DB_DBN_`.`contact` (`lastname` ASC) ;
 
+CREATE INDEX `ix_contact_createdate` ON `_PBR_DB_DBN_`.`contact` (`create_date` ASC) ;
 
 -- -----------------------------------------------------
 -- Table `_PBR_DB_DBN_`.`reservation`
@@ -185,6 +186,6 @@ CREATE INDEX `ix_reservation_day` ON `_PBR_DB_DBN_`.`reservation` (`day` ASC) ;
 -- -----------------------------------------------------
 SET AUTOCOMMIT=0;
 USE `_PBR_DB_DBN_`;
-INSERT INTO `config` (`name`, `value`, `role`) VALUES ('schema_version', '1.2.0-SD', 10);
+INSERT INTO `config` (`name`, `value`, `role`) VALUES ('schema_version', '1.2.0', 10);
 
 COMMIT;
diff --git a/src/includes-install/welcome.php b/src/includes-install/welcome.php
index 8492974..4c11be9 100644
--- a/src/includes-install/welcome.php
+++ b/src/includes-install/welcome.php
@@ -38,9 +38,13 @@
  *                  - $sPHPVersion (string)
  *                  - $sMYSQLVersion (string)
  *                  - $pUser (instance of CUser)
+ *                  - $pHeader (instance of CHeader)
  * author: Olivier JULLIEN - 2010-02-04
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
-if( !defined('PBR_VERSION') || !defined('PBR_URL') || !is_array($tMessageCode) || !isset($sPHPVersionRequired) || !isset($sMYSQLVersionRequired) || !isset($sPHPVersion) || !isset($sMYSQLVersion) || !isset($pUser) )
+if( !defined('PBR_VERSION') || !defined('PBR_URL') || !is_array($tMessageCode) || !isset($sPHPVersionRequired) || !isset($sMYSQLVersionRequired) || !isset($sPHPVersion) || !isset($sMYSQLVersion) || !isset($pUser) || !isset($pHeader) )
     die('-1');
 
 /**
@@ -62,7 +66,7 @@ function BuildMessage($iCode)
         }
         elseif($iCode===2)
         {
-            $sBuffer.='<p class="error">L&#39;application PBRaiders est d&#233;j&#224; install&#233;e. Si vous souhaitez la re-installer, vous devez d&#146;abord d&#233;truire la base de donn&#233;es, effacer le dossier qui contient l&#39;application puis suivre les instructions du fichier lisezmoi.txt.</p>';
+            $sBuffer.='<p class="error">L&#39;application PBRaiders est d&#233;j&#224; install&#233;e. Si vous souhaitez la re-installer, vous devez d&#39;abord d&#233;truire la base de donn&#233;es, effacer le dossier qui contient l&#39;application puis suivre les instructions du fichier lisezmoi.txt.</p>';
         }
         elseif($iCode===3)
         {
@@ -104,19 +108,19 @@ function BuildMessage($iCode)
       <p>MYSQL version: <b><?php echo $sMYSQLVersion; ?></b></p>
       <p>Addresse du serveur: <b><?php echo PBR_DB_HOST; ?></b></p>
       <p>Nom de la base de donn&#233;es: <b><?php echo PBR_DB_DBN; ?></b></p>
-      <p>Nom de l&#146;utilisateur de la base de donn&#233;es: <b><?php echo PBR_DB_USR; ?></b></p>
+      <p>Nom de l&#39;utilisateur de la base de donn&#233;es: <b><?php echo PBR_DB_USR; ?></b></p>
     </fieldset>
     <fieldset class="fieldsetform">
      <legend class="legendmain">Administrateur</legend>
      <p>Veuillez saisir le nom et le mot de passe de l'utilisateur administrateur de PBRaiders. Pour le nom, seuls les caract&#232;res alphanum&#233;riques, &quot;@&quot;,&quot;.&quot;,&quot;-&quot; et &quot;_&quot; sont autoris&#233;s.</p>
      <ul>
       <li class="label required">Nom</li>
-      <li><input id="loginusr" class="inputText" type="text" value="<?php echo $pUser->GetUsername(1); ?>" maxlength="<?php echo CUser::USERNAMEMAX; ?>" size="10" name="<?php echo CUser::USERNAMETAG; ?>"/></li>
+      <li><input id="loginusr" class="inputText" type="text" value="<?php echo $pUser->GetUsername(1); ?>" maxlength="<?php echo CUser::USERNAMEMAX; ?>" size="10" name="<?php echo CUser::USERNAMETAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
       <li class="label required">Mot de passe</li>
-      <li><input id="loginpwd1" class="inputText" type="password" value="" maxlength="<?php echo CUser::PASSWORDMAX; ?>" size="10" name="<?php echo CUser::PASSWORDTAG; ?>"/></li>
+      <li><input id="loginpwd1" class="inputText" type="password" value="" maxlength="<?php echo CUser::PASSWORDMAX; ?>" size="10" name="<?php echo CUser::PASSWORDTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
       <li class="label required">Confirmer</li>
-      <li><input id="loginpwd2" class="inputText" type="password" value="" maxlength="<?php echo CUser::PASSWORDMAX; ?>" size="10" name="<?php echo CUser::PASSWORDCHECKTAG; ?>"/></li>
-      <li class="listbuttonitem"><input class="inputButton" type="submit" value="Lancer l'installation" name="install"/></li>
+      <li><input id="loginpwd2" class="inputText" type="password" value="" maxlength="<?php echo CUser::PASSWORDMAX; ?>" size="10" name="<?php echo CUser::PASSWORDCHECKTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
+      <li class="listbuttonitem"><input class="inputButton" type="submit" value="Installer" name="install"<?php echo $pHeader->GetCloseTag(); ?></li>
      </ul>
     </fieldset>
    </form>
diff --git a/src/includes/class/cheader.php b/src/includes/class/cheader.php
index eeccac8..8cb0c35 100644
--- a/src/includes/class/cheader.php
+++ b/src/includes/class/cheader.php
@@ -41,6 +41,10 @@
  *                                        update GetKeyword()
  *                                        add AcceptXML()
  *                                        add AnalyseMIMEType()
+ * update: Olivier JULLIEN - 2010-09-01 - add GetCloseTag()
+ *                                        add GetBR()
+ *                                        add GetHR()
+ *                                        add GetAnchor()
  *************************************************************************/
 if( !defined('PBR_VERSION') )
     die('-1');
@@ -325,6 +329,71 @@ public function SetToDefault()
         $this->m_bPrint       = FALSE;
         $this->m_bAcceptXML   = FALSE;
     }
+
+   /**
+     * function: GetCloseTag
+     * description: return the close tag depending of the doctype
+     * parameter: none
+     * return: STRING
+     * author: Olivier JULLIEN - 2010-09-01
+     */
+    public function GetCloseTag()
+    {
+        if( $this->m_bAcceptXML )
+            $sReturn = ' />';
+        else
+            $sReturn = '>';
+        return $sReturn;
+    }
+
+   /**
+     * function: GetBR
+     * description: return the BR tag depending of the doctype
+     * parameter: none
+     * return: STRING
+     * author: Olivier JULLIEN - 2010-09-01
+     */
+    public function GetBR()
+    {
+        if( $this->m_bAcceptXML )
+            $sReturn = '<br />';
+        else
+            $sReturn = '<br>';
+        return $sReturn;
+    }
+
+   /**
+     * function: GetHR
+     * description: return the HR tag depending of the doctype
+     * parameter: none
+     * return: STRING
+     * author: Olivier JULLIEN - 2010-09-01
+     */
+    public function GetHR()
+    {
+        if( $this->m_bAcceptXML )
+            $sReturn = '<hr />';
+        else
+            $sReturn = '<hr>';
+        return $sReturn;
+    }
+
+   /**
+     * function: GetAnchor
+     * description: return the anchor tag depending of the doctype
+     * parameter: none
+     * return: STRING
+     * author: Olivier JULLIEN - 2010-09-01
+     */
+    public function GetAnchor($sAnchor)
+    {
+        if( $this->m_bAcceptXML )
+            $sReturn = '<a id="'.$sAnchor.'"></a>';
+        else
+            $sReturn = '<a name="'.$sAnchor.'"></a>';
+        return $sReturn;
+    }
+
 }
 
 ?>
diff --git a/src/includes/display/calendar.php b/src/includes/display/calendar.php
index 4ccc94e..4984786 100644
--- a/src/includes/display/calendar.php
+++ b/src/includes/display/calendar.php
@@ -36,11 +36,14 @@
  *                  - $pDate (instance of CDate)
  *                  - $tRecordset (array)
  *                  - $bAdmin (boolean)
+ *                  - $pHeader (instance of CHeader)
  * author: Olivier JULLIEN - 2010-02-04
  * update: Olivier JULLIEN - 2010-06-15 - improvement
- * W3C: This document was successfully checked as XHTML 1.0 Strict!
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
-if( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !isset($pDate) || !is_array($tRecordset) || !is_bool($bAdmin) )
+if( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !isset($pDate) || !is_array($tRecordset) || !is_bool($bAdmin) || !isset($pHeader) )
     die('-1');
 
 /**
@@ -163,16 +166,17 @@ function BuildDay($iDayName,$iDayNum,$iMonth,$iYear,$iReal,$iPlanned,$iCanceled,
 <div id="HEADER">
 <p><em><small>Connect&#233; en tant que <?php echo CAuth::GetInstance()->GetUsername(1); ?></small></em></p>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagetop'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller en bas de la page" name="pagetop" href="#pagebottom">&#8595;</a></li>
+<li><a title="Aller en bas de la page" href="#pagebottom">&#8595;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Afficher tous les contacts" href="<?php echo PBR_URL;?>contacts.php">Contacts</a></li>
 <?php if( $bAdmin===TRUE ){ ?>
 <li><a title="Options" href="<?php echo PBR_URL;?>parameters.php">Options</a></li>
 <?php }//if( $bAdmin===TRUE ) ?>
 </ul>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
 <div id="CONTENT">
 <form id="FORMCALENDAR" method="post" action="<?php echo PBR_URL;?>">
 <?php
@@ -180,10 +184,10 @@ function BuildDay($iDayName,$iDayNum,$iMonth,$iYear,$iReal,$iPlanned,$iCanceled,
 ?>
 <ul id="CALENDARNAVIGATION" class="listbuttons">
 <li>
-<input type="hidden" name="<?php echo CDate::CURRENTYEARTAG; ?>" value="<?php echo $pDate->GetRequestYear();?>" />
-<input type="hidden" name="<?php echo CDate::CURRENTMONTHTAG; ?>" value="<?php echo $pDate->GetRequestMonth();?>" />
-<input class="inputButton" type="submit" value="&nbsp;&nbsp;&#60;&#60;&nbsp;&nbsp;" name="<?php echo CDate::NAXPREVTAG; ?>"/>
-<input class="inputButton" type="submit" value="&nbsp;&nbsp;&#62;&#62;&nbsp;&nbsp;" name="<?php echo CDate::NAXNEXTTAG; ?>"/>
+<input type="hidden" name="<?php echo CDate::CURRENTYEARTAG; ?>" value="<?php echo $pDate->GetRequestYear(); ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
+<input type="hidden" name="<?php echo CDate::CURRENTMONTHTAG; ?>" value="<?php echo $pDate->GetRequestMonth(); ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
+<input class="inputButton" type="submit" value="&#60;&#60;" name="<?php echo CDate::NAXPREVTAG; ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
+<input class="inputButton" type="submit" value="&#62;&#62;" name="<?php echo CDate::NAXNEXTTAG; ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
 </li>
 <li><select class="inputSelect" name="<?php echo CDate::MONTHTAG; ?>">
 <?php
@@ -238,7 +242,7 @@ function BuildDay($iDayName,$iDayNum,$iMonth,$iYear,$iReal,$iPlanned,$iCanceled,
 ?>
 </select></li>
 <li>
-<input class="inputButton" type="submit" value="&nbsp;Aller&nbsp;" name="<?php echo CDate::NAVGOTOTAG; ?>"/>
+<input class="inputButton" type="submit" value="Aller" name="<?php echo CDate::NAVGOTOTAG; ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
 </li>
 </ul>
 </form>
@@ -321,9 +325,10 @@ function BuildDay($iDayName,$iDayNum,$iMonth,$iYear,$iReal,$iPlanned,$iCanceled,
     }//if( $iDayOfTheWeek>0 )
 ?>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagebottom'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller en haut de la page" href="#pagetop" name="pagebottom">&#8593;</a></li>
+<li><a title="Aller en haut de la page" href="#pagetop">&#8593;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Afficher tous les contacts" href="<?php echo PBR_URL;?>contacts.php">Contacts</a></li>
 <?php if( $bAdmin===TRUE ){ ?>
diff --git a/src/includes/display/contact.php b/src/includes/display/contact.php
index 1e0cd72..01bf1ae 100644
--- a/src/includes/display/contact.php
+++ b/src/includes/display/contact.php
@@ -37,11 +37,14 @@
  *                  - $pPaging (instance of CPaging)
  *                  - $pDate (instance of CDate)
  *                  - $iMessageCode (integer)
+ *                  - $pHeader (instance of CHeader)
  * author: Olivier JULLIEN - 2010-02-04
  * update: Olivier JULLIEN - 2010-06-15 - improvement
- * W3C: This document was successfully checked as XHTML 1.0 Strict!
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
-if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !is_integer($iMessageCode) || !isset($pPaging) || !isset($pContact) || !is_array($tRecordset) || !isset($pDate) )
+if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !is_integer($iMessageCode) || !isset($pPaging) || !isset($pContact) || !is_array($tRecordset) || !isset($pDate) || !isset($pHeader) )
     die('-1');
 
 /**
@@ -169,39 +172,40 @@ function BuildCurrentRent(&$tRecord, $iPagingMax, $iIndex, CDate $pDate)
 <div id="HEADER">
 <p><em><small>Connect&#233; en tant que <?php echo CAuth::GetInstance()->GetUsername(1); ?></small></em></p>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagetop'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller &#224; l'historique" name="pagetop" href="#pagemiddle">&#8595;</a></li>
+<li><a title="Aller &#224; l'historique" href="#pagemiddle">&#8595;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Retourner au calendrier" href="<?php echo PBR_URL;?>">Calendrier</a></li>
 <li><a title="Afficher tous les contacts" href="<?php echo PBR_URL;?>contacts.php">Contacts</a></li>
 <li><a title="Cr&#233;er un contact" href="<?php echo PBR_URL;?>contactnew.php">Cr&#233;er un contact</a></li>
 </ul>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
 <div id="CONTENT">
 <?php BuildMessage($iMessageCode); ?>
 <h1><?php echo $sFormTitle; ?></h1>
 <form id="FORMCONTACT" method="post" action="<?php echo PBR_URL;?>contact.php">
 <fieldset class="fieldsetform">
 <legend class="legendmain">Informations</legend>
-<input type="hidden" name="<?php echo CContact::IDENTIFIERTAG; ?>" value="<?php echo $pContact->GetIdentifier(); ?>" />
+<input type="hidden" name="<?php echo CContact::IDENTIFIERTAG; ?>" value="<?php echo $pContact->GetIdentifier(); ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
 <ul>
 <li class="label required">Nom</li>
-<li><input id="contactlastname" class="inputText" type="text" value="<?php echo $pContact->GetLastName(1); ?>" maxlength="<?php echo CContact::LASTNAMEMAX; ?>" size="10" name="<?php echo CContact::LASTNAMETAG; ?>"/></li>
+<li><input id="contactlastname" class="inputText" type="text" value="<?php echo $pContact->GetLastName(1); ?>" maxlength="<?php echo CContact::LASTNAMEMAX; ?>" size="10" name="<?php echo CContact::LASTNAMETAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label required">Pr&eacute;nom</li>
-<li><input id="contactfirstname" class="inputText" type="text" value="<?php echo $pContact->GetFirstName(1); ?>" maxlength="<?php echo CContact::FIRSTNAMEMAX; ?>" size="10" name="<?php echo CContact::FIRSTNAMETAG; ?>" /></li>
+<li><input id="contactfirstname" class="inputText" type="text" value="<?php echo $pContact->GetFirstName(1); ?>" maxlength="<?php echo CContact::FIRSTNAMEMAX; ?>" size="10" name="<?php echo CContact::FIRSTNAMETAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label required">T&#233;l&#233;phone</li>
-<li><input id="contactphone" class="inputText" type="text" value="<?php echo $pContact->GetTel(1);?>" maxlength="<?php echo CContact::TELMAX; ?>" size="10" name="<?php echo CContact::TELTAG; ?>" /></li>
+<li><input id="contactphone" class="inputText" type="text" value="<?php echo $pContact->GetTel(1);?>" maxlength="<?php echo CContact::TELMAX; ?>" size="10" name="<?php echo CContact::TELTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label">Email</li>
-<li><input id="contactemail" class="inputText" type="text" value="<?php echo $pContact->GetEmail(1);?>" maxlength="<?php echo CContact::EMAILMAX; ?>" size="10" name="<?php echo CContact::EMAILTAG; ?>" /></li>
+<li><input id="contactemail" class="inputText" type="text" value="<?php echo $pContact->GetEmail(1);?>" maxlength="<?php echo CContact::EMAILMAX; ?>" size="10" name="<?php echo CContact::EMAILTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label">Adresse</li>
-<li><input id="contactaddress_1" class="inputText" type="text" value="<?php echo $pContact->GetAddress(1);?>" maxlength="<?php echo CContact::ADDRESSMAX; ?>" size="10" name="<?php echo CContact::ADDRESSTAG; ?>" /></li>
+<li><input id="contactaddress_1" class="inputText" type="text" value="<?php echo $pContact->GetAddress(1);?>" maxlength="<?php echo CContact::ADDRESSMAX; ?>" size="10" name="<?php echo CContact::ADDRESSTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label hide">&nbsp;</li>
-<li><input id="contactaddress_2" class="inputText" type="text" value="<?php echo $pContact->GetAddressMore(1);?>" maxlength="<?php echo CContact::ADDRESSMOREMAX; ?>" size="10" name="<?php echo CContact::ADDRESSMORETAG; ?>" /></li>
+<li><input id="contactaddress_2" class="inputText" type="text" value="<?php echo $pContact->GetAddressMore(1);?>" maxlength="<?php echo CContact::ADDRESSMOREMAX; ?>" size="10" name="<?php echo CContact::ADDRESSMORETAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label">Ville</li>
-<li><input id="contactcity" class="inputText" type="text" value="<?php echo $pContact->GetCity(1);?>" maxlength="<?php echo CContact::CITYMAX; ?>" size="10" name="<?php echo CContact::CITYTAG; ?>" /></li>
+<li><input id="contactcity" class="inputText" type="text" value="<?php echo $pContact->GetCity(1);?>" maxlength="<?php echo CContact::CITYMAX; ?>" size="10" name="<?php echo CContact::CITYTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label">Code postal</li>
-<li><input id="contactzip" class="inputText" type="text" value="<?php echo $pContact->GetZip(1);?>" maxlength="<?php echo CContact::ZIPMAX; ?>" size="10" name="<?php echo CContact::ZIPTAG; ?>" /></li>
+<li><input id="contactzip" class="inputText" type="text" value="<?php echo $pContact->GetZip(1);?>" maxlength="<?php echo CContact::ZIPMAX; ?>" size="10" name="<?php echo CContact::ZIPTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <?php echo $sHelpCreate,"\n"; ?>
 <?php if( strlen($sHelpUpdate)>0 ) echo $sHelpUpdate,"\n"; ?>
 </ul>
@@ -211,10 +215,11 @@ function BuildCurrentRent(&$tRecord, $iPagingMax, $iIndex, CDate $pDate)
 <textarea cols="30" rows="5" class="inputTextarea" id="rentcomment" name="<?php echo CContact::COMMENTTAG; ?>"><?php echo $pContact->GetComment(1);?></textarea>
 <p><em><?php echo CContact::COMMENTLENGTH; ?> caract&#232;res ou moins</em></p>
 </fieldset>
-<ul class="listbuttons"><li class="listbuttonitem"><input class="inputButton" type="submit" value="Enregistrer" name="upd"/>&nbsp;<input class="inputButton" type="submit" value="&nbsp;Supprimer" name="del"/></li>
+<ul class="listbuttons"><li class="listbuttonitem"><input class="inputButton" type="submit" value="Enregistrer" name="upd"<?php echo $pHeader->GetCloseTag(); ?>&nbsp;<input class="inputButton" type="submit" value="Supprimer" name="del"<?php echo $pHeader->GetCloseTag(); ?></li>
 </ul>
 </form>
 <a name="pagemiddle"></a>
+<?php echo $pHeader->GetAnchor('pagemiddle'),"\n"; ?>
 <fieldset class="fieldsetform">
 <?php
 
@@ -223,7 +228,7 @@ function BuildCurrentRent(&$tRecord, $iPagingMax, $iIndex, CDate $pDate)
     $sBuffer  = '<legend class="legendmain">Historique';
     if( $pPaging->GetMax()>1 )
     {
-        $sBuffer .= ' <em>(page '.$pPaging->GetCurrent().' sur '.$pPaging->GetMax().')</em>';
+        $sBuffer .= ' <em class="hide">(page '.$pPaging->GetCurrent().' sur '.$pPaging->GetMax().')</em>';
     }//if( $pPaging->GetMax()>1 )
     $sBuffer .= '</legend>';
     echo $sBuffer,"\n";
@@ -285,9 +290,10 @@ function BuildCurrentRent(&$tRecord, $iPagingMax, $iIndex, CDate $pDate)
 ?>
 </fieldset>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagebottom'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller en haut de la page" href="#pagetop" name="pagebottom">&#8593;</a></li>
+<li><a title="Aller en haut de la page" href="#pagetop">&#8593;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Retourner au calendrier" href="<?php echo PBR_URL;?>">Calendrier</a></li>
 <li><a title="Afficher tous les contacts" href="<?php echo PBR_URL;?>contacts.php">Contacts</a></li>
diff --git a/src/includes/display/contactdelete.php b/src/includes/display/contactdelete.php
index a011193..5b8662d 100644
--- a/src/includes/display/contactdelete.php
+++ b/src/includes/display/contactdelete.php
@@ -34,10 +34,13 @@
  *              The following object(s) should exist:
  *                  - $sToken (string)
  *                  - $pContact (instance of CContact)
+ *                  - $pHeader (instance of CHeader)
  * author: Olivier JULLIEN - 2010-02-04
- * W3C: This document was successfully checked as XHTML 1.0 Strict!
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
-if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !isset($sToken) || !isset($pContact) )
+if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !isset($sToken) || !isset($pContact) || !isset($pHeader) )
     die('-1');
 
     // Build form title
@@ -48,19 +51,19 @@
 <div id="HEADER">
 <p><em><small>Connect&#233; en tant que <?php echo CAuth::GetInstance()->GetUsername(1); ?></small></em></p>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
 <div id="CONTENT">
 <h1><?php echo $sFormTitle;?></h1>
 <form id="FORMCONFIRM" method="post" action="<?php echo PBR_URL;?>contactdelete.php">
 <fieldset class="fieldsetform">
 <legend class="legendmain">Confirmer la suppression</legend>
-<input type="hidden" name="<?php echo CPHPSession::TOKENTAG; ?>" value="<?php echo $sToken; ?>" />
-<input type="hidden" name="<?php echo CContact::IDENTIFIERTAG; ?>" value="<?php echo $pContact->GetIdentifier(); ?>" />
+<input type="hidden" name="<?php echo CPHPSession::TOKENTAG; ?>" value="<?php echo $sToken; ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
+<input type="hidden" name="<?php echo CContact::IDENTIFIERTAG; ?>" value="<?php echo $pContact->GetIdentifier(); ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
 <div id="MESSAGE">
 <p class="error">Ce contact et toutes ses r&eacute;servations vont &ecirc;tre supprim&eacute;s.</p>
 </div>
 <ul>
-<li class="listbuttonitem"><input class="inputButton" type="submit" value="Supprimer" name="con"/>&nbsp;<input class="inputButton" type="submit" value="&nbsp;Annuler&nbsp;&nbsp;" name="can"/></li>
+<li class="listbuttonitem"><input class="inputButton" type="submit" value="Supprimer" name="con"<?php echo $pHeader->GetCloseTag(); ?>&nbsp;<input class="inputButton" type="submit" value="Annuler" name="can"<?php echo $pHeader->GetCloseTag(),"\n"; ?></li>
 </ul>
 </fieldset>
 </form>
diff --git a/src/includes/display/contactnew.php b/src/includes/display/contactnew.php
index fcecd08..f604adb 100644
--- a/src/includes/display/contactnew.php
+++ b/src/includes/display/contactnew.php
@@ -34,11 +34,14 @@
  *              The following objects should exist:
  *                  - $pContact ( instance of CContact)
  *                  - $iMessageCode (integer)
+ *                  - $pHeader (instance of CHeader)
  * author: Olivier JULLIEN - 2010-02-04
  * update: Olivier JULLIEN - 2010-06-15 - improvement
- * W3C: This document was successfully checked as XHTML 1.0 Strict!
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
-if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !is_integer($iMessageCode) || !isset($pContact) )
+if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !is_integer($iMessageCode) || !isset($pContact) || !isset($pHeader) )
     die('-1');
 
 /**
@@ -67,14 +70,15 @@ function BuildMessage($iCode)
 <div id="HEADER">
 <p><em><small>Connect&#233; en tant que <?php echo CAuth::GetInstance()->GetUsername(1); ?></small></em></p>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagetop'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller en bas de la page" name="pagetop" href="#pagebottom">&#8595;</a></li>
+<li><a title="Aller en bas de la page" href="#pagebottom">&#8595;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Afficher le calendrier" href="<?php echo PBR_URL;?>">Calendrier</a></li>
 <li><a title="Afficher tous les contacts" href="<?php echo PBR_URL;?>contacts.php">Contacts</a></li>
 </ul>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
 <div id="CONTENT">
 <?php BuildMessage($iMessageCode); ?>
 <h1>Nouveau contact</h1>
@@ -83,33 +87,34 @@ function BuildMessage($iCode)
 <legend class="legendmain">Informations</legend>
 <ul>
 <li class="label required">Nom</li>
-<li><input id="contactlastname" class="inputText" type="text" value="<?php echo $pContact->GetLastName(1); ?>" maxlength="<?php echo CContact::LASTNAMEMAX; ?>" size="10" name="<?php echo CContact::LASTNAMETAG; ?>"/></li>
+<li><input id="contactlastname" class="inputText" type="text" value="<?php echo $pContact->GetLastName(1); ?>" maxlength="<?php echo CContact::LASTNAMEMAX; ?>" size="10" name="<?php echo CContact::LASTNAMETAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label required">Pr&eacute;nom</li>
-<li><input id="contactfirstname" class="inputText" type="text" value="<?php echo $pContact->GetFirstName(1); ?>" maxlength="<?php echo CContact::FIRSTNAMEMAX; ?>" size="10" name="<?php echo CContact::FIRSTNAMETAG; ?>" /></li>
+<li><input id="contactfirstname" class="inputText" type="text" value="<?php echo $pContact->GetFirstName(1); ?>" maxlength="<?php echo CContact::FIRSTNAMEMAX; ?>" size="10" name="<?php echo CContact::FIRSTNAMETAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label required">T&#233;l&#233;phone</li>
-<li><input id="contactphone" class="inputText" type="text" value="<?php echo $pContact->GetTel(1);?>" maxlength="<?php echo CContact::TELMAX; ?>" size="10" name="<?php echo CContact::TELTAG; ?>" /></li>
+<li><input id="contactphone" class="inputText" type="text" value="<?php echo $pContact->GetTel(1);?>" maxlength="<?php echo CContact::TELMAX; ?>" size="10" name="<?php echo CContact::TELTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label">Email</li>
-<li><input id="contactemail" class="inputText" type="text" value="<?php echo $pContact->GetEmail(1);?>" maxlength="<?php echo CContact::EMAILMAX; ?>" size="10" name="<?php echo CContact::EMAILTAG; ?>" /></li>
+<li><input id="contactemail" class="inputText" type="text" value="<?php echo $pContact->GetEmail(1);?>" maxlength="<?php echo CContact::EMAILMAX; ?>" size="10" name="<?php echo CContact::EMAILTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label">Adresse</li>
-<li><input id="contactaddress_1" class="inputText" type="text" value="<?php echo $pContact->GetAddress(1);?>" maxlength="<?php echo CContact::ADDRESSMAX; ?>" size="10" name="<?php echo CContact::ADDRESSTAG; ?>" /></li>
+<li><input id="contactaddress_1" class="inputText" type="text" value="<?php echo $pContact->GetAddress(1);?>" maxlength="<?php echo CContact::ADDRESSMAX; ?>" size="10" name="<?php echo CContact::ADDRESSTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label hide">&nbsp;</li>
-<li><input id="contactaddress_2" class="inputText" type="text" value="<?php echo $pContact->GetAddressMore(1);?>" maxlength="<?php echo CContact::ADDRESSMOREMAX; ?>" size="10" name="<?php echo CContact::ADDRESSMORETAG; ?>" /></li>
+<li><input id="contactaddress_2" class="inputText" type="text" value="<?php echo $pContact->GetAddressMore(1);?>" maxlength="<?php echo CContact::ADDRESSMOREMAX; ?>" size="10" name="<?php echo CContact::ADDRESSMORETAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label">Ville</li>
-<li><input id="contactcity" class="inputText" type="text" value="<?php echo $pContact->GetCity(1);?>" maxlength="<?php echo CContact::CITYMAX; ?>" size="10" name="<?php echo CContact::CITYTAG; ?>" /></li>
+<li><input id="contactcity" class="inputText" type="text" value="<?php echo $pContact->GetCity(1);?>" maxlength="<?php echo CContact::CITYMAX; ?>" size="10" name="<?php echo CContact::CITYTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label">Code postal</li>
-<li><input id="contactzip" class="inputText" type="text" value="<?php echo $pContact->GetZip(1);?>" maxlength="<?php echo CContact::ZIPMAX; ?>" size="10" name="<?php echo CContact::ZIPTAG; ?>" /></li>
+<li><input id="contactzip" class="inputText" type="text" value="<?php echo $pContact->GetZip(1);?>" maxlength="<?php echo CContact::ZIPMAX; ?>" size="10" name="<?php echo CContact::ZIPTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 </ul>
 </fieldset>
 <ul class="listbuttons">
 <li class="listbuttonitem">
-<input class="inputButton" type="submit" value="Enregistrer" name="new" />
+<input class="inputButton" type="submit" value="Enregistrer" name="new"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
 </li>
 </ul>
 </form>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagebottom'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller en haut de la page" href="#pagetop" name="pagebottom">&#8593;</a></li>
+<li><a title="Aller en haut de la page" href="#pagetop">&#8593;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Afficher le calendrier" href="<?php echo PBR_URL;?>">Calendrier</a></li>
 <li><a title="Afficher tous les contacts" href="<?php echo PBR_URL;?>contacts.php">Contacts</a></li>
diff --git a/src/includes/display/contacts.php b/src/includes/display/contacts.php
index 2acdd0b..933849e 100644
--- a/src/includes/display/contacts.php
+++ b/src/includes/display/contacts.php
@@ -38,11 +38,14 @@
  *                  - $iMessageCode (integer)
  *                  - $pOrder (instance of COption)
  *                  - $pSort (instance of COption)
+ *                  - $pHeader (instance of CHeader)
  * author: Olivier JULLIEN - 2010-02-04
  * update: Olivier JULLIEN - 2010-06-15 - improvement
- * W3C: This document was successfully checked as XHTML 1.0 Strict!
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
-if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !isset($pPaging) || !is_array($tRecordset) || !is_integer($iMessageCode) || !isset($pSearch) || !isset($pOrder) || !isset($pSort) )
+if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !isset($pPaging) || !is_array($tRecordset) || !is_integer($iMessageCode) || !isset($pSearch) || !isset($pOrder) || !isset($pSort) || !isset($pHeader) )
     die('-1');
 
 /**
@@ -139,9 +142,10 @@ function BuildContact( &$tRecord )
 <div id="HEADER">
 <p><em><small>Connect&#233; en tant que <?php echo CAuth::GetInstance()->GetUsername(1); ?></small></em></p>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagetop'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller en bas de la page" name="pagetop" href="#pagebottom">&#8595;</a></li>
+<li><a title="Aller en bas de la page" href="#pagebottom">&#8595;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Afficher le calendrier" href="<?php echo PBR_URL;?>">Calendrier</a></li>
 <?php if(strlen($pSearch->GetLastName())>0) { ?>
@@ -149,17 +153,17 @@ function BuildContact( &$tRecord )
 <?php }//if(strlen($pSearch->GetLastName())>0) ?>
 <li><a title="Cr&#233;er un contact" href="<?php echo PBR_URL;?>contactnew.php">Cr&#233;er un contact</a></li>
 </ul>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
 <div id="CONTENT">
 <?php BuildMessage($iMessageCode); ?>
 <h1>Contacts</h1>
 <form id="FORMCONTACTS" method="get" action="<?php echo PBR_URL;?>contacts.php">
 <fieldset class="fieldsetsub fieldsetform">
 <legend class="legendmain">Chercher</legend>
-<input type="hidden" name="<?php echo CAction::ACTIONTAG; ?>" value="search" />
+<input type="hidden" name="<?php echo CAction::ACTIONTAG; ?>" value="search"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
 <ul>
 <li class="label required">Nom</li>
-<li><input id="contactsname" class="inputText" type="text" value="<?php echo $pSearch->GetLastName(1); ?>" maxlength="<?php echo CContact::LASTNAMEMAX; ?>" size="10" name="<?php echo CContact::LASTNAMETAG; ?>"/></li>
+<li><input id="contactsname" class="inputText" type="text" value="<?php echo $pSearch->GetLastName(1); ?>" maxlength="<?php echo CContact::LASTNAMEMAX; ?>" size="10" name="<?php echo CContact::LASTNAMETAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="help"><em>Utilisez le joker * pour des recherches partielles.</em></li>
 <li class="label">Trier par</li>
 <li><select class="inputSelect" name="<?php echo $pOrder->GetName(); ?>">
@@ -199,7 +203,7 @@ function BuildContact( &$tRecord )
     }//for( $iIndex=0;$iIndex<2;$iIndex++)
 ?>
 </select></li>
-<li class="listbuttonitem"><input class="inputButton" type="submit" value="Envoyer" /></li>
+<li class="listbuttonitem"><input class="inputButton" type="submit" value="Envoyer"<?php echo $pHeader->GetCloseTag(); ?></li>
 </ul>
 </fieldset>
 </form>
@@ -211,7 +215,7 @@ function BuildContact( &$tRecord )
     $sBuffer  = '<legend class="legendmain">Liste des contacts';
     if( $pPaging->GetMax()>1 )
     {
-        $sBuffer .= ' <em>(page '.$pPaging->GetCurrent().' sur '.$pPaging->GetMax().')</em>';
+        $sBuffer .= ' <em class="hide">(page '.$pPaging->GetCurrent().' sur '.$pPaging->GetMax().')</em>';
     }//if( $pPaging->GetMax()>1 )
     $sBuffer .= '</legend>';
     echo $sBuffer,"\n";
@@ -275,9 +279,10 @@ function BuildContact( &$tRecord )
 ?>
 </fieldset>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagebottom'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller en haut de la page" href="#pagetop" name="pagebottom">&#8593;</a></li>
+<li><a title="Aller en haut de la page" href="#pagetop">&#8593;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Afficher le calendrier" href="<?php echo PBR_URL;?>">Calendrier</a></li>
 <?php if(strlen($pSearch->GetLastName())>0) { ?>
diff --git a/src/includes/display/contactsexport.php b/src/includes/display/contactsexport.php
index 940a9d3..95dda9a 100644
--- a/src/includes/display/contactsexport.php
+++ b/src/includes/display/contactsexport.php
@@ -46,4 +46,4 @@
     header('Pragma: no-cache');     // For HTTP/1.0 compability
     header('Content-type: text/html; charset=UTF-8');
 ?>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"><head><title>Export</title></head><body><h1 style="color:red;">Il est impossible de g&#233;n&#233;rer le fichier d&#039;export.</h1><ol><li>V&#233;rifiez les fichiers de logs pour avoir une description de l'erreur.</li><li>Vous pouvez retourner &agrave; la liste des contacts en cliquant sur le lien: <a title="Contacts" href="<?php echo PBR_URL;?>contacts.php">PBRaiders</a></li></ol></body></html>
+<html lang="fr"><head><title>Export</title></head><body><h1 style="color:red;">Il est impossible de g&#233;n&#233;rer le fichier d&#039;export.</h1><ol><li>V&#233;rifiez les fichiers de logs pour avoir une description de l'erreur.</li><li>Vous pouvez retourner &agrave; la liste des contacts en cliquant sur le lien: <a title="Contacts" href="<?php echo PBR_URL;?>contacts.php">PBRaiders</a></li></ol></body></html>
diff --git a/src/includes/display/day.php b/src/includes/display/day.php
index 3ceea84..e23b2c7 100644
--- a/src/includes/display/day.php
+++ b/src/includes/display/day.php
@@ -39,11 +39,14 @@
  *                  - $sFormTitle (string)
  *                  - $tRecordset (array)
  *                  - $pPaging (instance of CPaging)
+ *                  - $pHeader (instance of CHeader)
  * author: Olivier JULLIEN - 2010-02-04
  * update: Olivier JULLIEN - 2010-06-15 - improvement
- * W3C: This document was successfully checked as XHTML 1.0 Strict!
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
-if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !is_integer($iMessageCode) || !isset($pRent) || !isset($pContact) || !isset($pDate) || !isset($sFormTitle) ||!is_array($tRecordset) || !isset($pPaging) )
+if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !is_integer($iMessageCode) || !isset($pRent) || !isset($pContact) || !isset($pDate) || !isset($sFormTitle) ||!is_array($tRecordset) || !isset($pPaging) || !isset($pHeader) )
     die('-1');
 
 /**
@@ -187,15 +190,16 @@ function BuildCurrentRent( &$tRecord, $sPrintHRef)
 <div id="HEADER">
 <p><em><small>Connect&#233; en tant que <?php echo CAuth::GetInstance()->GetUsername(1); ?></small></em></p>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagetop'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller aux r&#233;servations courantes" name="pagetop" href="#pagemiddle">&#8595;</a></li>
+<li><a title="Aller aux r&#233;servations courantes" href="#pagemiddle">&#8595;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Aller au calendrier" href="<?php echo PBR_URL;?>">Calendrier</a></li>
 <?php if( !empty($sCalendarHRef) ) echo $sCalendarHRef,"\n"; ?>
 <li><a title="Afficher tous les contacts" href="<?php echo PBR_URL;?>contacts.php">Contacts</a></li>
 </ul>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
 <div id="CONTENT">
 <?php BuildMessage($iMessageCode); ?>
 <h1><?php echo htmlentities( $sFormTitle, ENT_QUOTES, 'UTF-8'); ?></h1>
@@ -208,64 +212,64 @@ function BuildCurrentRent( &$tRecord, $sPrintHRef)
     // Identified contact
     if( $pContact->GetIdentifier()>0 )
     {
-        echo '<input type="hidden" name="'.CContact::IDENTIFIERTAG.'" value="'.$pContact->GetIdentifier().'" />',"\n";
+        echo '<input type="hidden" name="'.CContact::IDENTIFIERTAG.'" value="'.$pContact->GetIdentifier().'"'.$pHeader->GetCloseTag(),"\n";
     }//if( $pContact->GetIdentifier()>0 )
 ?>
-<input type="hidden" name="<?php echo CDate::DAYTAG; ?>" value="<?php echo $pDate->GetRequestDay(); ?>" />
-<input type="hidden" name="<?php echo CDate::MONTHTAG; ?>" value="<?php echo $pDate->GetRequestMonth(); ?>" />
-<input type="hidden" name="<?php echo CDate::YEARTAG; ?>" value="<?php echo $pDate->GetRequestYear(); ?>" />
+<input type="hidden" name="<?php echo CDate::DAYTAG; ?>" value="<?php echo $pDate->GetRequestDay(); ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
+<input type="hidden" name="<?php echo CDate::MONTHTAG; ?>" value="<?php echo $pDate->GetRequestMonth(); ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
+<input type="hidden" name="<?php echo CDate::YEARTAG; ?>" value="<?php echo $pDate->GetRequestYear(); ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
 <ul>
 <li class="label required">Nom</li>
-<li><input id="contactlastname" class="inputText" type="text" value="<?php echo $pContact->GetLastName(1); ?>" maxlength="<?php echo CContact::LASTNAMEMAX; ?>" size="10" name="<?php echo CContact::LASTNAMETAG; ?>" <?php echo $sDisable;?> /></li>
+<li><input id="contactlastname" class="inputText" type="text" value="<?php echo $pContact->GetLastName(1); ?>" maxlength="<?php echo CContact::LASTNAMEMAX; ?>" size="10" name="<?php echo CContact::LASTNAMETAG; ?>" <?php echo $sDisable.$pHeader->GetCloseTag(); ?></li>
 <li class="navigation"><a title="Choisir un contact" href="<?php echo $sSelectHRef;?>"><em>Choisir dans la liste</em></a></li>
 <li class="label required">Pr&eacute;nom</li>
-<li><input id="contactfirstname" class="inputText" type="text" value="<?php echo $pContact->GetFirstName(1); ?>" maxlength="<?php echo CContact::FIRSTNAMEMAX; ?>" size="10" name="<?php echo CContact::FIRSTNAMETAG; ?>" <?php echo $sDisable;?> /></li>
+<li><input id="contactfirstname" class="inputText" type="text" value="<?php echo $pContact->GetFirstName(1); ?>" maxlength="<?php echo CContact::FIRSTNAMEMAX; ?>" size="10" name="<?php echo CContact::FIRSTNAMETAG; ?>" <?php echo $sDisable.$pHeader->GetCloseTag(); ?></li>
 <li class="label required">T&#233;l&#233;phone</li>
-<li><input id="contactphone" class="inputText" type="text" value="<?php echo $pContact->GetTel(1);?>" maxlength="<?php echo CContact::TELMAX; ?>" size="10" name="<?php echo CContact::TELTAG; ?>" <?php echo $sDisable;?> /></li>
+<li><input id="contactphone" class="inputText" type="text" value="<?php echo $pContact->GetTel(1);?>" maxlength="<?php echo CContact::TELMAX; ?>" size="10" name="<?php echo CContact::TELTAG; ?>" <?php echo $sDisable.$pHeader->GetCloseTag(); ?></li>
 <li class="label">Email</li>
-<li><input id="contactemail" class="inputText" type="text" value="<?php echo $pContact->GetEmail(1);?>" maxlength="<?php echo CContact::EMAILMAX; ?>" size="10" name="<?php echo CContact::EMAILTAG; ?>" <?php echo $sDisable;?> /></li>
+<li><input id="contactemail" class="inputText" type="text" value="<?php echo $pContact->GetEmail(1);?>" maxlength="<?php echo CContact::EMAILMAX; ?>" size="10" name="<?php echo CContact::EMAILTAG; ?>" <?php echo $sDisable.$pHeader->GetCloseTag(); ?></li>
 <li class="label">Adresse</li>
-<li><input id="contactaddress_1" class="inputText" type="text" value="<?php echo $pContact->GetAddress(1);?>" maxlength="<?php echo CContact::ADDRESSMAX; ?>" size="10" name="<?php echo CContact::ADDRESSTAG; ?>" <?php echo $sDisable;?> /></li>
+<li><input id="contactaddress_1" class="inputText" type="text" value="<?php echo $pContact->GetAddress(1);?>" maxlength="<?php echo CContact::ADDRESSMAX; ?>" size="10" name="<?php echo CContact::ADDRESSTAG; ?>" <?php echo $sDisable.$pHeader->GetCloseTag(); ?></li>
 <li class="label hide">&nbsp;</li>
-<li><input id="contactaddress_2" class="inputText" type="text" value="<?php echo $pContact->GetAddressMore(1);?>" maxlength="<?php echo CContact::ADDRESSMOREMAX; ?>" size="10" name="<?php echo CContact::ADDRESSMORETAG; ?>" <?php echo $sDisable;?> /></li>
+<li><input id="contactaddress_2" class="inputText" type="text" value="<?php echo $pContact->GetAddressMore(1);?>" maxlength="<?php echo CContact::ADDRESSMOREMAX; ?>" size="10" name="<?php echo CContact::ADDRESSMORETAG; ?>" <?php echo $sDisable.$pHeader->GetCloseTag(); ?></li>
 <li class="label">Ville</li>
-<li><input id="contactcity" class="inputText" type="text" value="<?php echo $pContact->GetCity(1);?>" maxlength="<?php echo CContact::CITYMAX; ?>" size="10" name="<?php echo CContact::CITYTAG; ?>" <?php echo $sDisable;?> /></li>
+<li><input id="contactcity" class="inputText" type="text" value="<?php echo $pContact->GetCity(1);?>" maxlength="<?php echo CContact::CITYMAX; ?>" size="10" name="<?php echo CContact::CITYTAG; ?>" <?php echo $sDisable.$pHeader->GetCloseTag(); ?></li>
 <li class="label">Code postal</li>
-<li><input id="contactzip" class="inputText" type="text" value="<?php echo $pContact->GetZip(1);?>" maxlength="<?php echo CContact::ZIPMAX; ?>" size="10" name="<?php echo CContact::ZIPTAG; ?>" <?php echo $sDisable;?> /></li>
+<li><input id="contactzip" class="inputText" type="text" value="<?php echo $pContact->GetZip(1);?>" maxlength="<?php echo CContact::ZIPMAX; ?>" size="10" name="<?php echo CContact::ZIPTAG; ?>" <?php echo $sDisable.$pHeader->GetCloseTag(); ?></li>
 </ul>
 </fieldset>
 <fieldset class="fieldsetsub fieldsetform fieldsetformgroup">
 <legend>Taille du groupe</legend>
 <ul>
 <li class="labelF real">R&#233;el</li>
-<li><input id="rentsizereal" class="inputText" type="text" value="<?php echo $iCountReal;?>" maxlength="3" size="3" name="<?php echo CRent::REALTAG; ?>" /></li>
+<li><input id="rentsizereal" class="inputText" type="text" value="<?php echo $iCountReal;?>" maxlength="3" size="3" name="<?php echo CRent::REALTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="labelF planned">Suppos&#233;</li>
-<li><input id="rentsizeplanned" class="inputText" type="text" value="<?php echo $iCountPlanned;?>" maxlength="3" size="3" name="<?php echo CRent::PLANNEDTAG; ?>" /></li>
+<li><input id="rentsizeplanned" class="inputText" type="text" value="<?php echo $iCountPlanned;?>" maxlength="3" size="3" name="<?php echo CRent::PLANNEDTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label hide">&nbsp;</li>
 </ul>
 </fieldset>
 <fieldset class="fieldsetsub fieldsetform fieldsetformgroup">
 <legend>&#194;ge</legend>
 <ul>
-<li class="radio"><input id="rentage1" class="inputRadio" type="radio" name="<?php echo CRent::AGETAG; ?>" value="1" <?php if($iAge===1) echo 'checked="checked"';?> />16-25 ans</li>
-<li class="radio"><input id="rentage2" class="inputRadio" type="radio" name="<?php echo CRent::AGETAG; ?>" value="2" <?php if(($iAge===2)||($iAge===0)) echo 'checked="checked"';?> />26-35 ans</li>
-<li class="radio"><input id="rentage3" class="inputRadio" type="radio" name="<?php echo CRent::AGETAG; ?>" value="3" <?php if($iAge===3) echo 'checked="checked"';?> />35 ans et +</li>
+<li class="radio"><input id="rentage1" class="inputRadio" type="radio" name="<?php echo CRent::AGETAG; ?>" value="1" <?php if($iAge===1) echo 'checked="checked"'; echo $pHeader->GetCloseTag(); ?>16-25 ans</li>
+<li class="radio"><input id="rentage2" class="inputRadio" type="radio" name="<?php echo CRent::AGETAG; ?>" value="2" <?php if(($iAge===2)||($iAge===0)) echo 'checked="checked"'; echo $pHeader->GetCloseTag(); ?>26-35 ans</li>
+<li class="radio"><input id="rentage3" class="inputRadio" type="radio" name="<?php echo CRent::AGETAG; ?>" value="3" <?php if($iAge===3) echo 'checked="checked"'; echo $pHeader->GetCloseTag(); ?>35 ans et +</li>
 </ul>
 </fieldset>
 <fieldset class="fieldsetsub fieldsetform">
 <legend>Arrhes</legend>
 <ul>
-<li class="radio"><input id="rentarrhre1" class="inputRadio" type="radio" name="<?php echo CRent::ARRHESTAG; ?>" value="1" <?php if($iArrhes===1) echo 'checked="checked"';?> />Esp&#232;ce</li>
-<li class="radio"><input id="rentarrhre2" class="inputRadio" type="radio" name="<?php echo CRent::ARRHESTAG; ?>" value="2" <?php if($iArrhes===2) echo 'checked="checked"';?> />Ch&#232;que</li>
-<li class="radio"><input id="rentarrhre3" class="inputRadio" type="radio" name="<?php echo CRent::ARRHESTAG; ?>" value="3" <?php if($iArrhes===3) echo 'checked="checked"';?> />CB</li>
+<li class="radio"><input id="rentarrhre1" class="inputRadio" type="radio" name="<?php echo CRent::ARRHESTAG; ?>" value="1" <?php if($iArrhes===1) echo 'checked="checked"'; echo $pHeader->GetCloseTag(); ?>Esp&#232;ce</li>
+<li class="radio"><input id="rentarrhre2" class="inputRadio" type="radio" name="<?php echo CRent::ARRHESTAG; ?>" value="2" <?php if($iArrhes===2) echo 'checked="checked"'; echo $pHeader->GetCloseTag(); ?>Ch&#232;que</li>
+<li class="radio"><input id="rentarrhre3" class="inputRadio" type="radio" name="<?php echo CRent::ARRHESTAG; ?>" value="3" <?php if($iArrhes===3) echo 'checked="checked"'; echo $pHeader->GetCloseTag(); ?>CB</li>
 </ul>
 </fieldset>
 <ul class="listbuttons">
-<li><input class="inputButton" type="submit" value="&nbsp;&nbsp;&nbsp;Cr&#233;er&nbsp;&nbsp;&nbsp;" name="new"/></li>
+<li><input class="inputButton" type="submit" value="Cr&#233;er" name="new"<?php echo $pHeader->GetCloseTag(); ?></li>
 </ul>
 </fieldset>
 </form>
-<a name="pagemiddle"></a>
+<?php echo $pHeader->GetAnchor('pagemiddle'),"\n"; ?>
 <fieldset class="fieldsetform">
 <?php
 
@@ -274,7 +278,7 @@ function BuildCurrentRent( &$tRecord, $sPrintHRef)
     $sBuffer  = '<legend class="legendmain">R&#233;servations courantes';
     if( $pPaging->GetMax()>1 )
     {
-        $sBuffer .= ' <em>(page '.$pPaging->GetCurrent().' sur '.$pPaging->GetMax().')</em>';
+        $sBuffer .= ' <em class="hide">(page '.$pPaging->GetCurrent().' sur '.$pPaging->GetMax().')</em>';
     }//if( $pPaging->GetMax()>1 )
     $sBuffer .= '</legend>';
     echo $sBuffer,"\n";
@@ -284,10 +288,8 @@ function BuildCurrentRent( &$tRecord, $sPrintHRef)
     if( !empty($tRecordset) )
     {
         echo '<ul class="navigation menu">',"\n";
-//        echo '<li><a title="Imprimer les r&#233;servations" href="'.$sPrintHRef.'" target="_blank">Imprimer</a></li>',"\n";
         echo '<li><a title="Imprimer les r&#233;servations" href="'.$sPrintHRef.'" >Imprimer</a></li>',"\n";
 
-
         if( $pPaging->GetMax()>1 )
         {
             // First page
@@ -341,9 +343,10 @@ function BuildCurrentRent( &$tRecord, $sPrintHRef)
 ?>
 </fieldset>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagebottom'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller en haut de la page" href="#pagetop" name="pagebottom">&#8593;</a></li>
+<li><a title="Aller en haut de la page" href="#pagetop">&#8593;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Retourner au calendrier" href="<?php echo PBR_URL;?>">Calendrier</a></li>
 <?php if( !empty($sCalendarHRef) ) echo $sCalendarHRef,"\n"; ?>
diff --git a/src/includes/display/dayprint.php b/src/includes/display/dayprint.php
index 8b54879..fc33aa5 100644
--- a/src/includes/display/dayprint.php
+++ b/src/includes/display/dayprint.php
@@ -35,11 +35,14 @@
  *                  - $pDate (instance of CDate)
  *                  - $sFormTitle (string)
  *                  - $tRecordset (array)
+ *                  - $pHeader (instance of CHeader)
  * author: Olivier JULLIEN - 2010-02-04
  * update: Olivier JULLIEN - 2010-06-15 - improvement
- * W3C: This document was successfully checked as XHTML 1.0 Strict!
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
-if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !isset($pDate) || !isset($sFormTitle) ||!is_array($tRecordset) )
+if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !isset($pDate) || !isset($sFormTitle) ||!is_array($tRecordset) || !isset($pHeader) )
     die('-1');
 
 /**
@@ -55,6 +58,7 @@
   */
 function BuildCurrentRent(&$tRecord, $bPageBreak)
 {
+    global $pHeader;
     if( is_array($tRecord) && array_key_exists('reservation_id', $tRecord)
                            && array_key_exists('reservation_real', $tRecord)
                            && array_key_exists('reservation_planned', $tRecord)
@@ -73,7 +77,7 @@ function BuildCurrentRent(&$tRecord, $bPageBreak)
             $sBuffer.='<span class="planned">&nbsp;'.$tRecord['reservation_planned'].'</span>';
             $sBuffer.='<span class="canceled">&nbsp;'.$tRecord['reservation_canceled'].'</span>';
             $iTotal=(integer)$tRecord['reservation_real']+(integer)$tRecord['reservation_planned'];
-            $sBuffer.='<span>Total: '.$iTotal.' / '.$tRecord['reservation_arrhes'].'</span><hr/>';
+            $sBuffer.='<span>Total: '.$iTotal.' / '.$tRecord['reservation_arrhes'].'</span>'.$pHeader->GetHR();
         }
         else
         {
@@ -125,7 +129,7 @@ function BuildCurrentRent(&$tRecord, $bPageBreak)
 <li><a title="Retour" href="<?php echo $sHRef; ?>">Retour</a></li>
 </ul>
 <h1><?php echo htmlentities($sFormTitle,ENT_QUOTES,'UTF-8');?></h1>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
 <ul>
 <?php
     if( is_array($tRecordset) )
diff --git a/src/includes/display/footer.php b/src/includes/display/footer.php
index 218c2fe..d8b4387 100644
--- a/src/includes/display/footer.php
+++ b/src/includes/display/footer.php
@@ -34,13 +34,21 @@
  * author: Olivier JULLIEN - 2010-02-04
  * update: Olivier JULLIEN - 2010-05-24 - write error(s)
  * update: Olivier JULLIEN - 2010-06-15 - improvement
- * W3C: This document was successfully checked as XHTML 1.0 Strict!
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
-if ( !defined('PBR_VERSION') )
+if( !defined('PBR_VERSION') )
     die('-1');
 
     // Version
-    $sVersion='Release CAMP '.PBR_VERSION.' ©JOT 2010';
+    $sVersion = PBR_VERSION;
+    $sVersion = trim($sVersion);
+    if( !empty($sVersion) )
+        $sVersion = 'Version '.$sVersion;
+    if( isset($pHeader) && $pHeader->AcceptXML() )
+        $sVersion.=' xhtml';
+    $sVersion.=' ©JOT 2010';
 
     // Mobile
     if( isset($pHeader) && $pHeader->IsMobile() && CAuth::GetInstance()->IsAuthenticated() )
diff --git a/src/includes/display/graphs.php b/src/includes/display/graphs.php
index 12af409..ababe92 100644
--- a/src/includes/display/graphs.php
+++ b/src/includes/display/graphs.php
@@ -36,10 +36,13 @@
  *                  - $pChoice (instance of COption)
  *                  - $pInterval (instance of COption)
  *                  - $sTitle (string)
+ *                  - $pHeader (instance of CHeader)
  * author: Olivier JULLIEN - 2010-06-15
- * W3C: This document was successfully checked as XHTML 1.0 Strict!
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
-if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !is_array($tGraphs) || !isset($pChoice) || !isset($pInterval) || !isset($sTitle) )
+if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !is_array($tGraphs) || !isset($pChoice) || !isset($pInterval) || !isset($sTitle) || !isset($pHeader) )
     die('-1');
 
     // Default image source
@@ -50,17 +53,17 @@
 <div id="HEADER">
 <p><em><small>Connect&#233; en tant que <?php echo CAuth::GetInstance()->GetUsername(1); ?></small></em></p>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagetop'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller aux r&#233;servations courantes" name="pagetop" href="#pagemiddle">&#8595;</a></li>
+<li><a title="Aller aux r&#233;servations courantes" href="#pagemiddle">&#8595;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Retourner au calendrier" href="<?php echo PBR_URL;?>">Calendrier</a></li>
 <li><a title="Configurer" href="<?php echo PBR_URL;?>parameters.php">Param&#232;tres</a></li>
 <li><a title="Gestion des utilisateurs" href="<?php echo PBR_URL;?>users.php">Utilisateurs</a></li>
-<li><a title="Voir les graphes" href="<?php echo PBR_URL;?>graphs.php">Graphes</a></li>
 <li><a title="Voir les logs" href="<?php echo PBR_URL;?>logs.php">Logs</a></li>
 </ul>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
 <div id="CONTENT">
 <h1><?php echo htmlentities($sTitle,ENT_QUOTES,'UTF-8'); ?></h1>
 <form id="FORMSELECT" method="post" action="<?php echo PBR_URL;?>graphs.php">
@@ -86,33 +89,34 @@
 ?>
 </select></li>
 <li class="label">Intervalle</li>
-<li><input id="interval" class="inputTextS" type="text" value="<?php if( $pInterval->GetValue()>0) echo $pInterval->GetValue(); ?>" maxlength="3" size="3" name="<?php echo $pInterval->GetName(); ?>"/></li>
-<li class="listbuttonitem"><input class="inputButton" type="submit" value="&nbsp;Afficher&nbsp;" /></li>
+<li><input id="interval" class="inputTextS" type="text" value="<?php if( $pInterval->GetValue()>0) echo $pInterval->GetValue(); ?>" maxlength="3" size="3" name="<?php echo $pInterval->GetName(); ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
+<li class="listbuttonitem"><input class="inputButton" type="submit" value="Afficher"<?php echo $pHeader->GetCloseTag(); ?></li>
 </ul>
 </fieldset>
 </form>
 <?php
+    echo $pHeader->GetAnchor('pagemiddle'),"\n";
     /** image
      ********/
     if( !empty($sSource) )
     {
         $sSource = PBR_URL.'graphs/'.$sSource.'.php?'.$pInterval->GetName().'='.$pInterval->GetValue();
         echo '<div class="graph">',"\n";
-        echo '<img src="'.$sSource.'" alt="Aucune donn&#233;e &#224; afficher" />',"\n";
+        echo '<img src="'.$sSource.'" alt="Aucune donn&#233;e &#224; afficher"'.$pHeader->GetCloseTag(),"\n";
         echo '</div>',"\n";
     }
 ?>
 <form id="FORMDELETE" method="post" action="<?php echo $sSource; ?>">
-<ul class="listbuttons"><li><input class="inputButton" type="submit" value="&nbsp;Exporter&nbsp;" name="exp"/></li></ul>
+<ul class="listbuttons"><li><input class="inputButton" type="submit" value="Exporter" name="exp"<?php echo $pHeader->GetCloseTag(); ?></li></ul>
 </form>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagebottom'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller en haut de la page" href="#pagetop" name="pagebottom">&#8593;</a></li>
+<li><a title="Aller en haut de la page" href="#pagetop">&#8593;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Retourner au calendrier" href="<?php echo PBR_URL;?>">Calendrier</a></li>
 <li><a title="Configurer" href="<?php echo PBR_URL;?>parameters.php">Param&#232;tres</a></li>
 <li><a title="Gestion des utilisateurs" href="<?php echo PBR_URL;?>users.php">Utilisateurs</a></li>
-<li><a title="Voir les graphes" href="<?php echo PBR_URL;?>graphs.php">Graphes</a></li>
 <li><a title="Voir les logs" href="<?php echo PBR_URL;?>logs.php">Logs</a></li>
 </ul>
diff --git a/src/includes/display/header.php b/src/includes/display/header.php
index 2f0b785..2b41eaf 100644
--- a/src/includes/display/header.php
+++ b/src/includes/display/header.php
@@ -36,7 +36,9 @@
  * author: Olivier JULLIEN - 2010-02-04
  * update: Olivier JULLIEN - 2010-05-21 - Case: short_open_tag is on
  * update: Olivier JULLIEN - 2010-06-15 - improvement
- * W3C: This document was successfully checked as XHTML 1.0 Strict!
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
 if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !isset($pHeader) )
     die('-1');
@@ -59,59 +61,69 @@
     header('Cache-Control: post-check=0, pre-check=0', FALSE);
     header('Pragma: no-cache');     // For HTTP/1.0 compability
 
-    /** Send content-type header
-     ***************************/
+    /** Build header
+     ***************/
     $sContentType = '<meta http-equiv="Content-Type" content="';
     if( $pHeader->AcceptXML()===TRUE )
     {
+
+        /** XHTML 1.0 strict
+         *******************/
+
+        // Send content-type header
         header('Content-type: application/xhtml+xml; charset=UTF-8');
-        $sContentType .= 'application/xhtml+xml';
+        echo '<?xml version="1.0" encoding="utf-8"?>',"\n";
+        echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',"\n";
+        echo '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">',"\n";
+        $sContentType .= 'application/xhtml+xml;charset=utf-8" />';
     }
     else
     {
+
+        /** HTML 4.01 strict
+         *******************/
+
+        // Send content-type header
         header('Content-type: text/html; charset=UTF-8');
-        $sContentType .= 'text/html';
+        echo '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',"\n";
+        echo '<html lang="fr">',"\n";
+        $sContentType .= 'text/html;charset=utf-8">';
     }//if( $pHeader->AcceptXML()===TRUE )
-    $sContentType .= ';charset=utf-8" />';
 
-    // In case of short_open_tag is on
-    echo '<?xml version="1.0" encoding="utf-8"?>',"\n";
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
-<head>
-<title><?php echo $pHeader->GetTitle(); ?></title>
-<?php echo $sContentType,"\n"; ?>
-<link rel="shortcut icon" href="<?php echo PBR_URL; ?>favicon.ico" type="image/x-icon" />
-<link rel="apple-touch-icon" href="<?php echo PBR_URL; ?>apple-touch-icon.png" />
-<meta http-equiv="expires" content="<?php echo $sExpire_RFC822; ?>" />
-<?php
+    /** COMMON
+     *********/
+    echo '<head>',"\n";
+    echo '<title>'.$pHeader->GetTitle().'</title>',"\n";
+    echo $sContentType,"\n";
+    echo '<link rel="shortcut icon" href="'.PBR_URL.'favicon.ico" type="image/x-icon"'.$pHeader->GetCloseTag(),"\n";
+    echo '<link rel="apple-touch-icon" href="'.PBR_URL.'apple-touch-icon.png"'.$pHeader->GetCloseTag(),"\n";
+    echo '<meta http-equiv="expires" content="'.$sExpire_RFC822.'"'.$pHeader->GetCloseTag(),"\n";
     if( $pHeader->ForPrinting() )
     {
-        echo '<link rel="stylesheet" type="text/css" href="'.PBR_URL.'css/prints.css" media="screen" />',"\n";
-        echo '<link rel="stylesheet" type="text/css" href="'.PBR_URL.'css/printp.css" media="print" />',"\n";
+        echo '<link rel="stylesheet" type="text/css" href="'.PBR_URL.'css/prints.css" media="screen"'.$pHeader->GetCloseTag(),"\n";
+        echo '<link rel="stylesheet" type="text/css" href="'.PBR_URL.'css/printp.css" media="print"'.$pHeader->GetCloseTag(),"\n";
     }
     elseif( $pHeader->IsMobile() )
     {
         if( CAuth::GetInstance()->GetForceDesktop() )
         {
-            echo '<link rel="stylesheet" type="text/css" href="'.PBR_URL.'css/style.css" media="all" />',"\n";
+            echo '<link rel="stylesheet" type="text/css" href="'.PBR_URL.'css/style.css" media="all"'.$pHeader->GetCloseTag(),"\n";
         }
         else
         {
-            echo '<link rel="stylesheet" type="text/css" href="'.PBR_URL.'css/mobile.css" />',"\n";
+            echo '<link rel="stylesheet" type="text/css" href="'.PBR_URL.'css/mobile.css"'.$pHeader->GetCloseTag(),"\n";
         }
     }
     else
     {
-        echo '<link rel="stylesheet" type="text/css" href="'.PBR_URL.'css/style.css" media="all" />',"\n";
-        echo '<link rel="stylesheet" type="text/css" href="'.PBR_URL.'css/mobilize.css" media="only screen and (max-device-width: 480px)" />',"\n";
+        echo '<link rel="stylesheet" type="text/css" href="'.PBR_URL.'css/style.css" media="all"'.$pHeader->GetCloseTag(),"\n";
+        echo '<link rel="stylesheet" type="text/css" href="'.PBR_URL.'css/mobilize.css" media="only screen and (max-device-width: 480px)"'.$pHeader->GetCloseTag(),"\n";
     }//if( $pHeader->ForPrinting() )
+    echo '<meta http-equiv="Content-Language" content="fr"'.$pHeader->GetCloseTag(),"\n";
+    echo '<meta name="description" content="'.$pHeader->GetDescription().'"'.$pHeader->GetCloseTag(),"\n";
+    echo '<meta name="keywords"  content="'.$pHeader->GetKeywords().'"'.$pHeader->GetCloseTag(),"\n";
+    echo '<meta name="robots" content="'.$pHeader->GetRobot().'"'.$pHeader->GetCloseTag(),"\n";
+    echo '<meta name="copyright" content="Olivier JULLIEN"'.$pHeader->GetCloseTag(),"\n";
 ?>
-<meta http-equiv="Content-Language" content="fr" />
-<meta name="description" content="<?php echo $pHeader->GetDescription(); ?>" />
-<meta name="keywords"  content="<?php echo $pHeader->GetKeywords(); ?>" />
-<meta name="robots" content="<?php echo $pHeader->GetRobot(); ?>" />
-<meta name="copyright" content="Olivier JULLIEN" />
 </head>
 <body>
diff --git a/src/includes/display/login.php b/src/includes/display/login.php
index 30279dc..090f1f4 100644
--- a/src/includes/display/login.php
+++ b/src/includes/display/login.php
@@ -35,11 +35,14 @@
  *                  - $sToken
  *                  - CUser
  *                  - $iMessageCode
+ *                  - $pHeader (instance of CHeader)
  * author: Olivier JULLIEN - 2010-02-04
  * update: Olivier JULLIEN - 2010-06-15 - improvement
- * W3C: This document was successfully checked as XHTML 1.0 Strict!
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
-if( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !isset($pUser) || !isset($iMessageCode) && !isset($sToken) )
+if( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !isset($pUser) || !isset($iMessageCode) && !isset($sToken) || !isset($pHeader) )
     die('-1');
 
 /**
@@ -80,14 +83,14 @@ function BuildMessage($iCode)
 <form id="FORMLOGIN" method="post" action="<?php echo PBR_URL;?>login.php">
 <fieldset class="fieldsetform">
 <legend class="legendmain">Connexion</legend>
-<input type="hidden" name="<?php echo CAction::ACTIONTAG; ?>" value="login" />
-<input type="hidden" name="<?php echo CPHPSession::TOKENTAG; ?>" value="<?php echo $sToken; ?>" />
+<input type="hidden" name="<?php echo CAction::ACTIONTAG; ?>" value="login"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
+<input type="hidden" name="<?php echo CPHPSession::TOKENTAG; ?>" value="<?php echo $sToken; ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
 <ul>
 <li class="label required">Nom</li>
-<li><input id="loginusr" class="inputText" type="text" value="<?php echo $sUsername; ?>" maxlength="<?php echo CUser::USERNAMEMAX; ?>" size="10" name="<?php echo CUser::USERNAMETAG; ?>"/></li>
+<li><input id="loginusr" class="inputText" type="text" value="<?php echo $sUsername; ?>" maxlength="<?php echo CUser::USERNAMEMAX; ?>" size="10" name="<?php echo CUser::USERNAMETAG; ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?></li>
 <li class="label required">Mot de passe</li>
-<li><input id="loginpwd" class="inputText" type="password" value="" maxlength="<?php echo CUser::PASSWORDMAX; ?>" size="10" name="<?php echo CUser::PASSWORDTAG; ?>"/></li>
-<li class="listbuttonitem"><input class="inputButton" type="submit" value="Connexion" name="login"/></li>
+<li><input id="loginpwd" class="inputText" type="password" value="" maxlength="<?php echo CUser::PASSWORDMAX; ?>" size="10" name="<?php echo CUser::PASSWORDTAG; ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?></li>
+<li class="listbuttonitem"><input class="inputButton" type="submit" value="Connexion" name="login"<?php echo $pHeader->GetCloseTag(),"\n"; ?></li>
 </ul>
 </fieldset>
 </form>
diff --git a/src/includes/display/logs.php b/src/includes/display/logs.php
index e56b41e..c2bf978 100644
--- a/src/includes/display/logs.php
+++ b/src/includes/display/logs.php
@@ -35,11 +35,14 @@
  *                  - $tRecordset (array)
  *                  - $pPaging (instance of CPaging)
  *                  - $iMessageCode (integer)
+ *                  - $pHeader (instance of CHeader)
  * author: Olivier JULLIEN - 2010-02-04
  * update: Olivier JULLIEN - 2010-06-15 - improvement
- * W3C: This document was successfully checked as XHTML 1.0 Strict!
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
-if( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !isset($pPaging) || !is_array($tRecordset) || !is_integer($iMessageCode) )
+if( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !isset($pPaging) || !is_array($tRecordset) || !is_integer($iMessageCode) || !isset($pHeader) )
     die('-1');
 
 /**
@@ -112,17 +115,17 @@ function BuildLog( &$tRecord, $iPagingMax, $iIndex)
 <div id="HEADER">
 <p><em><small>Connect&#233; en tant que <?php echo CAuth::GetInstance()->GetUsername(1); ?></small></em></p>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagetop'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller en bas de la page" name="pagetop" href="#pagebottom">&#8595;</a></li>
+<li><a title="Aller en bas de la page" href="#pagebottom">&#8595;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Retourner au calendrier" href="<?php echo PBR_URL;?>">Calendrier</a></li>
 <li><a title="Configurer" href="<?php echo PBR_URL;?>parameters.php">Param&#232;tres</a></li>
 <li><a title="Gestion des utilisateurs" href="<?php echo PBR_URL;?>users.php">Utilisateurs</a></li>
 <li><a title="Voir les graphes" href="<?php echo PBR_URL;?>graphs.php">Graphes</a></li>
-<li><a title="Voir les logs" href="<?php echo PBR_URL;?>logs.php">Logs</a></li>
 </ul>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
 <div id="CONTENT">
 <?php BuildMessage($iMessageCode); ?>
 <h1>Logs</h1>
@@ -131,7 +134,7 @@ function BuildLog( &$tRecord, $iPagingMax, $iIndex)
 <fieldset class="fieldsetsub fieldsetform">
 <legend class="legendmain">Effacer tous les logs</legend>
 <ul>
-<li class="listbuttonitem"><input class="inputButton" type="submit" value="Supprimer" /></li>
+<li class="listbuttonitem"><input class="inputButton" type="submit" value="Supprimer"<?php echo $pHeader->GetCloseTag(),"\n"; ?></li>
 </ul>
 </fieldset>
 </form>
@@ -144,7 +147,7 @@ function BuildLog( &$tRecord, $iPagingMax, $iIndex)
     $sBuffer  = '<legend class="legendmain">Logs';
     if( $pPaging->GetMax()>1 )
     {
-        $sBuffer .= ' <em>(page '.$pPaging->GetCurrent().' sur '.$pPaging->GetMax().')</em>';
+        $sBuffer .= ' <em class=hide">(page '.$pPaging->GetCurrent().' sur '.$pPaging->GetMax().')</em>';
     }//if( $pPaging->GetMax()>1 )
     $sBuffer .= '</legend>';
     echo $sBuffer,"\n";
@@ -205,7 +208,8 @@ function BuildLog( &$tRecord, $iPagingMax, $iIndex)
 ?>
 </fieldset>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagebottom'),"\n"; ?>
 <ul class="navigation menu">
 <li><a title="Aller en haut de la page" href="#pagetop" name="pagebottom">&#8593;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
@@ -213,5 +217,4 @@ function BuildLog( &$tRecord, $iPagingMax, $iIndex)
 <li><a title="Configurer" href="<?php echo PBR_URL;?>parameters.php">Param&#232;tres</a></li>
 <li><a title="Gestion des utilisateurs" href="<?php echo PBR_URL;?>users.php">Utilisateurs</a></li>
 <li><a title="Voir les graphes" href="<?php echo PBR_URL;?>graphs.php">Graphes</a></li>
-<li><a title="Voir les logs" href="<?php echo PBR_URL;?>logs.php">Logs</a></li>
 </ul>
diff --git a/src/includes/display/logsdelete.php b/src/includes/display/logsdelete.php
index 8434556..28d08ad 100644
--- a/src/includes/display/logsdelete.php
+++ b/src/includes/display/logsdelete.php
@@ -33,29 +33,32 @@
  * description: Display the log delete page.
  *              The following object(s) should exist:
  *                  - $sToken (string)
+ *                  - $pHeader (instance of CHeader)
  * author: Olivier JULLIEN - 2010-02-04
  * update: Olivier JULLIEN - 2010-06-15 - improvement
- * W3C: This document was successfully checked as XHTML 1.0 Strict!
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
-if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !isset($sToken) )
+if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !isset($sToken) || !isset($pHeader) )
     die('-1');
 ?>
 <div id="PAGE">
 <div id="HEADER">
 <p><em><small>Connect&#233; en tant que <?php echo CAuth::GetInstance()->GetUsername(1); ?></small></em></p>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
 <div id="CONTENT">
 <h1>Supprimer les logs</h1>
 <form id="FORMCONFIRM" method="post" action="<?php echo PBR_URL;?>logsdelete.php">
 <fieldset class="fieldsetform">
 <legend class="legendmain">Confirmer la suppression</legend>
-<input type="hidden" name="<?php echo CPHPSession::TOKENTAG; ?>" value="<?php echo $sToken; ?>" />
+<input type="hidden" name="<?php echo CPHPSession::TOKENTAG; ?>" value="<?php echo $sToken; ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
 <div id="MESSAGE">
 <p class="error">Tous les logs vont &ecirc;tre supprim&eacute;s.</p>
 </div>
 <ul>
-<li class="listbuttonitem"><input class="inputButton" type="submit" value="Supprimer" name="con"/>&nbsp;<input class="inputButton" type="submit" value="&nbsp;Annuler&nbsp;&nbsp;" name="can"/></li>
+<li class="listbuttonitem"><input class="inputButton" type="submit" value="Supprimer" name="con"<?php echo $pHeader->GetCloseTag(),"\n"; ?>&nbsp;<input class="inputButton" type="submit" value="Annuler" name="can"<?php echo $pHeader->GetCloseTag(),"\n"; ?></li>
 </ul>
 </fieldset>
 </form>
diff --git a/src/includes/display/parameters.php b/src/includes/display/parameters.php
index d510cb0..cdd8dcf 100644
--- a/src/includes/display/parameters.php
+++ b/src/includes/display/parameters.php
@@ -36,11 +36,14 @@
  *                  - $tRecordsetDB (array)
  *                  - $iMessageCode (integer)
  *                  - $pDate (instance of CDate)
+ *                  - $pHeader (instance of CHeader)
  * author: Olivier JULLIEN - 2010-02-04
  * update: Olivier JULLIEN - 2010-06-15 - improvement
- * W3C: This document was successfully checked as XHTML 1.0 Strict!
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
-if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !is_array($tRecordset) || !is_integer($iMessageCode) || !isset($pDate) || !is_array($tRecordsetDB) )
+if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !is_array($tRecordset) || !is_integer($iMessageCode) || !isset($pDate) || !is_array($tRecordsetDB) || !isset($pHeader) )
     die('-1');
 
 /**
@@ -83,17 +86,17 @@ function BuildMessage($iCode)
 <div id="HEADER">
 <p><em><small>Connect&#233; en tant que <?php echo CAuth::GetInstance()->GetUsername(1); ?></small></em></p>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagetop'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller aux r&#233;servations courantes" name="pagetop" href="#pagemiddle">&#8595;</a></li>
+<li><a title="Aller aux r&#233;servations courantes" href="#pagemiddle">&#8595;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Retourner au calendrier" href="<?php echo PBR_URL;?>">Calendrier</a></li>
-<li><a title="Configurer" href="<?php echo PBR_URL;?>parameters.php">Param&#232;tres</a></li>
 <li><a title="Gestion des utilisateurs" href="<?php echo PBR_URL;?>users.php">Utilisateurs</a></li>
 <li><a title="Voir les graphes" href="<?php echo PBR_URL;?>graphs.php">Graphes</a></li>
 <li><a title="Voir les logs" href="<?php echo PBR_URL;?>logs.php">Logs</a></li>
 </ul>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
 <div id="CONTENT">
 <?php BuildMessage($iMessageCode); ?>
 <h1>Param&#232;tres</h1>
@@ -101,46 +104,50 @@ function BuildMessage($iCode)
 <fieldset class="fieldsetsub">
 <legend>Maximum</legend>
 <fieldset class="fieldsetform fieldsetformgroup noborder">
+<legend class="hide"></legend>
 <ul>
 <?php
     for( $iIndex=1; $iIndex<5; $iIndex++ )
     {
         echo '<li class="labelF">'.$pDate->GetMonthName($iIndex,1).'</li>',"\n";
-        echo '<li><input id="param'.$iIndex.'" class="inputParam" type="text" value="'.$tRecordset[$iIndex].'" maxlength="3" size="3" name="'.CMaxRentPerMonthList::PARAMETERTAG.$iIndex.'" /></li>',"\n";
+        echo '<li><input id="param'.$iIndex.'" class="inputParam" type="text" value="'.$tRecordset[$iIndex].'" maxlength="3" size="3" name="'.CMaxRentPerMonthList::PARAMETERTAG.$iIndex.'"'.$pHeader->GetCloseTag().'</li>',"\n";
     }//for( $iIndex=1; $iIndex<5; $iIndex++ )
 ?>
 </ul>
 </fieldset>
 <fieldset class="noborder fieldsetform fieldsetformgroup">
+<legend class="hide"></legend>
 <ul>
 <?php
     for( $iIndex=5; $iIndex<9; $iIndex++ )
     {
         echo '<li class="labelF">'.$pDate->GetMonthName($iIndex,1).'</li>',"\n";
-        echo '<li><input id="param'.$iIndex.'" class="inputParam" type="text" value="'.$tRecordset[$iIndex].'" maxlength="3" size="3" name="'.CMaxRentPerMonthList::PARAMETERTAG.$iIndex.'" /></li>',"\n";
+        echo '<li><input id="param'.$iIndex.'" class="inputParam" type="text" value="'.$tRecordset[$iIndex].'" maxlength="3" size="3" name="'.CMaxRentPerMonthList::PARAMETERTAG.$iIndex.'"'.$pHeader->GetCloseTag().'</li>',"\n";
     }//for( $iIndex=1; $iIndex<5; $iIndex++ )
 ?>
 </ul>
 </fieldset>
 <fieldset class="noborder fieldsetform">
+<legend class="hide"></legend>
 <ul>
 <?php
     for( $iIndex=9; $iIndex<13; $iIndex++ )
     {
         echo '<li class="label">'.$pDate->GetMonthName($iIndex,1).'</li>',"\n";
-        echo '<li><input id="param'.$iIndex.'" class="inputParam" type="text" value="'.$tRecordset[$iIndex].'" maxlength="3" size="3" name="'.CMaxRentPerMonthList::PARAMETERTAG.$iIndex.'" /></li>',"\n";
+        echo '<li><input id="param'.$iIndex.'" class="inputParam" type="text" value="'.$tRecordset[$iIndex].'" maxlength="3" size="3" name="'.CMaxRentPerMonthList::PARAMETERTAG.$iIndex.'"'.$pHeader->GetCloseTag().'</li>',"\n";
     }//for( $iIndex=1; $iIndex<5; $iIndex++ )
 ?>
 </ul>
 </fieldset>
-<ul class="listbuttons"><li><input class="inputButton" type="submit" value="Modifier" name="update" /></li></ul>
+<ul class="listbuttons"><li><input class="inputButton" type="submit" value="Modifier" name="update"<?php echo $pHeader->GetCloseTag(); ?></li></ul>
 </fieldset>
 </form>
+<?php echo $pHeader->GetAnchor('pagemiddle'),"\n"; ?>
 <form id="FORMDELETE" method="post" action="<?php echo PBR_URL;?>rentsdelete.php">
 <fieldset class="fieldsetsub fieldsetform">
 <legend>Purge</legend>
-<p>Supprimer les r&#233;servations ant&#233;rieures &#224; l&#39;ann&#233;e: &nbsp;<input id="paramyear" class="inputTextS" type="text" value="" maxlength="4" size="4" name="<?php echo CDate::YEARTAG; ?>" /><?php echo ' ( &le; '.$pDate->GetCurrentYear().' )';?></p>
-<ul class="listbuttons"><li><input class="inputButton" type="submit" value="Envoyer" /></li></ul>
+<p>Supprimer les r&#233;servations ant&#233;rieures &#224; l&#39;ann&#233;e: &nbsp;<input id="paramyear" class="inputTextS" type="text" value="" maxlength="4" size="4" name="<?php echo CDate::YEARTAG; ?>"<?php echo $pHeader->GetCloseTag().' ( &le; '.$pDate->GetCurrentYear().' )';?></p>
+<ul class="listbuttons"><li><input class="inputButton" type="submit" value="Envoyer"<?php echo $pHeader->GetCloseTag(); ?></li></ul>
 </fieldset>
 </form>
 <fieldset class="fieldsetsub fieldsetform">
@@ -170,12 +177,12 @@ function BuildMessage($iCode)
 ?>
 </fieldset>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagebottom'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller en haut de la page" href="#pagetop" name="pagebottom">&#8593;</a></li>
+<li><a title="Aller en haut de la page" href="#pagetop">&#8593;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Retourner au calendrier" href="<?php echo PBR_URL;?>">Calendrier</a></li>
-<li><a title="Configurer" href="<?php echo PBR_URL;?>parameters.php">Param&#232;tres</a></li>
 <li><a title="Gestion des utilisateurs" href="<?php echo PBR_URL;?>users.php">Utilisateurs</a></li>
 <li><a title="Voir les graphes" href="<?php echo PBR_URL;?>graphs.php">Graphes</a></li>
 <li><a title="Voir les logs" href="<?php echo PBR_URL;?>logs.php">Logs</a></li>
diff --git a/src/includes/display/rent.php b/src/includes/display/rent.php
index 493b63d..d322929 100644
--- a/src/includes/display/rent.php
+++ b/src/includes/display/rent.php
@@ -36,11 +36,14 @@
  *                  - $pDate (instance of CDate)
  *                  - $pContact ( instance of CContact)
  *                  - $iMessageCode (integer)
+ *                  - $pHeader (instance of CHeader)
  * author: Olivier JULLIEN - 2010-02-04
  * update: Olivier JULLIEN - 2010-06-15 - improvement
- * W3C: This document was successfully checked as XHTML 1.0 Strict!
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
-if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !is_integer($iMessageCode) || !isset($pRent) || !isset($pContact) || !isset($pDate) )
+if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !is_integer($iMessageCode) || !isset($pRent) || !isset($pContact) || !isset($pDate) || !isset($pHeader) )
     die('-1');
 
 /**
@@ -116,9 +119,10 @@ function BuildMessage($iCode)
 <div id="HEADER">
 <p><em><small>Connect&#233; en tant que <?php echo CAuth::GetInstance()->GetUsername(1); ?></small></em></p>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagetop'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller en bas de la page" name="pagetop" href="#pagebottom">&#8595;</a></li>
+<li><a title="Aller en bas de la page" href="#pagebottom">&#8595;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Aller au calendrier" href="<?php echo PBR_URL;?>">Calendrier</a></li>
 <?php
@@ -131,32 +135,32 @@ function BuildMessage($iCode)
 ?>
 <li><a title="Afficher tous les contacts" href="<?php echo PBR_URL;?>contacts.php">Contacts</a></li>
 </ul>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
 <div id="CONTENT">
 <?php BuildMessage($iMessageCode); ?>
 <h1><?php echo $sFormTitle;?></h1>
 <form id="FORMRENT" method="post" action="<?php echo PBR_URL.'rent.php'; ?>">
 <fieldset class="fieldsetform">
 <legend class="legendmain">Contact</legend>
-<input type="hidden" name="<?php echo CRent::IDENTIFIERTAG; ?>" value="<?php echo $pRent->GetIdentifier(); ?>" />
+<input type="hidden" name="<?php echo CRent::IDENTIFIERTAG; ?>" value="<?php echo $pRent->GetIdentifier(); ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
 <ul>
 <li class="label required">Nom</li>
-<li><input id="contactlastname" class="inputText" type="text" value="<?php echo $sEncodedLastName; ?>" maxlength="<?php echo CContact::LASTNAMEMAX; ?>" size="10" name="<?php echo CContact::LASTNAMETAG; ?>"  disabled="disabled" /></li>
+<li><input id="contactlastname" class="inputText" type="text" value="<?php echo $sEncodedLastName; ?>" maxlength="<?php echo CContact::LASTNAMEMAX; ?>" size="10" name="<?php echo CContact::LASTNAMETAG; ?>"  disabled="disabled"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="navigation"><a title="Voir la fiche" href="<?php echo $sContactHRef;?>"><em>Voir la fiche</em></a></li>
 <li class="label required">Pr&eacute;nom</li>
-<li><input id="contactfirstname" class="inputText" type="text" value="<?php echo $sEncodedFirstName; ?>" maxlength="<?php echo CContact::FIRSTNAMEMAX; ?>" size="10" name="<?php echo CContact::FIRSTNAMETAG; ?>" disabled="disabled" /></li>
+<li><input id="contactfirstname" class="inputText" type="text" value="<?php echo $sEncodedFirstName; ?>" maxlength="<?php echo CContact::FIRSTNAMEMAX; ?>" size="10" name="<?php echo CContact::FIRSTNAMETAG; ?>" disabled="disabled"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label required">T&#233;l&#233;phone</li>
-<li><input id="contactphone" class="inputText" type="text" value="<?php echo $pContact->GetTel(1);?>" maxlength="<?php echo CContact::TELMAX; ?>" size="10" name="<?php echo CContact::TELTAG; ?>" disabled="disabled" /></li>
+<li><input id="contactphone" class="inputText" type="text" value="<?php echo $pContact->GetTel(1);?>" maxlength="<?php echo CContact::TELMAX; ?>" size="10" name="<?php echo CContact::TELTAG; ?>" disabled="disabled"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label">Email</li>
-<li><input id="contactemail" class="inputText" type="text" value="<?php echo $pContact->GetEmail(1);?>" maxlength="<?php echo CContact::EMAILMAX; ?>" size="10" name="<?php echo CContact::EMAILTAG; ?>" disabled="disabled" /></li>
+<li><input id="contactemail" class="inputText" type="text" value="<?php echo $pContact->GetEmail(1);?>" maxlength="<?php echo CContact::EMAILMAX; ?>" size="10" name="<?php echo CContact::EMAILTAG; ?>" disabled="disabled"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label">Adresse</li>
-<li><input id="contactaddress_1" class="inputText" type="text" value="<?php echo $pContact->GetAddress(1);?>" maxlength="<?php echo CContact::ADDRESSMAX; ?>" size="10" name="<?php echo CContact::ADDRESSTAG; ?>" disabled="disabled" /></li>
+<li><input id="contactaddress_1" class="inputText" type="text" value="<?php echo $pContact->GetAddress(1);?>" maxlength="<?php echo CContact::ADDRESSMAX; ?>" size="10" name="<?php echo CContact::ADDRESSTAG; ?>" disabled="disabled"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label hide">&nbsp;</li>
-<li><input id="contactaddress_2" class="inputText" type="text" value="<?php echo $pContact->GetAddressMore(1);?>" maxlength="<?php echo CContact::ADDRESSMOREMAX; ?>" size="10" name="<?php echo CContact::ADDRESSMORETAG; ?>" disabled="disabled" /></li>
+<li><input id="contactaddress_2" class="inputText" type="text" value="<?php echo $pContact->GetAddressMore(1);?>" maxlength="<?php echo CContact::ADDRESSMOREMAX; ?>" size="10" name="<?php echo CContact::ADDRESSMORETAG; ?>" disabled="disabled"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label">Ville</li>
-<li><input id="contactcity" class="inputText" type="text" value="<?php echo $pContact->GetCity(1);?>" maxlength="<?php echo CContact::CITYMAX; ?>" size="10" name="<?php echo CContact::CITYTAG; ?>" disabled="disabled" /></li>
+<li><input id="contactcity" class="inputText" type="text" value="<?php echo $pContact->GetCity(1);?>" maxlength="<?php echo CContact::CITYMAX; ?>" size="10" name="<?php echo CContact::CITYTAG; ?>" disabled="disabled"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label">Code postal</li>
-<li><input id="contactzip" class="inputText" type="text" value="<?php echo $pContact->GetZip(1);?>" maxlength="<?php echo CContact::ZIPMAX; ?>" size="10" name="<?php echo CContact::ZIPTAG; ?>" disabled="disabled" /></li>
+<li><input id="contactzip" class="inputText" type="text" value="<?php echo $pContact->GetZip(1);?>" maxlength="<?php echo CContact::ZIPMAX; ?>" size="10" name="<?php echo CContact::ZIPTAG; ?>" disabled="disabled"<?php echo $pHeader->GetCloseTag(); ?></li>
 </ul>
 </fieldset>
 <fieldset class="fieldsetform">
@@ -165,31 +169,31 @@ function BuildMessage($iCode)
 <legend>Taille du groupe</legend>
 <ul>
 <li class="labelF real">R&#233;el</li>
-<li><input id="rentsizereal" class="inputText" type="text" value="<?php echo $iCountReal;?>" maxlength="3" size="3" name="<?php echo CRent::REALTAG; ?>" /></li>
+<li><input id="rentsizereal" class="inputText" type="text" value="<?php echo $iCountReal;?>" maxlength="3" size="3" name="<?php echo CRent::REALTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="labelF planned">Suppos&#233;</li>
-<li><input id="rentsizeplanned" class="inputText" type="text" value="<?php echo $iCountPlanned;?>" maxlength="3" size="3" name="<?php echo CRent::PLANNEDTAG; ?>" /></li>
-<li class="labelF canceled">Annul&#233;e</li>
-<li><input id="rentsizecanceled" class="inputText" type="text" value="<?php echo $iCountCanceled;?>" maxlength="3" size="3" name="<?php echo CRent::CANCELEDTAG; ?>" /></li>
+<li><input id="rentsizeplanned" class="inputText" type="text" value="<?php echo $iCountPlanned;?>" maxlength="3" size="3" name="<?php echo CRent::PLANNEDTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
+<li class="labelF canceled">Annul&#233;</li>
+<li><input id="rentsizecanceled" class="inputText" type="text" value="<?php echo $iCountCanceled;?>" maxlength="3" size="3" name="<?php echo CRent::CANCELEDTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="labelF maximum">Maximum</li>
-<li><input id="maxsize" class="inputText" type="text" value="<?php echo $iMax;?>" maxlength="3" size="3" name="<?php echo CRent::MAXTAG; ?>" /></li>
+<li><input id="maxsize" class="inputText" type="text" value="<?php echo $iMax;?>" maxlength="3" size="3" name="<?php echo CRent::MAXTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 </ul>
 </fieldset>
 <fieldset class="fieldsetsub fieldsetform fieldsetformgroup">
 <legend>&#194;ge</legend>
 <ul>
-<li class="radio"><input id="rentage1" class="inputRadio" type="radio" name="<?php echo CRent::AGETAG; ?>" value="1" <?php if($iAge===1) echo 'checked="checked"';?> />16-25 ans</li>
-<li class="radio"><input id="rentage2" class="inputRadio" type="radio" name="<?php echo CRent::AGETAG; ?>" value="2" <?php if(($iAge===2)||($iAge===0)) echo 'checked="checked"';?> />26-35 ans</li>
-<li class="radio"><input id="rentage3" class="inputRadio" type="radio" name="<?php echo CRent::AGETAG; ?>" value="3" <?php if($iAge===3) echo 'checked="checked"';?> />35 ans et +</li>
+<li class="radio"><input id="rentage1" class="inputRadio" type="radio" name="<?php echo CRent::AGETAG; ?>" value="1" <?php if($iAge===1) echo 'checked="checked"'; echo $pHeader->GetCloseTag(); ?>16-25 ans</li>
+<li class="radio"><input id="rentage2" class="inputRadio" type="radio" name="<?php echo CRent::AGETAG; ?>" value="2" <?php if(($iAge===2)||($iAge===0)) echo 'checked="checked"'; echo $pHeader->GetCloseTag(); ?>26-35 ans</li>
+<li class="radio"><input id="rentage3" class="inputRadio" type="radio" name="<?php echo CRent::AGETAG; ?>" value="3" <?php if($iAge===3) echo 'checked="checked"'; echo $pHeader->GetCloseTag(); ?>35 ans et +</li>
 <li class="label hide">&nbsp;</li>
 </ul>
 </fieldset>
 <fieldset class="fieldsetsub fieldsetform">
 <legend>Arrhes</legend>
 <ul>
-<li class="radio"><input id="rentarrhre1" class="inputRadio" type="radio" name="<?php echo CRent::ARRHESTAG; ?>" value="1" <?php if($iArrhes===1) echo 'checked="checked"';?> />Esp&#232;ce</li>
-<li class="radio"><input id="rentarrhre2" class="inputRadio" type="radio" name="<?php echo CRent::ARRHESTAG; ?>" value="2" <?php if($iArrhes===2) echo 'checked="checked"';?> />Ch&#232;que</li>
-<li class="radio"><input id="rentarrhre3" class="inputRadio" type="radio" name="<?php echo CRent::ARRHESTAG; ?>" value="3" <?php if($iArrhes===3) echo 'checked="checked"';?> />CB</li>
-<li class="radio"><input id="rentarrhre4" class="inputRadio" type="radio" name="<?php echo CRent::ARRHESTAG; ?>" value="0" />Aucune</li>
+<li class="radio"><input id="rentarrhre1" class="inputRadio" type="radio" name="<?php echo CRent::ARRHESTAG; ?>" value="1" <?php if($iArrhes===1) echo 'checked="checked"'; echo $pHeader->GetCloseTag(); ?>Esp&#232;ce</li>
+<li class="radio"><input id="rentarrhre2" class="inputRadio" type="radio" name="<?php echo CRent::ARRHESTAG; ?>" value="2" <?php if($iArrhes===2) echo 'checked="checked"'; echo $pHeader->GetCloseTag(); ?>Ch&#232;que</li>
+<li class="radio"><input id="rentarrhre3" class="inputRadio" type="radio" name="<?php echo CRent::ARRHESTAG; ?>" value="3" <?php if($iArrhes===3) echo 'checked="checked"'; echo $pHeader->GetCloseTag(); ?>CB</li>
+<li class="radio"><input id="rentarrhre4" class="inputRadio" type="radio" name="<?php echo CRent::ARRHESTAG; ?>" value="0"<?php echo $pHeader->GetCloseTag(); ?>Aucune</li>
 </ul>
 </fieldset>
 <ul>
@@ -205,13 +209,14 @@ function BuildMessage($iCode)
 <p class="small"><em><?php echo CRent::COMMENTLENGTH; ?> caract&#232;res ou moins</em></p>
 </fieldset>
 <ul class="listbuttons">
-<li><input class="inputButton" type="submit" value="Enregistrer" name="upd"/>&nbsp;<input class="inputButton" type="submit" value="&nbsp;Supprimer" name="del"/></li>
+<li><input class="inputButton" type="submit" value="Enregistrer" name="upd"<?php echo $pHeader->GetCloseTag(); ?>&nbsp;<input class="inputButton" type="submit" value="Supprimer" name="del"<?php echo $pHeader->GetCloseTag(); ?></li>
 </ul>
 </form>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagebottom'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller en haut de la page" href="#pagetop" name="pagebottom">&#8593;</a></li>
+<li><a title="Aller en haut de la page" href="#pagetop">&#8593;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Aller au calendrier" href="<?php echo PBR_URL;?>">Calendrier</a></li>
 <?php
diff --git a/src/includes/display/rentdelete.php b/src/includes/display/rentdelete.php
index c771093..af6f2e9 100644
--- a/src/includes/display/rentdelete.php
+++ b/src/includes/display/rentdelete.php
@@ -36,10 +36,13 @@
  *                  - $pDate (instance of CDate)
  *                  - $pContact ( instance of CContact)
  *                  - $sToken (string)
+ *                  - $pHeader (instance of CHeader)
  * author: Olivier JULLIEN - 2010-02-04
- * W3C: This document was successfully checked as XHTML 1.0 Strict!
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
-if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !isset($sToken) || !isset($pContact) || !isset($pDate) || !isset($pRent) )
+if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !isset($sToken) || !isset($pContact) || !isset($pDate) || !isset($pRent) || !isset($pHeader) )
     die('-1');
 
     // Build form title
@@ -52,19 +55,19 @@
 <div id="HEADER">
 <p><em><small>Connect&#233; en tant que <?php echo CAuth::GetInstance()->GetUsername(1); ?></small></em></p>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
 <div id="CONTENT">
 <h1><?php echo $sFormTitle;?></h1>
 <form id="FORMCONFIRM" method="post" action="<?php echo PBR_URL;?>rentdelete.php">
 <fieldset class="fieldsetform">
 <legend class="legendmain">Confirmer la suppression</legend>
-<input type="hidden" name="<?php echo CPHPSession::TOKENTAG; ?>" value="<?php echo $sToken; ?>" />
-<input type="hidden" name="<?php echo CRent::IDENTIFIERTAG; ?>" value="<?php echo $pRent->GetIdentifier(); ?>" />
+<input type="hidden" name="<?php echo CPHPSession::TOKENTAG; ?>" value="<?php echo $sToken; ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
+<input type="hidden" name="<?php echo CRent::IDENTIFIERTAG; ?>" value="<?php echo $pRent->GetIdentifier(); ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
 <div id="MESSAGE">
 <p class="error">Cette r&eacute;servation va &ecirc;tre supprim&eacute;e.</p>
 </div>
 <ul>
-<li class="listbuttonitem"><input class="inputButton" type="submit" value="Supprimer" name="con"/>&nbsp;<input class="inputButton" type="submit" value="&nbsp;Annuler&nbsp;&nbsp;" name="can"/></li>
+<li class="listbuttonitem"><input class="inputButton" type="submit" value="Supprimer" name="con"<?php echo $pHeader->GetCloseTag(); ?>&nbsp;<input class="inputButton" type="submit" value="Annuler" name="can"<?php echo $pHeader->GetCloseTag(); ?></li>
 </ul>
 </fieldset>
 </form>
diff --git a/src/includes/display/rentsdelete.php b/src/includes/display/rentsdelete.php
index 6842534..2f3331b 100644
--- a/src/includes/display/rentsdelete.php
+++ b/src/includes/display/rentsdelete.php
@@ -34,32 +34,34 @@
  *              The following object(s) should exist:
  *                  - $sToken (string)
  *                  - $iYear (integer)
+ *                  - $pHeader (instance of CHeader)
  * author: Olivier JULLIEN - 2010-02-04
  * update: Olivier JULLIEN - 2010-06-15 - improvement
- * W3C: This document was successfully checked as XHTML 1.0 Strict!
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
-if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !isset($sToken) || !isset($iYear)  )
+if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !isset($sToken) || !isset($iYear) || !isset($pHeader) )
     die('-1');
 ?>
 <div id="PAGE">
 <div id="HEADER">
 <p><em><small>Connect&#233; en tant que <?php echo CAuth::GetInstance()->GetUsername(1); ?></small></em></p>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
 <div id="CONTENT">
 <h1>Supprimer les anciennes r&#233;servations</h1>
 <form id="FORMCONFIRM" method="post" action="<?php echo PBR_URL;?>rentsdelete.php">
 <fieldset class="fieldsetform">
 <legend class="legendmain">Confirmer la suppression</legend>
-<input type="hidden" name="<?php echo CDate::YEARTAG; ?>" value="<?php echo $iYear; ?>" />
-<input type="hidden" name="<?php echo CPHPSession::TOKENTAG; ?>" value="<?php echo $sToken; ?>" />
+<input type="hidden" name="<?php echo CDate::YEARTAG; ?>" value="<?php echo $iYear; ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
+<input type="hidden" name="<?php echo CPHPSession::TOKENTAG; ?>" value="<?php echo $sToken; ?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
 <div id="MESSAGE">
 <p class="error">Toutes les r&#233;servations ant&#233;rieures &#224; <?php echo $iYear; ?> vont &ecirc;tre supprim&#233;es.</p>
 </div>
 <ul>
 <li class="listbuttonitem">
-<input class="inputButton" type="submit" value="Supprimer" name="con"/>&nbsp;
-<input class="inputButton" type="submit" value="&nbsp;Annuler&nbsp;&nbsp;" name="can"/>
+<input class="inputButton" type="submit" value="Supprimer" name="con"<?php echo $pHeader->GetCloseTag(); ?>&nbsp;<input class="inputButton" type="submit" value="Annuler" name="can"<?php echo $pHeader->GetCloseTag(); ?>
 </li>
 </ul>
 </fieldset>
diff --git a/src/includes/display/select.php b/src/includes/display/select.php
index 5d45c7d..5950e73 100644
--- a/src/includes/display/select.php
+++ b/src/includes/display/select.php
@@ -36,11 +36,14 @@
  *                  - $pSearch (instance of CContact)
  *                  - $pPaging (instance of CPaging)
  *                  - $pDate (instance of CDate)
+ *                  - $pHeader (instance of CHeader)
  * author: Olivier JULLIEN - 2010-02-04
  * update: Olivier JULLIEN - 2010-06-15 - improvement
- * W3C: This document was successfully checked as XHTML 1.0 Strict!
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
-if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !isset($pPaging) || !is_array($tRecordset) || !isset($pDate) || !isset($pSearch) )
+if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !isset($pPaging) || !is_array($tRecordset) || !isset($pDate) || !isset($pSearch) || !isset($pHeader) )
     die('-1');
 
 /**
@@ -124,9 +127,10 @@ function BuildContact( &$tRecord, $iPagingMax, $iIndex, CDate $pDate)
 <div id="HEADER">
 <p><em><small>Connect&#233; en tant que <?php echo CAuth::GetInstance()->GetUsername(1); ?></small></em></p>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagetop'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller en bas de la page" name="pagetop" href="#pagebottom">&#8595;</a></li>
+<li><a title="Aller en bas de la page" href="#pagebottom">&#8595;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Afficher au calendrier" href="<?php echo $sCalendarHRef;?>"><?php echo $sCalendarTitle;?></a></li>
 <?php if(strlen($pSearch->GetLastName())>0) { ?>
@@ -134,20 +138,20 @@ function BuildContact( &$tRecord, $iPagingMax, $iIndex, CDate $pDate)
 <?php }//if(strlen($pSearch->GetLastName())>0) ?>
 <li><a title="Cr&#233;er un contact" href="<?php echo PBR_URL;?>contactnew.php">Cr&#233;er un contact</a></li>
 </ul>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
 <div id="CONTENT">
 <h1>S&#233;lectionner un contact</h1>
 <form id="FORMCONTACTS" method="get" action="<?php echo PBR_URL.'select.php'; ?>">
 <fieldset class="fieldsetsub fieldsetform">
 <legend class="legendmain">Chercher</legend>
-<input type="hidden" name="<?php echo CDate::MONTHTAG; ?>" value="<?php echo $pDate->GetRequestMonth();?>" />
-<input type="hidden" name="<?php echo CDate::DAYTAG; ?>" value="<?php echo $pDate->GetRequestDay();?>" />
-<input type="hidden" name="<?php echo CDate::YEARTAG; ?>" value="<?php echo $pDate->GetRequestYear();?>" />
+<input type="hidden" name="<?php echo CDate::MONTHTAG; ?>" value="<?php echo $pDate->GetRequestMonth();?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
+<input type="hidden" name="<?php echo CDate::DAYTAG; ?>" value="<?php echo $pDate->GetRequestDay();?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
+<input type="hidden" name="<?php echo CDate::YEARTAG; ?>" value="<?php echo $pDate->GetRequestYear();?>"<?php echo $pHeader->GetCloseTag(),"\n"; ?>
 <ul>
 <li class="label required">Nom</li>
-<li><input id="contactsname" class="inputText" type="text" value="<?php echo $pSearch->GetLastName(1); ?>" maxlength="<?php echo CContact::LASTNAMEMAX; ?>" size="10" name="<?php echo CContact::LASTNAMETAG; ?>"/></li>
+<li><input id="contactsname" class="inputText" type="text" value="<?php echo $pSearch->GetLastName(1); ?>" maxlength="<?php echo CContact::LASTNAMEMAX; ?>" size="10" name="<?php echo CContact::LASTNAMETAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="help"><em>Utilisez le joker * pour des recherches partielles.</em></li>
-<li class="listbuttonitem"><input class="inputButton" type="submit" value="Envoyer" /></li>
+<li class="listbuttonitem"><input class="inputButton" type="submit" value="Envoyer"<?php echo $pHeader->GetCloseTag(); ?></li>
 </ul>
 </fieldset>
 </form>
@@ -159,7 +163,7 @@ function BuildContact( &$tRecord, $iPagingMax, $iIndex, CDate $pDate)
     $sBuffer  = '<legend class="legendmain">Liste des contacts';
     if( $pPaging->GetMax()>1 )
     {
-        $sBuffer .= ' <em>(page '.$pPaging->GetCurrent().' sur '.$pPaging->GetMax().')</em>';
+        $sBuffer .= ' <em class="hide">(page '.$pPaging->GetCurrent().' sur '.$pPaging->GetMax().')</em>';
     }//if( $pPaging->GetMax()>1 )
     $sBuffer .= '</legend>';
     echo $sBuffer,"\n";
@@ -221,9 +225,10 @@ function BuildContact( &$tRecord, $iPagingMax, $iIndex, CDate $pDate)
 ?>
 </fieldset>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagebottom'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller en haut de la page" href="#pagetop" name="pagebottom">&#8593;</a></li>
+<li><a title="Aller en haut de la page" href="#pagetop">&#8593;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Afficher le calendrier" href="<?php echo $sCalendarHRef;?>"><?php echo $sCalendarTitle;?></a></li>
 <?php if(strlen($pSearch->GetLastName())>0) { ?>
diff --git a/src/includes/display/users.php b/src/includes/display/users.php
index e1376c2..b6c2291 100644
--- a/src/includes/display/users.php
+++ b/src/includes/display/users.php
@@ -35,12 +35,15 @@
  *                  - $tRecordset (array)
  *                  - $pUser (instance of CUser or null)
  *                  - $iMessageCode (integer)
+ *                  - $pHeader (instance of CHeader)
  * author: Olivier JULLIEN - 2010-02-04
  * update: Olivier JULLIEN - 2010-06-11 - add password check
  * update: Olivier JULLIEN - 2010-06-15 - improvement
- * W3C: This document was successfully checked as XHTML 1.0 Strict!
+ * update: Olivier JULLIEN - 2010-09-01 - HTML 4.01 Strict
+ * W3C: This document was successfully checked as XHTML 1.0 Strict
+ *      and HTML 4.01 Strict
  *************************************************************************/
-if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !is_array($tRecordset) || !is_integer($iMessageCode) )
+if ( !defined('PBR_VERSION') || !defined('PBR_URL') || !defined('PBR_AUTH_LOADED') || !is_array($tRecordset) || !is_integer($iMessageCode) || !isset($pHeader) )
     die('-1');
 
 /**
@@ -120,9 +123,9 @@ function BuildUser(&$tRecord)
         // Build legend
         $sFormLegend   = 'Modifier';
         // Build hidden control
-        $sFormHidden   = '<input type="hidden" name="'.CAction::ACTIONTAG.'" value="update" />';
-        $sFormHidden  .= '<input type="hidden" name="'.CUser::USERNAMETAG.'" value="'.$pUser->GetUsername().'" />';
-        $sFormHidden  .= '<input type="hidden" name="'.CUser::IDENTIFIERTAG.'" value="'.$pUser->GetIdentifier().'" />';
+        $sFormHidden   = '<input type="hidden" name="'.CAction::ACTIONTAG.'" value="update"'.$pHeader->GetCloseTag();
+        $sFormHidden  .= '<input type="hidden" name="'.CUser::USERNAMETAG.'" value="'.$pUser->GetUsername().'"'.$pHeader->GetCloseTag();
+        $sFormHidden  .= '<input type="hidden" name="'.CUser::IDENTIFIERTAG.'" value="'.$pUser->GetIdentifier().'"'.$pHeader->GetCloseTag();
         // Build name label
         $sDisable      = 'disabled="disabled"';
         $sLabelName    = 'Nom';
@@ -134,7 +137,7 @@ function BuildUser(&$tRecord)
         {
             $sState   .= 'checked="checked"';
         }//if( $pUser->GetState()===1 )
-        $sState .= ' /></li>';
+        $sState .= $pHeader->GetCloseTag().'</li>';
     }
     else
     {
@@ -148,7 +151,7 @@ function BuildUser(&$tRecord)
         // Build legend
         $sFormLegend = 'Nouvel utilisateur';
 	    // Build hidden control
-    	$sFormHidden = '<input type="hidden" name="'.CAction::ACTIONTAG.'" value="new" />';
+    	$sFormHidden = '<input type="hidden" name="'.CAction::ACTIONTAG.'" value="new"'.$pHeader->GetCloseTag();
         // Build name label
         $sDisable    = '';
         $sLabelName  = 'Nom*';
@@ -162,17 +165,17 @@ function BuildUser(&$tRecord)
 <div id="HEADER">
 <p><em><small>Connect&#233; en tant que <?php echo CAuth::GetInstance()->GetUsername(1); ?></small></em></p>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagetop'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller &#224; la liste des utilisateurs" name="pagetop" href="#pagemiddle">&#8595;</a></li>
+<li><a title="Aller &#224; la liste des utilisateurs" href="#pagemiddle">&#8595;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Retourner au calendrier" href="<?php echo PBR_URL;?>">Calendrier</a></li>
 <li><a title="Configurer" href="<?php echo PBR_URL;?>parameters.php">Param&#232;tres</a></li>
-<li><a title="Gestion des utilisateurs" href="<?php echo PBR_URL;?>users.php">Utilisateurs</a></li>
 <li><a title="Voir les graphes" href="<?php echo PBR_URL;?>graphs.php">Graphes</a></li>
 <li><a title="Voir les logs" href="<?php echo PBR_URL;?>logs.php">Logs</a></li>
 </ul>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
 <div id="CONTENT">
 <?php BuildMessage($iMessageCode); ?>
 <h1><?php echo $sFormTitle; ?></h1>
@@ -182,18 +185,18 @@ function BuildUser(&$tRecord)
 <?php echo $sFormHidden,"\n"; ?>
 <ul>
 <li class="label required"><?php echo $sLabelName; ?></li>
-<li><input id="loginusr" class="inputText" type="text" value="<?php echo $sFormUsername; ?>" maxlength="<?php echo CUser::USERNAMEMAX; ?>" size="10" name="<?php echo CUser::USERNAMETAG; ?>" <?php echo $sDisable;?> /></li>
+<li><input id="loginusr" class="inputText" type="text" value="<?php echo $sFormUsername; ?>" maxlength="<?php echo CUser::USERNAMEMAX; ?>" size="10" name="<?php echo CUser::USERNAMETAG; ?>" <?php echo $sDisable.$pHeader->GetCloseTag(); ?></li>
 <?php if(!empty($sHelp)) echo $sHelp,"\n"; ?>
 <li class="label required">Mot de passe</li>
-<li><input id="loginpwd" class="inputText" type="password" value="" maxlength="<?php echo CUser::PASSWORDMAX; ?>" size="10" name="<?php echo CUser::PASSWORDTAG; ?>"/></li>
+<li><input id="loginpwd" class="inputText" type="password" value="" maxlength="<?php echo CUser::PASSWORDMAX; ?>" size="10" name="<?php echo CUser::PASSWORDTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <li class="label required">Confirmez</li>
-<li><input id="loginpwdc" class="inputText" type="password" value="" maxlength="<?php echo CUser::PASSWORDMAX; ?>" size="10" name="<?php echo CUser::PASSWORDCHECKTAG; ?>"/></li>
+<li><input id="loginpwdc" class="inputText" type="password" value="" maxlength="<?php echo CUser::PASSWORDMAX; ?>" size="10" name="<?php echo CUser::PASSWORDCHECKTAG; ?>"<?php echo $pHeader->GetCloseTag(); ?></li>
 <?php if(!empty($sState)) echo $sState,"\n"; ?>
-<li class="listbuttonitem"><input class="inputButton" type="submit" value="Envoyer" name="new"/></li>
+<li class="listbuttonitem"><input class="inputButton" type="submit" value="Envoyer" name="new"<?php echo $pHeader->GetCloseTag(); ?></li>
 </ul>
 </fieldset>
 </form>
-<a name="pagemiddle"></a>
+<?php echo $pHeader->GetAnchor('pagemiddle'),"\n"; ?>
 <fieldset>
 <legend class="legendmain">Liste des utilisateurs</legend>
 <ul class="records">
@@ -207,13 +210,13 @@ function BuildUser(&$tRecord)
 </ul>
 </fieldset>
 </div>
-<hr/>
+<?php echo $pHeader->GetHR(),"\n"; ?>
+<?php echo $pHeader->GetAnchor('pagebottom'),"\n"; ?>
 <ul class="navigation menu">
-<li><a title="Aller en haut de la page" href="#pagetop" name="pagebottom">&#8593;</a></li>
+<li><a title="Aller en haut de la page" href="#pagetop">&#8593;</a></li>
 <li><a title="Se d&#233;connecter" href="<?php echo PBR_URL;?>logout.php">D&#233;connexion</a></li>
 <li><a title="Retourner au calendrier" href="<?php echo PBR_URL;?>">Calendrier</a></li>
 <li><a title="Configurer" href="<?php echo PBR_URL;?>parameters.php">Param&#232;tres</a></li>
-<li><a title="Gestion des utilisateurs" href="<?php echo PBR_URL;?>users.php">Utilisateurs</a></li>
 <li><a title="Voir les graphes" href="<?php echo PBR_URL;?>graphs.php">Graphes</a></li>
 <li><a title="Voir les logs" href="<?php echo PBR_URL;?>logs.php">Logs</a></li>
 </ul>
diff --git a/src/includes/init/context.php b/src/includes/init/context.php
index bf88791..15b7678 100644
--- a/src/includes/init/context.php
+++ b/src/includes/init/context.php
@@ -112,8 +112,8 @@
 
     /** Set error level
      ******************/
- //   error_reporting(E_ALL ^ E_NOTICE);
-    error_reporting(E_ALL | E_STRICT);
+    error_reporting(E_ALL ^ E_NOTICE);
+//    error_reporting(E_ALL | E_STRICT);
 
     /** Error management
      *******************/
diff --git a/src/index.php b/src/index.php
index a89aea1..39a0ab5 100644
--- a/src/index.php
+++ b/src/index.php
@@ -40,7 +40,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__));
 
     /** Include config
diff --git a/src/install.php b/src/install.php
index 28e5c53..475828f 100644
--- a/src/install.php
+++ b/src/install.php
@@ -37,7 +37,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__));
 
     /** Include config
diff --git a/src/logs.php b/src/logs.php
index 86ca29f..04424c0 100644
--- a/src/logs.php
+++ b/src/logs.php
@@ -38,7 +38,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__));
 
     /** Include config
diff --git a/src/logsdelete.php b/src/logsdelete.php
index 8772b70..24dfc2a 100644
--- a/src/logsdelete.php
+++ b/src/logsdelete.php
@@ -39,7 +39,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__));
 
     /** Include config
diff --git a/src/parameters.php b/src/parameters.php
index 7ef52a2..54e8ed2 100644
--- a/src/parameters.php
+++ b/src/parameters.php
@@ -38,7 +38,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__));
 
     /** Include config
diff --git a/src/rent.php b/src/rent.php
index 2abcefd..293d4d8 100644
--- a/src/rent.php
+++ b/src/rent.php
@@ -40,7 +40,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__));
 
     /** Include config
diff --git a/src/rentdelete.php b/src/rentdelete.php
index d3efda3..96f768e 100644
--- a/src/rentdelete.php
+++ b/src/rentdelete.php
@@ -40,7 +40,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__));
 
     /** Include config
diff --git a/src/rentsdelete.php b/src/rentsdelete.php
index 6d786c1..a4a2f4c 100644
--- a/src/rentsdelete.php
+++ b/src/rentsdelete.php
@@ -40,7 +40,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__));
 
     /** Include config
diff --git a/src/select.php b/src/select.php
index 7835a9c..60046eb 100644
--- a/src/select.php
+++ b/src/select.php
@@ -39,7 +39,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__));
 
     /** Include config
diff --git a/src/users.php b/src/users.php
index cd3429b..1c904fc 100644
--- a/src/users.php
+++ b/src/users.php
@@ -42,7 +42,7 @@
 
     /** Defines
      **********/
-    define('PBR_VERSION','1.2.0');
+    define('PBR_VERSION','1.2.1');
     define('PBR_PATH',dirname(__FILE__));
 
     /** Include config