diff --git a/lam/lib/account.inc b/lam/lib/account.inc index b8fde23a..f5800221 100644 --- a/lam/lib/account.inc +++ b/lam/lib/account.inc @@ -110,7 +110,7 @@ function smbflag($input) { */ function lmPassword($password) { // Needed to calculate Samba passwords - include_once("createntlm.inc"); + include_once(__DIR__ . "/createntlm.inc"); // get hash $hash = new smbHash(); return $hash->lmhash($password); @@ -124,7 +124,7 @@ function lmPassword($password) { */ function ntPassword($password) { // Needed to calculate Samba passwords - include_once("createntlm.inc"); + include_once(__DIR__ . "/createntlm.inc"); // get hash $hash = new smbHash(); return $hash->nthash($password); diff --git a/lam/lib/checkEnvironment.inc b/lam/lib/checkEnvironment.inc index d231d883..3a50358e 100644 --- a/lam/lib/checkEnvironment.inc +++ b/lam/lib/checkEnvironment.inc @@ -30,10 +30,10 @@ */ /** status messages */ -include_once("../lib/status.inc"); +include_once(__DIR__ . "/../lib/status.inc"); /** config */ -include_once("../lib/config.inc"); +include_once(__DIR__ . "/../lib/config.inc"); // check if PHP >= 5.6.0 if (version_compare(phpversion(), '5.6.0') < 0) { diff --git a/lam/lib/lamtcpdf.inc b/lam/lib/lamtcpdf.inc index 6236f2df..c806edc0 100644 --- a/lam/lib/lamtcpdf.inc +++ b/lam/lib/lamtcpdf.inc @@ -27,7 +27,7 @@ namespace LAM\PDF; */ /** PDF generator class */ -include_once("3rdParty/tcpdf/tcpdf.php"); +include_once(__DIR__ . "/3rdParty/tcpdf/tcpdf.php"); class LAMTCPDF extends \TCPDF { diff --git a/lam/lib/ldap.inc b/lam/lib/ldap.inc index 4901976d..9be9804f 100644 --- a/lam/lib/ldap.inc +++ b/lam/lib/ldap.inc @@ -29,7 +29,7 @@ $Id$ */ /** Access to configuration data */ -include_once("config.inc"); +include_once(__DIR__ . "/config.inc"); /** * Ldap manages connection to LDAP and includes several helper functions. diff --git a/lam/lib/lists.inc b/lam/lib/lists.inc index 03d5ca61..5161f535 100644 --- a/lam/lib/lists.inc +++ b/lam/lib/lists.inc @@ -31,11 +31,11 @@ use LAM\TYPES\ConfiguredType; */ /** Used to get type information. */ -include_once("types.inc"); +include_once(__DIR__ . "/types.inc"); /** Used to get PDF information. */ -include_once("pdfstruct.inc"); +include_once(__DIR__ . "/pdfstruct.inc"); /** Used to create PDF files. */ -include_once("pdf.inc"); +include_once(__DIR__ . "/pdf.inc"); /** diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc index 29545f4a..a9c51ddc 100644 --- a/lam/lib/modules.inc +++ b/lam/lib/modules.inc @@ -33,23 +33,23 @@ use \LAM\TYPES\TypeManager; */ /** self service functions */ -include_once("selfService.inc"); +include_once(__DIR__ . "/selfService.inc"); if (isLAMProVersion()) { /** job interface */ - include_once("jobs.inc"); + include_once(__DIR__ . "/jobs.inc"); } /** some helper functions */ -include_once("account.inc"); +include_once(__DIR__ . "/account.inc"); /** parent class of account modules */ -include_once("baseModule.inc"); +include_once(__DIR__ . "/baseModule.inc"); /** access to LDAP server */ -include_once("ldap.inc"); +include_once(__DIR__ . "/ldap.inc"); /** remote functions */ -include_once("remote.inc"); +include_once(__DIR__ . "/remote.inc"); /** security functions */ -include_once("security.inc"); +include_once(__DIR__ . "/security.inc"); /** meta HTML classes */ -include_once("html.inc"); +include_once(__DIR__ . "/html.inc"); /** * This includes all module files. diff --git a/lam/lib/modules/nisNetGroupHost.inc b/lam/lib/modules/nisNetGroupHost.inc index acbdf62b..95b68781 100644 --- a/lam/lib/modules/nisNetGroupHost.inc +++ b/lam/lib/modules/nisNetGroupHost.inc @@ -31,7 +31,7 @@ use \LAM\PDF\PDFTableRow; */ /** include parent class */ -include_once("nisNetGroupUser.inc"); +include_once(__DIR__ . "/nisNetGroupUser.inc"); /** * Manages memberships in NIS net groups. diff --git a/lam/lib/modules/pykotaGroupStructural.inc b/lam/lib/modules/pykotaGroupStructural.inc index 02f8d1b9..85b3f3ce 100644 --- a/lam/lib/modules/pykotaGroupStructural.inc +++ b/lam/lib/modules/pykotaGroupStructural.inc @@ -29,7 +29,7 @@ $Id$ */ /** include parent class */ -include_once("pykotaGroup.inc"); +include_once(__DIR__ . "/pykotaGroup.inc"); /** * Manages PyKota group accounts. @@ -37,11 +37,11 @@ include_once("pykotaGroup.inc"); * @package modules */ class pykotaGroupStructural extends pykotaGroup { - + /** * Returns if this module also manages the structural object class pykotaObject. * This is overridden by a submodule that must provide the structural object class. - * + * * @return boolean structural usage */ public function isStructural() { @@ -52,7 +52,7 @@ class pykotaGroupStructural extends pykotaGroup { * Returns meta data that is interpreted by parent class * * @return array array with meta data - * + * * @see baseModule::get_metaData() */ function get_metaData() { diff --git a/lam/lib/modules/pykotaUserStructural.inc b/lam/lib/modules/pykotaUserStructural.inc index 17c9e7a4..5a62c2d9 100644 --- a/lam/lib/modules/pykotaUserStructural.inc +++ b/lam/lib/modules/pykotaUserStructural.inc @@ -29,7 +29,7 @@ $Id$ */ /** include parent class */ -include_once("pykotaUser.inc"); +include_once(__DIR__ . "/pykotaUser.inc"); /** * Manages PyKota user accounts. @@ -37,11 +37,11 @@ include_once("pykotaUser.inc"); * @package modules */ class pykotaUserStructural extends pykotaUser { - + /** * Returns if this module also manages the structural object class pykotaObject. * This is overridden by a submodule that must provide the structural object class. - * + * * @return boolean structural usage */ public function isStructural() { @@ -52,7 +52,7 @@ class pykotaUserStructural extends pykotaUser { * Returns meta data that is interpreted by parent class * * @return array array with meta data - * + * * @see baseModule::get_metaData() */ function get_metaData() { diff --git a/lam/lib/modules/windowsPosixGroup.inc b/lam/lib/modules/windowsPosixGroup.inc index c58fb7ee..1e99b334 100644 --- a/lam/lib/modules/windowsPosixGroup.inc +++ b/lam/lib/modules/windowsPosixGroup.inc @@ -28,7 +28,7 @@ $Id$ */ /** include parent class */ -include_once("posixGroup.inc"); +include_once(__DIR__ . "/posixGroup.inc"); /** * Manages Unix groups in Windows LDAP schema. diff --git a/lam/lib/pdf.inc b/lam/lib/pdf.inc index 9d0bdbe0..86feac5a 100644 --- a/lam/lib/pdf.inc +++ b/lam/lib/pdf.inc @@ -95,7 +95,7 @@ function createModulePDF($accounts, $pdf_structure="default", $font, $returnAsSt */ function createPdf($structure, $accounts, $pdfKeys, $account_type, $font, $returnAsString) { /** PDF generator class */ - include_once("lamtcpdf.inc"); + include_once(__DIR__ . "/lamtcpdf.inc"); $pdf = new LAMTCPDF($structure, $font); // Loop over each account and add a new page in the PDF file for it diff --git a/lam/lib/pdfstruct.inc b/lam/lib/pdfstruct.inc index ad92ea58..4bc0a9cc 100644 --- a/lam/lib/pdfstruct.inc +++ b/lam/lib/pdfstruct.inc @@ -32,10 +32,10 @@ use \LAM\ImageUtils\ImageManipulationFactory; */ /** LAM configuration */ -include_once("config.inc"); +include_once(__DIR__ . "/config.inc"); /** LDAP object */ -include_once("ldap.inc"); +include_once(__DIR__ . "/ldap.inc"); /** * This function will return all available PDF structure definitions for the submitted diff --git a/lam/lib/types.inc b/lam/lib/types.inc index fd9bda57..9a4a2263 100644 --- a/lam/lib/types.inc +++ b/lam/lib/types.inc @@ -29,11 +29,11 @@ namespace LAM\TYPES; */ /** parent class of account types */ -include_once("baseType.inc"); +include_once(__DIR__ . "/baseType.inc"); /** parent class of list views */ -include_once("lists.inc"); +include_once(__DIR__ . "/lists.inc"); /** Used to check if this is a LAM Pro release. */ -include_once("selfService.inc"); +include_once(__DIR__ . "/selfService.inc"); /** diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php index fda1a529..3e0e7c8d 100644 --- a/lam/templates/config/confmain.php +++ b/lam/templates/config/confmain.php @@ -51,15 +51,15 @@ use \htmlGroup; /** Access to config functions */ -include_once("../../lib/config.inc"); +include_once(__DIR__ . "/../../lib/config.inc"); /** access to module settings */ -include_once("../../lib/modules.inc"); +include_once(__DIR__ . "/../../lib/modules.inc"); /** access to tools */ -include_once("../../lib/tools.inc"); +include_once(__DIR__ . "/../../lib/tools.inc"); /** 2-factor */ -include_once '../../lib/2factor.inc'; +include_once __DIR__ . '/../../lib/2factor.inc'; /** common functions */ -include_once '../../lib/configPages.inc'; +include_once __DIR__ . '/../../lib/configPages.inc'; // start session if (strtolower(session_module_name()) == 'files') { diff --git a/lam/templates/config/confsave.php b/lam/templates/config/confsave.php index 0a437613..22e56e53 100644 --- a/lam/templates/config/confsave.php +++ b/lam/templates/config/confsave.php @@ -34,10 +34,10 @@ $Id$ /** Access to config functions */ -include_once("../../lib/config.inc"); +include_once(__DIR__ . "/../../lib/config.inc"); /** access to module settings */ -include_once("../../lib/modules.inc"); +include_once(__DIR__ . "/../../lib/modules.inc"); // start session if (strtolower(session_module_name()) == 'files') { diff --git a/lam/templates/config/index.php b/lam/templates/config/index.php index ae649ba3..6e45ce05 100644 --- a/lam/templates/config/index.php +++ b/lam/templates/config/index.php @@ -107,7 +107,7 @@ printHeaderContents(_("Configuration overview"), '../..'); printLicenseInfo(); echo "

"; diff --git a/lam/templates/config/mainlogin.php b/lam/templates/config/mainlogin.php index ea575ccb..55a223be 100644 --- a/lam/templates/config/mainlogin.php +++ b/lam/templates/config/mainlogin.php @@ -34,7 +34,7 @@ include_once('../../lib/config.inc'); /** Used to print status messages */ include_once('../../lib/status.inc'); if (isLAMProVersion()) { - include_once("../../lib/env.inc"); + include_once(__DIR__ . "/../../lib/env.inc"); } // start session diff --git a/lam/templates/lib/141_jquery-validationEngine-lang.php b/lam/templates/lib/141_jquery-validationEngine-lang.php index 29fe6142..80bcfa0f 100644 --- a/lam/templates/lib/141_jquery-validationEngine-lang.php +++ b/lam/templates/lib/141_jquery-validationEngine-lang.php @@ -22,7 +22,7 @@ */ /** access to configuration options */ -include_once("../../lib/config.inc"); // Include config.inc which provides Config class +include_once(__DIR__ . "/../../lib/config.inc"); // Include config.inc which provides Config class // set session save path if (strtolower(session_module_name()) == 'files') {