Module for mailing selection can be in two different root locations

This commit is contained in:
Laurent Destailleur 2008-05-15 17:59:37 +00:00
parent 6b4fc8c6e9
commit b3fb3c684b

View File

@ -32,7 +32,9 @@ if (! $user->rights->mailing->lire || $user->societe_id > 0)
accessforbidden(); accessforbidden();
$dir=DOL_DOCUMENT_ROOT."/includes/modules/mailings"; $dirmod=DOL_DOCUMENT_ROOT."/includes/modules/mailings";
if (defined('DOL_DOCUMENT_ROOT_BIS')) $dirmod2=DOL_DOCUMENT_ROOT_BIS."/includes/modules/mailings";
$mesg = ''; $mesg = '';
@ -59,7 +61,7 @@ if ($_GET["action"] == 'add')
$modulename=$_GET["module"]; $modulename=$_GET["module"];
// Chargement de la classe // Chargement de la classe
$file = $dir."/".$modulename.".modules.php"; $file = $dirmod."/".$modulename.".modules.php";
$classname = "mailing_".$modulename; $classname = "mailing_".$modulename;
require_once($file); require_once($file);
@ -88,7 +90,7 @@ if ($_GET["action"] == 'add')
if ($_GET["action"] == 'clear') if ($_GET["action"] == 'clear')
{ {
// Chargement de la classe // Chargement de la classe
$file = $dir."/modules_mailings.php"; $file = $dirmod."/modules_mailings.php";
$classname = "MailingTargets"; $classname = "MailingTargets";
require_once($file); require_once($file);
@ -106,7 +108,7 @@ if ($_GET["action"] == 'delete')
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
$file = $dir."/modules_mailings.php"; $file = $dirmod."/modules_mailings.php";
$classname = "MailingTargets"; $classname = "MailingTargets";
require_once($file); require_once($file);
@ -187,93 +189,100 @@ if ($mil->fetch($_REQUEST["id"]) >= 0)
clearstatcache(); clearstatcache();
$handle=opendir($dir); $listdir=array();
$listdir[]=$dirmod;
if (! empty($dirmod2)) $listdir[]=$dirmod2;
$var=True; foreach ($listdir as $dir)
while (($file = readdir($handle))!==false)
{ {
if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS') $handle=opendir($dir);
{
if (eregi("(.*)\.modules\.php$",$file,$reg)) $var=True;
{ while (($file = readdir($handle))!==false)
$modulename=$reg[1]; {
if ($modulename == 'example') continue; if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
{
// Chargement de la classe if (eregi("(.*)\.modules\.php$",$file,$reg))
$file = $dir."/".$modulename.".modules.php"; {
$classname = "mailing_".$modulename; $modulename=$reg[1];
require_once($file); if ($modulename == 'example') continue;
$obj = new $classname($db); // Chargement de la classe
$file = $dir."/".$modulename.".modules.php";
$qualified=1; $classname = "mailing_".$modulename;
foreach ($obj->require_module as $key) require_once($file);
{
if (! $conf->$key->enabled || (! $user->admin && $obj->require_admin)) $obj = new $classname($db);
{
$qualified=0; $qualified=1;
//print "Les prérequis d'activation du module mailing ne sont pas respectés. Il ne sera pas actif"; foreach ($obj->require_module as $key)
break; {
} if (! $conf->$key->enabled || (! $user->admin && $obj->require_admin))
} {
$qualified=0;
// Si le module mailing est qualifié //print "Les prérequis d'activation du module mailing ne sont pas respectés. Il ne sera pas actif";
if ($qualified) break;
{ }
$var = !$var; }
print '<tr '.$bc[$var].'>';
// Si le module mailing est qualifié
if ($mil->statut == 0) print '<form action="cibles.php?action=add&rowid='.$mil->id.'&module='.$modulename.'" method="POST">'; if ($qualified)
{
print '<td>'; $var = !$var;
if (! $obj->picto) $obj->picto='generic'; print '<tr '.$bc[$var].'>';
print img_object('',$obj->picto).' '.$obj->getDesc();
print '</td>'; if ($mil->statut == 0) print '<form action="cibles.php?action=add&rowid='.$mil->id.'&module='.$modulename.'" method="POST">';
/* print '<td>';
print '<td width=\"100\">'; if (! $obj->picto) $obj->picto='generic';
print $modulename; print img_object('',$obj->picto).' '.$obj->getDesc();
print "</td>"; print '</td>';
*/
$nbofrecipient=$obj->getNbOfRecipients(); /*
print '<td align="center">'; print '<td width=\"100\">';
if ($nbofrecipient >= 0) print $modulename;
{ print "</td>";
print $nbofrecipient; */
} $nbofrecipient=$obj->getNbOfRecipients();
else print '<td align="center">';
{ if ($nbofrecipient >= 0)
print $langs->trans("Error").' '.img_error($obj->error); {
} print $nbofrecipient;
print '</td>'; }
else
print '<td align="center">'; {
$filter=$obj->formFilter(); print $langs->trans("Error").' '.img_error($obj->error);
if ($filter) print $filter; }
else print $langs->trans("None"); print '</td>';
print '</td>';
print '<td align="center">';
print '<td align="center">'; $filter=$obj->formFilter();
if ($mil->statut == 0) if ($filter) print $filter;
{ else print $langs->trans("None");
print '<input type="submit" class="button" value="'.$langs->trans("Add").'">'; print '</td>';
}
else print '<td align="center">';
{ if ($mil->statut == 0)
//print $langs->trans("MailNoChangePossible"); {
print "&nbsp;"; print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
} }
print '</td>'; else
{
if ($mil->statut == 0) print '</form>'; //print $langs->trans("MailNoChangePossible");
print "&nbsp;";
print "</tr>\n"; }
} print '</td>';
}
} if ($mil->statut == 0) print '</form>';
print "</tr>\n";
}
}
}
}
closedir($handle);
} }
closedir($handle);
print '</table>'; print '</table>';
print '<br>'; print '<br>';