From 85f17e4d9e344cc2d58c727b6a2f28d100ba6aad Mon Sep 17 00:00:00 2001 From: Armand Bahi <armand.bahi@veremes.com> Date: Wed, 7 Nov 2018 12:33:42 +0100 Subject: [PATCH] Squashed 'src/module_gtf/' changes from 9c28fdd..fd04f40 fd04f40 pull subtree f5030f4 add subtree d2cf5d0 add subtree c56f5a1 Squashed 'src/closure/' content from commit 622066d 6524718 add subtree 82408f3 Squashed 'src/vitis/' content from commit 355b5f8 83cce5c Reset sources 7fb843d set dependency.xml 1d57117 Merge branch 'master' into next_version 73d00dc Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME']) bbab977 Change __DIR__ by dirname($_SERVER['SCRIPT_FILENAME']) b143820 update app template c5717ed Update readme 2d488f4 add subtree 10346dc Squashed 'src/module_gtf/' content from commit 9c28fdd 9c2ebb7 add subtree 98fcb48 Squashed 'src/closure/' content from commit 622066d a7f230c add subtree be874a2 Squashed 'src/vitis/' content from commit 01d199c 6c1b3e3 Reset sources a195a4d Init from SVN 4ad29c4 add subtree 1ac46cd Squashed 'src/closure/' content from commit 622066d 635a2f9 add subtree 7593c38 Squashed 'src/vitis/' content from commit 01d199c b487cd6 Update from SVN 266e19a Initial commit 4d8d920 Update from SVN fb0113e Update from SVN git-subtree-dir: src/module_gtf git-subtree-split: fd04f40f7d36e4800de982daeb01062b8845563b --- web_service/ws/Categories.class.inc | 4 ++-- web_service/ws/Category.class.inc | 2 +- web_service/ws/EmailContext.class.inc | 2 +- web_service/ws/EmailContexts.class.inc | 4 ++-- web_service/ws/EmailOption.class.inc | 2 +- web_service/ws/EmailOptions.class.inc | 4 ++-- web_service/ws/EmailTemplate.class.inc | 2 +- web_service/ws/EmailTemplates.class.inc | 6 +++--- web_service/ws/FmeEngine.class.inc | 2 +- web_service/ws/FmeEngineType.class.inc | 2 +- web_service/ws/FmeEngineTypes.class.inc | 4 ++-- web_service/ws/FmeEngines.class.inc | 4 ++-- web_service/ws/Gtf.class.inc | 2 +- web_service/ws/GtfEngine.class.inc | 2 +- web_service/ws/GtfEngines.class.inc | 4 ++-- web_service/ws/GtfGroup.class.inc | 2 +- web_service/ws/GtfGroups.class.inc | 4 ++-- web_service/ws/Inbox.class.inc | 2 +- web_service/ws/Inboxes.class.inc | 4 ++-- web_service/ws/Instance.class.inc | 4 ++-- web_service/ws/License.class.inc | 4 ++-- web_service/ws/Message.class.inc | 2 +- web_service/ws/MessageClass.class.inc | 2 +- web_service/ws/MessageClassType.class.inc | 2 +- web_service/ws/MessageClassTypes.class.inc | 4 ++-- web_service/ws/MessageClasses.class.inc | 4 ++-- web_service/ws/Messages.class.inc | 4 ++-- web_service/ws/Order.class.inc | 2 +- web_service/ws/OrderStatus.class.inc | 2 +- web_service/ws/OrderStatutes.class.inc | 4 ++-- web_service/ws/Orders.class.inc | 4 ++-- web_service/ws/Period.class.inc | 2 +- web_service/ws/Periods.class.inc | 4 ++-- web_service/ws/Priorities.class.inc | 4 ++-- web_service/ws/Priority.class.inc | 2 +- web_service/ws/SchemaGroup.class.inc | 2 +- web_service/ws/SchemaGroups.class.inc | 4 ++-- web_service/ws/Server.class.inc | 2 +- web_service/ws/ServerClass.class.inc | 4 ++-- web_service/ws/Servers.class.inc | 4 ++-- web_service/ws/SmtpServer.class.inc | 4 ++-- web_service/ws/Statistics.class.inc | 4 ++-- web_service/ws/Subscription.class.inc | 2 +- web_service/ws/Subscriptions.class.inc | 4 ++-- web_service/ws/SupervisionStatus.class.inc | 2 +- web_service/ws/SupervisionStatutes.class.inc | 4 ++-- web_service/ws/Survey.class.inc | 2 +- web_service/ws/SurveyType.class.inc | 2 +- web_service/ws/SurveyTypes.class.inc | 4 ++-- web_service/ws/Surveys.class.inc | 4 ++-- web_service/ws/Tag.class.inc | 2 +- web_service/ws/Tags.class.inc | 4 ++-- web_service/ws/UserInboxe.class.inc | 2 +- web_service/ws/UserInboxes.class.inc | 6 +++--- web_service/ws/UserOrder.class.inc | 2 +- web_service/ws/UserOrders.class.inc | 6 +++--- web_service/ws/UserSubscription.class.inc | 2 +- web_service/ws/UserSubscriptions.class.inc | 4 ++-- web_service/ws/UserSurvey.class.inc | 2 +- web_service/ws/UserSurveys.class.inc | 4 ++-- web_service/ws/UserWorkspace.class.inc | 2 +- web_service/ws/UserWorkspaces.class.inc | 6 +++--- web_service/ws/Workspace.class.inc | 2 +- web_service/ws/Workspaces.class.inc | 8 ++++---- 64 files changed, 104 insertions(+), 104 deletions(-) diff --git a/web_service/ws/Categories.class.inc b/web_service/ws/Categories.class.inc index 36bb182c..a4d14028 100755 --- a/web_service/ws/Categories.class.inc +++ b/web_service/ws/Categories.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'Category.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class Categories extends GTF { /** diff --git a/web_service/ws/Category.class.inc b/web_service/ws/Category.class.inc index efe469a5..3dbcbeb6 100755 --- a/web_service/ws/Category.class.inc +++ b/web_service/ws/Category.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file Category.class.inc diff --git a/web_service/ws/EmailContext.class.inc b/web_service/ws/EmailContext.class.inc index a26ed36d..b9b8bbeb 100755 --- a/web_service/ws/EmailContext.class.inc +++ b/web_service/ws/EmailContext.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file EmailContext.class.inc diff --git a/web_service/ws/EmailContexts.class.inc b/web_service/ws/EmailContexts.class.inc index 6d0efd2a..b69471fa 100755 --- a/web_service/ws/EmailContexts.class.inc +++ b/web_service/ws/EmailContexts.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'EmailContext.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class EmailContexts extends GTF { /** diff --git a/web_service/ws/EmailOption.class.inc b/web_service/ws/EmailOption.class.inc index a1d1d664..c5d0e8d2 100755 --- a/web_service/ws/EmailOption.class.inc +++ b/web_service/ws/EmailOption.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file EmailOption.class.inc diff --git a/web_service/ws/EmailOptions.class.inc b/web_service/ws/EmailOptions.class.inc index a102a59c..a786997f 100755 --- a/web_service/ws/EmailOptions.class.inc +++ b/web_service/ws/EmailOptions.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'EmailOption.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class EmailOptions extends GTF { /** diff --git a/web_service/ws/EmailTemplate.class.inc b/web_service/ws/EmailTemplate.class.inc index 382d5057..489104eb 100755 --- a/web_service/ws/EmailTemplate.class.inc +++ b/web_service/ws/EmailTemplate.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file EmailTemplate.class.inc diff --git a/web_service/ws/EmailTemplates.class.inc b/web_service/ws/EmailTemplates.class.inc index ce06588c..0160d888 100755 --- a/web_service/ws/EmailTemplates.class.inc +++ b/web_service/ws/EmailTemplates.class.inc @@ -12,10 +12,10 @@ * */ require_once 'Gtf.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 'EmailTemplate.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; -require_once __DIR__ . '/../../class/vmlib/Email.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/Email.class.inc'; class EmailTemplates extends GTF { /** diff --git a/web_service/ws/FmeEngine.class.inc b/web_service/ws/FmeEngine.class.inc index 4e93af18..fe3ee90c 100644 --- a/web_service/ws/FmeEngine.class.inc +++ b/web_service/ws/FmeEngine.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file FmeEngine.class.inc diff --git a/web_service/ws/FmeEngineType.class.inc b/web_service/ws/FmeEngineType.class.inc index 65d8f4e1..0bb700fe 100755 --- a/web_service/ws/FmeEngineType.class.inc +++ b/web_service/ws/FmeEngineType.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file FmeEngineType.class.inc diff --git a/web_service/ws/FmeEngineTypes.class.inc b/web_service/ws/FmeEngineTypes.class.inc index 26db4a71..1cebef5c 100755 --- a/web_service/ws/FmeEngineTypes.class.inc +++ b/web_service/ws/FmeEngineTypes.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'FmeEngineType.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class FmeEngineTypes extends GTF { /** diff --git a/web_service/ws/FmeEngines.class.inc b/web_service/ws/FmeEngines.class.inc index 1ef27ae6..d4c70333 100644 --- a/web_service/ws/FmeEngines.class.inc +++ b/web_service/ws/FmeEngines.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'FmeEngine.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; require_once 'gtf_lib/FmeCloud.class.inc'; require_once 'gtf_lib/FmeServer.class.inc'; diff --git a/web_service/ws/Gtf.class.inc b/web_service/ws/Gtf.class.inc index 403e63b1..e5711e5e 100755 --- a/web_service/ws/Gtf.class.inc +++ b/web_service/ws/Gtf.class.inc @@ -1,6 +1,6 @@ <?php -require_once __DIR__ . "/../vitis/Vitis.class.inc"; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . "/ws/vitis/Vitis.class.inc"; class GTF extends Vitis { diff --git a/web_service/ws/GtfEngine.class.inc b/web_service/ws/GtfEngine.class.inc index e68d2e31..6a94d712 100755 --- a/web_service/ws/GtfEngine.class.inc +++ b/web_service/ws/GtfEngine.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * @file GtfEngine.class.inc diff --git a/web_service/ws/GtfEngines.class.inc b/web_service/ws/GtfEngines.class.inc index e228e21e..0985607d 100755 --- a/web_service/ws/GtfEngines.class.inc +++ b/web_service/ws/GtfEngines.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'GtfEngine.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class GtfEngines extends GTF { /** diff --git a/web_service/ws/GtfGroup.class.inc b/web_service/ws/GtfGroup.class.inc index b7111fdc..586bf5ce 100755 --- a/web_service/ws/GtfGroup.class.inc +++ b/web_service/ws/GtfGroup.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file Group.class.inc diff --git a/web_service/ws/GtfGroups.class.inc b/web_service/ws/GtfGroups.class.inc index 4be4fe11..b1714a66 100755 --- a/web_service/ws/GtfGroups.class.inc +++ b/web_service/ws/GtfGroups.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'GtfGroup.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class GtfGroups extends GTF { /** diff --git a/web_service/ws/Inbox.class.inc b/web_service/ws/Inbox.class.inc index 5e58e5b3..6e4fca77 100755 --- a/web_service/ws/Inbox.class.inc +++ b/web_service/ws/Inbox.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file Inbox.class.inc diff --git a/web_service/ws/Inboxes.class.inc b/web_service/ws/Inboxes.class.inc index a393ea0a..56d29daa 100755 --- a/web_service/ws/Inboxes.class.inc +++ b/web_service/ws/Inboxes.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'Inbox.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class Inboxes extends GTF { /** diff --git a/web_service/ws/Instance.class.inc b/web_service/ws/Instance.class.inc index 996c28c5..0c024c1e 100755 --- a/web_service/ws/Instance.class.inc +++ b/web_service/ws/Instance.class.inc @@ -11,8 +11,8 @@ * */ require_once 'Gtf.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'; require_once ("gtf_lib/phpUtility.inc"); class Instance extends GTF { diff --git a/web_service/ws/License.class.inc b/web_service/ws/License.class.inc index c38149a4..8f1e63df 100755 --- a/web_service/ws/License.class.inc +++ b/web_service/ws/License.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'Priority.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; //require_once ("PEAR/Mail.php"); use PHPMailer\PHPMailer\PHPMailer; use PHPMailer\PHPMailer\Exception; diff --git a/web_service/ws/Message.class.inc b/web_service/ws/Message.class.inc index 062dd634..04c94ced 100755 --- a/web_service/ws/Message.class.inc +++ b/web_service/ws/Message.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file Message.class.inc diff --git a/web_service/ws/MessageClass.class.inc b/web_service/ws/MessageClass.class.inc index 070494c7..de85c62c 100755 --- a/web_service/ws/MessageClass.class.inc +++ b/web_service/ws/MessageClass.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file MessageClass.class.inc diff --git a/web_service/ws/MessageClassType.class.inc b/web_service/ws/MessageClassType.class.inc index 2ad4d934..839d16d9 100755 --- a/web_service/ws/MessageClassType.class.inc +++ b/web_service/ws/MessageClassType.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file MessageClassType.class.inc diff --git a/web_service/ws/MessageClassTypes.class.inc b/web_service/ws/MessageClassTypes.class.inc index 6cf8013b..9d97e2a5 100755 --- a/web_service/ws/MessageClassTypes.class.inc +++ b/web_service/ws/MessageClassTypes.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'MessageClassType.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class MessageClassTypes extends GTF { /** diff --git a/web_service/ws/MessageClasses.class.inc b/web_service/ws/MessageClasses.class.inc index c4fe9b3f..570da8da 100755 --- a/web_service/ws/MessageClasses.class.inc +++ b/web_service/ws/MessageClasses.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'MessageClass.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class MessageClasses extends GTF { /** diff --git a/web_service/ws/Messages.class.inc b/web_service/ws/Messages.class.inc index b53ab2fc..2b27d033 100755 --- a/web_service/ws/Messages.class.inc +++ b/web_service/ws/Messages.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'Message.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class Messages extends GTF { /** diff --git a/web_service/ws/Order.class.inc b/web_service/ws/Order.class.inc index 4888332c..ef369ff6 100644 --- a/web_service/ws/Order.class.inc +++ b/web_service/ws/Order.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file Order.class.inc diff --git a/web_service/ws/OrderStatus.class.inc b/web_service/ws/OrderStatus.class.inc index ddfe37ff..15313451 100755 --- a/web_service/ws/OrderStatus.class.inc +++ b/web_service/ws/OrderStatus.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file OrderStatus.class.inc diff --git a/web_service/ws/OrderStatutes.class.inc b/web_service/ws/OrderStatutes.class.inc index dbb56fb4..eb8f463c 100755 --- a/web_service/ws/OrderStatutes.class.inc +++ b/web_service/ws/OrderStatutes.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'OrderStatus.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class OrderStatutes extends GTF { /** diff --git a/web_service/ws/Orders.class.inc b/web_service/ws/Orders.class.inc index 352904e1..c3142fb1 100644 --- a/web_service/ws/Orders.class.inc +++ b/web_service/ws/Orders.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'Order.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; require_once 'gtf_lib/FmeServer.class.inc'; require_once 'gtf_lib/FmeCloud.class.inc'; diff --git a/web_service/ws/Period.class.inc b/web_service/ws/Period.class.inc index 6d1e2f9c..f6db78da 100755 --- a/web_service/ws/Period.class.inc +++ b/web_service/ws/Period.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * This class defines operation for one Period diff --git a/web_service/ws/Periods.class.inc b/web_service/ws/Periods.class.inc index ea18edda..3801fcd5 100755 --- a/web_service/ws/Periods.class.inc +++ b/web_service/ws/Periods.class.inc @@ -1,9 +1,9 @@ <?php require_once 'Gtf.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 'Period.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; /** * \file Periods.class.inc diff --git a/web_service/ws/Priorities.class.inc b/web_service/ws/Priorities.class.inc index 5ca36af1..dcc02aa8 100755 --- a/web_service/ws/Priorities.class.inc +++ b/web_service/ws/Priorities.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'Priority.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class Priorities extends GTF { /** diff --git a/web_service/ws/Priority.class.inc b/web_service/ws/Priority.class.inc index f7448483..063bc42e 100755 --- a/web_service/ws/Priority.class.inc +++ b/web_service/ws/Priority.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file Priority.class.inc diff --git a/web_service/ws/SchemaGroup.class.inc b/web_service/ws/SchemaGroup.class.inc index 42639729..6dc50604 100755 --- a/web_service/ws/SchemaGroup.class.inc +++ b/web_service/ws/SchemaGroup.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file SchemaGroup.class.inc diff --git a/web_service/ws/SchemaGroups.class.inc b/web_service/ws/SchemaGroups.class.inc index d2894070..d0dfd665 100755 --- a/web_service/ws/SchemaGroups.class.inc +++ b/web_service/ws/SchemaGroups.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'SchemaGroup.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class SchemaGroups extends GTF { /** diff --git a/web_service/ws/Server.class.inc b/web_service/ws/Server.class.inc index 53c24868..f21f596b 100755 --- a/web_service/ws/Server.class.inc +++ b/web_service/ws/Server.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file Server.class.inc diff --git a/web_service/ws/ServerClass.class.inc b/web_service/ws/ServerClass.class.inc index 06ee850b..8eb898ae 100755 --- a/web_service/ws/ServerClass.class.inc +++ b/web_service/ws/ServerClass.class.inc @@ -1,7 +1,7 @@ <?php -require_once __DIR__ . '/../../class/vmlib/dbUtil.inc'; -require_once __DIR__ . '/../../class/vmlib/logUtil.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/dbUtil.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/logUtil.inc'; class ServerClass { diff --git a/web_service/ws/Servers.class.inc b/web_service/ws/Servers.class.inc index ca05622a..ba40d3c3 100755 --- a/web_service/ws/Servers.class.inc +++ b/web_service/ws/Servers.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'Server.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class Servers extends GTF { /** diff --git a/web_service/ws/SmtpServer.class.inc b/web_service/ws/SmtpServer.class.inc index 441ab4c0..bf715b64 100755 --- a/web_service/ws/SmtpServer.class.inc +++ b/web_service/ws/SmtpServer.class.inc @@ -14,8 +14,8 @@ // usage of this class is deprecated require_once 'Gtf.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'; use PHPMailer\PHPMailer\PHPMailer; use PHPMailer\PHPMailer\Exception; require_once 'PHPMailer/src/Exception.php'; diff --git a/web_service/ws/Statistics.class.inc b/web_service/ws/Statistics.class.inc index c9d97029..5e2025b7 100755 --- a/web_service/ws/Statistics.class.inc +++ b/web_service/ws/Statistics.class.inc @@ -12,8 +12,8 @@ * */ require_once 'Gtf.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'; require 'Stats.class.inc'; class Statistics extends GTF { diff --git a/web_service/ws/Subscription.class.inc b/web_service/ws/Subscription.class.inc index ad609a4b..c07bd07e 100755 --- a/web_service/ws/Subscription.class.inc +++ b/web_service/ws/Subscription.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file Subscription.class.inc diff --git a/web_service/ws/Subscriptions.class.inc b/web_service/ws/Subscriptions.class.inc index e7a060f0..74de1e18 100755 --- a/web_service/ws/Subscriptions.class.inc +++ b/web_service/ws/Subscriptions.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'Subscription.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class Subscriptions extends GTF { /** diff --git a/web_service/ws/SupervisionStatus.class.inc b/web_service/ws/SupervisionStatus.class.inc index 1991f1e9..396a8269 100755 --- a/web_service/ws/SupervisionStatus.class.inc +++ b/web_service/ws/SupervisionStatus.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file SupervisionStatus.class.inc diff --git a/web_service/ws/SupervisionStatutes.class.inc b/web_service/ws/SupervisionStatutes.class.inc index 20f28624..ad0ee6f9 100755 --- a/web_service/ws/SupervisionStatutes.class.inc +++ b/web_service/ws/SupervisionStatutes.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'SupervisionStatus.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class SupervisionStatutes extends GTF { /** diff --git a/web_service/ws/Survey.class.inc b/web_service/ws/Survey.class.inc index 33b1dd88..7d4a7f4a 100755 --- a/web_service/ws/Survey.class.inc +++ b/web_service/ws/Survey.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file Survey.class.inc diff --git a/web_service/ws/SurveyType.class.inc b/web_service/ws/SurveyType.class.inc index 458dddde..a12d7107 100755 --- a/web_service/ws/SurveyType.class.inc +++ b/web_service/ws/SurveyType.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file SurveyType.class.inc diff --git a/web_service/ws/SurveyTypes.class.inc b/web_service/ws/SurveyTypes.class.inc index 24bd840a..d72bd104 100755 --- a/web_service/ws/SurveyTypes.class.inc +++ b/web_service/ws/SurveyTypes.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'SurveyType.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class SurveyTypes extends GTF { /** diff --git a/web_service/ws/Surveys.class.inc b/web_service/ws/Surveys.class.inc index e9996e48..52657a5f 100755 --- a/web_service/ws/Surveys.class.inc +++ b/web_service/ws/Surveys.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'Survey.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class Surveys extends GTF { /** diff --git a/web_service/ws/Tag.class.inc b/web_service/ws/Tag.class.inc index 6fd0e510..52780848 100755 --- a/web_service/ws/Tag.class.inc +++ b/web_service/ws/Tag.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file Tag.class.inc diff --git a/web_service/ws/Tags.class.inc b/web_service/ws/Tags.class.inc index 0cf4c356..d4309a0a 100755 --- a/web_service/ws/Tags.class.inc +++ b/web_service/ws/Tags.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'Tag.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class Tags extends GTF { /** diff --git a/web_service/ws/UserInboxe.class.inc b/web_service/ws/UserInboxe.class.inc index 22624b7d..5f426e42 100755 --- a/web_service/ws/UserInboxe.class.inc +++ b/web_service/ws/UserInboxe.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file Inbox.class.inc diff --git a/web_service/ws/UserInboxes.class.inc b/web_service/ws/UserInboxes.class.inc index 7c21aa99..93cbab60 100755 --- a/web_service/ws/UserInboxes.class.inc +++ b/web_service/ws/UserInboxes.class.inc @@ -13,9 +13,9 @@ */ require_once 'Gtf.class.inc'; require_once 'UserInboxe.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 UserInboxes extends GTF { /** diff --git a/web_service/ws/UserOrder.class.inc b/web_service/ws/UserOrder.class.inc index 41e89d68..8b80abff 100755 --- a/web_service/ws/UserOrder.class.inc +++ b/web_service/ws/UserOrder.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file UserOrder.class.inc diff --git a/web_service/ws/UserOrders.class.inc b/web_service/ws/UserOrders.class.inc index a078bc21..b0919bb3 100755 --- a/web_service/ws/UserOrders.class.inc +++ b/web_service/ws/UserOrders.class.inc @@ -12,10 +12,10 @@ * */ require_once 'Gtf.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 'UserOrder.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; -require_once __DIR__ . '/../vitis/PrivateToken.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/ws/vitis/PrivateToken.class.inc'; class UserOrders extends GTF { /** diff --git a/web_service/ws/UserSubscription.class.inc b/web_service/ws/UserSubscription.class.inc index acc45dbc..6e0b5b45 100755 --- a/web_service/ws/UserSubscription.class.inc +++ b/web_service/ws/UserSubscription.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file UserSubscription.class.inc diff --git a/web_service/ws/UserSubscriptions.class.inc b/web_service/ws/UserSubscriptions.class.inc index 0e161b76..e70b529f 100755 --- a/web_service/ws/UserSubscriptions.class.inc +++ b/web_service/ws/UserSubscriptions.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'UserSubscription.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class UserSubscriptions extends GTF { /** diff --git a/web_service/ws/UserSurvey.class.inc b/web_service/ws/UserSurvey.class.inc index 3aa38652..a603ae25 100755 --- a/web_service/ws/UserSurvey.class.inc +++ b/web_service/ws/UserSurvey.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file UserSurvey.class.inc diff --git a/web_service/ws/UserSurveys.class.inc b/web_service/ws/UserSurveys.class.inc index 939d601f..e9e955c9 100755 --- a/web_service/ws/UserSurveys.class.inc +++ b/web_service/ws/UserSurveys.class.inc @@ -12,9 +12,9 @@ * */ require_once 'Gtf.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 'UserSurvey.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; class UserSurveys extends GTF { /** diff --git a/web_service/ws/UserWorkspace.class.inc b/web_service/ws/UserWorkspace.class.inc index 21e0414c..ab5e357b 100755 --- a/web_service/ws/UserWorkspace.class.inc +++ b/web_service/ws/UserWorkspace.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.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 'vmlib/logUtil.inc'; /** diff --git a/web_service/ws/UserWorkspaces.class.inc b/web_service/ws/UserWorkspaces.class.inc index 464b8794..5fd494de 100755 --- a/web_service/ws/UserWorkspaces.class.inc +++ b/web_service/ws/UserWorkspaces.class.inc @@ -13,9 +13,9 @@ */ require_once 'Gtf.class.inc'; require_once 'UserWorkspace.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 UserWorkspaces extends GTF { /** diff --git a/web_service/ws/Workspace.class.inc b/web_service/ws/Workspace.class.inc index d0950ec9..07a23d46 100755 --- a/web_service/ws/Workspace.class.inc +++ b/web_service/ws/Workspace.class.inc @@ -1,7 +1,7 @@ <?php require_once 'Gtf.class.inc'; -require_once __DIR__ . '/../../class/vitis_lib/Connection.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vitis_lib/Connection.class.inc'; /** * \file Workspace.class.inc diff --git a/web_service/ws/Workspaces.class.inc b/web_service/ws/Workspaces.class.inc index 879b9378..521713a1 100755 --- a/web_service/ws/Workspaces.class.inc +++ b/web_service/ws/Workspaces.class.inc @@ -12,11 +12,11 @@ * */ require_once 'Gtf.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 'Workspace.class.inc'; -require_once __DIR__ . '/../../class/vmlib/BdDataAccess.inc'; -require_once __DIR__ . '/../../class/vmlib/phpUtil.inc'; -require_once __DIR__ . '/../../class/gtf_lib/GtfFmwParser.class.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/BdDataAccess.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/vmlib/phpUtil.inc'; +require_once dirname($_SERVER['SCRIPT_FILENAME']) . '/class/gtf_lib/GtfFmwParser.class.inc'; class Workspaces extends GTF { /** -- GitLab