WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactoring

This commit is contained in:
Roland Gruber 2018-12-23 17:21:50 +01:00
parent de2b6e1631
commit 77282fed29
5 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lam/templates/help.php
View File

@ -33,13 +33,13 @@ namespace LAM\HELP;
*/ */
/** LDAP connection */ /** LDAP connection */
include_once("../lib/ldap.inc"); include_once(__DIR__ . "/../lib/ldap.inc");
/** configuration */ /** configuration */
include_once("../lib/config.inc"); include_once(__DIR__ . "/../lib/config.inc");
/** self service functions */ /** self service functions */
include_once("../lib/selfService.inc"); include_once(__DIR__ . "/../lib/selfService.inc");
if (!empty($_GET['selfService']) && ($_GET['selfService'] === '1')) { if (!empty($_GET['selfService']) && ($_GET['selfService'] === '1')) {
session_name('SELFSERVICE'); session_name('SELFSERVICE');
} }
@ -50,12 +50,12 @@ if (strtolower(session_module_name()) == 'files') {
lam_start_session(); lam_start_session();
/** status messages */ /** status messages */
include_once("../lib/status.inc"); include_once(__DIR__ . "/../lib/status.inc");
setlanguage(); setlanguage();
/** help data */ /** help data */
include_once("../help/help.inc"); // Include help/help.inc which provides $helpArray where the help pages are stored include_once(__DIR__ . "/../help/help.inc"); // Include help/help.inc which provides $helpArray where the help pages are stored
/** /**
@ -115,7 +115,7 @@ $helpEntry = array();
// module help // module help
if(isset($_GET['module']) && !($_GET['module'] == 'main') && !($_GET['module'] == '')) { if(isset($_GET['module']) && !($_GET['module'] == 'main') && !($_GET['module'] == '')) {
include_once("../lib/modules.inc"); include_once(__DIR__ . "/../lib/modules.inc");
if (isset($_GET['scope'])) { if (isset($_GET['scope'])) {
$helpEntry = getHelp($_GET['module'],$_GET['HelpNumber'],$_GET['scope']); $helpEntry = getHelp($_GET['module'],$_GET['HelpNumber'],$_GET['scope']);
} }

12
lam/templates/initsuff.php
View File

@ -28,13 +28,13 @@
*/ */
/** security functions */ /** security functions */
include_once("../lib/security.inc"); include_once(__DIR__ . "/../lib/security.inc");
/** access to configuration settings */ /** access to configuration settings */
include_once("../lib/config.inc"); include_once(__DIR__ . "/../lib/config.inc");
/** LDAP access */ /** LDAP access */
include_once("../lib/ldap.inc"); include_once(__DIR__ . "/../lib/ldap.inc");
/** status messages */ /** status messages */
include_once("../lib/status.inc"); include_once(__DIR__ . "/../lib/status.inc");
// start session // start session
startSecureSession(); startSecureSession();
@ -182,7 +182,7 @@ $newSuffixes = str_replace("\\", "", $newSuffixes);
$newSuffixes = str_replace("'", "", $newSuffixes); $newSuffixes = str_replace("'", "", $newSuffixes);
$newSuffixes = explode(";", $newSuffixes); $newSuffixes = explode(";", $newSuffixes);
include '../lib/adminHeader.inc'; include __DIR__ . '/../lib/adminHeader.inc';
echo '<div class="user-bright smallPaddingContent">'; echo '<div class="user-bright smallPaddingContent">';
echo "<form action=\"initsuff.php\" method=\"post\">\n"; echo "<form action=\"initsuff.php\" method=\"post\">\n";
$container = new htmlResponsiveRow(); $container = new htmlResponsiveRow();
@ -207,5 +207,5 @@ include '../lib/adminHeader.inc';
echo "</form><br>\n"; echo "</form><br>\n";
echo "</div>\n"; echo "</div>\n";
include '../lib/adminFooter.inc'; include __DIR__ . '/../lib/adminFooter.inc';
?> ?>

16
lam/templates/login.php
View File

@ -45,26 +45,26 @@ use \htmlDiv;
*/ */
/** status messages */ /** status messages */
include_once("../lib/status.inc"); include_once(__DIR__ . "/../lib/status.inc");
/** check environment */ /** check environment */
include '../lib/checkEnvironment.inc'; include __DIR__ . '/../lib/checkEnvironment.inc';
/** security functions */ /** security functions */
include_once("../lib/security.inc"); include_once(__DIR__ . "/../lib/security.inc");
/** self service functions */ /** self service functions */
include_once("../lib/selfService.inc"); include_once(__DIR__ . "/../lib/selfService.inc");
/** access to configuration options */ /** access to configuration options */
include_once("../lib/config.inc"); include_once(__DIR__ . "/../lib/config.inc");
$licenseValidator = null; $licenseValidator = null;
if (isLAMProVersion()) { if (isLAMProVersion()) {
include_once("../lib/env.inc"); include_once(__DIR__ . "/../lib/env.inc");
$licenseValidator = new \LAM\ENV\LAMLicenseValidator(); $licenseValidator = new \LAM\ENV\LAMLicenseValidator();
$licenseValidator->validateAndRedirect('config/mainlogin.php?invalidLicense=1', 'config/mainlogin.php?invalidLicense=2'); $licenseValidator->validateAndRedirect('config/mainlogin.php?invalidLicense=1', 'config/mainlogin.php?invalidLicense=2');
} }
/** Upgrade functions */ /** Upgrade functions */
include_once("../lib/upgrade.inc"); include_once(__DIR__ . "/../lib/upgrade.inc");
// set session save path // set session save path
if (strtolower(session_module_name()) == 'files') { if (strtolower(session_module_name()) == 'files') {
@ -465,7 +465,7 @@ function display_LoginPage($licenseValidator, $error_message) {
// checking if the submitted username/password is correct. // checking if the submitted username/password is correct.
if(isset($_POST['checklogin'])) { if(isset($_POST['checklogin'])) {
include_once("../lib/ldap.inc"); // Include ldap.php which provides Ldap class include_once(__DIR__ . "/../lib/ldap.inc"); // Include ldap.php which provides Ldap class
$_SESSION['ldap'] = new Ldap($_SESSION['config']); // Create new Ldap object $_SESSION['ldap'] = new Ldap($_SESSION['config']); // Create new Ldap object

8
lam/templates/logout.php
View File

@ -3,7 +3,7 @@
$Id$ $Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2003 - 2017 Roland Gruber Copyright (C) 2003 - 2018 Roland Gruber
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -36,11 +36,11 @@ if (function_exists('openssl_random_pseudo_bytes')) {
} }
/** security functions */ /** security functions */
include_once("../lib/security.inc"); include_once(__DIR__ . "/../lib/security.inc");
/** Used to display status messages */ /** Used to display status messages */
include_once("../lib/status.inc"); include_once(__DIR__ . "/../lib/status.inc");
/** LDAP settings are deleted at logout */ /** LDAP settings are deleted at logout */
include_once("../lib/ldap.inc"); include_once(__DIR__ . "/../lib/ldap.inc");
// start session // start session
startSecureSession(); startSecureSession();

6
lam/templates/tools.php
View File

@ -34,11 +34,11 @@ $Id$
*/ */
/** security functions */ /** security functions */
include_once("../lib/security.inc"); include_once(__DIR__ . "/../lib/security.inc");
/** access to configuration options */ /** access to configuration options */
include_once("../lib/config.inc"); include_once(__DIR__ . "/../lib/config.inc");
/** tool definitions */ /** tool definitions */
include_once("../lib/tools.inc"); include_once(__DIR__ . "/../lib/tools.inc");
// start session // start session
startSecureSession(); startSecureSession();