From 0b1d66c61f0bfbad02c58b4be7b85c21ac008be9 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Wed, 17 Oct 2018 10:42:29 +0200
Subject: [PATCH] Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
---
web_service/class/majic_lib/Mj.class.inc | 2 +-
web_service/ws/Adresse.class.inc | 4 ++--
web_service/ws/Adresses.class.inc | 4 ++--
web_service/ws/Cadastre.class.inc | 4 ++--
web_service/ws/CadastreProperties.class.inc | 2 +-
web_service/ws/Commune.class.inc | 4 ++--
web_service/ws/Communes.class.inc | 4 ++--
web_service/ws/DescriptionParcelle.class.inc | 4 ++--
web_service/ws/DescriptionParcelles.class.inc | 4 ++--
web_service/ws/DownloadRapport.class.inc | 6 +++---
.../ws/FicheDescriptiveInvariant.class.inc | 6 +++---
.../ws/FicheDescriptiveParcelle.class.inc | 6 +++---
web_service/ws/FicheUrbanisme.class.inc | 6 +++---
web_service/ws/Invariant.class.inc | 4 ++--
web_service/ws/Invariants.class.inc | 4 ++--
web_service/ws/LieuDit.class.inc | 2 +-
web_service/ws/LieuDits.class.inc | 4 ++--
web_service/ws/Parcelle.class.inc | 4 ++--
web_service/ws/Parcelles.class.inc | 4 ++--
web_service/ws/Proprietaire.class.inc | 2 +-
web_service/ws/Proprietaires.class.inc | 4 ++--
.../ws/RapportsCadastreParcelle.class.inc | 14 +++++++-------
web_service/ws/ReleveDePropriete.class.inc | 16 ++++++++--------
web_service/ws/Section.class.inc | 4 ++--
web_service/ws/Sections.class.inc | 4 ++--
web_service/ws/Voie.class.inc | 4 ++--
web_service/ws/Voies.class.inc | 4 ++--
27 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/web_service/class/majic_lib/Mj.class.inc b/web_service/class/majic_lib/Mj.class.inc
index 6a929471..60198cd8 100755
--- a/web_service/class/majic_lib/Mj.class.inc
+++ b/web_service/class/majic_lib/Mj.class.inc
@@ -18,7 +18,7 @@
* \author Damien Bedel
* \author Olivier Gayte <olivier.gayte@veremes.com>
*/
-require_once __DIR__ . "/../vitis_lib/XmlAbstract.class.inc";
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . "/ws/vitis_lib/XmlAbstract.class.inc";
class Mj extends XmlAbstract {
diff --git a/web_service/ws/Adresse.class.inc b/web_service/ws/Adresse.class.inc
index 3cff3396..9f907c38 100755
--- a/web_service/ws/Adresse.class.inc
+++ b/web_service/ws/Adresse.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Cadastre.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file Adresse.class.inc
@@ -65,7 +65,7 @@ class Adresse extends Cadastre {
* get informations about Adresse
*/
function GET() {
- require __DIR__ . "/../vitis/" . $this->sRessourcesFile;
+ require dirname($_SERVER['SCRIPT_FILENAME']) . "/ws/vitis/" . $this->sRessourcesFile;
$this->aFields = $this->getFields('public', $this->aProperties['cadastre']['views']['adresse'], 'ID_PAR');
}
diff --git a/web_service/ws/Adresses.class.inc b/web_service/ws/Adresses.class.inc
index 38dea19d..351ba82f 100755
--- a/web_service/ws/Adresses.class.inc
+++ b/web_service/ws/Adresses.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Cadastre.class.inc';
require_once 'Adresse.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
class Adresses extends Cadastre {
/**
diff --git a/web_service/ws/Cadastre.class.inc b/web_service/ws/Cadastre.class.inc
index ce60eb55..ea64c0e1 100755
--- a/web_service/ws/Cadastre.class.inc
+++ b/web_service/ws/Cadastre.class.inc
@@ -1,7 +1,7 @@
<?php
-require_once __DIR__ . "/../../class/vitis_lib/DbClass.class.inc";
-require_once __DIR__ . '/../vmap/Vmap.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . "/class/vitis_lib/DbClass.class.inc";
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/vmap/Vmap.class.inc';
class Cadastre extends Vmap {
diff --git a/web_service/ws/CadastreProperties.class.inc b/web_service/ws/CadastreProperties.class.inc
index 9946176f..b205877d 100755
--- a/web_service/ws/CadastreProperties.class.inc
+++ b/web_service/ws/CadastreProperties.class.inc
@@ -1,6 +1,6 @@
<?php
-require_once __DIR__ . '/../vitis/Vitis.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/vitis/Vitis.class.inc';
/**
* \file cadastreproperties.class.inc
diff --git a/web_service/ws/Commune.class.inc b/web_service/ws/Commune.class.inc
index 9aec3ee2..010fca07 100755
--- a/web_service/ws/Commune.class.inc
+++ b/web_service/ws/Commune.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Cadastre.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file Commune.class.inc
@@ -66,7 +66,7 @@ class Commune extends Cadastre {
* get informations about Commune
*/
function GET() {
- require __DIR__ . "/../vitis/" . $this->sRessourcesFile;
+ require dirname($_SERVER['SCRIPT_FILENAME']) . "/ws/vitis/" . $this->sRessourcesFile;
$this->aFields = $this->getFields('public', $this->aProperties['cadastre']['views']['commune'], 'id_com');
}
diff --git a/web_service/ws/Communes.class.inc b/web_service/ws/Communes.class.inc
index a3b21489..88a95ecb 100755
--- a/web_service/ws/Communes.class.inc
+++ b/web_service/ws/Communes.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Cadastre.class.inc';
require_once 'Commune.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
class Communes extends Cadastre {
/**
diff --git a/web_service/ws/DescriptionParcelle.class.inc b/web_service/ws/DescriptionParcelle.class.inc
index 7fe77be3..dcc9bd6a 100755
--- a/web_service/ws/DescriptionParcelle.class.inc
+++ b/web_service/ws/DescriptionParcelle.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Cadastre.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file DescriptionParcelle.class.inc
@@ -65,7 +65,7 @@ class DescriptionParcelle extends Cadastre {
* get informations about DescriptionParcelle
*/
function GET() {
- require __DIR__ . "/../vitis/" . $this->sRessourcesFile;
+ require dirname($_SERVER['SCRIPT_FILENAME']) . "/ws/vitis/" . $this->sRessourcesFile;
$this->aFields = $this->getFields('public', $this->aProperties['cadastre']['views']['description_parcelle'], 'ID_PAR');
}
diff --git a/web_service/ws/DescriptionParcelles.class.inc b/web_service/ws/DescriptionParcelles.class.inc
index a0beaf77..11421877 100755
--- a/web_service/ws/DescriptionParcelles.class.inc
+++ b/web_service/ws/DescriptionParcelles.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Cadastre.class.inc';
require_once 'DescriptionParcelle.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
class DescriptionParcelles extends Cadastre {
/**
diff --git a/web_service/ws/DownloadRapport.class.inc b/web_service/ws/DownloadRapport.class.inc
index 07ac4813..1786b2c0 100755
--- a/web_service/ws/DownloadRapport.class.inc
+++ b/web_service/ws/DownloadRapport.class.inc
@@ -1,9 +1,9 @@
<?php
require_once 'Cadastre.class.inc';
-require_once __DIR__ . '/../vitis/Vitis.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/vitis/Vitis.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
/**
* \file downloadrapport.class.inc
diff --git a/web_service/ws/FicheDescriptiveInvariant.class.inc b/web_service/ws/FicheDescriptiveInvariant.class.inc
index 96887da2..1231717b 100755
--- a/web_service/ws/FicheDescriptiveInvariant.class.inc
+++ b/web_service/ws/FicheDescriptiveInvariant.class.inc
@@ -1,9 +1,9 @@
<?php
require_once 'Cadastre.class.inc';
-require_once __DIR__ . '/../vitis/Vitis.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/vitis/Vitis.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
/**
* \file fichedescriptiveinvariant.class.inc
diff --git a/web_service/ws/FicheDescriptiveParcelle.class.inc b/web_service/ws/FicheDescriptiveParcelle.class.inc
index b6bd6567..d40e39b2 100755
--- a/web_service/ws/FicheDescriptiveParcelle.class.inc
+++ b/web_service/ws/FicheDescriptiveParcelle.class.inc
@@ -1,9 +1,9 @@
<?php
require_once 'Cadastre.class.inc';
-require_once __DIR__ . '/../vitis/Vitis.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/vitis/Vitis.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
/**
* \file fichedescriptiveparcelle.class.inc
diff --git a/web_service/ws/FicheUrbanisme.class.inc b/web_service/ws/FicheUrbanisme.class.inc
index aaa0c4e2..10781b12 100755
--- a/web_service/ws/FicheUrbanisme.class.inc
+++ b/web_service/ws/FicheUrbanisme.class.inc
@@ -1,9 +1,9 @@
<?php
require_once 'Cadastre.class.inc';
-require_once __DIR__ . '/../vitis/Vitis.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/vitis/Vitis.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
/**
* \file ficheurbanisme.class.inc
diff --git a/web_service/ws/Invariant.class.inc b/web_service/ws/Invariant.class.inc
index 4c901af7..7b5a54d8 100755
--- a/web_service/ws/Invariant.class.inc
+++ b/web_service/ws/Invariant.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Cadastre.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file Invariant.class.inc
@@ -65,7 +65,7 @@ class Invariant extends Cadastre {
* get informations about Invariant
*/
function GET() {
- require __DIR__ . "/../vitis/" . $this->sRessourcesFile;
+ require dirname($_SERVER['SCRIPT_FILENAME']) . "/ws/vitis/" . $this->sRessourcesFile;
$this->aFields = $this->getFields('public', $this->aProperties['cadastre']['views']['invariant'], 'ID_BAT');
}
diff --git a/web_service/ws/Invariants.class.inc b/web_service/ws/Invariants.class.inc
index 13c9beff..e7503acb 100755
--- a/web_service/ws/Invariants.class.inc
+++ b/web_service/ws/Invariants.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Cadastre.class.inc';
require_once 'Invariant.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
class Invariants extends Vmap {
/**
diff --git a/web_service/ws/LieuDit.class.inc b/web_service/ws/LieuDit.class.inc
index 992c02e9..1dcf2a5d 100755
--- a/web_service/ws/LieuDit.class.inc
+++ b/web_service/ws/LieuDit.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Cadastre.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file LieuDit.class.inc
diff --git a/web_service/ws/LieuDits.class.inc b/web_service/ws/LieuDits.class.inc
index 13db1fe7..2a33874d 100755
--- a/web_service/ws/LieuDits.class.inc
+++ b/web_service/ws/LieuDits.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Cadastre.class.inc';
require_once 'LieuDit.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
class LieuDits extends Cadastre {
/**
diff --git a/web_service/ws/Parcelle.class.inc b/web_service/ws/Parcelle.class.inc
index de1fee3c..876bd73b 100755
--- a/web_service/ws/Parcelle.class.inc
+++ b/web_service/ws/Parcelle.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Cadastre.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file Parcelle.class.inc
@@ -65,7 +65,7 @@ class Parcelle extends Cadastre {
* get informations about Parcelle
*/
function GET() {
- require __DIR__ . "/../vitis/" . $this->sRessourcesFile;
+ require dirname($_SERVER['SCRIPT_FILENAME']) . "/ws/vitis/" . $this->sRessourcesFile;
$this->aFields = $this->getFields('public', $this->aProperties['cadastre']['views']['parcelle'], 'id_par');
}
diff --git a/web_service/ws/Parcelles.class.inc b/web_service/ws/Parcelles.class.inc
index 797ab424..89d185d8 100755
--- a/web_service/ws/Parcelles.class.inc
+++ b/web_service/ws/Parcelles.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Cadastre.class.inc';
require_once 'Parcelle.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
class Parcelles extends Cadastre {
/**
diff --git a/web_service/ws/Proprietaire.class.inc b/web_service/ws/Proprietaire.class.inc
index 6c52fdf2..41b65cb2 100755
--- a/web_service/ws/Proprietaire.class.inc
+++ b/web_service/ws/Proprietaire.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Cadastre.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file Proprietaire.class.inc
diff --git a/web_service/ws/Proprietaires.class.inc b/web_service/ws/Proprietaires.class.inc
index ebf25726..3fa0b7c9 100755
--- a/web_service/ws/Proprietaires.class.inc
+++ b/web_service/ws/Proprietaires.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Cadastre.class.inc';
require_once 'Proprietaire.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
class Proprietaires extends Cadastre {
/**
diff --git a/web_service/ws/RapportsCadastreParcelle.class.inc b/web_service/ws/RapportsCadastreParcelle.class.inc
index b50102df..8736a468 100755
--- a/web_service/ws/RapportsCadastreParcelle.class.inc
+++ b/web_service/ws/RapportsCadastreParcelle.class.inc
@@ -1,9 +1,9 @@
<?php
require_once 'Cadastre.class.inc';
-require_once __DIR__ . '/../vitis/Vitis.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/vitis/Vitis.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
/**
* \file rapportscadastreparcelle.class.inc
@@ -138,10 +138,10 @@ class RapportsCadastreParcelle extends Cadastre {
// Charge les données
if ($rapportType != 'Locaux' && $rapportType != 'ProprietaireLocaux') {
- require_once(__DIR__ . "/../../class/majic_libV2/Mj_Compte_Communal_Parcelles.class.inc");
+ require_once(dirname($_SERVER['SCRIPT_FILENAME']) . "/class/majic_libV2/Mj_Compte_Communal_Parcelles.class.inc");
$oRapport = new Mj_Compte_Communal_Parcelles($aParcelles, $oBd, $properties, "polygon");
} else {
- require_once(__DIR__ . "/../../class/majic_libV2/Mj_Bati_Parcelles.class.inc");
+ require_once(dirname($_SERVER['SCRIPT_FILENAME']) . "/class/majic_libV2/Mj_Bati_Parcelles.class.inc");
$oRapport = new Mj_Bati_Parcelles($aParcelles, $oBd, $properties);
}
@@ -174,9 +174,9 @@ class RapportsCadastreParcelle extends Cadastre {
$sXmlFileName = $properties["cadastre"]["rp"]["rp_dir"] . "/" . $sYear . "/Rapport_Parcelle_" . $rapportType . "/" . $sFile . ".xml";
if ($rapportType === 'ToutesInfos')
- $sXslFileName = __DIR__ . "/../../class/majic_lib/xsl/Mj_Rapport.xsl";
+ $sXslFileName = dirname($_SERVER['SCRIPT_FILENAME']) . "/class/majic_lib/xsl/Mj_Rapport.xsl";
else
- $sXslFileName = __DIR__ . "/../../class/majic_lib/xsl/Mj_Rapport_Parcelle_" . $rapportType . ".xsl";
+ $sXslFileName = dirname($_SERVER['SCRIPT_FILENAME']) . "/class/majic_lib/xsl/Mj_Rapport_Parcelle_" . $rapportType . ".xsl";
if (!file_exists($sXmlFileName)) {
$oRapport->asXMLFile("", $sXmlFileName, "Rapport_Parcelle", "UTF-8", "ISO-8859-1");
diff --git a/web_service/ws/ReleveDePropriete.class.inc b/web_service/ws/ReleveDePropriete.class.inc
index 667891e9..0d445f67 100755
--- a/web_service/ws/ReleveDePropriete.class.inc
+++ b/web_service/ws/ReleveDePropriete.class.inc
@@ -1,9 +1,9 @@
<?php
require_once 'Cadastre.class.inc';
-require_once __DIR__ . '/../vitis/Vitis.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/vitis/Vitis.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
/**
* \file relevedepropriete.class.inc
@@ -124,7 +124,7 @@ class ReleveDePropriete extends Cadastre {
$aReturn['error']['errorMessage'] = "Erreur lors de la génération du fichier PDF de relevé de propriété.";
return json_encode($aReturn);
}
- if (!is_dir(__DIR__ . '/../../class/majic_lib')) {
+ if (!is_dir(dirname($_SERVER['SCRIPT_FILENAME']) . '/class/majic_lib')) {
http_response_code(500);
writeToErrorLog("Dossier majic_lib introuvable");
$aReturn['error']['errorMessage'] = "Erreur lors de la génération du fichier PDF de relevé de propriété.";
@@ -186,7 +186,7 @@ class ReleveDePropriete extends Cadastre {
switch ($sType) {
case "tiers" :
case "standard" :
- require_once __DIR__ . '/../../class/majic_lib/Mj_Compte_Communal.class.inc';
+ require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/majic_lib/Mj_Compte_Communal.class.inc';
$oRP = new Mj_Compte_Communal($IDDNUPRO, $oBD);
if ($oRP->isError()) {
http_response_code(500);
@@ -204,7 +204,7 @@ class ReleveDePropriete extends Cadastre {
break;
case "parcelle" :
- require_once __DIR__ . '/../../class/majic_lib/Mj_Compte_Communal_Parcelle.class.inc';
+ require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/majic_lib/Mj_Compte_Communal_Parcelle.class.inc';
$oRP = new Mj_Compte_Communal_Parcelle("", $ID_PAR, $oBD);
if ($oRP->isError()) {
http_response_code(500);
@@ -220,9 +220,9 @@ class ReleveDePropriete extends Cadastre {
if (!$bError) {
$sXMLFile = $properties["cadastre"]["rp"]["rp_dir"] . "/" . $sDir . $sFile . ".xml";
if ($sType === "tiers") {
- $sXSLFile = __DIR__ . '/../../class/majic_lib/xsl/Mj_fo_tiers.xsl';
+ $sXSLFile = dirname($_SERVER['SCRIPT_FILENAME']) . '/class/majic_lib/xsl/Mj_fo_tiers.xsl';
} else {
- $sXSLFile = __DIR__ . '/../../class/majic_lib/xsl/Mj_fo.xsl';
+ $sXSLFile = dirname($_SERVER['SCRIPT_FILENAME']) . '/class/majic_lib/xsl/Mj_fo.xsl';
}
$sPDFFile = $properties["cadastre"]["rp"]["rp_dir"] . "/" . $sDir . $sFile . ".pdf";
diff --git a/web_service/ws/Section.class.inc b/web_service/ws/Section.class.inc
index 403db329..83116512 100755
--- a/web_service/ws/Section.class.inc
+++ b/web_service/ws/Section.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Cadastre.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file Section.class.inc
@@ -66,7 +66,7 @@ class Section extends Cadastre {
* get informations about Section
*/
function GET() {
- require __DIR__ . "/../vitis/" . $this->sRessourcesFile;
+ require dirname($_SERVER['SCRIPT_FILENAME']) . "/ws/vitis/" . $this->sRessourcesFile;
$this->aFields = $this->getFields('public', $this->aProperties['cadastre']['views']['section'], 'id_sec');
}
diff --git a/web_service/ws/Sections.class.inc b/web_service/ws/Sections.class.inc
index be0c3b5c..9b94963a 100755
--- a/web_service/ws/Sections.class.inc
+++ b/web_service/ws/Sections.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Cadastre.class.inc';
require_once 'Section.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
class Sections extends Cadastre {
/**
diff --git a/web_service/ws/Voie.class.inc b/web_service/ws/Voie.class.inc
index 74d96ba2..e9af9fbd 100755
--- a/web_service/ws/Voie.class.inc
+++ b/web_service/ws/Voie.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Cadastre.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file Voie.class.inc
@@ -65,7 +65,7 @@ class Voie extends Cadastre {
* get informations about Voie
*/
function GET() {
- require __DIR__ . "/../vitis/" . $this->sRessourcesFile;
+ require dirname($_SERVER['SCRIPT_FILENAME']) . "/ws/vitis/" . $this->sRessourcesFile;
$this->aFields = $this->getFields('public', $this->aProperties['cadastre']['views']['voie'], 'ID_RIVOLI');
}
diff --git a/web_service/ws/Voies.class.inc b/web_service/ws/Voies.class.inc
index e9f61e93..9885c122 100755
--- a/web_service/ws/Voies.class.inc
+++ b/web_service/ws/Voies.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Cadastre.class.inc';
require_once 'Voie.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
class Voies extends Cadastre {
/**
--
GitLab