From 5bc3585dce7e0d21ece4e169a959ae2d95f98ff8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 5 Mar 2005 19:22:41 +0000
Subject: [PATCH] =?UTF-8?q?New:=20Am=E9lioration=20sur=20l'outil=20de=20ma?=
 =?UTF-8?q?iling.=20Les=20modules=20de=20choix=20des=20cibles=20sont=20act?=
 =?UTF-8?q?ifs=20ou=20non=20selon=20leur=20d=E9pendances=20avec=20les=20mo?=
 =?UTF-8?q?dules=20Dolibarr.=20Les=20pictos=20des=20cibles=20s'affiche=20s?=
 =?UTF-8?q?ur=20la=20page=20des=20mailings.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/comm/mailing/cibles.php | 63 ++++++++++++++++++++++------------
 htdocs/comm/mailing/index.php  |  4 +--
 2 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index a6b51bb504e..f1adeb3dde0 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -147,7 +147,6 @@ if ($mil->fetch($_GET["id"]) == 0)
             if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
             {
                 if (eregi("(.*)\.(.*)\.(.*)",$file,$reg)) {
-                    $var = !$var;
                     $modulename=$reg[1];
         
                     // Chargement de la classe
@@ -155,31 +154,51 @@ if ($mil->fetch($_GET["id"]) == 0)
                     $classname = "mailing_".$modulename;
                     require_once($file);
         
-                    print '<tr '.$bc[$var].'>';
-        
-                    print '<td>';
                     $obj = new $classname($db);
-                    print img_object('',$obj->picto).' '.$obj->getDesc();
-                    print '</td>';
+
+                    $qualified=1;
+                    foreach ($obj->require_module as $key)
+                    {
+                        if (! $conf->$key->enabled || (! $user->admin && $obj->require_admin))
+                        {
+                            $qualified=0;
+                            //print "Les prérequis d'activation du module mailing ne sont pas respectés. Il ne sera pas actif";
+                            break;
+                        }
+                    }
+                    
+                    // Si le module mailing est qualifié
+                    if ($qualified)
+                    {
+                        $var = !$var;
+                        print '<tr '.$bc[$var].'>';
+            
+                        print '<td>';
+                        print img_object('',$obj->picto).' '.$obj->getDesc();
+                        print '</td>';
+            
+                        /*
+                        print '<td width=\"100\">';
+                        print $modulename;
+                        print "</td>";
+                        */
+                        print '<td align="center">'.$obj->getNbOfRecipients().'</td>';
         
-                    /*
-                    print '<td width=\"100\">';
-                    print $modulename;
-                    print "</td>";
-                    */
-                    print '<td align="center">'.$obj->getNbOfRecipients().'</td>';
-    
-                    print '<td align="center">';
-                    if ($mil->statut == 0) {
-                        print '<form action="cibles.php?action=add&rowid='.$mil->id.'&module='.$modulename.'" method="POST"><input type="submit" value="'.$langs->trans("Add").'"></form>';
+                        print '<td align="center">';
+                        if ($mil->statut == 0)
+                        {
+                            print '<form action="cibles.php?action=add&rowid='.$mil->id.'&module='.$modulename.'" method="POST"><input type="submit" value="'.$langs->trans("Add").'"></form>';
+                        }
+                        else
+                        {
+                            //print $langs->trans("MailNoChangePossible");
+                            print "&nbsp;";
+                        }
+                        print '</td>';
+
+                        print "</tr>\n";
                     }
-                    else {
-                        //print $langs->trans("MailNoChangePossible");
-                        print "&nbsp;";
-                    }
-                    print '</td>';
                 }
-                print "</tr>\n";
             }
         }
         closedir($handle);
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index 147fbf0e94c..dfcc7518273 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -80,10 +80,10 @@ while (($file = readdir($handle))!==false)
                 $qualified=1;
                 foreach ($mailmodule->require_module as $key)
                 {
-                    if (! $conf->$key->enabled)
+                    if (! $conf->$key->enabled || (! $user->admin && $obj->require_admin))
                     {
                         $qualified=0;
-                        //print "Le module mailing a besoin du module $key. Il ne sera pas actif";
+                        //print "Les prérequis d'activation du module mailing ne sont pas respectés. Il ne sera pas actif";
                         break;
                     }
                 }