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 @@ * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2006 Laurent Destailleur + * Copyright (C) 2004-2007 Laurent Destailleur * * 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 ''; } - print ""; print '    ';