Fix: can use alertnative path

This commit is contained in:
Regis Houssin 2011-01-14 17:33:03 +00:00
parent 11da59feea
commit eb01c964d9

View File

@ -1,10 +1,10 @@
<?php <?php
/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr> * Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -316,7 +316,6 @@ else
dol_print_error($db); dol_print_error($db);
} }
$dir = "../includes/modules/propale/";
print "<table class=\"noborder\" width=\"100%\">\n"; print "<table class=\"noborder\" width=\"100%\">\n";
print "<tr class=\"liste_titre\">\n"; print "<tr class=\"liste_titre\">\n";
@ -330,11 +329,16 @@ print "</tr>\n";
clearstatcache(); clearstatcache();
$handle=opendir($dir);
$var=true; $var=true;
if (is_resource($handle)) foreach ($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot . "/includes/modules/propale/";
if (is_dir($dir))
{
$handle=opendir($dir);
if (is_resource($handle))
{
while (($file = readdir($handle))!==false) while (($file = readdir($handle))!==false)
{ {
if (substr($file, dol_strlen($file) -12) == '.modules.php' && substr($file,0,12) == 'pdf_propale_') if (substr($file, dol_strlen($file) -12) == '.modules.php' && substr($file,0,12) == 'pdf_propale_')
@ -352,7 +356,7 @@ if (is_resource($handle))
print '</td>'; print '</td>';
// Activate // Activate
print "<td align=\"center\">\n"; print '<td align="center">'."\n";
if (in_array($name, $def)) if (in_array($name, $def))
{ {
if ($conf->global->PROPALE_ADDON_PDF != "$name") if ($conf->global->PROPALE_ADDON_PDF != "$name")
@ -375,7 +379,7 @@ if (is_resource($handle))
print "</td>"; print "</td>";
// Default // Default
print "<td align=\"center\">"; print '<td align="center">';
if ($conf->global->PROPALE_ADDON_PDF == "$name") if ($conf->global->PROPALE_ADDON_PDF == "$name")
{ {
print img_picto($langs->trans("Yes"),'on'); print img_picto($langs->trans("Yes"),'on');
@ -401,8 +405,6 @@ if (is_resource($handle))
//$htmltooltip.='<br>'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,1,1); //$htmltooltip.='<br>'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,1,1);
$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftProposal").': '.yn($module->option_draft_watermark,1,1); $htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftProposal").': '.yn($module->option_draft_watermark,1,1);
print '<td align="center">'; print '<td align="center">';
print $html->textwithpicto('',$htmltooltip,1,0); print $html->textwithpicto('',$htmltooltip,1,0);
print '</td>'; print '</td>';
@ -414,8 +416,11 @@ if (is_resource($handle))
} }
} }
closedir($handle); closedir($handle);
}
}
} }
print '</table>'; print '</table>';
print '<br>'; print '<br>';