From 5acd09b2d542a0ce2cdf7e78a226023ab4d2903b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 24 Nov 2016 17:03:18 +0100 Subject: [PATCH] Fix require_once instead of require. --- htdocs/commande/card.php | 4 ++-- htdocs/core/lib/files.lib.php | 2 +- htdocs/core/lib/functions.lib.php | 6 +++--- htdocs/core/modules/DolibarrModules.class.php | 2 +- htdocs/ecm/ajax/ecmdatabase.php | 4 ++-- htdocs/expedition/index.php | 4 ++-- htdocs/fourn/commande/card.php | 2 +- htdocs/fourn/paiement/info.php | 2 +- htdocs/holiday/common.inc.php | 2 +- htdocs/product/ajax/products.php | 2 +- htdocs/societe/ajax/company.php | 2 +- htdocs/user/card.php | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index ac80f231e00..51c77e2632f 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -44,9 +44,9 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/order.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; if (! empty($conf->propal->enabled)) - require DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php'; + require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php'; if (! empty($conf->projet->enabled)) { - require DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php'; } require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php'; diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index 3d43108e6a3..f67f1a0daf4 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -602,7 +602,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable if (empty($disablevirusscan) && file_exists($src_file) && ! empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) { if (! class_exists('AntiVir')) { - require DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php'; + require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php'; } $antivir=new AntiVir($db); $result = $antivir->dol_avscan_file($src_file); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 832d859db65..7b69b17f89d 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4016,7 +4016,7 @@ function get_product_localtax_for_country($idprod, $local, $thirdparty_seller) global $db,$mysoc; if (! class_exists('Product')) { - require DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; + require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; } $ret=0; @@ -4173,7 +4173,7 @@ function get_default_npr(Societe $thirdparty_seller, Societe $thirdparty_buyer, if ($idprodfournprice > 0) { if (! class_exists('ProductFournisseur')) - require DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php'; + require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php'; $prodprice = new ProductFournisseur($db); $prodprice->fetch_product_fournisseur_price($idprodfournprice); return $prodprice->fourn_tva_npr; @@ -4181,7 +4181,7 @@ function get_default_npr(Societe $thirdparty_seller, Societe $thirdparty_buyer, elseif ($idprod > 0) { if (! class_exists('Product')) - require DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; + require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; $prod = new Product($db); $prod->fetch($idprod); return $prod->tva_npr; diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php index dbb8f9b3f01..efb2ec646c8 100644 --- a/htdocs/core/modules/DolibarrModules.class.php +++ b/htdocs/core/modules/DolibarrModules.class.php @@ -1507,7 +1507,7 @@ class DolibarrModules // Can not be abstract, because we need to insta if ($reinitadminperms) { if (! class_exists('User')) { - require DOL_DOCUMENT_ROOT . '/user/class/user.class.php'; + require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php'; } $sql="SELECT rowid FROM ".MAIN_DB_PREFIX."user WHERE admin = 1"; dol_syslog(get_class($this)."::insert_permissions Search all admin users", LOG_DEBUG); diff --git a/htdocs/ecm/ajax/ecmdatabase.php b/htdocs/ecm/ajax/ecmdatabase.php index 4e5103399d9..ac3a45d5683 100644 --- a/htdocs/ecm/ajax/ecmdatabase.php +++ b/htdocs/ecm/ajax/ecmdatabase.php @@ -28,7 +28,7 @@ if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); require '../../main.inc.php'; -require DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; $action = GETPOST('action','alpha'); $element = GETPOST('element', 'alpha'); @@ -48,7 +48,7 @@ if (isset($action) && ! empty($action)) if ($action == 'build' && ! empty($element)) { - require DOL_DOCUMENT_ROOT . '/ecm/class/ecmdirectory.class.php'; + require_once DOL_DOCUMENT_ROOT . '/ecm/class/ecmdirectory.class.php'; $ecmdirstatic = new EcmDirectory($db); $ecmdirtmp = new EcmDirectory($db); diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index 66355a471ee..33aae04c5ab 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -24,8 +24,8 @@ */ require '../main.inc.php'; -require DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; -require DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; +require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; $langs->load("orders"); $langs->load("sendings"); diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index fa4fa4c8295..5fcb3248579 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; if (! empty($conf->supplier_proposal->enabled)) - require DOL_DOCUMENT_ROOT . '/supplier_proposal/class/supplier_proposal.class.php'; + require_once DOL_DOCUMENT_ROOT . '/supplier_proposal/class/supplier_proposal.class.php'; if (!empty($conf->produit->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; if (!empty($conf->projet->enabled)) { diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php index 409b567959a..24263106052 100644 --- a/htdocs/fourn/paiement/info.php +++ b/htdocs/fourn/paiement/info.php @@ -26,7 +26,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; -require DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php'; $langs->load("bills"); $langs->load("suppliers"); diff --git a/htdocs/holiday/common.inc.php b/htdocs/holiday/common.inc.php index a047bee9889..574c4394c81 100644 --- a/htdocs/holiday/common.inc.php +++ b/htdocs/holiday/common.inc.php @@ -25,7 +25,7 @@ require_once realpath(dirname(__FILE__)).'/../main.inc.php'; if (! class_exists('Holiday')) { - require DOL_DOCUMENT_ROOT. '/holiday/class/holiday.class.php'; + require_once DOL_DOCUMENT_ROOT. '/holiday/class/holiday.class.php'; } $langs->load("user"); diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php index c399d222177..e6d2c6524b7 100644 --- a/htdocs/product/ajax/products.php +++ b/htdocs/product/ajax/products.php @@ -63,7 +63,7 @@ dol_syslog(join(',', $_GET)); if (! empty($action) && $action == 'fetch' && ! empty($id)) { - require DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; + require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; $outjson = array(); diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php index 96ac9f0154b..d2a244f9444 100644 --- a/htdocs/societe/ajax/company.php +++ b/htdocs/societe/ajax/company.php @@ -54,7 +54,7 @@ dol_syslog(join(',',$_GET)); if (! empty($action) && $action == 'fetch' && ! empty($id)) { - require DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php'; + require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php'; $outjson=array(); diff --git a/htdocs/user/card.php b/htdocs/user/card.php index b7659a5992c..5f7e496c872 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -46,7 +46,7 @@ if (! empty($conf->ldap->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/l if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; if (! empty($conf->multicompany->enabled)) dol_include_once('/multicompany/class/actions_multicompany.class.php'); if (! empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; -c + $id = GETPOST('id','int'); $action = GETPOST('action','alpha');