From 23681822430e918a20603d71e75deee40935dab9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 23 Feb 2007 18:17:49 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Le=20contenu=20du=20mail=20de=20validati?=
 =?UTF-8?q?on=20pour=20un=20type=20d'adh=E9rent=20n'apparait=20pas=20en=20?=
 =?UTF-8?q?modif.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/adherents/adherent_type.class.php | 17 +++++++++--------
 htdocs/adherents/type.php                | 14 ++++++--------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/htdocs/adherents/adherent_type.class.php b/htdocs/adherents/adherent_type.class.php
index c44a0b9f4bf..69714b997df 100644
--- a/htdocs/adherents/adherent_type.class.php
+++ b/htdocs/adherents/adherent_type.class.php
@@ -41,17 +41,18 @@ class AdherentType
   var $libelle;
   var $statut;
   var $cotisation;  /**< Soumis à la cotisation */
-  var $error;
-  var $mail_valid;	/**< mail envoye lors de la validation */
-  var $commentaire; /**< commentaire */
   var $vote;		/** droit de vote ? */
+  var $commentaire; /**< commentaire */
+  var $mail_valid;	/**< mail envoye lors de la validation */
 
+  var $error;
+  var $db;
 
-/**
-		\brief AdherentType
-		\param DB				handler accès base de données
-*/
-
+  
+	/**
+			\brief AdherentType
+			\param DB				handler accès base de données
+	*/
   function AdherentType($DB)
     {
       $this->db = $DB ;
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index d3ef9b1348e..7c061637998 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2007 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
@@ -38,7 +38,9 @@ $user->getrights('adherent');
 $rowid=isset($_GET["rowid"])?$_GET["rowid"]:$_POST["rowid"];
 
 
-
+/*
+*	Actions
+*/
 if ($_POST["action"] == 'add') 
 {
 	if (! $user->rights->adherent->configurer) accessforbidden();
@@ -109,8 +111,6 @@ if ($_GET["action"] == 'commentaire')
 
 llxHeader();
 
-
-
 /* ************************************************************************** */
 /*                                                                            */
 /* Liste des types d'adhérents                                                */
@@ -187,8 +187,6 @@ if (! $rowid && $_GET["action"] != 'create' && $_GET["action"] != 'edit')
 /* Création d'un type adherent                                                */
 /*                                                                            */
 /* ************************************************************************** */
-
-
 if ($_GET["action"] == 'create')
 {
   $htmls = new Form($db);
@@ -335,16 +333,16 @@ if ($rowid > 0)
 		if ($conf->fckeditor->enabled)
 		{
 			require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-			$doleditor=new DolEditor('mail_valid','',280,'dolibarr_notes','',false);
+			$doleditor=new DolEditor('mail_valid',$adht->mail_valid,280,'dolibarr_notes','',false);
 			$doleditor->Create();
 		}
 		else
 		{
 			print '<textarea class="flat" name="mail_valid" rows="15" cols="90">';
+			print $adht->mail_valid;
 			print '</textarea>';
 		}
 
-
         print "</td></tr>";
         
         print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"> &nbsp; &nbsp;';