diff --git a/htdocs/public/dons/bplc.php b/htdocs/public/bplc/bplc.php
similarity index 100%
rename from htdocs/public/dons/bplc.php
rename to htdocs/public/bplc/bplc.php
diff --git a/htdocs/public/dons/merci_code.php b/htdocs/public/bplc/merci_code.php
similarity index 100%
rename from htdocs/public/dons/merci_code.php
rename to htdocs/public/bplc/merci_code.php
diff --git a/htdocs/public/dons/testretour.php b/htdocs/public/bplc/testretour.php
similarity index 100%
rename from htdocs/public/dons/testretour.php
rename to htdocs/public/bplc/testretour.php
diff --git a/htdocs/public/dons/code_valid.php b/htdocs/public/dons/code_valid.php
deleted file mode 100644
index 051ab42a3c62d917d7c30ee087561bfaca62880a..0000000000000000000000000000000000000000
--- a/htdocs/public/dons/code_valid.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
- *
- */
-
-print '<input type="hidden" name="projetid"    value="'.$_POST["projetid"].'">';
-print '<input type="hidden" name="prenom"      value="'.$_POST["prenom"].'">';
-print '<input type="hidden" name="nom"         value="'.$_POST["nom"].'">';
-print '<input type="hidden" name="societe"     value="'.$_POST["societe"].'">';
-print '<input type="hidden" name="adresse"     value="'.$_POST["adresse"].'">';
-print '<input type="hidden" name="cp"          value="'.$_POST["cp"].'">';
-print '<input type="hidden" name="ville"       value="'.$_POST["ville"].'">';
-print '<input type="hidden" name="pays"        value="'.$_POST["pays"].'">';
-print '<input type="hidden" name="date"        value="'.$_POST["date"].'">';
-print '<input type="hidden" name="public"      value="'.$_POST["public"].'">';
-print '<input type="hidden" name="email"       value="'.$_POST["email"].'">';
-print '<input type="hidden" name="montant"     value="'.$_POST["montant"].'">';
-print '<input type="hidden" name="commentaire" value="'.$_POST["commentaire"].'">';
-
-
-?>
diff --git a/htdocs/public/dons/depenses_code.php b/htdocs/public/dons/depenses_code.php
deleted file mode 100644
index 1e4dfc1f06840cc8971f8a21c7ea2b7a31dd9a09..0000000000000000000000000000000000000000
--- a/htdocs/public/dons/depenses_code.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/* Copyright (C) 2003 Rodolphe Quiedeville   <rodolphe@quiedeville.org>
- * Copyright (C) 2003 Association FSF France <contact@fsffrance.org>
- * Copyright (C) 2004 Laurent Destailleur    <eldy@users.sourceforge.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- * $Source$
- *
- */
-
-
-$conf = new Conf();
-$conf->db->type = $dolibarr_main_db_type;
-$conf->db->host = $dolibarr_main_db_host;
-$conf->db->name = $dolibarr_main_db_name;
-$conf->db->user = $dolibarr_main_db_user;
-$conf->db->pass = $dolibarr_main_db_pass;
-
-$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name);
-$sql = "SELECT ".$db->pdate("f.datef")." as datef, s.nom, f.total, f.note, f.paye";
-$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
-$sql .= " WHERE f.fk_soc = s.rowid ORDER BY f.datef DESC";
-
-if ( $db->query( $sql) )
-{
-  $num = $db->num_rows();
-  if ($num)
-    {
-      
-      print "<TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
-
-      print '<TR>';
-      print "<td>Soci�t�</td>";
-      print "<td>Date</td>";
-      print "<td align=\"right\">Montant</TD>";
-      print "</TR>\n";
-      
-      $var=True;
-      $bc[1]='bgcolor="#f5f5f5"';
-      $bc[0]='bgcolor="#f0f0f0"';
-      while ($i < $num)
-	{
-	  $objp = $db->fetch_object( $i);
-
-	  $var=!$var;
-	  print "<TR $bc[$var]>";
-	  print "<td>".stripslashes($objp->nom)."</TD>\n";
-	  	  
-	  print "<TD>".dolibarr_print_date($objp->datef,'dayhour')."</td>\n";
-	  print '<TD align="right">'.number_format($objp->total,2,'.','').' '.$langs->trans("Currency".$conf->monnaie);
-
-	  if ($objp->paye == 1)
-	    {
-	      print "<br>pay�";
-	      $total_paye += $objp->total;
-	    }
-	  else
-	    {
-	      print "<br>A payer";
-	      $total_apayer += $objp->total;
-	    }
-
-	  print '</TD>';
-	  print "</tr>";
-	  
-	  print "<TR $bc[$var]><td>&nbsp</td><td>";
-	  print nl2br(stripslashes($objp->note));
-	  print "</td><td>&nbsp</td></tr>";
-
-	  $total += $objp->total;
-
-	  $i++;
-	}
-
-      $var=!$var;
-      print "<TR $bc[$var]>";
-      print '<TD colspan="3" align="right">Pay� : '.number_format($total_paye,2,'.',' ').' '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
-
-      $var=!$var;
-      print "<TR $bc[$var]>";
-      print '<TD colspan="3" align="right">A payer : '.number_format($total_apayer,2,'.',' ').' '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
-
-      $var=!$var;
-      print "<TR $bc[$var]>";
-      print '<TD colspan="3" align="right">'.$langs->trans("Total").': '.number_format($total,2,'.',' ').' '.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
-
-      print "</table>";
-
-    }
-}
-else
-{
-  print $db->error();
-}
-
-$db->close();
-
-?>
diff --git a/htdocs/public/dons/don.xhtml b/htdocs/public/dons/don.xhtml
deleted file mode 100644
index 965f0472205c5d6273d37e13feafda3b1b257f0b..0000000000000000000000000000000000000000
--- a/htdocs/public/dons/don.xhtml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-<!DOCTYPE html
-          PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
->
-<html lang="fr">
-  <head>    
-    <!-- $Id$ -->
-    <title>EUCD.INFO - Au secours de la copie priv�e - Promesse de don</title>
-  </head>
-  <body>
-    <div class="main">     
-
-      <h1>Promesse de don</h1>
-
-      <p>
-	Les contributions financi�res ouvrent droit � une r�duction
-	d'imp�t et serviront principalement � r�mun�rer des juristes dont
-	les t�ches seront d'analyser la situation et de proposer un
-	avant-projet de loi transposant la directive du 22 mai 2001
-	(EUCD) dans le respect des droits des utilisateurs et du
-	public.
-      </p>
-
-      <p>
-	En remplissant ce formulaire vous promettez de faire
-	parvenir le montant de votre choix � l'initiative EUCD.INFO
-	dans les trois semaines � venir.
-      </p>
-
-      <form action="index.php" method="post">
-	<table id="formulaire">
-	  <input type="hidden" name="action" value="add" />
-	  <!-- la ligne projet est invisible -->
-	  <tr id="projet">
-
-	  </tr>
-	  <tr id="date">
-
-	    <script language="php">
-	      $a = setlocale(LC_TIME, "fr_FR");
-	      print strftime("%d %B %Y", time());
-	    </script>
-	  </tr>
-	
-	  <tr id="montant">
-	    <script language="php">
-	      print '&lt;input type="text" name="montant" size="10" value="'.$HTTP_POST_VARS["montant"].'"&gt;';
-	    </script>
-	  </tr>
-
-	  
-	  <tr id="prenom">
-	    <script language="php">
-	      print '&lt;input type="text" name="prenom" size="30" value="'.$HTTP_POST_VARS["prenom"].'"&gt;';
-	    </script>
-	  </tr>
-
-	  <tr id="nom">
-	    <script language="php">
-	      print '&lt;input type="text" name="nom" size="40" value="'.$HTTP_POST_VARS["nom"].'"&gt;';
-	    </script>
-	  </tr>
-	  
-	  <tr id="societe">
-	    <script language="php">
-	      print '&lt;input type="text" name="societe" size="40" value="'.$HTTP_POST_VARS["societe"].'"&gt;';
-	    </script>
-	  </tr>
-
-	  <tr id="adresse">
-	      <script language="php">
-	      print '&lt;textarea name="adresse" wrap="soft" cols="40" rows="3"&gt;'.$HTTP_POST_VARS["adresse"].'&lt;/textarea&gt;';
-	      </script>
-	  </tr>
-
-	  <tr id="cp">
-	    <script language="php">
-	      print '&lt;input type="text" name="cp" size="8" value="'.$HTTP_POST_VARS["cp"].'"&gt;';
-	    </script>
-	  </tr>
-
-	  <tr id="ville">
-	    <script language="php">
-	      print '&lt;input type="text" name="ville" size="30" value="'.$HTTP_POST_VARS["ville"].'"&gt;';
-	    </script>
-	  </tr>
-
-	  <tr id="pays">
-	    <script language="php">
-	      print '&lt;input type="text" name="pays" size="40" value="'.$HTTP_POST_VARS["pays"].'"&gt;';
-	    </script>
-	  </tr>
-
-	  <tr id="email">
-	    <script language="php">
-	      print '&lt;input type="text" name="email" size="50" value="'.$HTTP_POST_VARS["email"].'"&gt;';
-	    </script>
-	  </tr>
-
-	  <tr id="public">
-	    <select name="public">
-	      <script language="php">
-		if ($HTTP_POST_VARS["public"] == "FALSE")
-		{
-		print '&lt;option value="TRUE"&gt;oui/yes&lt;/option&gt;';
-		print '&lt;option value="FALSE" SELECTED&gt;non/no&lt;/option&gt;';
-		}
-		else
-		{
-		print '&lt;option value="TRUE" SELECTED&gt;oui/yes&lt;/option&gt;';
-		print '&lt;option value="FALSE"&gt;non/no&lt;/option&gt;';
-		}
-	    </script>
-	    </select>
-	  </tr>
-
-	  <tr id="commentaire">
-	    <script language="php">
-	      print '&lt;textarea name="commentaire" wrap="soft" cols="40" rows="6"&gt;'.$HTTP_POST_VARS["commentaire"].'&lt;/textarea&gt;';
-	    </script>
-	  </tr>
-
-	  <tr>
-	    <td colspan="3" align="center" class="titre">
-	      <input type="submit" value="V�rifier la promesse" />  (�tape 1/3)
-	    </td>
-	  </tr>
-	</table>
-      </form>
-    </div>    
-  </body>  
-</html>
-<!--
-Local Variables: ***
-mode: xml ***
-End: ***
--->
-
diff --git a/htdocs/public/dons/donateurs.xhtml b/htdocs/public/dons/donateurs.xhtml
deleted file mode 100644
index 550824cf9cb54fc261719d9d81cc249c09b2ab80..0000000000000000000000000000000000000000
--- a/htdocs/public/dons/donateurs.xhtml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-<!DOCTYPE html
-          PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
->
-<html lang="fr">
-  <head>
-    <!-- $Id$ -->
-    <title>Dons FSF France Projet EUCD.INFO</title>
-    <script language="php">
-      require("../../conf/conf.class.php");
-      require("../../lib/mysql.lib.php");
-      require("../../don.class.php");
-    </script>
-  </head>
-
-  <body>
-    <div class="main">     
-      <h1>Liste des donateurs.</h1>
-
-      <p>
-	Nous tenons � remercier toutes les personnes qui ont fait un
-	don � l'initiative EUCD.INFO afin de soutenir la d�fense de la
-	copie priv�e. Voir aussi <a
-	href="depenses.php">la liste des d�penses</a>.
-      </p>
-      <script language="php">
-	require("donateurs_code.php");
-      </script>
-    </div>    
-  </body>  
-</html>
-<!--
-Local Variables: ***
-mode: xml ***
-End: ***
--->
-
diff --git a/htdocs/public/dons/donateurs_code.php b/htdocs/public/dons/donateurs_code.php
index 157bacc516d90170511c4f2025efca840b276ffc..6c627cd021fe690398afc843e50cae179e6d7be6 100644
--- a/htdocs/public/dons/donateurs_code.php
+++ b/htdocs/public/dons/donateurs_code.php
@@ -16,19 +16,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id$
- * $Source$
- *
  */
 
+require("./pre.inc.php");
+require_once(DOL_DOCUMENT_ROOT ."/don.class.php");
 
-$conf = new Conf();
-$conf->db->type = $dolibarr_main_db_type;
-$conf->db->host = $dolibarr_main_db_host;
-$conf->db->name = $dolibarr_main_db_name;
-$conf->db->user = $dolibarr_main_db_user;
-$conf->db->pass = $dolibarr_main_db_pass;
-
-$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name);
+$langs->load("donations");
 
 $sql = "SELECT ".$db->pdate("d.datedon")." as datedon, d.nom, d.prenom, d.amount, d.public, d.societe";
 $sql .= " FROM ".MAIN_DB_PREFIX."don as d";
@@ -37,13 +30,14 @@ $sql .= " WHERE d.fk_don_projet = 1 AND d.fk_statut in (2, 3) ORDER BY d.datedon
 if ( $db->query( $sql) )
 {
   $num = $db->num_rows();
+  
   if ($num)
     {
       
       print "<TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
 
       print '<TR>';
-      print "<td>Pr�nom Nom / Soci�t�</td>";
+      print "<td>Pr�nom Nom / Soci�t�</td>";
       print "<td>Date</td>";
       print "<td align=\"right\">Montant</TD>";
       print "</TR>\n";
@@ -73,10 +67,14 @@ if ( $db->query( $sql) )
       print "</table>";
 
     }
+    else
+    {
+    	print "Aucun don publique";
+    }
 }
 else
 {
-  print $db->error();
+	dolibarr_print_error($db);
 }
 
 $db->close();
diff --git a/htdocs/public/dons/erreur.xhtml b/htdocs/public/dons/erreur.xhtml
deleted file mode 100644
index 7bdf06bb53f7c934f04f9b31dd9c1fb779fe0e69..0000000000000000000000000000000000000000
--- a/htdocs/public/dons/erreur.xhtml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-<!DOCTYPE html
-          PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
->
-<html lang="fr">
-  <head>    
-    <!-- $Id$ -->
-    <title>Dons FSF France Projet EUCD.INFO</title>
-  </head>
-  <body>
-    <div class="main">     
-
-      <h1>Erreur</h1>
-
-      
-      <p>
-	Nous avons d�tect� les erreurs suivantes :	
-      <ol>
-	  <script language="php">
-	    $don->print_error_list();
-	  </script>
-      </ol>
-    </p>
-      
-      <form action="index.php" method="post">
-	<script language="php">
-	  require("code_valid.php");
-	</script>
-	<table id="formulaire">
-	  <!-- la ligne projet est invisible -->
-	  <tr id="projet">
-
-	  </tr>
-
-	  <tr id="date">
-	    <script language="php">
-	      $a = setlocale(LC_TIME, "fr_FR");
-	      print strftime("%d %B %Y", time());
-	    </script>
-	  </tr>
-	  
-	  <tr id="montant">
-	    <script language="php">
-	      print $don->amount;
-	    </script>
-	  </tr>
-
-	  <tr id="prenom">
-	    <script language="php">
-	      print $don->prenom;
-	    </script>
-	  </tr>
-
-	  <tr id="nom">
-	    <script language="php">
-	      print $don->nom;
-	    </script>
-	  </tr>
-	  
-	  <tr id="societe">
-	    <script language="php">
-	      print $don->societe;
-	    </script>
-	  </tr>
-	  
-	  <tr id="adresse">
-	    <script language="php">
-	      print nl2br(stripslashes($don->adresse));
-	    </script>
-	  </tr>
-	  
-	  <tr id="cp">
-	    <script language="php">
-	      print $don->cp;
-	    </script>
-	  </tr>
-
-	  <tr id="ville">
-	    <script language="php">
-	      print $don->ville;
-	    </script>
-	  </tr>
-	  
-	  <tr id="pays">
-	    <script language="php">
-	      print $don->pays;
-	    </script>
-	  </tr>
-
-	  <tr id="email">
-	    <script language="php">
-	      print $don->email;
-	    </script>
-	  </tr>	 
-	  	  
-	  <tr id="public">
-	    <script language="php">
-	      $yn[0]="non/no";
-	      $yn[1]="oui/yes";
-	      print $yn[$don->public];
-	    </script>
-	  </tr>
-
-	  <tr id="commentaire">
-	    <script language="php">
-	      print nl2br(stripslashes($don->commentaire));
-	    </script>	    
-	  </tr>
-
-	  <tr>
-	    <td colspan="3" align="center" class="titre">
-	      <input type="submit" value="Corriger" /> (�tape 1/3)
-	    </td>
-	  </tr>
-
-	</table>
-
-      </form>
-
-    </div>    
-
-  </body>  
-
-</html>
-<!--
-Local Variables: ***
-mode: xml ***
-End: ***
--->
-
diff --git a/htdocs/public/dons/eucd-nav.fr.xsl b/htdocs/public/dons/eucd-nav.fr.xsl
deleted file mode 100644
index cc8c240cdf2008fa76f7bc359d768a296641698c..0000000000000000000000000000000000000000
--- a/htdocs/public/dons/eucd-nav.fr.xsl
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE xsl:stylesheet [<!ENTITY nbsp "&#160;">]>
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!-- Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org> -->
-  <!-- $Id$ -->
-
-  <xsl:template match="table[@id='formulaire']">
-    <table cellpadding="4" cellspacing="0">
-      <xsl:apply-templates select="@*|node()"/>
-    </table>
-    <p>
-      La FSF France s'engage � utiliser vos informations personnelles
-      exclusivement pour le traitement de votre don. Vous ne
-      receverez aucun email de la part de la FSF France autre que
-      pour la gestion de votre don.
-    </p>
-
-  </xsl:template> 
-
-
-  <xsl:template match="/html[@lang='fr']/body/div[@class='main']/form/table/tr[@id='projet']">
-    <input type="hidden" name="projetid" value="1" />
-  </xsl:template> 
-
-  <xsl:template match="/html[@lang='fr']/body/div[@class='main']/form/table/tr[@id='date']">
-    <tr>
-      <td class="titre">
-	Date
-      </td>
-      <td class="valeur">
-	<xsl:apply-templates select="@*|node()"/>
-      </td>
-      <td class="titre">
-	Date
-      </td>
-    </tr>
-  </xsl:template> 
-
-  <xsl:template match="table/tr[@id='nom']">
-    <tr>
-      <td class="titre">
-	Nom 
-      </td>
-      <td class="valeur">
-	<xsl:apply-templates select="@*|node()"/>
-      </td>
-      <td class="titre">
-	Name 
-      </td>
-    </tr>
-  </xsl:template>
-  
-  <xsl:template match="table/tr[@id='prenom']">
-    <tr>
-      <td class="titre">
-	Pr�nom
-      </td>
-      <td class="valeur">
-	<xsl:apply-templates select="@*|node()"/>
-      </td>
-      <td class="titre">
-	Firstname 
-      </td>
-    </tr>
-  </xsl:template>
-
-  <xsl:template match="table/tr[@id='societe']">
-    <tr>
-      <td class="titre">
-	Soci�t�
-      </td>
-      <td class="valeur">
-	<xsl:apply-templates select="@*|node()"/>
-      </td>
-      <td class="titre">
-	Company 
-      </td>
-    </tr>
-  </xsl:template>
-
-
-  <xsl:template match="/html[@lang='fr']/body/div[@class='main']/form/table/tr[@id='adresse']">
-    <tr>
-      <td class="titre">
-	Adresse
-      </td>
-      <td class="valeur">
-	<xsl:apply-templates select="@*|node()"/>
-      </td>
-      <td class="titre">
-	Address 
-      </td>
-    </tr>
-  </xsl:template>
-
-  <xsl:template match="/html[@lang='fr']/body/div[@class='main']/form/table/tr[@id='cp']">
-    <tr>
-      <td class="titre">
-	Code Postal
-      </td>
-      <td class="valeur">
-	<xsl:apply-templates select="@*|node()"/>
-      </td>
-      <td class="titre">
-	Postal code 
-      </td>
-    </tr>
-  </xsl:template>
-
-
-  <xsl:template match="table/tr[@id='ville']">
-    <tr>
-      <td class="titre">
-	Ville
-      </td>
-      <td class="valeur">
-	<xsl:apply-templates select="@*|node()"/>
-      </td>
-      <td class="titre">
-	Town 
-      </td>
-    </tr>
-  </xsl:template>
-
-  <xsl:template match="table/tr[@id='pays']">
-    <tr>
-      <td class="titre">
-	Pays
-      </td>
-      <td class="valeur">
-	<xsl:apply-templates select="@*|node()"/>
-      </td>
-      <td class="titre">
-	Country 
-      </td>
-    </tr>
-  </xsl:template>
-
-  <xsl:template match="table/tr[@id='email']">
-    <tr>
-      <td class="titre">
-	Email
-      </td>
-      <td class="valeur">
-	<xsl:apply-templates select="@*|node()"/>
-      </td>
-      <td class="titre">
-	Email 
-      </td>
-    </tr>
-  </xsl:template>
-
-  <xsl:template match="table/tr[@id='montant']">
-    <tr>
-      <td class="titre">
-	Montant
-      </td>
-      <td class="valeur">
-	<xsl:apply-templates select="@*|node()"/>,00 euros
-      </td>
-      <td class="titre">
-	Amount 
-      </td>
-    </tr>
-    <tr>
-      <td class="titre">&nbsp;</td>
-      <td class="valeur">
-	<hr />
-      </td>
-      <td class="titre">&nbsp;</td>
-    </tr>
-  </xsl:template>
-
-  <xsl:template match="table/tr[@id='limitdate']">
-    <tr>
-      <td class="titre">
-	Ech�ance
-      </td>
-      <td class="valeur">
-	<xsl:apply-templates select="@*|node()"/>
-      </td>
-      <td class="titre">
-	Expiry
-      </td>
-    </tr>
-  </xsl:template>
-
-
-  <xsl:template match="/html[@lang='fr']/body/div[@class='main']/form/table/tr[@id='public']">
-    <tr>
-      <td valign="top" class="titre">
-	Don public
-      </td>
-      <td class="valeur">
-	<xsl:apply-templates select="@*|node()"/>
-	<div class="commentaire">
-	  Acceptez-vous que vos noms et pr�noms ou le nom de votre soci�t� soient affich�s dans la liste des <a href="donateurs.php">donateurs</a> ?<br />
-	  Do you allow us to list your name, firstname or company name on the donations list ?
-	</div>
-      </td>
-      <td valign="top" class="titre">
-	Don public
-      </td>
-    </tr>    
-  </xsl:template> 
-
-  <xsl:template match="/html[@lang='fr']/body/div[@class='main']/form/table/tr[@id='commentaire']">
-    <tr>
-      <td valign="top" class="titre">
-	Commentaire
-      </td>
-      <td valign="top" class="valeur">
-	<xsl:apply-templates select="@*|node()"/>
-      </td>
-      <td valign="top" class="titre">
-	Comment
-      </td>      
-    </tr>
-  </xsl:template> 
-<!--
-Local Variables: ***
-mode: xml ***
-End: ***
--->
-</xsl:stylesheet>
diff --git a/htdocs/public/dons/eucd.css b/htdocs/public/dons/eucd.css
deleted file mode 100644
index 28622760a8510089ab87b2eb0d7dbddd2a5f2e50..0000000000000000000000000000000000000000
--- a/htdocs/public/dons/eucd.css
+++ /dev/null
@@ -1,99 +0,0 @@
-/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-   Copyright (C) 2002 Loic Dachary         <loic@gnu.org>
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
- 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
-   $Id$
-   $Source$
-*/
-body
-{
-       color: black;  
-       font-family: arial, sans-serif;
-       background-color: white;
-}
-
-table.main
-{
-	border: 0 solid;
-}
-
-table.formulaire {
-                   border: 0 solid;
-                   }
-
-
-h1 {
-     font-weight: bold;
-     font-size: 12pt;
-}
-
-ul { list-style: circle;  }
-
-
-
-span {
-     font-weight: bold;
-     font-size: 12pt;
-}
-
-h2 {
-     font-weight: bold;
-     font-size: 10pt;
-     }
-a {
-    color: #002390;
-    font-weight: bold;
-    text-decoration: none;
-    }
-
-a.extern {
-    color: #002390;
-    font-weight: normal;
-    text-decoration: none;
-    }
-
-a.extern:hover {
-    color: #002390;
-    font-weight: normal;
-    text-decoration: underline;
-    }
-
-address {
-          font-weight: bold;
-          font-size: 10pt;
-          }
-
-p { 
-    padding-left: 9px;
-    }
-
-p.passe { 
-          color: #c0C0C0;
- }
-
-td.titre{ 
-          font-weight: bold; 
-          background-color: #d0d0d0;
-          }
-
-td.valeur { 
-            font-weight: normal;
-            background-color: #f1f1f1;
-            }
-
-div.commentaire { 
-                  font-size: 10pt;
-                  }
\ No newline at end of file
diff --git a/htdocs/public/dons/eucd.xsl b/htdocs/public/dons/eucd.xsl
deleted file mode 100644
index 6b76a7b02878b5ca21f708c568674b37be571347..0000000000000000000000000000000000000000
--- a/htdocs/public/dons/eucd.xsl
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE xsl:stylesheet [<!ENTITY nbsp "&#160;">]>
-
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-  <xsl:output method="html"
-	    encoding="ISO-8859-1"
-	    doctype-public="-//W3C//DTD HTML 4.0 Transitional//EN"
-	    doctype-system="http://www.w3.org/TR/REC-html40/loose.dtd"
-	    indent="yes"
-	    />
-
-  <xsl:param name="fsffrance">http://france.fsfeurope.org</xsl:param>
-  <xsl:param name="fsfeurope">http://www.fsfeurope.org</xsl:param>
-  <xsl:param name="fsf">http://www.fsf.org</xsl:param>
-  <xsl:param name="gnu">http://www.gnu.org</xsl:param>
-  <xsl:param name="filebase">nofile.html</xsl:param>
-  <xsl:param name="path">nofile.html</xsl:param>
-
-  <xsl:template match="/">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="/html/body">
-    <body>
-      <xsl:comment>
-
-	DO NOT MODIFY THIS DOCUMENT. IT WAS GENERATED BY XSLT PROCESSING
-	AND YOUR MODIFICATIONS WILL BE LOST. THE SOURCE OF THE DOCUMENT
-	IS IN THE .xhtml FILE USE make all TO REGENERATE
-
-      </xsl:comment>
-      <xsl:apply-templates select="node()"/>
-    </body>
-  </xsl:template>
-
-  <xsl:template match="/html/head">
-    <head>
-      <link rel="stylesheet" type="text/css" href="http://eucd.info/eucd.css" />
-      <meta name="author" content="FSF France"></meta>
-      <meta name="keywords" content="logiciel libre projet eucd"></meta>
-      <meta name="description" content="Dons � la FSF France."></meta>
-      <title>Dons FSF France - Fond de secours EUCD.INFO</title>
-
-      <xsl:apply-templates select="@*|node()"/>
-    </head>
-  </xsl:template>
-
-  <xsl:include href="eucd-nav.fr.xsl" />
-
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
-<!--
-Local Variables: ***
-mode: xml ***
-End: ***
--->
-</xsl:stylesheet>
diff --git a/htdocs/public/dons/fsfe-fr.xsl b/htdocs/public/dons/fsfe-fr.xsl
deleted file mode 100644
index 7360a4c5da71ccd734fc0d2efa216d5f0e836ea7..0000000000000000000000000000000000000000
--- a/htdocs/public/dons/fsfe-fr.xsl
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE xsl:stylesheet [<!ENTITY nbsp "&#160;">]>
-
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-  <xsl:output method="html"
-	    encoding="ISO-8859-1"
-	    doctype-public="-//W3C//DTD HTML 4.0 Transitional//EN"
-	    doctype-system="http://www.w3.org/TR/REC-html40/loose.dtd"
-	    indent="yes"
-	    />
-
-
-  <xsl:param name="fsffrance">http://france.fsfeurope.org</xsl:param>
-  <xsl:param name="fsfeurope">http://www.fsfeurope.org</xsl:param>
-  <xsl:param name="fsf">http://www.fsf.org</xsl:param>
-  <xsl:param name="gnu">http://www.gnu.org</xsl:param>
-  <xsl:param name="filebase">nofile.html</xsl:param>
-  <xsl:param name="path">nofile.html</xsl:param>
-
-  <xsl:template match="/">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="/html/body">
-    <body>
-      <xsl:comment>
-
-	DO NOT MODIFY THIS DOCUMENT. IT WAS GENERATED BY XSLT PROCESSING
-	AND YOUR MODIFICATIONS WILL BE LOST. THE SOURCE OF THE DOCUMENT
-	IS IN THE .xhtml FILE USE make all TO REGENERATE
-
-      </xsl:comment>
-      <xsl:apply-templates select="node()"/>
-    </body>
-  </xsl:template>
-
-  <xsl:template match="/html/head">
-    <head>
-      <link rel="stylesheet" type="text/css" href="./eucd.css" />
-      <xsl:apply-templates select="@*|node()"/>
-    </head>
-  </xsl:template>
-
-  <xsl:include href="navigation.fr.xsl" />
-  <!-- <xsl:include href="navigation.en.xsl" /> -->
-
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
-<!--
-Local Variables: ***
-mode: xml ***
-End: ***
--->
-</xsl:stylesheet>
diff --git a/htdocs/public/dons/graph.xhtml b/htdocs/public/dons/graph.xhtml
deleted file mode 100644
index 69676040ed25675f36e4b81364c7adef3bbd3c10..0000000000000000000000000000000000000000
--- a/htdocs/public/dons/graph.xhtml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-<!DOCTYPE html
-          PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
->
-<html lang="fr">
-  <head>    
-    <!-- $Id$ -->
-    <title>Dons FSF France Projet EUCD.INFO</title>
-    <script language="php">
-      require("../../conf/conf.class.php");
-      require("../../lib/mysql.lib.php");
-      require("../../don.class.php");
-    </script>
-  </head>
-  <body>
-    <div class="main">     
-
-      <center>
-	<h1>Progression des dons</h1>
-
-
-	<p>
-	  <img src="http://eucd.info/cacti/graph_image.php?graphid=58&amp;rraid=1" height="261" width="597" alt="progression des dons" />
-	</p>
-
-	<p>
-	  <img src="http://eucd.info/cacti/graph_image.php?graphid=58&amp;rraid=2" height="261" width="597" alt="progression des dons"></img>
-	</p>
-
-	<p>
-	  <img src="http://eucd.info/cacti/graph_image.php?graphid=58&amp;rraid=3" height="261" width="597" alt="progression des dons"></img>
-	</p>
-
-	<p>
-	  <img src="http://eucd.info/cacti/graph_image.php?graphid=58&amp;rraid=4" height="261" width="597" alt="progression des dons"></img>
-	</p>
-      </center>
-
-
-    </div>    
-  </body>  
-</html>
-<!--
-Local Variables: ***
-mode: xml ***
-End: ***
--->
-
diff --git a/htdocs/public/dons/index.php b/htdocs/public/dons/index.php
index 76451c8fad3e8ea291171c63babff4641fb92017..ea2026d2ef4057f72d94f0f724bd27a350548816 100644
--- a/htdocs/public/dons/index.php
+++ b/htdocs/public/dons/index.php
@@ -16,31 +16,13 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id$
- * $Source$
- *
- */
-
-require("../../don.class.php");
-require("../../conf/conf.class.php");
-
-$conf = new Conf();
-$conf->db->type = $dolibarr_main_db_type;
-$conf->db->host = $dolibarr_main_db_host;
-$conf->db->name = $dolibarr_main_db_name;
-$conf->db->user = $dolibarr_main_db_user;
-$conf->db->pass = $dolibarr_main_db_pass;
+*/
 
-// Si type non d�fini (pour compatibilit� avec ancienne install), on
-// travail avec mysql
-if (! $conf->db->type) { $conf->db->type = 'mysql'; }
-
-require("../../lib/.$dolibarr_main_db_type.lib.php");
+require("./pre.inc.php");
+require_once(DOL_DOCUMENT_ROOT ."/don.class.php");
 
 if ($conf->don->enabled)
 {
-
-  $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name);
-
   $don = new Don($db);
       
   $don->projetid    = $_POST["projetid"];
@@ -112,7 +94,7 @@ if ($conf->don->enabled)
 }
 else
 {
-  print "Cette fonctionnalit� n'est pas activ� sur ce site";
+  print "Cette fonctionnalit� n'est pas activ� sur ce site";
 }
 
 
diff --git a/htdocs/public/dons/mail.php b/htdocs/public/dons/mail.php
deleted file mode 100644
index 55c6784d8fb7764e2fd1727096958412ee18f1ab..0000000000000000000000000000000000000000
--- a/htdocs/public/dons/mail.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-$subject = "EUCD.INFO promesse de don de $don->amount euros pour sauver la copie priv�e";
-
-$body ="
-EUCD.INFO  vous  remercie  de  la  promesse  de  don  que  vous  venez
-d'enregistrer.   Elle  sera  comptabilis�e   sur  le   thermom�tre  de
-http://eucd.info/ apr�s validation par un op�rateur.
-
-
-Pr�nom: $don->prenom
-Nom: $don->nom
-Montant: $don->amount
-Au plus tard le: $date_limite
-Informations sur les modes de paiement: http://eucd.info/donations.fr.php
-
-L'initiative EUCD.INFO[1] a pour  objet de pr�server l'int�r�t g�n�ral
-menac�  par  la   transposition  de  la  directive  du   22  mai  2001
-(EUCD)[2]. Pour y parvenir elle entend:
-
-    * Produire et proposer des solutions au l�gislateur.
-    * Le promouvoir aupr�s des personnes responsables.
-    * Entrer dans le cercle de consultation.
-
-Votre contribution  financi�re servira principalement  � r�mun�rer des
-juristes dont les t�ches seront d'analyser la situation et de proposer
-des  solutions permettant une  transposition de  la directive  dans le
-respect des droits des utilisateurs et du public.
-
-Vous pourrez suivre  les progr�s de notre action  gr�ce � l'�ch�ancier
-que nous remettons  r�guli�rement � jour sur la page  de garde du site
-http://eucd.info/. N'h�sitez  pas � nous poser des  questions par mail
-si vous le souhaitez, � l'adresse contact@eucd.info.
-
-L'association loi 1901 FSF France est d'int�r�t g�n�ral[3] et les dons
-qui lui sont fait ouvrent  droit � une r�duction d'imp�t. Vous pourrez
-en b�n�ficier gr�ce au re�u[4]  qui vous sera adress� d�s reception du
-montant promis de $don->amount euros.
-
-Merci pour votre soutien.
-
-[1] EUCD.INFO: http://eucd.info/
-[2] Directive du 22 mai 2001:
-    http://europa.eu.int/smartapi/cgi/sga_doc?smartapi!celexapi!prod!CELEXnumdoc&lg=fr&numdoc=32001L0029&model=guichett
-[3] FSF France et dons: http://france.fsfeurope.org/donations/
-[4] Mod�le de re�u: http://france.fsfeurope.org/donations/formulaire.fr.html
-";
-?>
diff --git a/htdocs/public/dons/mail_moderator.php b/htdocs/public/dons/mail_moderator.php
deleted file mode 100644
index fd028b4d2848ea677d8599087405a165468cf7eb..0000000000000000000000000000000000000000
--- a/htdocs/public/dons/mail_moderator.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$subject_moderator = "EUCD.INFO Nouvelle promesse de don de $don->amount euros";
-
-$body_moderator ="
-Une nouvelle promesse de don � valider :
-
-
-Pr�nom:  $don->prenom
-Nom:     $don->nom
-Montant: $don->amount
-
-https://fsffrance.org/dolibarr/compta/dons/
-
-";
-?>
diff --git a/htdocs/public/dons/main-eucd.xsl b/htdocs/public/dons/main-eucd.xsl
deleted file mode 100644
index 7e642ade73daaad8dc01af442f76537e83084675..0000000000000000000000000000000000000000
--- a/htdocs/public/dons/main-eucd.xsl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE xsl:stylesheet [<!ENTITY nbsp "&#160;">]>
-
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-
-  <xsl:include href="fsfe-fr.xsl" />
-  <xsl:include href="navigation.fr.xsl" />
-
-  <!--  <xsl:include href="eucd.xsl" /> -->
-  <xsl:include href="eucd-nav.fr.xsl" />
-
-
-
-<!--
-Local Variables: ***
-mode: xml ***
-End: ***
--->
-</xsl:stylesheet>
diff --git a/htdocs/public/dons/merci.txt b/htdocs/public/dons/merci.txt
deleted file mode 100644
index ebc8268ee9524a8a0bcaf6fdd73ace692b569b6f..0000000000000000000000000000000000000000
--- a/htdocs/public/dons/merci.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Subject: EUCD.INFO promesse de don de #amount euros pour sauver la copie priv�e
-
-EUCD.INFO  vous  remercie  de  la  promesse  de  don  que  vous  venez
-d'enregistrer.   Elle  sera  comptabilis�e   sur  le   thermom�tre  de
-http://eucd.info/ apr�s validation par un op�rateur.
-
-Pr�nom: #pr�nom
-Nom: #nom
-Montant: #amount
-Au plus tard le: #(date + 3 semaine)
-
-L'initiative EUCD.INFO[1]  a pour objet de  pr�server l'int�r�t public
-menac�  par  la   transposition  de  la  directive  du   22  mai  2001
-(EUCD)[2]. Pour y parvenir elle entend:
-
-    * Produire et proposer un avant-projet de loi alternatif.
-    * Le promouvoir aupr�s des personnes responsables.
-    * Entrer dans le cercle de consultation.
-
-Votre  contribution  financi�re  servira  principalement �  payer  des
-juristes dont les t�ches seront d'analyser la situation et de proposer
-un avant-projet  de loi transposant  la directive dans le  respect des
-droits des utilisateurs et du public.
-
-Vous pourrez suivre  les progr�s de notre action  gr�ce � l'�ch�ancier
-que nous remettons  r�guli�rement � jour sur la page  de garde du site
-http://eucd.info/. N'h�sitez  pas � nous poser des  questions par mail
-si vous le souhaitez, � l'adresse contact@eucd.info.
-
-L'association loi 1901 FSF France est d'int�r�t g�n�ral[3] et les dons
-qui lui sont fait ouvrent  droit � une r�duction d'imp�t. Vous pourrez
-en b�n�ficier gr�ce au re�u[4]  qui vous sera adress� d�s reception du
-montant promis de #amount euros.
-
-Merci pour votre soutien.
-
-[1] EUCD.INFO: http://eucd.info/
-[2] Directive du 22 mai 2001:
-    http://europa.eu.int/smartapi/cgi/sga_doc?smartapi!celexapi!prod!CELEXnumdoc&lg=fr&numdoc=32001L0029&model=guichett
-[3] FSF France et dons: http://france.fsfeurope.org/donations/
-[4] Mod�le de re�u: http://france.fsfeurope.org/donations/formulaire.fr.html
diff --git a/htdocs/public/dons/merci.xhtml b/htdocs/public/dons/merci.xhtml
deleted file mode 100644
index 88a46b313f3862198fc7a451cc5d17cba008bd9c..0000000000000000000000000000000000000000
--- a/htdocs/public/dons/merci.xhtml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-<!DOCTYPE html
-          PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
->
-<html lang="fr">
-  <head>    
-    <!-- $Id$ -->
-    <title>EUCD.INFO - Au secours de la copie priv�e - Promesse de don (3/3)</title>
-  </head>
-  <body>
-    <div class="main">     
-
-      <h1>Votre promesse de don a �t� prise en compte et un courrier
-	�lectronique vient de vous �tre envoy� reprenant le contenu de
-	cette page.</h1>
-
-      <p>
-	EUCD.INFO vous remercie de la promesse de don que vous venez
-	d'enregistrer.  Elle sera comptabilis�e sur le thermom�tre de
-	http://eucd.info/ apr�s validation par un op�rateur.
-      </p>
-
-      <table id="formulaire">
-	<tr id="prenom">
-	  <script language="php">
-	    print stripslashes($don->prenom);
-	  </script>
-	</tr>
-	
-	<tr id="nom">
-	  <script language="php">
-	    print stripslashes($don->nom);
-	  </script>
-	</tr>
-
-	<tr id="societe">
-	  <script language="php">
-	    print stripslashes($don->societe);
-	  </script>
-	</tr>
-
-	<tr id="montant">
-	  <script language="php">
-	    print stripslashes($don->amount);
-	  </script>
-	</tr>
-
-	<tr id="limitdate">
-	  <script language="php">
-	    print $date_limite;
-	  </script>
-	</tr>
-      </table>
-
-
-      <script language="php">
-	require("merci_code.php");
-      </script>
-
-      <p>
-	L'initiative <a href="http://eucd.info/">EUCD.INFO</a> a
-	pour objet de pr�server l'int�r�t g�n�ral menac� par la
-	transposition de la <a
-	  href="http://europa.eu.int/smartapi/cgi/sga_doc?smartapi!celexapi!prod!CELEXnumdoc&amp;lg=fr&amp;numdoc=32001L0029&amp;model=guichett">directive
-	  du 22 mai 2001 (EUCD)</a>. Pour y parvenir elle entend: 
-      </p>
-
-      <ul>
-	<li>Produire et proposer des solutions au l�gislateur.</li>
-	<li>Le promouvoir aupr�s des personnes responsables.</li>
-	<li>Entrer dans le cercle de consultation.</li>
-      </ul>
-
-      <p>
-        Votre contribution financi�re servira principalement �
-	r�mun�rer des juristes dont les t�ches seront d'analyser la
-	situation et de proposer des solutions permettant une
-	transposition de la directive dans le respect des droits des
-	utilisateurs et du public.
-      </p>
-
-      <p>
-	Vous pourrez suivre les progr�s de notre action gr�ce �
-	l'�ch�ancier que nous remettons r�guli�rement � jour sur la
-	page de garde du site <a
-	href="http://eucd.info/">http://eucd.info/</a>. N'h�sitez pas
-
-	� nous poser des questions par mail si vous le souhaitez, �
-	l'adresse <a href="mailto:contact@eucd.info">contact@eucd.info</a>.
-      </p>
-
-      <p>
-	L'association loi 1901 FSF France est <a
-	href="http://france.fsfeurope.org/donations/howto.fr.html">d'int�r�t
-	g�n�ral</a> et les dons qui lui sont fait ouvrent droit � une
-	r�duction d'imp�t. Vous pourrez en b�n�ficier gr�ce au <a
-	href="http://france.fsfeurope.org/donations/formulaire.fr.html">re�u</a>
-	qui vous sera adress� d�s reception du montant promis de
-	  <script language="php">
-	    print stripslashes($don->amount);
-	  </script>
-	euros.
-      </p>
-
-      <p>
-	Merci pour votre soutien.
-      </p>
-
-    </div>    
-  </body>  
-</html>
-<!--
-Local Variables: ***
-mode: xml ***
-End: ***
--->
-
diff --git a/htdocs/public/dons/navigation.fr.xsl b/htdocs/public/dons/navigation.fr.xsl
deleted file mode 100644
index f32138394d804e7ce38e58cee8ffec1bcc163df9..0000000000000000000000000000000000000000
--- a/htdocs/public/dons/navigation.fr.xsl
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE xsl:stylesheet [<!ENTITY nbsp "&#160;">]>
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-  <xsl:template match="/html[@lang='fr']/body/div">
-    <!-- $Id$ -->
-    <!-- $Source$ -->
-    <!-- Top menu line -->
-    <table border="1" cellpadding="5" cellspacing="10" class="main">
-      <tr>
-	<td colspan="2">
-	  <span><img src="http://eucd.info/eucd.info-logo-50x64.png" align="middle" /> <a href="http://eucd.info/">EUCD.INFO</a> - Au <a href="http://eucd.info/donations.fr.php">secours</a> de la copie priv�e<br/>For UK citizens: <a href="http://www.eucd.org/">www.eucd.org</a> is addressing the same problem your country.</span>
-	</td>
-      </tr>
-      
-      <tr>
-	<td valign="top">
-	  <a href="http://eucd.info/index.fr.php">Accueil</a><br />
-	  <a href="http://eucd.info/documents/documents.fr.php">Dossier</a><br />
-	  <a href="http://eucd.info/revue.fr.php">Presse</a><br />
-	  <br/>
-	  <a href="http://eucd.info/donations.fr.php">Aider</a><br />
-	  <a href="http://eucd.info/transparence.fr.php">Transparence</a><br />
-	  <a href="http://wiki.ael.be/index.php/EUCD-Status">Situation</a><br />
-	  <a href="http://mail.gnu.org/mailman/listinfo/fsfe-france">Discuter</a><br />
-	  <a href="http://eucd.info/who.fr.php">Qui</a><br />
-	  <a href="http://eucd.info/images.fr.php">Images</a><br />
-	  <br />
-	  <br />
-	  <a href="https://dons.eucd.info/">Dons</a><br />	  
-	  <script language="php">
-	    if (file_exists ("therm.php"))
-	    {
-	    include("therm.php");
-	    }
-	  </script>
-
-	</td>
-	
-	<td valign="top">
-	  
-	  <xsl:apply-templates select="@*|node()"/>
-
-	</td>
-      </tr>
-      
-    </table>
-    <address><a href="mailto:contact@eucd.info">Contact:</a> EUCD.INFO c/o FSF France 8, rue de valois, 75001 Paris - Tel: 01 42 76 05 49 - Mail: <a href="mailto:contact@eucd.info">contact@eucd.info</a> - Web: <a href="http://eucd.info/">http://eucd.info/</a></address>
-  </xsl:template> 
-
-<!--
-Local Variables: ***
-mode: xml ***
-End: ***
--->
-</xsl:stylesheet>
diff --git a/htdocs/public/dons/pre.inc.php b/htdocs/public/dons/pre.inc.php
new file mode 100644
index 0000000000000000000000000000000000000000..b58c9c743a8eeb9149d2ac6182af044ea342dc8f
--- /dev/null
+++ b/htdocs/public/dons/pre.inc.php
@@ -0,0 +1,52 @@
+<?php
+/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org> 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * $Id$
+ * $Source$
+ *
+ */
+
+require("../../main.inc.php");
+
+function llxHeader($head = "")
+{
+  global $user, $conf, $langs;
+
+  top_menu($head);
+
+  $menu = new Menu();
+
+  $menu->add(DOL_URL_ROOT."/public/adherents/","Non adherent");
+  $menu->add_submenu("new.php","Inscription");
+  $menu->add(DOL_URL_ROOT."/public/adherents/","Adherents");
+  $menu->add_submenu("priv_edit.php","Edition de sa fiche");
+  $menu->add_submenu("priv_liste.php","Liste des adherents");
+
+  left_menu($menu->liste);
+}
+
+
+function llxHeaderVierge($head = "")
+{
+	global $user, $conf, $langs;
+
+	top_htmlhead('');
+    print '<body>';
+	
+}
+
+?>
diff --git a/htdocs/public/dons/therm.php b/htdocs/public/dons/therm.php
index 9c2bc9e104224dc2c69b762d19c6e59ea9fe4ef9..58bbe52776d7827f12a80ee6f42d848d9ee28dd7 100644
--- a/htdocs/public/dons/therm.php
+++ b/htdocs/public/dons/therm.php
@@ -16,7 +16,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id$
- * $Source$
  */
 
 $thermlib = "../../lib/thermometer.php";
diff --git a/htdocs/public/dons/valid.xhtml b/htdocs/public/dons/valid.xhtml
deleted file mode 100644
index 2f7e642bb7e8a14a3778f29d551d0df6cd441557..0000000000000000000000000000000000000000
--- a/htdocs/public/dons/valid.xhtml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-<!DOCTYPE html
-          PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
->
-<html lang="fr">
-  <head>    
-    <!-- $Id$ -->
-    <title>Dons FSF France Projet EUCD.INFO</title>
-  </head>
-  <body>
-    <div class="main">     
-
-      <h1>Merci
- de v�rifier les information avant de valider votre promesse de don.</h1>
-
-
-      <form action="index.php" method="post">
-	<input type="hidden" name="action" value="valid" />
-	<script language="php">
-	  require("code_valid.php");
-	</script>
-
-	<table id="formulaire">
-	  <!-- la ligne projet est invisible -->
-	  <tr id="projet">
-
-	  </tr>
-
-	  <tr id="date">
-	    <script language="php">
-	      $a = setlocale(LC_TIME, "fr_FR");
-	      print strftime("%d %B %Y", time());
-	    </script>
-	  </tr>
-
-	  <tr id="montant">
-	    <script language="php">
-	      print number_format($don->amount, 0, '', ' ');
-	    </script>
-	  </tr>
-
-	  <tr id="prenom">
-	    <script language="php">
-	      print stripslashes($don->prenom);
-	    </script>
-	  </tr>
-	  
-	  <tr id="nom">
-	    <script language="php">
-	      print stripslashes($don->nom);
-	    </script>
-	  </tr>
-
-	  <tr id="societe">
-	    <script language="php">
-	      print stripslashes($don->societe);
-	    </script>
-	  </tr>
-	  
-	  <tr id="adresse">
-	    <script language="php">
-	      print nl2br(stripslashes($don->adresse));
-	    </script>
-	  </tr>
-	  
-	  <tr id="cp">
-	    <script language="php">
-	      print stripslashes($don->cp);
-	    </script>
-	  </tr>
-
-	  <tr id="ville">
-	    <script language="php">
-	      print stripslashes($don->ville);
-	    </script>
-	  </tr>
-
-	  <tr id="pays">
-	    <script language="php">
-	      print stripslashes($don->pays);
-	    </script>
-	  </tr>
-	  
-	  <tr id="email">
-	    <script language="php">
-	      print stripslashes($don->email);
-	    </script>
-	  </tr>
-	  
-	  <tr id="public">
-	    <script language="php">
-	      $yn[0]="non";
-	      $yn[1]="oui";
-	      print $yn[$don->public];
-	    </script>
-	  </tr>
-	  
-	  <tr id="commentaire">
-	    <script language="php">
-	      print nl2br(stripslashes($don->commentaire));
-	    </script>	    
-	  </tr>
-
-	  <tr>
-	    <td colspan="3" align="center" class="titre">
-	      <!-- 
-	      // Ne pas changer la value du bouton Valider, la valeur est utilis�e dans index.php
-	      -->
-	      <input type="submit" name="valid" value="Valider" /> <input type="submit" value="Corriger" /> (�tape 2/3)
-	    </td>
-	  </tr>
-	  
-	</table>
-      </form>
-    </div>    
-  </body>  
-</html>
-<!--
-Local Variables: ***
-mode: xml ***
-End: ***
--->
-
diff --git a/htdocs/public/error-401.html b/htdocs/public/error-401.html
index 45a00ced21212fa3350065a110356bc94a834c01..63e17c7551cf88653523944b89be832211e5a180 100644
--- a/htdocs/public/error-401.html
+++ b/htdocs/public/error-401.html
@@ -7,19 +7,11 @@
   <body>
     <h1>Erreur</h1>
 
-    <p>Le login ou le mot de passe que vous avez saisi est erron�, si vous souhaitez tester le site utiliser les login et mot de passe suivant :
+    <p>Le login ou le mot de passe que vous avez saisi est erroné, si vous souhaitez tester le site utiliser les login et mot de passe suivant :
     <ul>
       <li>login : demo
       <li>pass  : demo
     </ul>
 
-    <p>
-    Info sur <a href="http://rodolphe.quiedeville.org/projets/dolibarr/">http://rodolphe.quiedeville.org/projets/dolibarr/</a>
-    </p>
-
-    <hr>
-    <address><a href="mailto:rodo@lager.lolix.net"></a></address>
-<!-- Created: Mon Jun 24 13:51:43 CEST 2002 -->
-<!-- hhmts start -->Last modified: Fri Jun  6 19:38:42 CEST 2003 <!-- hhmts end -->
   </body>
 </html>
diff --git a/htdocs/public/error-404.php b/htdocs/public/error-404.php
index bf9b298063694873d4adec843d65ac86dff08b01..5ffaf7fa7ca5bedf447b94daf40aac87d58dc096 100644
--- a/htdocs/public/error-404.php
+++ b/htdocs/public/error-404.php
@@ -8,7 +8,7 @@
     <h2>Erreur 404</h2>
 
     <br>
-    La page demand�e n'existe pas :
+    La page demandée n'existe pas :
 
     <br>
     Vous venez de <?php print $_SERVER["HTTP_REFERER"] ?>.
diff --git a/htdocs/public/index.php b/htdocs/public/index.php
index 893dcf38286e7fb7b389dbbaadf53ed6f2d6e8a1..d8a79ba811ae57efcb6be4bc614b5e62f45ddcea 100644
--- a/htdocs/public/index.php
+++ b/htdocs/public/index.php
@@ -7,7 +7,5 @@
   <body>
     <h1>Section Public</h1>
 
-
-
   </body>
 </html>