From b51e622f032ae3b6e00adee92f04c4d6fb241fa7 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Wed, 17 Oct 2018 10:43:44 +0200
Subject: [PATCH] Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
---
.../web_service/class/majic_libV2/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/Commune.class.inc | 4 ++--
.../web_service/ws/CommuneByGeom.class.inc | 6 +++---
.../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/LieuDitByGeom.class.inc | 6 +++---
.../web_service/ws/LieuDits.class.inc | 4 ++--
.../web_service/ws/Parcelle.class.inc | 4 ++--
.../web_service/ws/ParcelleByGeom.class.inc | 6 +++---
.../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 | 14 +++++++-------
.../web_service/ws/Section.class.inc | 4 ++--
.../web_service/ws/SectionByGeom.class.inc | 6 +++---
.../web_service/ws/Sections.class.inc | 4 ++--
.../web_service/ws/Voie.class.inc | 4 ++--
.../web_service/ws/Voies.class.inc | 4 ++--
30 files changed, 75 insertions(+), 75 deletions(-)
diff --git a/src/module_cadastreV2/web_service/class/majic_libV2/Mj.class.inc b/src/module_cadastreV2/web_service/class/majic_libV2/Mj.class.inc
index c73e9470..e3eace9e 100755
--- a/src/module_cadastreV2/web_service/class/majic_libV2/Mj.class.inc
+++ b/src/module_cadastreV2/web_service/class/majic_libV2/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";
diff --git a/src/module_cadastreV2/web_service/ws/Adresse.class.inc b/src/module_cadastreV2/web_service/ws/Adresse.class.inc
index 17b0c75c..8431d35c 100755
--- a/src/module_cadastreV2/web_service/ws/Adresse.class.inc
+++ b/src/module_cadastreV2/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($this->aProperties['schema_majic'], $this->aProperties['cadastre']['views']['adresse'], 'id_par');
}
diff --git a/src/module_cadastreV2/web_service/ws/Adresses.class.inc b/src/module_cadastreV2/web_service/ws/Adresses.class.inc
index fcece103..8c5d85b9 100755
--- a/src/module_cadastreV2/web_service/ws/Adresses.class.inc
+++ b/src/module_cadastreV2/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/src/module_cadastreV2/web_service/ws/Cadastre.class.inc b/src/module_cadastreV2/web_service/ws/Cadastre.class.inc
index 1fa90641..3704e757 100755
--- a/src/module_cadastreV2/web_service/ws/Cadastre.class.inc
+++ b/src/module_cadastreV2/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/src/module_cadastreV2/web_service/ws/Commune.class.inc b/src/module_cadastreV2/web_service/ws/Commune.class.inc
index f5ba5ae1..f667940f 100755
--- a/src/module_cadastreV2/web_service/ws/Commune.class.inc
+++ b/src/module_cadastreV2/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
@@ -65,7 +65,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($this->aProperties['schema_cadastre'], $this->aProperties['cadastre']['views']['commune'], 'id_com', 'vmap_cadastre_user', 'vmap_cadastre_user');
}
diff --git a/src/module_cadastreV2/web_service/ws/CommuneByGeom.class.inc b/src/module_cadastreV2/web_service/ws/CommuneByGeom.class.inc
index 93c3b837..201b42cb 100755
--- a/src/module_cadastreV2/web_service/ws/CommuneByGeom.class.inc
+++ b/src/module_cadastreV2/web_service/ws/CommuneByGeom.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 communebygeom.class.inc
diff --git a/src/module_cadastreV2/web_service/ws/Communes.class.inc b/src/module_cadastreV2/web_service/ws/Communes.class.inc
index 8f3093d4..ced9553f 100755
--- a/src/module_cadastreV2/web_service/ws/Communes.class.inc
+++ b/src/module_cadastreV2/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/src/module_cadastreV2/web_service/ws/DescriptionParcelle.class.inc b/src/module_cadastreV2/web_service/ws/DescriptionParcelle.class.inc
index 3bcf56fc..37ef77dc 100755
--- a/src/module_cadastreV2/web_service/ws/DescriptionParcelle.class.inc
+++ b/src/module_cadastreV2/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($this->aProperties['schema_majic'], $this->aProperties['cadastre']['views']['description_parcelle'], 'ID_PAR', 'vmap_cadastre_user', 'vmap_cadastre_user');
}
diff --git a/src/module_cadastreV2/web_service/ws/DescriptionParcelles.class.inc b/src/module_cadastreV2/web_service/ws/DescriptionParcelles.class.inc
index d7778ce6..f91f48a5 100755
--- a/src/module_cadastreV2/web_service/ws/DescriptionParcelles.class.inc
+++ b/src/module_cadastreV2/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/src/module_cadastreV2/web_service/ws/DownloadRapport.class.inc b/src/module_cadastreV2/web_service/ws/DownloadRapport.class.inc
index 668371f1..5259e77e 100755
--- a/src/module_cadastreV2/web_service/ws/DownloadRapport.class.inc
+++ b/src/module_cadastreV2/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/src/module_cadastreV2/web_service/ws/FicheDescriptiveInvariant.class.inc b/src/module_cadastreV2/web_service/ws/FicheDescriptiveInvariant.class.inc
index dba04017..5f3d4afb 100755
--- a/src/module_cadastreV2/web_service/ws/FicheDescriptiveInvariant.class.inc
+++ b/src/module_cadastreV2/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/src/module_cadastreV2/web_service/ws/FicheDescriptiveParcelle.class.inc b/src/module_cadastreV2/web_service/ws/FicheDescriptiveParcelle.class.inc
index fe349bf2..8a6980d1 100755
--- a/src/module_cadastreV2/web_service/ws/FicheDescriptiveParcelle.class.inc
+++ b/src/module_cadastreV2/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/src/module_cadastreV2/web_service/ws/FicheUrbanisme.class.inc b/src/module_cadastreV2/web_service/ws/FicheUrbanisme.class.inc
index 0151bf5d..841ac439 100755
--- a/src/module_cadastreV2/web_service/ws/FicheUrbanisme.class.inc
+++ b/src/module_cadastreV2/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/src/module_cadastreV2/web_service/ws/Invariant.class.inc b/src/module_cadastreV2/web_service/ws/Invariant.class.inc
index cbb8b1a6..a1e2d814 100755
--- a/src/module_cadastreV2/web_service/ws/Invariant.class.inc
+++ b/src/module_cadastreV2/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($this->aProperties['schema_majic'], $this->aProperties['cadastre']['views']['invariant'], 'id_local', 'vmap_cadastre_user', 'vmap_cadastre_user');
}
diff --git a/src/module_cadastreV2/web_service/ws/Invariants.class.inc b/src/module_cadastreV2/web_service/ws/Invariants.class.inc
index b84e50e4..8238b643 100755
--- a/src/module_cadastreV2/web_service/ws/Invariants.class.inc
+++ b/src/module_cadastreV2/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/src/module_cadastreV2/web_service/ws/LieuDit.class.inc b/src/module_cadastreV2/web_service/ws/LieuDit.class.inc
index 94b22aca..c68e32ca 100755
--- a/src/module_cadastreV2/web_service/ws/LieuDit.class.inc
+++ b/src/module_cadastreV2/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/src/module_cadastreV2/web_service/ws/LieuDitByGeom.class.inc b/src/module_cadastreV2/web_service/ws/LieuDitByGeom.class.inc
index 4c95b0fd..9cedd496 100755
--- a/src/module_cadastreV2/web_service/ws/LieuDitByGeom.class.inc
+++ b/src/module_cadastreV2/web_service/ws/LieuDitByGeom.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 lieuditbygeom.class.inc
diff --git a/src/module_cadastreV2/web_service/ws/LieuDits.class.inc b/src/module_cadastreV2/web_service/ws/LieuDits.class.inc
index 8a26e168..8af82ae8 100755
--- a/src/module_cadastreV2/web_service/ws/LieuDits.class.inc
+++ b/src/module_cadastreV2/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/src/module_cadastreV2/web_service/ws/Parcelle.class.inc b/src/module_cadastreV2/web_service/ws/Parcelle.class.inc
index 7d1b99f3..830ef6fc 100755
--- a/src/module_cadastreV2/web_service/ws/Parcelle.class.inc
+++ b/src/module_cadastreV2/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($this->aProperties['schema_cadastre'], $this->aProperties['cadastre']['views']['parcelle'], 'id_par', 'vmap_cadastre_user', 'vmap_cadastre_user');
}
diff --git a/src/module_cadastreV2/web_service/ws/ParcelleByGeom.class.inc b/src/module_cadastreV2/web_service/ws/ParcelleByGeom.class.inc
index 244f07d7..20fb31b7 100755
--- a/src/module_cadastreV2/web_service/ws/ParcelleByGeom.class.inc
+++ b/src/module_cadastreV2/web_service/ws/ParcelleByGeom.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 parcellebygeom.class.inc
diff --git a/src/module_cadastreV2/web_service/ws/Parcelles.class.inc b/src/module_cadastreV2/web_service/ws/Parcelles.class.inc
index c85ec3af..8a87866b 100755
--- a/src/module_cadastreV2/web_service/ws/Parcelles.class.inc
+++ b/src/module_cadastreV2/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/src/module_cadastreV2/web_service/ws/Proprietaire.class.inc b/src/module_cadastreV2/web_service/ws/Proprietaire.class.inc
index 26f6c9b6..5820459a 100755
--- a/src/module_cadastreV2/web_service/ws/Proprietaire.class.inc
+++ b/src/module_cadastreV2/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/src/module_cadastreV2/web_service/ws/Proprietaires.class.inc b/src/module_cadastreV2/web_service/ws/Proprietaires.class.inc
index dbe9c3c1..8d0cddb4 100755
--- a/src/module_cadastreV2/web_service/ws/Proprietaires.class.inc
+++ b/src/module_cadastreV2/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/src/module_cadastreV2/web_service/ws/RapportsCadastreParcelle.class.inc b/src/module_cadastreV2/web_service/ws/RapportsCadastreParcelle.class.inc
index b79394fc..e412ec7d 100755
--- a/src/module_cadastreV2/web_service/ws/RapportsCadastreParcelle.class.inc
+++ b/src/module_cadastreV2/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
@@ -134,10 +134,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);
}
@@ -164,9 +164,9 @@ class RapportsCadastreParcelle extends Cadastre {
$sXmlFileName = $properties["cadastre"]["rp"]["rp_dir"] . "/" . $sYear . "/Rapport_Parcelle_" . $rapportType . "/" . $sFile . ".xml";
if ($rapportType === 'ToutesInfos') {
- $sXslFileName = __DIR__ . "/../../class/majic_libV2/xsl/Mj_Rapport.xsl";
+ $sXslFileName = dirname($_SERVER['SCRIPT_FILENAME']) . "/class/majic_libV2/xsl/Mj_Rapport.xsl";
} else {
- $sXslFileName = __DIR__ . "/../../class/majic_libV2/xsl/Mj_Rapport_Parcelle_" . $rapportType . ".xsl";
+ $sXslFileName = dirname($_SERVER['SCRIPT_FILENAME']) . "/class/majic_libV2/xsl/Mj_Rapport_Parcelle_" . $rapportType . ".xsl";
}
if (!file_exists($sXmlFileName)) {
$oRapport->asXMLFile("", $sXmlFileName, "Rapport_Parcelle", "UTF-8", "ISO-8859-1");
diff --git a/src/module_cadastreV2/web_service/ws/ReleveDePropriete.class.inc b/src/module_cadastreV2/web_service/ws/ReleveDePropriete.class.inc
index 0394b346..997a97c8 100755
--- a/src/module_cadastreV2/web_service/ws/ReleveDePropriete.class.inc
+++ b/src/module_cadastreV2/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
@@ -174,7 +174,7 @@ class ReleveDePropriete extends Cadastre {
switch ($sType) {
case "tiers" :
case "standard" :
- require_once __DIR__ . '/../../class/majic_libV2/Mj_Compte_Communal.class.inc';
+ require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/majic_libV2/Mj_Compte_Communal.class.inc';
$oRP = new Mj_Compte_Communal($IDDNUPRO, $oBD, $properties);
if ($oRP->isError()) {
http_response_code(500);
@@ -190,7 +190,7 @@ class ReleveDePropriete extends Cadastre {
break;
case "parcelle" :
- require_once __DIR__ . '/../../class/majic_libV2/Mj_Compte_Communal_Parcelle.class.inc';
+ require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/majic_libV2/Mj_Compte_Communal_Parcelle.class.inc';
$oRP = new Mj_Compte_Communal_Parcelle('', $ID_PAR, $oBD, $properties);
if ($oRP->isError()) {
http_response_code(500);
@@ -207,9 +207,9 @@ class ReleveDePropriete extends Cadastre {
if (!$bError) {
$sXMLFile = $properties["cadastre"]["rp"]["rp_dir"] . "/" . $sDir . $sFile . ".xml";
if ($sType === "tiers") {
- $sXSLFile = __DIR__ . '/../../class/majic_libV2/xsl/Mj_fo_tiers.xsl';
+ $sXSLFile = dirname($_SERVER['SCRIPT_FILENAME']) . '/class/majic_libV2/xsl/Mj_fo_tiers.xsl';
} else {
- $sXSLFile = __DIR__ . '/../../class/majic_libV2/xsl/Mj_fo.xsl';
+ $sXSLFile = dirname($_SERVER['SCRIPT_FILENAME']) . '/class/majic_libV2/xsl/Mj_fo.xsl';
}
$sPDFFile = $properties["cadastre"]["rp"]["rp_dir"] . "/" . $sDir . $sFile . ".pdf";
diff --git a/src/module_cadastreV2/web_service/ws/Section.class.inc b/src/module_cadastreV2/web_service/ws/Section.class.inc
index de149b15..93f2eacf 100755
--- a/src/module_cadastreV2/web_service/ws/Section.class.inc
+++ b/src/module_cadastreV2/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
@@ -65,7 +65,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($this->aProperties['schema_cadastre'], $this->aProperties['cadastre']['views']['section'], 'id_sec', 'vmap_cadastre_user', 'vmap_cadastre_user');
}
diff --git a/src/module_cadastreV2/web_service/ws/SectionByGeom.class.inc b/src/module_cadastreV2/web_service/ws/SectionByGeom.class.inc
index 89f26a1a..317a9915 100755
--- a/src/module_cadastreV2/web_service/ws/SectionByGeom.class.inc
+++ b/src/module_cadastreV2/web_service/ws/SectionByGeom.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 sectionbygeom.class.inc
diff --git a/src/module_cadastreV2/web_service/ws/Sections.class.inc b/src/module_cadastreV2/web_service/ws/Sections.class.inc
index 5e32d194..3a836425 100755
--- a/src/module_cadastreV2/web_service/ws/Sections.class.inc
+++ b/src/module_cadastreV2/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/src/module_cadastreV2/web_service/ws/Voie.class.inc b/src/module_cadastreV2/web_service/ws/Voie.class.inc
index e490d1fa..bff067b1 100755
--- a/src/module_cadastreV2/web_service/ws/Voie.class.inc
+++ b/src/module_cadastreV2/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($this->aProperties['schema_majic'], $this->aProperties['cadastre']['views']['voie'], 'id_voie');
}
diff --git a/src/module_cadastreV2/web_service/ws/Voies.class.inc b/src/module_cadastreV2/web_service/ws/Voies.class.inc
index dd5b099c..e5856e2c 100755
--- a/src/module_cadastreV2/web_service/ws/Voies.class.inc
+++ b/src/module_cadastreV2/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