diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 6442c41862c2e37ee020234629a96524263f2a5e..03d3295fe23fd13ae3fb964874e128a358571e73 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -66,11 +66,9 @@ if ($mil->fetch($_GET["id"]) == 0) dolibarr_fiche_head($head, $hselected, substr($mil->titre,0,20)); - print_titre($langs->trans("Mailing")); - print '<table class="border" width="100%">'; - print '<tr><td width="20%">'.$langs->trans("Title").'</td><td>'.$mil->titre.'</td></tr>'; + print '<tr><td width="20%">'.$langs->trans("MailTitle").'</td><td>'.$mil->titre.'</td></tr>'; print '</table>'; /* diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 67dc43790ef02edb67076e32d4b300e0b95af5d4..32ff938801601826dadcef2d31c8295192d46c1e 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -194,13 +194,11 @@ else "confirm_approve"); } - print_titre("Mailing"); - print '<table class="border" width="100%">'; print '<tr><td width="20%">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$mil->titre.'</td></tr>'; - print '<tr><td width="20%">'.$langs->trans("MailSender").'</td><td>'.htmlentities($mil->email_from).'</td>'; + print '<tr><td width="20%">'.$langs->trans("MailFrom").'</td><td>'.htmlentities($mil->email_from).'</td>'; print '<td>'.$langs->trans("EMail").'</td><td>'.htmlentities($mil->email_from).'</td></tr>'; //print '<tr><td width="20%">R�ponse</td><td>'.htmlentities($mil->email_replyto).'</td></tr>'; diff --git a/htdocs/comm/mailing/mailing.class.php b/htdocs/comm/mailing/mailing.class.php index 246d11c701f5b8120948dc2622c6df4567463e80..3d826c4953ea8de704d58edc0eb08673aec1b2f6 100644 --- a/htdocs/comm/mailing/mailing.class.php +++ b/htdocs/comm/mailing/mailing.class.php @@ -1,5 +1,6 @@ <?php /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> + * Copyright (C) 2005 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 @@ -20,13 +21,15 @@ * */ +/** \file htdocs/comm/mailing/mailing.class.php + \brief Fichier de la classe de gestion des mailings + \version $Revision$ +*/ - -/*! \class Mailing - +/** \class Mailing + \brief Classe permettant la gestion des mailings */ - class Mailing { var $id; @@ -157,7 +160,7 @@ class Mailing /** * \brief Valide le mailing - * \param userid id de l'utilisateur qui valide + * \param user objet user qui valide */ function valid($user) { @@ -181,7 +184,7 @@ class Mailing /** * \brief Approuve le mailing - * \param userid id de l'utilisateur qui valide + * \param user objet user qui approuve */ function approve($user) { @@ -204,7 +207,7 @@ class Mailing /** * \brief Supprime le mailing - * \param rowid id � supprimer + * \param rowid id du mailing � supprimer */ function delete($rowid) {