diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index dda389d5368..0760842f933 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -301,7 +301,7 @@ if ($mil->fetch($_REQUEST["id"]) >= 0) - // Liste des destinataires s�lectionn�s + // List of selected targets print "\n\n"; print '
'; print ''; @@ -326,7 +326,8 @@ if ($mil->fetch($_REQUEST["id"]) >= 0) if ($search_nom) $addu.= "&search_nom=".urlencode($search_nom); if ($search_prenom) $addu.= "&search_prenom=".urlencode($search_prenom); if ($search_email) $addu.= "&search_email=".urlencode($search_email); - print_barre_liste($langs->trans("MailSelectedRecipients"),$page,$_SERVER["PHP_SELF"],$addu,$sortfield,$sortorder,"",$num,$mil->nbemail); + + print_barre_liste($langs->trans("MailSelectedRecipients"),$page,$_SERVER["PHP_SELF"],$addu,$sortfield,$sortorder,"",$num,$mil->nbemail,''); if ($page) $addu.= "&page=".$page; print ''; diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 96073eb1df0..4e6ad8e8c81 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -526,7 +526,11 @@ else print '
'; - print ''; + print ''; + print ''; + print ''; print ''; print ''; diff --git a/htdocs/comm/mailing/mailing.class.php b/htdocs/comm/mailing/mailing.class.php index a050ae3ac8d..65d9d048d20 100644 --- a/htdocs/comm/mailing/mailing.class.php +++ b/htdocs/comm/mailing/mailing.class.php @@ -18,22 +18,27 @@ */ /** - \file htdocs/comm/mailing/mailing.class.php - \ingroup mailing - \brief Fichier de la classe de gestion des mailings - \version $Id$ + * \file htdocs/comm/mailing/mailing.class.php + * \ingroup mailing + * \brief Fichier de la classe de gestion des mailings + * \version $Id$ */ +require_once(DOL_DOCUMENT_ROOT ."/commonobject.class.php"); + /** * \class Mailing * \brief Classe permettant la gestion des mailings */ -class Mailing +class Mailing extends CommonObject { - var $id; + var $db; var $error; - + var $element='mailing'; + var $table_element='mailing'; + + var $id; var $statut; var $titre; var $sujet;
'.$langs->trans("Ref").''.$mil->id.'
'.$langs->trans("Ref").''; + print $html->showrefnav($mil,'id'); + print '
'.$langs->trans("MailTitle").''.$mil->titre.'
'.$langs->trans("MailFrom").''.htmlentities($mil->email_from).'
'.$langs->trans("Status").''.$mil->getLibStatut(4).'