From 36b91b2785ac08546c3d4a7cbd8b3b86ab5a2e2e Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Sun, 23 Dec 2018 17:32:17 +0100
Subject: [PATCH] refactoring

---
 lam/templates/schema/schema.php      | 12 ++++++------
 lam/templates/tools/importexport.php | 14 +++++++-------
 lam/templates/tools/multiEdit.php    | 12 ++++++------
 lam/templates/tools/ou_edit.php      | 12 ++++++------
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/lam/templates/schema/schema.php b/lam/templates/schema/schema.php
index a7b4616d..05f4075f 100644
--- a/lam/templates/schema/schema.php
+++ b/lam/templates/schema/schema.php
@@ -40,13 +40,13 @@ use \htmlSubTitle;
 
 
 /** security functions */
-include_once("../../lib/security.inc");
+include_once(__DIR__ . "/../../lib/security.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");
 /** schema functions */
-require_once("../../lib/schema.inc");
+require_once(__DIR__ . "/../../lib/schema.inc");
 
 // start session
 startSecureSession();
@@ -56,7 +56,7 @@ checkIfToolIsActive('toolSchemaBrowser');
 
 setlanguage();
 
-include '../../lib/adminHeader.inc';
+include __DIR__ . '/../../lib/adminHeader.inc';
 echo "<div class=\"user-bright smallPaddingContent\">\n";
 
 $availableViews = array('objectClass', 'attribute', 'syntax', 'rule');
@@ -93,7 +93,7 @@ elseif( $selectedView == 'objectClass' ) {
 parseHtml(null, $row, array(), false, $tabindex, 'user');
 
 echo '</div>';
-include '../../lib/adminFooter.inc';
+include __DIR__ . '/../../lib/adminFooter.inc';
 
 /**
  * Displays the syntax list.
diff --git a/lam/templates/tools/importexport.php b/lam/templates/tools/importexport.php
index b853c737..74b8260f 100644
--- a/lam/templates/tools/importexport.php
+++ b/lam/templates/tools/importexport.php
@@ -47,15 +47,15 @@ use LAM\TYPES\TypeManager;
 */
 
 /** security functions */
-include_once("../../lib/security.inc");
+include_once(__DIR__ . "/../../lib/security.inc");
 /** access to configuration data */
-include_once("../../lib/config.inc");
+include_once(__DIR__ . "/../../lib/config.inc");
 /** access LDAP server */
-include_once("../../lib/ldap.inc");
+include_once(__DIR__ . "/../../lib/ldap.inc");
 /** used to print status messages */
-include_once("../../lib/status.inc");
+include_once(__DIR__ . "/../../lib/status.inc");
 /** import class */
-include_once("../../lib/import.inc");
+include_once(__DIR__ . "/../../lib/import.inc");
 
 // start session
 startSecureSession();
@@ -85,7 +85,7 @@ if (isset($_SESSION[Importer::SESSION_KEY_STOP_ON_ERROR])) {
 	unset($_SESSION[Importer::SESSION_KEY_STOP_ON_ERROR]);
 }
 
-include '../../lib/adminHeader.inc';
+include __DIR__ . '/../../lib/adminHeader.inc';
 $tabindex = 1;
 $activeTab = 0;
 if (!empty($_GET['tab']) && ($_GET['tab'] === 'export')) {
@@ -396,4 +396,4 @@ function checkExportData() {
 	}
 }
 
-include '../../lib/adminFooter.inc';
+include __DIR__ . '/../../lib/adminFooter.inc';
diff --git a/lam/templates/tools/multiEdit.php b/lam/templates/tools/multiEdit.php
index be5cc191..21efe438 100644
--- a/lam/templates/tools/multiEdit.php
+++ b/lam/templates/tools/multiEdit.php
@@ -48,13 +48,13 @@ use \htmlResponsiveTable;
 */
 
 /** security functions */
-include_once("../../lib/security.inc");
+include_once(__DIR__ . "/../../lib/security.inc");
 /** access to configuration data */
-include_once("../../lib/config.inc");
+include_once(__DIR__ . "/../../lib/config.inc");
 /** access LDAP server */
-include_once("../../lib/ldap.inc");
+include_once(__DIR__ . "/../../lib/ldap.inc");
 /** used to print status messages */
-include_once("../../lib/status.inc");
+include_once(__DIR__ . "/../../lib/status.inc");
 
 // start session
 startSecureSession();
@@ -93,7 +93,7 @@ else {
  */
 function displayStartPage() {
 	// display main page
-	include '../../lib/adminHeader.inc';
+	include __DIR__ . '/../../lib/adminHeader.inc';
 	echo '<div class="user-bright smallPaddingContent">';
 	echo "<form action=\"multiEdit.php\" method=\"post\">\n";
 	$errors = array();
@@ -203,7 +203,7 @@ function displayStartPage() {
 	parseHtml(null, $container, array(), false, $tabindex, 'user');
 	echo "</form>\n";
 	echo '</div>';
-	include '../../lib/adminFooter.inc';
+	include __DIR__ . '/../../lib/adminFooter.inc';
 }
 
 /**
diff --git a/lam/templates/tools/ou_edit.php b/lam/templates/tools/ou_edit.php
index cd888f64..a7adcdcc 100644
--- a/lam/templates/tools/ou_edit.php
+++ b/lam/templates/tools/ou_edit.php
@@ -40,13 +40,13 @@ use \htmlGroup;
 */
 
 /** security functions */
-include_once("../../lib/security.inc");
+include_once(__DIR__ . "/../../lib/security.inc");
 /** access to configuration data */
-include_once("../../lib/config.inc");
+include_once(__DIR__ . "/../../lib/config.inc");
 /** access LDAP server */
-include_once("../../lib/ldap.inc");
+include_once(__DIR__ . "/../../lib/ldap.inc");
 /** used to print status messages */
-include_once("../../lib/status.inc");
+include_once(__DIR__ . "/../../lib/status.inc");
 
 // start session
 startSecureSession();
@@ -161,7 +161,7 @@ display_main($message, $error);
  */
 function display_main($message, $error) {
 	// display main page
-	include '../../lib/adminHeader.inc';
+	include __DIR__ . '/../../lib/adminHeader.inc';
 	echo '<div class="user-bright smallPaddingContent">';
 	echo "<form action=\"ou_edit.php\" method=\"post\">\n";
 
@@ -230,5 +230,5 @@ function display_main($message, $error) {
 	parseHtml(null, $container, array(), false, $tabindex, 'user');
 	echo "</form>\n";
 	echo '</div>';
-	include '../../lib/adminFooter.inc';
+	include __DIR__ . '/../../lib/adminFooter.inc';
 }