diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..98ef169d65ec22973d313123ec3a178af98b7d71 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +web_service/conf/properties* +web_service/conf/version.inc diff --git a/web_service/class/majic_lib/Mj.class.inc b/web_service/class/majic_lib/Mj.class.inc index 6a929471084860bd679759adf84539750a41ffdb..3d3138d68fb4512845b4024127d4f1016acb7daf 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']) . "/class/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 3cff33960b08a533bd9afc35655195da0511d703..9f907c3826dcaa673e6dbd158f5395a4e216f76b 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 38dea19da77a97608e2ce677de865e285f588033..351ba82f37f13831e4abcf0b88bef5e58ab77788 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 ce60eb55d573d3d112d716df3de2dbc184f2464d..ea64c0e19bc165957e547b3db437900fe8cc11d9 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 9946176f4f9a15e3d9455c7e4184fe51e68abd31..b205877d9ecdfccccef63f296f200ecc0a81bfc4 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 9aec3ee25051f953f327c52bb2750cb507d783d8..010fca07d354d34fd38e6a7e498e557f5b14cd6d 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 a3b21489e889db80c02d807bcb8382755be4276d..88a95ecb63638a3f746589bb8321d9c253e8d7d5 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 7fe77be3b88b1d2b854692bb26d16f50e99a264a..dcc9bd6a6faa6aabf34769bc618e07da9dd2f847 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 a0beaf77137f79f0e9198b5b3f2678af12966ead..11421877ea10cfc7e1eb0c91a50ece0aec997b51 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 07ac4813249b3aef74991a0cfc6e0ed51bfd8166..1786b2c08dd6691805d31b0faad1d857de367f5e 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 96887da22e43a10422febafa8b0b343b8af99828..1231717ba3fdddabaea6f61e471c979bd62c8e6c 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 b6bd656795e3f594c6e7243c478d73b222084743..d40e39b2c9a01b14ae726790d5b257913eebf378 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 aaa0c4e25bc3456af45d30782dd2a0da5b08941a..10781b12e80f9d3d34b058f9361167cc217edaaa 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 4c901af7f013153b1d8bc25777dc657df8411eee..7b5a54d83350929b5bb5ca260331318eae34864d 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 13c9beff6bacb2d12fcaa5a6909641d089f42683..e7503acb195ecce345383a1558ef6e85fb80601d 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 992c02e9ee4ec8b63b38f8737824906ac21fd69a..1dcf2a5d65313c65a1ba64034232e451fde1bba6 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 13db1fe7334f6aad3addeb58606f3864cca5272d..2a33874d4f4540f79ca16cf5a5f3921058a4cef3 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 de1fee3c765eea7378465647c20d5ce1545f05c6..876bd73b88aa3226c52cc80a4ff623bf880af4d1 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 797ab424f7961dc302d6dc4157206081124fd67b..89d185d8c50275ec1ae3219b6345c269c56662e6 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 6c52fdf26682f9ea4b118b9c2b972a93c850342a..41b65cb2cfac295ccda6b0cd6f706c83f253b856 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 ebf25726bae7ba7c3373b5a7db3a7bd2cd44897f..3fa0b7c9767cd56ac35197baa5092dbb9eb78fec 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 b50102dfc207d2f15d82e3037804607fc5a9b384..8736a4688e21441de45cbc3b77fd3fa33fb0d475 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 667891e9984217dca6937669473282e44cc1f8ea..0d445f67f48f1c0f6113ce1d9efe74052a73325f 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 403db32906ee226299e5e1066f853f75ee8cf8c3..83116512f0b0225e7b8b6c12d8673dcb0e4910e8 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 be0c3b5ce521ec68435e04d2c5a1bea644607fc5..9b94963a1e9982c5fe479c0d4a3926ea91369363 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 74d96ba2d0ec5bf5a9b65a05cbdccfbc1dfc0563..e9af9fbd41d7b4bdc2562c6d83a6d2237563b17a 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 e9f61e93ba32519bc80146cdb82a1c3495512977..9885c122ebb15271789a6e84c6b0ed63d81e555e 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 { /**