From 922f3afbcb2ca1ed560b1a14da0f60f0aeff9a17 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 25 Jun 2006 15:52:12 +0000
Subject: [PATCH] =?UTF-8?q?Look:=20Ajout=20picto=20sur=20statut=20mailing?=
 =?UTF-8?q?=20Am=E9lioration=20de=20la=20modularit=E9=20des=20modules=20de?=
 =?UTF-8?q?=20sel=E9ction=20cibles=20d'un=20mailing=20pour=20rendre=20plus?=
 =?UTF-8?q?=20facile=20ajout=20de=20ses=20propres=20mailing-list.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/mailing/cibles.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 5863a75f700..4d28e04f5d8 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -159,8 +159,8 @@ if ($mil->fetch($_GET["id"]) == 0)
     print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">'.$mil->id.'</td></tr>';
     print '<tr><td width="25%">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$mil->titre.'</td></tr>';
     print '<tr><td width="25%">'.$langs->trans("MailFrom").'</td><td colspan="3">'.htmlentities($mil->email_from).'</td></tr>';
+    print '<tr><td width="25%">'.$langs->trans("Status").'</td><td colspan="3">'.$mil->getLibStatut(4).'</td></tr>';
     print '<tr><td width="25%">'.$langs->trans("TotalNbOfDistinctRecipients").'</td><td colspan="3">'.($mil->nbemail?$mil->nbemail:'<font class="error">'.$langs->trans("NoTargetYet").'</font>').'</td></tr>';
-    print '<tr><td width="25%">'.$langs->trans("Status").'</td><td colspan="3">'.$mil->statuts[$mil->statut].'</td></tr>';
     print '</table>';
     
     print "</div>";
@@ -196,7 +196,8 @@ if ($mil->fetch($_GET["id"]) == 0)
             {
                 if (eregi("(.*)\.(.*)\.(.*)",$file,$reg)) {
                     $modulename=$reg[1];
-        
+        			if ($modulename == 'example') continue;
+        			
                     // Chargement de la classe
                     $file = $dir."/".$modulename.".modules.php";
                     $classname = "mailing_".$modulename;
@@ -224,6 +225,7 @@ if ($mil->fetch($_GET["id"]) == 0)
                         if ($mil->statut == 0) print '<form action="cibles.php?action=add&rowid='.$mil->id.'&module='.$modulename.'" method="POST">';
                         
                         print '<td>';
+                        if (! $obj->picto) $obj->picto='generic';
                         print img_object('',$obj->picto).' '.$obj->getDesc();
                         print '</td>';
             
@@ -259,7 +261,12 @@ if ($mil->fetch($_GET["id"]) == 0)
         }
         closedir($handle);
 
-        print '</table><br>';
+        print '</table>';
+        if ($user->admin)
+        {
+        	print info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"));
+        }
+		print '<br>';
     }