From e7dabee070e478a7a87e887cf99bbe381c5dd6e3 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Wed, 17 Oct 2018 10:44:47 +0200
Subject: [PATCH] Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME'])
---
web_service/ws/BusinessObject.class.inc | 2 +-
web_service/ws/BusinessObjectEvent.class.inc | 2 +-
web_service/ws/BusinessObjectEvents.class.inc | 4 ++--
web_service/ws/BusinessObjects.class.inc | 6 ++---
web_service/ws/CRS.class.inc | 2 +-
web_service/ws/CRSs.class.inc | 4 ++--
web_service/ws/Format.class.inc | 2 +-
web_service/ws/Formats.class.inc | 4 ++--
web_service/ws/Layer.class.inc | 2 +-
web_service/ws/LayerTheme.class.inc | 2 +-
web_service/ws/LayerThemes.class.inc | 4 ++--
web_service/ws/Layers.class.inc | 6 ++---
web_service/ws/Map.class.inc | 2 +-
web_service/ws/MapCatalog.class.inc | 8 +++----
web_service/ws/MapCatalogs.class.inc | 4 ++--
web_service/ws/MapJSON.class.inc | 2 +-
web_service/ws/MapJSONs.class.inc | 4 ++--
web_service/ws/MapLayer.class.inc | 2 +-
web_service/ws/MapLayers.class.inc | 4 ++--
web_service/ws/MapTheme.class.inc | 2 +-
web_service/ws/MapThemes.class.inc | 4 ++--
web_service/ws/Maps.class.inc | 4 ++--
web_service/ws/Module.class.inc | 2 +-
web_service/ws/Modules.class.inc | 4 ++--
web_service/ws/Orientation.class.inc | 2 +-
web_service/ws/Orientations.class.inc | 4 ++--
web_service/ws/OutputFormat.class.inc | 2 +-
web_service/ws/OutputFormats.class.inc | 4 ++--
web_service/ws/PrintMapServices.class.inc | 6 ++---
web_service/ws/PrintParameter.class.inc | 2 +-
web_service/ws/PrintParameters.class.inc | 4 ++--
web_service/ws/PrintReport.class.inc | 2 +-
web_service/ws/PrintReportServices.class.inc | 22 +++++++++----------
web_service/ws/PrintReports.class.inc | 4 ++--
web_service/ws/PrintServices.class.inc | 6 ++---
web_service/ws/PrintStyle.class.inc | 2 +-
web_service/ws/PrintStyles.class.inc | 4 ++--
web_service/ws/PrintTemplate.class.inc | 2 +-
.../ws/PrintTemplateServices.class.inc | 6 ++---
web_service/ws/PrintTemplates.class.inc | 4 ++--
web_service/ws/Query.class.inc | 2 +-
web_service/ws/Querys.class.inc | 12 +++++-----
web_service/ws/Service.class.inc | 2 +-
web_service/ws/ServiceType.class.inc | 2 +-
web_service/ws/ServiceTypes.class.inc | 4 ++--
web_service/ws/Services.class.inc | 4 ++--
web_service/ws/UserModule.class.inc | 2 +-
web_service/ws/UserModules.class.inc | 4 ++--
web_service/ws/UserPrintStyle.class.inc | 2 +-
web_service/ws/UserPrintStyles.class.inc | 4 ++--
web_service/ws/UserPrintTemplate.class.inc | 2 +-
web_service/ws/UserPrintTemplates.class.inc | 6 ++---
web_service/ws/Vex.class.inc | 6 ++---
web_service/ws/VexExport.class.inc | 10 ++++-----
web_service/ws/VexGetter.class.inc | 12 +++++-----
web_service/ws/VexImport.class.inc | 6 ++---
web_service/ws/VexParser.class.inc | 6 ++---
web_service/ws/Vmap.class.inc | 13 ++++++-----
web_service/ws/VmapGroup.class.inc | 2 +-
web_service/ws/VmapGroups.class.inc | 4 ++--
web_service/ws/VmapUser.class.inc | 2 +-
web_service/ws/VmapUsers.class.inc | 4 ++--
62 files changed, 135 insertions(+), 134 deletions(-)
diff --git a/web_service/ws/BusinessObject.class.inc b/web_service/ws/BusinessObject.class.inc
index 83869545..b3da1a45 100755
--- a/web_service/ws/BusinessObject.class.inc
+++ b/web_service/ws/BusinessObject.class.inc
@@ -4,7 +4,7 @@ require_once 'Vmap.class.inc';
require_once 'Layers.class.inc';
require_once 'BusinessObjectEvent.class.inc';
require_once 'PrintReports.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file BusinessObject.class.inc
diff --git a/web_service/ws/BusinessObjectEvent.class.inc b/web_service/ws/BusinessObjectEvent.class.inc
index 8de888db..74ac6871 100755
--- a/web_service/ws/BusinessObjectEvent.class.inc
+++ b/web_service/ws/BusinessObjectEvent.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file BusinessObjectEvent.class.inc
diff --git a/web_service/ws/BusinessObjectEvents.class.inc b/web_service/ws/BusinessObjectEvents.class.inc
index 059fe3db..04b352a9 100755
--- a/web_service/ws/BusinessObjectEvents.class.inc
+++ b/web_service/ws/BusinessObjectEvents.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Vmap.class.inc';
require_once 'BusinessObjectEvent.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 BusinessObjectEvents extends Vmap {
/**
diff --git a/web_service/ws/BusinessObjects.class.inc b/web_service/ws/BusinessObjects.class.inc
index 6a05dfb8..4ab16f4a 100644
--- a/web_service/ws/BusinessObjects.class.inc
+++ b/web_service/ws/BusinessObjects.class.inc
@@ -13,9 +13,9 @@
*/
require_once 'Vmap.class.inc';
require_once 'BusinessObject.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Form.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/vitis_lib/Form.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
require_once 'vmlib/logUtil.inc';
class BusinessObjects extends Vmap {
diff --git a/web_service/ws/CRS.class.inc b/web_service/ws/CRS.class.inc
index 11b1f053..e7ff490f 100755
--- a/web_service/ws/CRS.class.inc
+++ b/web_service/ws/CRS.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file CRS.class.inc
diff --git a/web_service/ws/CRSs.class.inc b/web_service/ws/CRSs.class.inc
index f5258bca..33df12c2 100755
--- a/web_service/ws/CRSs.class.inc
+++ b/web_service/ws/CRSs.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Vmap.class.inc';
require_once 'CRS.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 CRSs extends Vmap {
/**
diff --git a/web_service/ws/Format.class.inc b/web_service/ws/Format.class.inc
index c890b6dd..baa868a1 100755
--- a/web_service/ws/Format.class.inc
+++ b/web_service/ws/Format.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__.'/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file Format.class.inc
diff --git a/web_service/ws/Formats.class.inc b/web_service/ws/Formats.class.inc
index f1a4545d..bae206ed 100755
--- a/web_service/ws/Formats.class.inc
+++ b/web_service/ws/Formats.class.inc
@@ -11,9 +11,9 @@
*
*/
require_once 'Vmap.class.inc';
-require_once __DIR__.'/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
require_once 'Format.class.inc';
-require_once(__DIR__.'/../../class/vmlib/BdDataAccess.inc');
+require_once(dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc');
class Formats extends Vmap {
diff --git a/web_service/ws/Layer.class.inc b/web_service/ws/Layer.class.inc
index 509353a2..dda04a63 100755
--- a/web_service/ws/Layer.class.inc
+++ b/web_service/ws/Layer.class.inc
@@ -2,7 +2,7 @@
require_once 'Vmap.class.inc';
require_once 'BusinessObject.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file Layer.class.inc
diff --git a/web_service/ws/LayerTheme.class.inc b/web_service/ws/LayerTheme.class.inc
index f7f818c5..180d51e2 100755
--- a/web_service/ws/LayerTheme.class.inc
+++ b/web_service/ws/LayerTheme.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file LayerTheme.class.inc
diff --git a/web_service/ws/LayerThemes.class.inc b/web_service/ws/LayerThemes.class.inc
index 060661b7..5e5f6be1 100755
--- a/web_service/ws/LayerThemes.class.inc
+++ b/web_service/ws/LayerThemes.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Vmap.class.inc';
require_once 'LayerTheme.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 LayerThemes extends Vmap {
/**
diff --git a/web_service/ws/Layers.class.inc b/web_service/ws/Layers.class.inc
index ec2134f7..430a91c7 100755
--- a/web_service/ws/Layers.class.inc
+++ b/web_service/ws/Layers.class.inc
@@ -13,9 +13,9 @@
*/
require_once 'Vmap.class.inc';
require_once 'Layer.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Form.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/Form.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
class Layers extends Vmap {
/**
diff --git a/web_service/ws/Map.class.inc b/web_service/ws/Map.class.inc
index ddfbd278..f57f5945 100755
--- a/web_service/ws/Map.class.inc
+++ b/web_service/ws/Map.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file Map.class.inc
diff --git a/web_service/ws/MapCatalog.class.inc b/web_service/ws/MapCatalog.class.inc
index aef8d600..34e8a343 100755
--- a/web_service/ws/MapCatalog.class.inc
+++ b/web_service/ws/MapCatalog.class.inc
@@ -4,8 +4,8 @@ require_once 'Vmap.class.inc';
require_once 'Maps.class.inc';
require_once 'Services.class.inc';
require_once 'Layers.class.inc';
-require_once __DIR__ . '/../vitis/Users.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/vitis/Users.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file Map.class.inc
@@ -109,8 +109,8 @@ class MapCatalog extends Vmap {
}
}
// Création du fichier ".map" du flux wms privé de Vmap4MapServer (nom du fichier = token de l'utilisateur connecté).
- if (!empty($properties["use_vm4ms_api"]) && $properties["use_vm4ms_api"] === true && file_exists(__DIR__ . '/../vm4ms/WmsServices.class.inc')) {
- require_once __DIR__ . '/../vm4ms/WmsServices.class.inc';
+ if (!empty($properties["use_vm4ms_api"]) && $properties["use_vm4ms_api"] === true && file_exists(dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/vm4ms/WmsServices.class.inc')) {
+ require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/vm4ms/WmsServices.class.inc';
$aPath = array('vm4ms', 'wmsservices', 'private', 'MapFile');
diff --git a/web_service/ws/MapCatalogs.class.inc b/web_service/ws/MapCatalogs.class.inc
index 15b31c91..f5e62250 100755
--- a/web_service/ws/MapCatalogs.class.inc
+++ b/web_service/ws/MapCatalogs.class.inc
@@ -12,8 +12,8 @@
*/
require_once 'Vmap.class.inc';
require_once 'MapCatalog.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 MapCatalogs extends Vmap {
diff --git a/web_service/ws/MapJSON.class.inc b/web_service/ws/MapJSON.class.inc
index 533a6b90..b31c07ba 100755
--- a/web_service/ws/MapJSON.class.inc
+++ b/web_service/ws/MapJSON.class.inc
@@ -4,7 +4,7 @@ require_once 'Vmap.class.inc';
require_once 'Map.class.inc';
require_once 'Layers.class.inc';
require_once 'BusinessObject.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file Map.class.inc
diff --git a/web_service/ws/MapJSONs.class.inc b/web_service/ws/MapJSONs.class.inc
index d23347e3..1b157d03 100755
--- a/web_service/ws/MapJSONs.class.inc
+++ b/web_service/ws/MapJSONs.class.inc
@@ -13,8 +13,8 @@
require_once 'Vmap.class.inc';
require_once 'MapJSON.class.inc';
require_once 'BusinessObject.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 MapJSONs extends Vmap {
diff --git a/web_service/ws/MapLayer.class.inc b/web_service/ws/MapLayer.class.inc
index c27f9d00..d2448ab6 100755
--- a/web_service/ws/MapLayer.class.inc
+++ b/web_service/ws/MapLayer.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file MapLayer.class.inc
diff --git a/web_service/ws/MapLayers.class.inc b/web_service/ws/MapLayers.class.inc
index 1ce7deca..163ca659 100755
--- a/web_service/ws/MapLayers.class.inc
+++ b/web_service/ws/MapLayers.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Vmap.class.inc';
require_once 'MapLayer.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 MapLayers extends Vmap {
/**
diff --git a/web_service/ws/MapTheme.class.inc b/web_service/ws/MapTheme.class.inc
index 84b46b03..1fe4422d 100755
--- a/web_service/ws/MapTheme.class.inc
+++ b/web_service/ws/MapTheme.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file MapTheme.class.inc
diff --git a/web_service/ws/MapThemes.class.inc b/web_service/ws/MapThemes.class.inc
index d0d11d77..a6302d1d 100755
--- a/web_service/ws/MapThemes.class.inc
+++ b/web_service/ws/MapThemes.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Vmap.class.inc';
require_once 'MapTheme.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 MapThemes extends Vmap {
/**
diff --git a/web_service/ws/Maps.class.inc b/web_service/ws/Maps.class.inc
index 39b73ee5..59edd049 100755
--- a/web_service/ws/Maps.class.inc
+++ b/web_service/ws/Maps.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Vmap.class.inc';
require_once 'Map.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 Maps extends Vmap {
/**
diff --git a/web_service/ws/Module.class.inc b/web_service/ws/Module.class.inc
index 8ac78dc4..7c7360aa 100755
--- a/web_service/ws/Module.class.inc
+++ b/web_service/ws/Module.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file Module.class.inc
diff --git a/web_service/ws/Modules.class.inc b/web_service/ws/Modules.class.inc
index f8a91b70..f6f332c8 100755
--- a/web_service/ws/Modules.class.inc
+++ b/web_service/ws/Modules.class.inc
@@ -12,8 +12,8 @@
*/
require_once 'Vmap.class.inc';
require_once 'Module.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 Modules extends Vmap {
diff --git a/web_service/ws/Orientation.class.inc b/web_service/ws/Orientation.class.inc
index b88d4206..291c85a8 100755
--- a/web_service/ws/Orientation.class.inc
+++ b/web_service/ws/Orientation.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__.'/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file Orientation.class.inc
diff --git a/web_service/ws/Orientations.class.inc b/web_service/ws/Orientations.class.inc
index b23539d9..84f44a88 100755
--- a/web_service/ws/Orientations.class.inc
+++ b/web_service/ws/Orientations.class.inc
@@ -11,9 +11,9 @@
*
*/
require_once 'Vmap.class.inc';
-require_once __DIR__.'/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
require_once 'Orientation.class.inc';
-require_once(__DIR__.'/../../class/vmlib/BdDataAccess.inc');
+require_once(dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc');
class Orientations extends Vmap {
diff --git a/web_service/ws/OutputFormat.class.inc b/web_service/ws/OutputFormat.class.inc
index 552d0bfa..9e9348db 100755
--- a/web_service/ws/OutputFormat.class.inc
+++ b/web_service/ws/OutputFormat.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__.'/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file OutputFormat.class.inc
diff --git a/web_service/ws/OutputFormats.class.inc b/web_service/ws/OutputFormats.class.inc
index ab45f1e2..67274ee1 100755
--- a/web_service/ws/OutputFormats.class.inc
+++ b/web_service/ws/OutputFormats.class.inc
@@ -11,9 +11,9 @@
*
*/
require_once 'Vmap.class.inc';
-require_once __DIR__.'/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
require_once 'OutputFormat.class.inc';
-require_once(__DIR__.'/../../class/vmlib/BdDataAccess.inc');
+require_once(dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc');
class OutputFormats extends Vmap {
diff --git a/web_service/ws/PrintMapServices.class.inc b/web_service/ws/PrintMapServices.class.inc
index cf8ffd11..34623aa9 100755
--- a/web_service/ws/PrintMapServices.class.inc
+++ b/web_service/ws/PrintMapServices.class.inc
@@ -2,9 +2,9 @@
require_once 'Map.class.inc';
require_once 'PrintServices.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 printmapservices.class.inc
diff --git a/web_service/ws/PrintParameter.class.inc b/web_service/ws/PrintParameter.class.inc
index 654234e7..d0f764cb 100755
--- a/web_service/ws/PrintParameter.class.inc
+++ b/web_service/ws/PrintParameter.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file PrintParameter.class.inc
diff --git a/web_service/ws/PrintParameters.class.inc b/web_service/ws/PrintParameters.class.inc
index def8fcee..e2580803 100755
--- a/web_service/ws/PrintParameters.class.inc
+++ b/web_service/ws/PrintParameters.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Vmap.class.inc';
require_once 'PrintParameter.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 PrintParameters extends Vmap {
/**
diff --git a/web_service/ws/PrintReport.class.inc b/web_service/ws/PrintReport.class.inc
index 42ab3acd..cf548e2e 100755
--- a/web_service/ws/PrintReport.class.inc
+++ b/web_service/ws/PrintReport.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file PrintReport.class.inc
diff --git a/web_service/ws/PrintReportServices.class.inc b/web_service/ws/PrintReportServices.class.inc
index 3fd045e8..16186856 100755
--- a/web_service/ws/PrintReportServices.class.inc
+++ b/web_service/ws/PrintReportServices.class.inc
@@ -4,10 +4,10 @@ require_once 'PrintServices.class.inc';
require_once 'PrintReports.class.inc';
require_once 'Querys.class.inc';
require_once 'PrintMapServices.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 __DIR__ . '/../../class/vmlib/phpUtil.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';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/phpUtil.inc';
/**
* \file printreportservices.class.inc
@@ -18,7 +18,7 @@ require_once __DIR__ . '/../../class/vmlib/phpUtil.inc';
* \brief This file contains the PrintReportServices php class
*
* This class defines the rest api for printreportservices
- *
+ *
*/
class PrintReportServices extends PrintServices {
/**
@@ -541,7 +541,7 @@ class PrintReportServices extends PrintServices {
}
}
- $aQueryResult = $this->queryRessource($aPath, $aParams, $sId);
+ $aQueryResult = $this->queryRessource($aPath, $aParams, $sId);
$aJsonScope[$aJsonObjects[$i]['target']] = $aQueryResult;
}
// Type Objet
@@ -759,13 +759,13 @@ class PrintReportServices extends PrintServices {
$sRessource = $aPath[1];
// Vérifie que le webservice existe
- if (!is_dir(__DIR__ . '/../' . $sWebService)) {
+ if (!is_dir(dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/' . $sWebService)) {
$this->aReturn['error']['errorMessage'] = ' Webservice ' . $sWebService . ' does not exists';
return null;
}
// Trouve le nom du fichier correspondant à la ressource
- $aFiles = scandir(__DIR__ . '/../' . $sWebService);
+ $aFiles = scandir(dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/' . $sWebService);
for ($i = 0; $i < count($aFiles); $i++) {
if (strtolower($aFiles[$i]) === $sRessource . '.class.inc') {
@@ -779,12 +779,12 @@ class PrintReportServices extends PrintServices {
}
// Vérifie que la ressource existe
- if (!is_file(__DIR__ . '/../' . $sWebService . '/' . $sClassName . '.class.inc')) {
+ if (!is_file(dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/' . $sWebService . '/' . $sClassName . '.class.inc')) {
$this->aReturn['error']['errorMessage'] = ' unable to find file ' . $sWebService . '/' . $sClassName . '.class.inc';
return null;
}
- require_once __DIR__ . '/../' . $sWebService . '/' . $sClassName . '.class.inc';
+ require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/' . $sWebService . '/' . $sClassName . '.class.inc';
$aValues = $this->aValues;
unset($aValues['printreport_id']);
@@ -931,4 +931,4 @@ class PrintReportServices extends PrintServices {
}
-?>
\ No newline at end of file
+?>
diff --git a/web_service/ws/PrintReports.class.inc b/web_service/ws/PrintReports.class.inc
index 04005168..4cb6d7b4 100755
--- a/web_service/ws/PrintReports.class.inc
+++ b/web_service/ws/PrintReports.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Vmap.class.inc';
require_once 'PrintReport.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 PrintReports extends Vmap {
/**
diff --git a/web_service/ws/PrintServices.class.inc b/web_service/ws/PrintServices.class.inc
index e69330e5..8fb94aab 100755
--- a/web_service/ws/PrintServices.class.inc
+++ b/web_service/ws/PrintServices.class.inc
@@ -1,9 +1,9 @@
<?php
require_once 'Vmap.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 printservices.class.inc
diff --git a/web_service/ws/PrintStyle.class.inc b/web_service/ws/PrintStyle.class.inc
index 952b3e82..48df6cac 100755
--- a/web_service/ws/PrintStyle.class.inc
+++ b/web_service/ws/PrintStyle.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file PrintStyle.class.inc
diff --git a/web_service/ws/PrintStyles.class.inc b/web_service/ws/PrintStyles.class.inc
index 448c13b2..9087aa77 100755
--- a/web_service/ws/PrintStyles.class.inc
+++ b/web_service/ws/PrintStyles.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Vmap.class.inc';
require_once 'PrintStyle.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 PrintStyles extends Vmap {
/**
diff --git a/web_service/ws/PrintTemplate.class.inc b/web_service/ws/PrintTemplate.class.inc
index b787f46e..2d9b13d1 100755
--- a/web_service/ws/PrintTemplate.class.inc
+++ b/web_service/ws/PrintTemplate.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file PrintTemplate.class.inc
diff --git a/web_service/ws/PrintTemplateServices.class.inc b/web_service/ws/PrintTemplateServices.class.inc
index 7e585d29..079ea0a4 100755
--- a/web_service/ws/PrintTemplateServices.class.inc
+++ b/web_service/ws/PrintTemplateServices.class.inc
@@ -4,9 +4,9 @@ require_once 'PrintTemplate.class.inc';
require_once 'UserPrintTemplate.class.inc';
require_once 'PrintServices.class.inc';
require_once 'PrintMapServices.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 printtemplateservices.class.inc
diff --git a/web_service/ws/PrintTemplates.class.inc b/web_service/ws/PrintTemplates.class.inc
index 05e63f98..01a2642f 100755
--- a/web_service/ws/PrintTemplates.class.inc
+++ b/web_service/ws/PrintTemplates.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Vmap.class.inc';
require_once 'PrintTemplate.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 PrintTemplates extends Vmap {
/**
diff --git a/web_service/ws/Query.class.inc b/web_service/ws/Query.class.inc
index 41899ea4..093857f4 100755
--- a/web_service/ws/Query.class.inc
+++ b/web_service/ws/Query.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file Query.class.inc
diff --git a/web_service/ws/Querys.class.inc b/web_service/ws/Querys.class.inc
index 27cb5b0f..a5e4b7de 100755
--- a/web_service/ws/Querys.class.inc
+++ b/web_service/ws/Querys.class.inc
@@ -12,16 +12,16 @@
*
*/
require_once 'Vmap.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
require_once 'Query.class.inc';
require_once 'BusinessObject.class.inc';
-require_once(__DIR__ . '/../../class/vmlib/BdDataAccess.inc');
-require_once(__DIR__ . '/../../class/vmlib/phpUtil.inc');
+require_once(dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc');
+require_once(dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/phpUtil.inc');
require_once 'vmlib/logUtil.inc';
-require_once __DIR__ . '/../../class/vmlib/Vm.class.inc';
-require_once __DIR__ . '/../../class/vmlib/BD.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/Vm.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BD.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
class Querys extends Vmap {
/**
diff --git a/web_service/ws/Service.class.inc b/web_service/ws/Service.class.inc
index 4f3edad7..3c74a25b 100755
--- a/web_service/ws/Service.class.inc
+++ b/web_service/ws/Service.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file Service.class.inc
diff --git a/web_service/ws/ServiceType.class.inc b/web_service/ws/ServiceType.class.inc
index 8248a30f..5ac6cf02 100755
--- a/web_service/ws/ServiceType.class.inc
+++ b/web_service/ws/ServiceType.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file ServiceType.class.inc
diff --git a/web_service/ws/ServiceTypes.class.inc b/web_service/ws/ServiceTypes.class.inc
index 3d375293..209d7c64 100755
--- a/web_service/ws/ServiceTypes.class.inc
+++ b/web_service/ws/ServiceTypes.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Vmap.class.inc';
require_once 'ServiceType.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 ServiceTypes extends Vmap {
/**
diff --git a/web_service/ws/Services.class.inc b/web_service/ws/Services.class.inc
index 7e6d3a7d..d5e8deda 100755
--- a/web_service/ws/Services.class.inc
+++ b/web_service/ws/Services.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Vmap.class.inc';
require_once 'Service.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 Services extends Vmap {
/**
diff --git a/web_service/ws/UserModule.class.inc b/web_service/ws/UserModule.class.inc
index 673fef7f..0a3b4422 100755
--- a/web_service/ws/UserModule.class.inc
+++ b/web_service/ws/UserModule.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file UserModule.class.inc
diff --git a/web_service/ws/UserModules.class.inc b/web_service/ws/UserModules.class.inc
index 4e0fbdcf..f994b0ef 100755
--- a/web_service/ws/UserModules.class.inc
+++ b/web_service/ws/UserModules.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Vmap.class.inc';
require_once 'UserModule.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 UserModules extends Vmap {
/**
diff --git a/web_service/ws/UserPrintStyle.class.inc b/web_service/ws/UserPrintStyle.class.inc
index d60ac04a..ad1aa9ce 100755
--- a/web_service/ws/UserPrintStyle.class.inc
+++ b/web_service/ws/UserPrintStyle.class.inc
@@ -1,7 +1,7 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file UserPrintStyle.class.inc
diff --git a/web_service/ws/UserPrintStyles.class.inc b/web_service/ws/UserPrintStyles.class.inc
index d24bea2b..b0d329ce 100755
--- a/web_service/ws/UserPrintStyles.class.inc
+++ b/web_service/ws/UserPrintStyles.class.inc
@@ -13,8 +13,8 @@
*/
require_once 'Vmap.class.inc';
require_once 'UserPrintStyle.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 UserPrintStyles extends Vmap {
/**
diff --git a/web_service/ws/UserPrintTemplate.class.inc b/web_service/ws/UserPrintTemplate.class.inc
index c8256403..3f1db7b4 100755
--- a/web_service/ws/UserPrintTemplate.class.inc
+++ b/web_service/ws/UserPrintTemplate.class.inc
@@ -2,7 +2,7 @@
require_once 'Vmap.class.inc';
require_once 'UserPrintTemplates.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file UserPrintTemplate.class.inc
diff --git a/web_service/ws/UserPrintTemplates.class.inc b/web_service/ws/UserPrintTemplates.class.inc
index 98e4337f..61dbbaf7 100755
--- a/web_service/ws/UserPrintTemplates.class.inc
+++ b/web_service/ws/UserPrintTemplates.class.inc
@@ -14,9 +14,9 @@
require_once 'Vmap.class.inc';
require_once 'UserPrintTemplate.class.inc';
require_once 'UserPrintStyles.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once(__DIR__ . '/../../class/vmlib/BdDataAccess.inc');
-require_once(__DIR__ . '/../../class/vmlib/phpUtil.inc');
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
+require_once(dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc');
+require_once(dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/phpUtil.inc');
class UserPrintTemplates extends Vmap {
/**
diff --git a/web_service/ws/Vex.class.inc b/web_service/ws/Vex.class.inc
index 023f077d..af5a0f59 100755
--- a/web_service/ws/Vex.class.inc
+++ b/web_service/ws/Vex.class.inc
@@ -16,9 +16,9 @@ require_once 'VexExport.class.inc';
require_once 'VexImport.class.inc';
require_once 'VexGetter.class.inc';
require_once 'VexParser.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Form.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/vitis_lib/Form.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
require_once 'vmlib/logUtil.inc';
class Vex extends Vmap {
diff --git a/web_service/ws/VexExport.class.inc b/web_service/ws/VexExport.class.inc
index 5a964bae..eed7f7d5 100755
--- a/web_service/ws/VexExport.class.inc
+++ b/web_service/ws/VexExport.class.inc
@@ -13,9 +13,9 @@
*/
require_once 'Vex.class.inc';
require_once 'VexGetter.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Form.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/vitis_lib/Form.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
require_once 'vmlib/logUtil.inc';
/**
@@ -880,7 +880,7 @@ class VexExport extends Vmap {
* @return array
*/
function getVMapVm4msLayersDefByIds($aVm4msLayerIds) {
- require_once __DIR__ . '/../vm4ms/Layers.class.inc';
+ require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/vm4ms/Layers.class.inc';
if (empty($aVm4msLayerIds)) {
return array();
@@ -964,7 +964,7 @@ class VexExport extends Vmap {
* @return array
*/
function getVMapVm4msMetadataDefById($sMetadataId) {
- require_once __DIR__ . '/../vm4ms/Metadata.class.inc';
+ require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/vm4ms/Metadata.class.inc';
$aPath = ['vmap', 'metadata', $sMetadataId];
$aValues = array(
diff --git a/web_service/ws/VexGetter.class.inc b/web_service/ws/VexGetter.class.inc
index d7515118..e6653d57 100755
--- a/web_service/ws/VexGetter.class.inc
+++ b/web_service/ws/VexGetter.class.inc
@@ -12,9 +12,9 @@
*
*/
require_once 'Vex.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Form.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/vitis_lib/Form.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
require_once 'vmlib/logUtil.inc';
/**
@@ -468,7 +468,7 @@ class VexGetter extends Vmap {
* @return array
*/
function getVMapVm4msLayers($sNames = null, $aAttributs = ['name', 'tableschema', 'tablename', 'connection_id']) {
- require_once __DIR__ . '/../vm4ms/Layers.class.inc';
+ require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/vm4ms/Layers.class.inc';
$aPath = ['vm4ms', 'layers'];
$aValues = array(
@@ -519,7 +519,7 @@ class VexGetter extends Vmap {
* @return array
*/
function getVMapVm4msConnections($bPrivate = false) {
- require_once __DIR__ . '/../vm4ms/LayerConnections.class.inc';
+ require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/vm4ms/LayerConnections.class.inc';
$aPath = ['vm4ms', 'layerconnecitons'];
$aValues = array(
@@ -909,7 +909,7 @@ class VexGetter extends Vmap {
* @return string
*/
function getSqlObjects() {
- require_once __DIR__ . '/../vitis/GenericQuerys.class.inc';
+ require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/vitis/GenericQuerys.class.inc';
$this->aReturn = Array();
if (empty($this->aValues['database'])) {
diff --git a/web_service/ws/VexImport.class.inc b/web_service/ws/VexImport.class.inc
index f68bf267..761820e2 100755
--- a/web_service/ws/VexImport.class.inc
+++ b/web_service/ws/VexImport.class.inc
@@ -13,9 +13,9 @@
*/
require_once 'Vex.class.inc';
require_once 'VexGetter.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Form.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/vitis_lib/Form.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
require_once 'vmlib/logUtil.inc';
/**
diff --git a/web_service/ws/VexParser.class.inc b/web_service/ws/VexParser.class.inc
index 49a041d1..ffd2e304 100755
--- a/web_service/ws/VexParser.class.inc
+++ b/web_service/ws/VexParser.class.inc
@@ -12,9 +12,9 @@
*
*/
require_once 'Vex.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc';
-require_once __DIR__ . '/../../class/vitis_lib/Form.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/vitis_lib/Form.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc';
require_once 'vmlib/logUtil.inc';
/**
diff --git a/web_service/ws/Vmap.class.inc b/web_service/ws/Vmap.class.inc
index 5329015c..80214f81 100755
--- a/web_service/ws/Vmap.class.inc
+++ b/web_service/ws/Vmap.class.inc
@@ -1,7 +1,8 @@
<?php
-require_once __DIR__ . "/../../class/vitis_lib/DbClass.class.inc";
-require_once __DIR__ . '/../vitis/Vitis.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . "/class/vitis_lib/DbClass.class.inc";
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/vitis/Vitis.class.inc';
+
require_once 'vmlib/logUtil.inc';
class Vmap extends Vitis {
@@ -12,9 +13,9 @@ class Vmap extends Vitis {
function __construct($aPath, $aValues, $properties, $bShortcut = false, $oConnection = false) {
parent::__construct($aPath, $aValues, $properties, $bShortcut, $oConnection);
}
-
+
/**
- *
+ *
* @param string $sSchema
* @param string $sTable
* @param string $aAttributs
@@ -138,7 +139,7 @@ class Vmap extends Vitis {
}
/**
- *
+ *
* @param string $sSchema
* @param string $sTable
* @param string $geom
@@ -222,4 +223,4 @@ class Vmap extends Vitis {
}
-?>
\ No newline at end of file
+?>
diff --git a/web_service/ws/VmapGroup.class.inc b/web_service/ws/VmapGroup.class.inc
index 3c3ddfe5..f73054d9 100755
--- a/web_service/ws/VmapGroup.class.inc
+++ b/web_service/ws/VmapGroup.class.inc
@@ -1,6 +1,6 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__.'/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file VmapGroup.class.inc
* \class VmapGroup
diff --git a/web_service/ws/VmapGroups.class.inc b/web_service/ws/VmapGroups.class.inc
index 3b7ee926..90bc39f2 100755
--- a/web_service/ws/VmapGroups.class.inc
+++ b/web_service/ws/VmapGroups.class.inc
@@ -12,9 +12,9 @@
*
*/
require_once 'Vmap.class.inc';
-require_once __DIR__.'/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
require_once 'VmapGroup.class.inc';
-require_once(__DIR__.'/../../class/vmlib/BdDataAccess.inc');
+require_once(dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc');
class VmapGroups extends Vmap {
diff --git a/web_service/ws/VmapUser.class.inc b/web_service/ws/VmapUser.class.inc
index aa45fa79..d2225a63 100755
--- a/web_service/ws/VmapUser.class.inc
+++ b/web_service/ws/VmapUser.class.inc
@@ -1,6 +1,6 @@
<?php
require_once 'Vmap.class.inc';
-require_once __DIR__.'/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
/**
* \file VmapUser.class.inc
* \class VmapUser
diff --git a/web_service/ws/VmapUsers.class.inc b/web_service/ws/VmapUsers.class.inc
index 8ec4e204..ed8262b4 100755
--- a/web_service/ws/VmapUsers.class.inc
+++ b/web_service/ws/VmapUsers.class.inc
@@ -12,9 +12,9 @@
*
*/
require_once 'Vmap.class.inc';
-require_once __DIR__.'/../../class/vitis_lib/Connection.class.inc';
+require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc';
require_once 'VmapUser.class.inc';
-require_once(__DIR__.'/../../class/vmlib/BdDataAccess.inc');
+require_once(dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc');
class VmapUsers extends Vmap {
--
GitLab