From 19858a03f5d4efd217786f472c420a421f8cd715 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Sun, 23 Dec 2018 17:45:01 +0100 Subject: [PATCH] refactoring --- lam/templates/misc/ajax.php | 4 ++-- lam/templates/pdfedit/pdfmain.php | 14 +++++++------- lam/templates/pdfedit/pdfpage.php | 14 +++++++------- lam/templates/profedit/profilemain.php | 12 ++++++------ 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lam/templates/misc/ajax.php b/lam/templates/misc/ajax.php index 5c6c718d..9c2dc751 100644 --- a/lam/templates/misc/ajax.php +++ b/lam/templates/misc/ajax.php @@ -36,9 +36,9 @@ use \htmlButton; */ /** security functions */ -include_once("../../lib/security.inc"); +include_once(__DIR__ . "/../../lib/security.inc"); /** LDIF import */ -include_once("../../lib/import.inc"); +include_once(__DIR__ . "/../../lib/import.inc"); // start session if (isset($_GET['selfservice'])) { diff --git a/lam/templates/pdfedit/pdfmain.php b/lam/templates/pdfedit/pdfmain.php index 304a0d21..12c3b779 100644 --- a/lam/templates/pdfedit/pdfmain.php +++ b/lam/templates/pdfedit/pdfmain.php @@ -48,15 +48,15 @@ use \LAM\TYPES\TypeManager; */ /** security functions */ -include_once("../../lib/security.inc"); +include_once(__DIR__ . "/../../lib/security.inc"); /** access to PDF configuration files */ -include_once("../../lib/pdfstruct.inc"); +include_once(__DIR__ . "/../../lib/pdfstruct.inc"); /** LDAP object */ -include_once("../../lib/ldap.inc"); +include_once(__DIR__ . "/../../lib/ldap.inc"); /** for language settings */ -include_once("../../lib/config.inc"); +include_once(__DIR__ . "/../../lib/config.inc"); /** module functions */ -include_once("../../lib/modules.inc"); +include_once(__DIR__ . "/../../lib/modules.inc"); // start session startSecureSession(); @@ -202,7 +202,7 @@ foreach ($templateClasses as $templateClass) { exit; } } -include '../../lib/adminHeader.inc'; +include __DIR__ . '/../../lib/adminHeader.inc'; ?>
@@ -409,7 +409,7 @@ echo ''; -include '../../lib/adminFooter.inc'; +include __DIR__ . '/../../lib/adminFooter.inc'; /** diff --git a/lam/templates/pdfedit/pdfpage.php b/lam/templates/pdfedit/pdfpage.php index 7f3bb1f0..d183cbf5 100644 --- a/lam/templates/pdfedit/pdfpage.php +++ b/lam/templates/pdfedit/pdfpage.php @@ -50,15 +50,15 @@ use LAM\PDF\PDFStructureWriter; */ /** security functions */ -include_once("../../lib/security.inc"); +include_once(__DIR__ . "/../../lib/security.inc"); /** access to PDF configuration files */ -include_once('../../lib/pdfstruct.inc'); +include_once(__DIR__ . '/../../lib/pdfstruct.inc'); /** LDAP object */ -include_once('../../lib/ldap.inc'); +include_once(__DIR__ . '/../../lib/ldap.inc'); /** LAM configuration */ -include_once('../../lib/config.inc'); +include_once(__DIR__ . '/../../lib/config.inc'); /** module functions */ -include_once('../../lib/modules.inc'); +include_once(__DIR__ . '/../../lib/modules.inc'); // start session startSecureSession(); @@ -180,7 +180,7 @@ foreach($sortedModules as $module => $title) { $modules = join(',',$modules); // print header -include '../../lib/adminHeader.inc'; +include __DIR__ . '/../../lib/adminHeader.inc'; ?>
'; -include '../../lib/adminFooter.inc'; +include __DIR__ . '/../../lib/adminFooter.inc'; /** diff --git a/lam/templates/profedit/profilemain.php b/lam/templates/profedit/profilemain.php index 526a6ffd..fd228e69 100644 --- a/lam/templates/profedit/profilemain.php +++ b/lam/templates/profedit/profilemain.php @@ -45,13 +45,13 @@ use \LAM\TYPES\TypeManager; */ /** security functions */ -include_once("../../lib/security.inc"); +include_once(__DIR__ . "/../../lib/security.inc"); /** helper functions for profiles */ -include_once("../../lib/profiles.inc"); +include_once(__DIR__ . "/../../lib/profiles.inc"); /** access to LDAP server */ -include_once("../../lib/ldap.inc"); +include_once(__DIR__ . "/../../lib/ldap.inc"); /** access to configuration options */ -include_once("../../lib/config.inc"); +include_once(__DIR__ . "/../../lib/config.inc"); // start session startSecureSession(); @@ -182,7 +182,7 @@ foreach ($profileClasses as $profileClass) { } } -include '../../lib/adminHeader.inc'; +include __DIR__ . '/../../lib/adminHeader.inc'; echo "
\n"; echo "
\n"; echo ''; @@ -361,7 +361,7 @@ echo '
'; -include '../../lib/adminFooter.inc'; +include __DIR__ . '/../../lib/adminFooter.inc'; /** * Imports the selected account profiles.