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/ws/BusinessObject.class.inc b/web_service/ws/BusinessObject.class.inc index 838695456b28ba3e788ac2d04fc1ed36444d0a87..b3da1a450873ab4e1f76bae4ac4d0c60fe9c1f55 100644 --- 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 8de888db4dc8008b65224bdbaf5f069cdeaae0cb..74ac6871fe101be190412dba29fd619a2f3b690a 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 059fe3dbfdad20fb1c3a70926af3de1ae0529052..04b352a95b99134e00e56ea63842ac5908920c38 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 6fa5a44be559e96821500c33498e2b11783d2663..413f93e43ebbc728cbc4600f84d2cc8d85d05249 100755 --- 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 11b1f0534d54d47252c3808c098544beb539918f..e7ff490f4f0ed94bc5fc7047c9d952d1d970ca25 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 f5258bca4ffe53ddff6b9b7c7d52649c0873c598..33df12c2fa119b2d86614c7b1eadfa753b3b1b0f 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 c890b6dd4012c129a0ae26b4cfd503e042c258a7..baa868a11fe9ddbda10f61e9c0439fc75a1550bd 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 f1a4545d5c4c83cf20050e97ee85922bb9c0c538..bae206ed8657cad5e321b1dbe66e5960d7daf3f3 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 509353a28361802ab6b3b6b403ed218f874e6d05..dda04a633bfa009f77a4c25c8dbe033ac4c601c9 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 f7f818c51252bb0ac26532e76291fa1656002331..180d51e2f33a7520c52e9fd75176dc7c1fe70bca 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 060661b7506f46e14d2f7ac2363f4639bb0622b7..5e5f6be19ad4996b6908845fdae0461f2fa26e93 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 ec2134f7cb410a65ab4c6b203924b0f2a7b1a2db..430a91c728e40ee0497fd3baa024f5f669a5f0d6 100644 --- 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 ddfbd2786744831edda77eb143588b20de89ddf9..f57f594551256f366c1ed2003f93b161b6500820 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 aef8d600ec030e2cd85fc621996c7bef08191fd1..34e8a343a09402b2728ff8e2f7952bb479d40099 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 15b31c91e1f3a4eda67a2fae78d6f79d2a636ddb..f5e622507600eb658e9093ae25df2af9ec1a9810 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 533a6b90b2334274400e352edfe0f13510fde768..b31c07ba67f8e470f522349c22e86321e0e9e9db 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 d23347e37833350c4b9c3679571806f09babc529..1b157d03c1dafd717b0f1627495635e41fb7fc70 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 c27f9d001d93078e26118041839be2028087eda6..d2448ab6c4612ab9ec91bd31da3695cb5a2801ca 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 1ce7decaab4818364c969a8a8832f86eb898515d..163ca659216fb8927736cf43f559f3d87c55a65b 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 84b46b03ae15dfb56ec5d2c15ed9f4aa7177fe88..1fe4422dff0de3f6b0013127ed27483453955e6b 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 d0d11d77972365a6c7427d5a65a43764a618bdbd..a6302d1d4f8b1bbaaf5a20ec73ff6024817424f7 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 39b73ee53147468bf41a9c613dc271cc7aca9b45..59edd0491d82bf2d30348b6df7a39e4329ef706c 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 8ac78dc4f47977cba47a1eb715e20e917d2221c9..7c7360aae4ae1bc658f66f122112e54f7f5c6033 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 f8a91b70955bbd7c8a630fe22c550303b1dea413..f6f332c802d835d446022061ed9c348b80508193 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 b88d4206afe9dbf228fa3606ce77c46d65aacf79..291c85a83955710d1aa3ae387cf9923a0482d26b 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 b23539d935fc623dabb1820dfe976bb594c09167..84f44a88134ad73137ec6fa77f70323a770fa7f7 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 552d0bfab17b519acfeaa93a5efa36f9f3b3f683..9e9348db79481cfe98f774bbe494a9babedb9960 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 ab45f1e2e3bfa7831dc208b253b82d398f02ddde..67274ee19523117665112e20558a208b43c3210b 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 cf8ffd1181cc69d7148abf5b7b7eb98249c980ed..34623aa9e67138ed38103a4660df48aa16457ba8 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 654234e7d7e15799b2ff068ba5610eaddbca5a44..d0f764cbf9bbc828d118b71ef7db0fa351d7594d 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 def8fceed35524b053d933e09c71e803e400728c..e258080301770091e9644424202b82f7bf798e9a 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 42ab3acdb7958bc8bafc277eeb0caabf3f589f26..cf548e2ec4492562fd7d18e216da413ec8eb67c4 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 3fd045e83b9e4543d9001770e6daa35062a97eeb..161868568fa05b5c1c6954312f59967fc44eb3d9 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 04005168547cafb610eb9617709921a91519fc8d..4cb6d7b43ccc69ce699650ab0346721b79c75a1e 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 e69330e585a07c587d684a631decd48c0e0656f4..8fb94aab9b34ea63010beb77dd1b08b155bba9e7 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 952b3e82af0324de28b146077a206a1666657b5e..48df6caccbc1c05489a6fa73c72ac932e402d35e 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 448c13b219d45b788d15703599f4b448ddc9c808..9087aa77db60ec5a2bd814db0a86825bc3decda6 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 b787f46ea25fb387defc0f07ad89a052ad0989cb..2d9b13d1a10f91fd84ba8d2bf6fa6dafab64f30e 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 7e585d297a99bb84cd7527392d0f50d2e54ef87a..079ea0a492b8e9484c20f8e6b22285411629d6e5 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 05e63f98475d0f3a55cf98c232937f88508728e9..01a2642f3697fa4984dd54fffb48ee769f3f1e02 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 41899ea4b8124161af905450071380053493ea37..093857f4864444494d97051f2f84cece89037a78 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 27cb5b0fa0d346f75d228b7109c0b27a6a9231e5..a5e4b7deed246263e5d67a6856fb62af7d503fa9 100644 --- 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 4f3edad7ca847491ea656e00b87bd448417f0590..3c74a25bdffbc0d90ea4cad2e60e8eb531b8bb88 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 8248a30f12ca45867b63e7211a6564d297017cb9..5ac6cf029f31c418bc0a11ece8673a7320c8e026 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 3d3752936bb7ad066c6670824b7d544e98bdfcab..209d7c640425e8b86bd7e7e88c5c69f2bea74df8 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 7e6d3a7d6622ca795c455395a7880c82c73a06bb..d5e8deda7e33af0f4f91e3d230c1ebe0488fbeeb 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 673fef7f8c4169c5029ffbc206f4e6568866bf21..0a3b4422e5cb3c5634f2a79362e98b258c801a77 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 4e0fbdcfd7f71bdf950c8252509af5e6398cd9b4..f994b0efce3331fb6dfce60d8199f6f33eaec3ec 100644 --- 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 d60ac04ab97bd672113098cadafdd77542b3d9e3..ad1aa9ced2622cb04061305f15f8f61bd1bc2559 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 d24bea2b81848189bbddb6bd3d0a4d4d1ad6aa37..b0d329ce8d094d597d2cb60a3dcb3b16e046551a 100644 --- 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 c82564036d02868cf14a12d4c79fc37ff85f8486..3f1db7b4190dc3422a323250c22318d734c20212 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 98e4337fc46d95fa3bf4ef411a9d87825ac4d084..61dbbaf7543997da9c3f49447535be353ecd902f 100644 --- 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 023f077d134c062c6f8d2ab5db72a9ff1efd0466..af5a0f5926050969a4d370be619b250455eabad3 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 5a964bae90e7669f11e8e77c8450bb10fff290d3..eed7f7d5b8185a5c8d19b17d10d95d7afc03c272 100644 --- 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 d7515118d07d62b6d950da943fdcc8946e67dcf4..e6653d575476627922f6946dd31eba078150f0d9 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 f68bf2674af079ba1fda2cdc8ca60fe87f109343..761820e20565fd276574fab470d8cb3b4468297d 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 49a041d1e8642d88cd6e5232e813570dadec48e5..ffd2e304498ea0b26affe82f06f0e08d407a25b1 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 5329015c791df9f8e4e9d57de14c45e28bbb9e0c..80214f81e5cba93c54033554d7ebd2fcaec033c0 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 3c3ddfe577d5db417d88cdeddc2d172fd116e6a1..f73054d984d01952321973c33659266ec0bd25f0 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 3b7ee9267ec6403c8374b631266d9b34860b6d6e..90bc39f280278e413a08665f2d3c264d3dfe3de0 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 aa45fa79725046b61f68b8d9570e58902f563421..d2225a63c1ddcc1b2aa30fabf6ed3beac354bafa 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 8ec4e204d7e71094dc4d2e97bc6726cd552f7468..ed8262b4f3b894ad2249154423789106444ad166 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 {