diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 6f4986d393b..82551853035 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -265,19 +265,20 @@ if ($mil->fetch($_GET["id"]) == 0) $addu = "&id=".$mil->id."&page=$page";; print_barre_liste($langs->trans("MailSelectedRecipients"), $page, "cibles.php","&id=".$mil->id,$sortfield,$sortorder,"",$num); + print ''; print ''; print_liste_field_titre($langs->trans("Lastname"),"cibles.php","mc.nom",$addu,"","",$sortfield); print_liste_field_titre($langs->trans("Firstname"),"cibles.php","mc.prenom",$addu,"","",$sortfield); print_liste_field_titre($langs->trans("EMail"),"cibles.php","mc.email",$addu,"","",$sortfield); - print ''; + print ''; if ($mil->statut == 0) { print ''; } if ($mil->statut != 0) { - print ''; + print ''; } print ''; $var = true; @@ -294,16 +295,16 @@ if ($mil->fetch($_GET["id"]) == 0) print ''; if ($mil->statut == 0) { - print ''; + print ''; print ''; } if ($mil->statut != 0) { - print ''; - print ''; + print ''; } print ''; @@ -323,5 +324,5 @@ if ($mil->fetch($_GET["id"]) == 0) $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 20614a127b3..edb4e41b373 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -316,11 +316,9 @@ else if ($mil->statut > 1) { - $ua = new User($db, $mil->user_appro); - $ua->fetch(); - print ''; + print ''; print ''; - print ''; + print ''; } // Contenu du mail @@ -426,5 +424,5 @@ else $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 69da2638ce0..7d905cb7d07 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -46,12 +46,11 @@ llxHeader('','Mailing'); * */ -print_titre($langs->trans("MailingArea")); -print '
'; +print_fiche_titre($langs->trans("MailingArea")); -print '
'.$langs->trans("Status").''.$langs->trans("Status").' '.$langs->trans("Date").''.$langs->trans("Date").'
'.$obj->email.''.$langs->trans("MailingStatusNotSent").''.$langs->trans("MailingStatusNotSent").''.img_delete($langs->trans("RemoveRecipient")).''; - if ($obj->statut==-1) print $langs->trans("MailingStatusError"); + print ''; + if ($obj->statut==-1) print $langs->trans("MailingStatusError").' '.img_error(); if ($obj->statut==1) print $langs->trans("MailingStatusSent"); print ''.$obj->date_envoi.''.$obj->date_envoi.'
'.$langs->trans("SentBy").''.$ua->fullname.'
'.$langs->trans("SentBy").''.$langs->trans("Unknown").''.$langs->trans("Date").''.strftime("%d %b %Y %H:%M", $mil->date_appro).'
'.strftime("%d %b %Y %H:%M", $mil->date_envoi).'
'; +print '
'; -print '
'; +print '
'; // Recherche emails @@ -138,7 +137,7 @@ closedir($handle); print "

"; -print ''; +print ''; /* diff --git a/htdocs/comm/mailing/mailing.class.php b/htdocs/comm/mailing/mailing.class.php index 174e8774134..01b4149e1c7 100644 --- a/htdocs/comm/mailing/mailing.class.php +++ b/htdocs/comm/mailing/mailing.class.php @@ -71,7 +71,8 @@ class Mailing $this->statuts[0] = $langs->trans("MailingStatusDraft"); $this->statuts[1] = $langs->trans("MailingStatusValidated"); - $this->statuts[2] = $langs->trans("MailingStatusSent"); + $this->statuts[2] = $langs->trans("MailingStatusSentPartialy"); + $this->statuts[3] = $langs->trans("MailingStatusSentCompletely"); } /** @@ -174,7 +175,7 @@ class Mailing $sql .= ", m.fk_user_creat, m.fk_user_valid, m.fk_user_appro"; $sql .= ", ".$this->db->pdate("m.date_creat") . " as date_creat"; $sql .= ", ".$this->db->pdate("m.date_valid") . " as date_valid"; - $sql .= ", ".$this->db->pdate("m.date_appro") . " as date_appro"; + $sql .= ", ".$this->db->pdate("m.date_envoi") . " as date_envoi"; $sql .= " FROM ".MAIN_DB_PREFIX."mailing as m"; $sql .= " WHERE m.rowid = ".$rowid; @@ -202,6 +203,7 @@ class Mailing $this->date_creat = $obj->date_creat; $this->date_valid = $obj->date_valid; $this->date_appro = $obj->date_appro; + $this->date_envoi = $obj->date_envoi; return 0; }