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 '
';
-
- print '| ';
$obj = new $classname($db);
- print img_object('',$obj->picto).' '.$obj->getDesc();
- print ' | ';
+
+ $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 '
';
+
+ print '| ';
+ print img_object('',$obj->picto).' '.$obj->getDesc();
+ print ' | ';
+
+ /*
+ print '';
+ print $modulename;
+ print " | ";
+ */
+ print ''.$obj->getNbOfRecipients().' | ';
- /*
- print '';
- print $modulename;
- print " | ";
- */
- print ''.$obj->getNbOfRecipients().' | ';
-
- print '';
- if ($mil->statut == 0) {
- print '';
+ print ' | ';
+ if ($mil->statut == 0)
+ {
+ print '';
+ }
+ else
+ {
+ //print $langs->trans("MailNoChangePossible");
+ print " ";
+ }
+ print ' | ';
+
+ print "
\n";
}
- else {
- //print $langs->trans("MailNoChangePossible");
- print " ";
- }
- print '';
}
- print "\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;
}
}