diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php index f888e576a554e78a80ee18407967b8908267762d..587c5eb490ff36c1e10a03f566b646d7c01e6f7e 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.php @@ -88,14 +88,15 @@ class pdf_edison extends ModelePDFCommandes /** * Function to build pdf onto disk - - * @param object Id of object to generate - * @param outputlangs Lang output object - * @param srctemplatepath Full path of source filename for generator using a template file - * @param hidedetails Do not show line details - * @param hidedesc Do not show desc - * @param hideref Do not show ref - * @return int 1=OK, 0=KO + * + * @param int $object Id of object to generate + * @param object $outputlangs Lang output object + * @param string $srctemplatepath Full path of source filename for generator using a template file + * @param int $hidedetails Do not show line details + * @param int $hidedesc Do not show desc + * @param int $hideref Do not show ref + * @param object $hookmanager Hookmanager object + * @return int 1=OK, 0=KO */ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false) { diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index 6bbcd45bcb40d31b42766faef9f833670e81052a..5fc3d598b4a7942f1512d62f9432ea2cde9ed582 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -119,14 +119,15 @@ class pdf_einstein extends ModelePDFCommandes /** * Function to build pdf onto disk - - * @param object Id of object to generate - * @param outputlangs Lang output object - * @param srctemplatepath Full path of source filename for generator using a template file - * @param hidedetails Do not show line details - * @param hidedesc Do not show desc - * @param hideref Do not show ref - * @return int 1=OK, 0=KO + * + * @param int $object Id of object to generate + * @param object $outputlangs Lang output object + * @param string $srctemplatepath Full path of source filename for generator using a template file + * @param int $hidedetails Do not show line details + * @param int $hidedesc Do not show desc + * @param int $hideref Do not show ref + * @param object $hookmanager Hookmanager object + * @return int 1=OK, 0=KO */ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false) { diff --git a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php index de4c443b387a431098686dd013141489531161cd..f406208fe7e079cf19eda53381628df0134ddf0c 100755 --- a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php @@ -121,13 +121,15 @@ class pdf_crabe extends ModelePDFFactures /** * Function to build pdf onto disk - * @param object Id of object to generate - * @param outputlangs Lang output object - * @param srctemplatepath Full path of source filename for generator using a template file - * @param hidedetails Do not show line details - * @param hidedesc Do not show desc - * @param hideref Do not show ref - * @return int 1=OK, 0=KO + * + * @param int $object Id of object to generate + * @param object $outputlangs Lang output object + * @param string $srctemplatepath Full path of source filename for generator using a template file + * @param int $hidedetails Do not show line details + * @param int $hidedesc Do not show desc + * @param int $hideref Do not show ref + * @param object $hookmanager Hookmanager object + * @return int 1=OK, 0=KO */ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false) { diff --git a/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php b/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php index b5f90c6d9ece7790a34f53f5ed976ca6fd399571..4e14f6225339c7dbe9231ec8184cb4301eda70d4 100755 --- a/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php @@ -108,13 +108,15 @@ class pdf_oursin extends ModelePDFFactures /** * Function to build pdf onto disk - * @param object Id of object to generate - * @param outputlangs Lang output object - * @param srctemplatepath Full path of source filename for generator using a template file - * @param hidedetails Do not show line details - * @param hidedesc Do not show desc - * @param hideref Do not show ref - * @return int 1=OK, 0=KO + * + * @param int $object Id of object to generate + * @param object $outputlangs Lang output object + * @param string $srctemplatepath Full path of source filename for generator using a template file + * @param int $hidedetails Do not show line details + * @param int $hidedesc Do not show desc + * @param int $hideref Do not show ref + * @param object $hookmanager Hookmanager object + * @return int 1=OK, 0=KO */ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false) { diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 3781a0606e400cf48e2743a72add978eebb97ac2..a426e8bf1f234662ea6a97b82ce1820af65ac073 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -102,14 +102,15 @@ class pdf_propale_azur extends ModelePDFPropales /** * Function to build pdf onto disk - * - * @param object Id of object to generate - * @param outputlangs Lang output object - * @param srctemplatepath Full path of source filename for generator using a template file - * @param hidedetails Do not show line details - * @param hidedesc Do not show desc - * @param hideref Do not show ref - * @return int 1=OK, 0=KO + * + * @param int $object Id of object to generate + * @param object $outputlangs Lang output object + * @param string $srctemplatepath Full path of source filename for generator using a template file + * @param int $hidedetails Do not show line details + * @param int $hidedesc Do not show desc + * @param int $hideref Do not show ref + * @param object $hookmanager Hookmanager object + * @return int 1=OK, 0=KO */ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false) { diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php index 1820e8393d83f82a4e1c7fec072662fae09715c0..f3dd60f6ae96814d39fdd72c28b868ce50e76243 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php @@ -102,14 +102,15 @@ class pdf_propale_jaune extends ModelePDFPropales /** * Function to build pdf onto disk - * - * @param object Id of object to generate - * @param outputlangs Lang output object - * @param srctemplatepath Full path of source filename for generator using a template file - * @param hidedetails Do not show line details - * @param hidedesc Do not show desc - * @param hideref Do not show ref - * @return int 1=OK, 0=KO + * + * @param int $object Id of object to generate + * @param object $outputlangs Lang output object + * @param string $srctemplatepath Full path of source filename for generator using a template file + * @param int $hidedetails Do not show line details + * @param int $hidedesc Do not show desc + * @param int $hideref Do not show ref + * @param object $hookmanager Hookmanager object + * @return int 1=OK, 0=KO */ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false) { diff --git a/htdocs/user/home.php b/htdocs/user/home.php index 12b4fb94d17af0e4acc7621b2fa754945f412148..2af26b6fc8dde250f122675eead8aecb3b04b6ce 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -231,13 +231,13 @@ if ($canreadperms) } print "</td>"; if (! empty($conf->multicompany->enabled)) - { + { $mc = new ActionsMulticompany($db); $mc->getInfo($obj->entity); print '<td>'; print $mc->label; print '</td>'; - } + } print '<td nowrap="nowrap" align="right">'.dol_print_date($db->jdate($obj->datec),'dayhour').'</td>'; print "</tr>"; $i++; diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index d7e6cfe55f542591fbb03f13ad08c2e63c40e956..0ebbc059b96ffbd3bdd45da7eeaf341cffcc19b5 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -153,7 +153,7 @@ foreach($modulesdir as $dir) $handle=opendir($dir); if (is_resource($handle)) { - while (($file = readdir($handle))!==false) + while (($file = readdir($handle))!==false) { if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') { diff --git a/htdocs/webservices/index.php b/htdocs/webservices/index.php index d99da75f9aa5d4158f01b38c3bf757abbe3cbc69..3c2981f940fb99689e9aa49f65115ccbbfbef13e 100644 --- a/htdocs/webservices/index.php +++ b/htdocs/webservices/index.php @@ -1,5 +1,6 @@ <?php -/* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net> +/* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net> + * Copyright (C) 2011 Regis Houssin <regis@dolibarr.fr> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -51,21 +52,21 @@ if (empty($conf->global->MAIN_MODULE_WEBSERVICES)) // WSDL print '<u>'.$langs->trans("WSDLCanBeDownloadedHere").':</u><br>'; $url=DOL_MAIN_URL_ROOT.'/webservices/server_other.php?wsdl'; -print img_picto('','object_globe.png').' '.'<a href="'.$url.'" target="_blank">'.$url."</a><br>\n"; +print img_picto('','object_globe.png') . ' <a href="' . $url . '" target="_blank">' . $url . "</a><br>\n"; if ($conf->societe->enabled) { $url=DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php?wsdl'; - print img_picto('','object_globe.png').' '.'<a href="'.$url.'" target="_blank">'.$url."</a><br>\n"; + print img_picto('','object_globe.png') . ' <a href="' . $url . '" target="_blank">' . $url . "</a><br>\n"; } if ($conf->facture->enabled) { $url=DOL_MAIN_URL_ROOT.'/webservices/server_invoice.php?wsdl'; - print img_picto('','object_globe.png').' '.'<a href="'.$url.'" target="_blank">'.$url."</a><br>\n"; + print img_picto('','object_globe.png') . ' <a href="' . $url . '" target="_blank">' . $url . "</a><br>\n"; } if ($conf->fournisseur->enabled) { $url=DOL_MAIN_URL_ROOT.'/webservices/server_supplier_invoice.php?wsdl'; - print img_picto('','object_globe.png').' '.'<a href="'.$url.'" target="_blank">'.$url."</a><br>\n"; + print img_picto('','object_globe.png') . ' <a href="' . $url . '" target="_blank">' . $url . "</a><br>\n"; } print '<br>'; @@ -73,26 +74,26 @@ print '<br>'; // Endpoint print '<u>'.$langs->trans("EndPointIs").':</u><br>'; $url=DOL_MAIN_URL_ROOT.'/webservices/server_other.php'; -print img_picto('','object_globe.png').' '.'<a href="'.$url.'" target="_blank">'.$url."</a><br>\n"; +print img_picto('','object_globe.png') . ' <a href="' . $url . '" target="_blank">' . $url . "</a><br>\n"; if ($conf->societe->enabled) { $url=DOL_MAIN_URL_ROOT.'/webservices/server_thirdparty.php'; - print img_picto('','object_globe.png').' '.'<a href="'.$url.'" target="_blank">'.$url."</a><br>\n"; + print img_picto('','object_globe.png') . ' <a href="' . $url . '" target="_blank">' . $url . "</a><br>\n"; } if ($conf->facture->enabled) { $url=DOL_MAIN_URL_ROOT.'/webservices/server_invoice.php'; - print img_picto('','object_globe.png').' '.'<a href="'.$url.'" target="_blank">'.$url."</a><br>\n"; + print img_picto('','object_globe.png') . ' <a href="' . $url . '" target="_blank">' . $url . "</a><br>\n"; } if ($conf->fournisseur->enabled) { $url=DOL_MAIN_URL_ROOT.'/webservices/server_supplier_invoice.php'; - print img_picto('','object_globe.png').' '.'<a href="'.$url.'" target="_blank">'.$url."</a><br>\n"; + print img_picto('','object_globe.png') . ' <a href="' . $url . '" target="_blank">' . $url . "</a><br>\n"; } print '<br>'; print '<br>'; -print 'NUSoap library path used by Dolibarr: '.NUSOAP_PATH.'<br>'; +print 'NUSoap library path used by Dolibarr: ' . NUSOAP_PATH . '<br>'; print '<br>'; $db->close();