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:52:56 +01:00
parent 4e7c972187
commit efdaa29136
18 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lam/lib/account.inc
View File

@ -110,7 +110,7 @@ function smbflag($input) {
*/ */
function lmPassword($password) { function lmPassword($password) {
// Needed to calculate Samba passwords // Needed to calculate Samba passwords
include_once("createntlm.inc"); include_once(__DIR__ . "/createntlm.inc");
// get hash // get hash
$hash = new smbHash(); $hash = new smbHash();
return $hash->lmhash($password); return $hash->lmhash($password);
@ -124,7 +124,7 @@ function lmPassword($password) {
*/ */
function ntPassword($password) { function ntPassword($password) {
// Needed to calculate Samba passwords // Needed to calculate Samba passwords
include_once("createntlm.inc"); include_once(__DIR__ . "/createntlm.inc");
// get hash // get hash
$hash = new smbHash(); $hash = new smbHash();
return $hash->nthash($password); return $hash->nthash($password);

4
lam/lib/checkEnvironment.inc
View File

@ -30,10 +30,10 @@
*/ */
/** status messages */ /** status messages */
include_once("../lib/status.inc"); include_once(__DIR__ . "/../lib/status.inc");
/** config */ /** config */
include_once("../lib/config.inc"); include_once(__DIR__ . "/../lib/config.inc");
// check if PHP >= 5.6.0 // check if PHP >= 5.6.0
if (version_compare(phpversion(), '5.6.0') < 0) { if (version_compare(phpversion(), '5.6.0') < 0) {

2
lam/lib/lamtcpdf.inc
View File

@ -27,7 +27,7 @@ namespace LAM\PDF;
*/ */
/** PDF generator class */ /** PDF generator class */
include_once("3rdParty/tcpdf/tcpdf.php"); include_once(__DIR__ . "/3rdParty/tcpdf/tcpdf.php");
class LAMTCPDF extends \TCPDF { class LAMTCPDF extends \TCPDF {

2
lam/lib/ldap.inc
View File

@ -29,7 +29,7 @@ $Id$
*/ */
/** Access to configuration data */ /** Access to configuration data */
include_once("config.inc"); include_once(__DIR__ . "/config.inc");
/** /**
* Ldap manages connection to LDAP and includes several helper functions. * Ldap manages connection to LDAP and includes several helper functions.

6
lam/lib/lists.inc
View File

@ -31,11 +31,11 @@ use LAM\TYPES\ConfiguredType;
*/ */
/** Used to get type information. */ /** Used to get type information. */
include_once("types.inc"); include_once(__DIR__ . "/types.inc");
/** Used to get PDF information. */ /** Used to get PDF information. */
include_once("pdfstruct.inc"); include_once(__DIR__ . "/pdfstruct.inc");
/** Used to create PDF files. */ /** Used to create PDF files. */
include_once("pdf.inc"); include_once(__DIR__ . "/pdf.inc");
/** /**

16
lam/lib/modules.inc
View File

@ -33,23 +33,23 @@ use \LAM\TYPES\TypeManager;
*/ */
/** self service functions */ /** self service functions */
include_once("selfService.inc"); include_once(__DIR__ . "/selfService.inc");
if (isLAMProVersion()) { if (isLAMProVersion()) {
/** job interface */ /** job interface */
include_once("jobs.inc"); include_once(__DIR__ . "/jobs.inc");
} }
/** some helper functions */ /** some helper functions */
include_once("account.inc"); include_once(__DIR__ . "/account.inc");
/** parent class of account modules */ /** parent class of account modules */
include_once("baseModule.inc"); include_once(__DIR__ . "/baseModule.inc");
/** access to LDAP server */ /** access to LDAP server */
include_once("ldap.inc"); include_once(__DIR__ . "/ldap.inc");
/** remote functions */ /** remote functions */
include_once("remote.inc"); include_once(__DIR__ . "/remote.inc");
/** security functions */ /** security functions */
include_once("security.inc"); include_once(__DIR__ . "/security.inc");
/** meta HTML classes */ /** meta HTML classes */
include_once("html.inc"); include_once(__DIR__ . "/html.inc");
/** /**
* This includes all module files. * This includes all module files.

2
lam/lib/modules/nisNetGroupHost.inc
View File

@ -31,7 +31,7 @@ use \LAM\PDF\PDFTableRow;
*/ */
/** include parent class */ /** include parent class */
include_once("nisNetGroupUser.inc"); include_once(__DIR__ . "/nisNetGroupUser.inc");
/** /**
* Manages memberships in NIS net groups. * Manages memberships in NIS net groups.

8
lam/lib/modules/pykotaGroupStructural.inc
View File

@ -29,7 +29,7 @@ $Id$
*/ */
/** include parent class */ /** include parent class */
include_once("pykotaGroup.inc"); include_once(__DIR__ . "/pykotaGroup.inc");
/** /**
* Manages PyKota group accounts. * Manages PyKota group accounts.
@ -37,11 +37,11 @@ include_once("pykotaGroup.inc");
* @package modules * @package modules
*/ */
class pykotaGroupStructural extends pykotaGroup { class pykotaGroupStructural extends pykotaGroup {
/** /**
* Returns if this module also manages the structural object class pykotaObject. * Returns if this module also manages the structural object class pykotaObject.
* This is overridden by a submodule that must provide the structural object class. * This is overridden by a submodule that must provide the structural object class.
* *
* @return boolean structural usage * @return boolean structural usage
*/ */
public function isStructural() { public function isStructural() {
@ -52,7 +52,7 @@ class pykotaGroupStructural extends pykotaGroup {
* Returns meta data that is interpreted by parent class * Returns meta data that is interpreted by parent class
* *
* @return array array with meta data * @return array array with meta data
* *
* @see baseModule::get_metaData() * @see baseModule::get_metaData()
*/ */
function get_metaData() { function get_metaData() {

8
lam/lib/modules/pykotaUserStructural.inc
View File

@ -29,7 +29,7 @@ $Id$
*/ */
/** include parent class */ /** include parent class */
include_once("pykotaUser.inc"); include_once(__DIR__ . "/pykotaUser.inc");
/** /**
* Manages PyKota user accounts. * Manages PyKota user accounts.
@ -37,11 +37,11 @@ include_once("pykotaUser.inc");
* @package modules * @package modules
*/ */
class pykotaUserStructural extends pykotaUser { class pykotaUserStructural extends pykotaUser {
/** /**
* Returns if this module also manages the structural object class pykotaObject. * Returns if this module also manages the structural object class pykotaObject.
* This is overridden by a submodule that must provide the structural object class. * This is overridden by a submodule that must provide the structural object class.
* *
* @return boolean structural usage * @return boolean structural usage
*/ */
public function isStructural() { public function isStructural() {
@ -52,7 +52,7 @@ class pykotaUserStructural extends pykotaUser {
* Returns meta data that is interpreted by parent class * Returns meta data that is interpreted by parent class
* *
* @return array array with meta data * @return array array with meta data
* *
* @see baseModule::get_metaData() * @see baseModule::get_metaData()
*/ */
function get_metaData() { function get_metaData() {

2
lam/lib/modules/windowsPosixGroup.inc
View File

@ -28,7 +28,7 @@ $Id$
*/ */
/** include parent class */ /** include parent class */
include_once("posixGroup.inc"); include_once(__DIR__ . "/posixGroup.inc");
/** /**
* Manages Unix groups in Windows LDAP schema. * Manages Unix groups in Windows LDAP schema.

2
lam/lib/pdf.inc
View File

@ -95,7 +95,7 @@ function createModulePDF($accounts, $pdf_structure="default", $font, $returnAsSt
*/ */
function createPdf($structure, $accounts, $pdfKeys, $account_type, $font, $returnAsString) { function createPdf($structure, $accounts, $pdfKeys, $account_type, $font, $returnAsString) {
/** PDF generator class */ /** PDF generator class */
include_once("lamtcpdf.inc"); include_once(__DIR__ . "/lamtcpdf.inc");
$pdf = new LAMTCPDF($structure, $font); $pdf = new LAMTCPDF($structure, $font);
// Loop over each account and add a new page in the PDF file for it // Loop over each account and add a new page in the PDF file for it

4
lam/lib/pdfstruct.inc
View File

@ -32,10 +32,10 @@ use \LAM\ImageUtils\ImageManipulationFactory;
*/ */
/** LAM configuration */ /** LAM configuration */
include_once("config.inc"); include_once(__DIR__ . "/config.inc");
/** LDAP object */ /** LDAP object */
include_once("ldap.inc"); include_once(__DIR__ . "/ldap.inc");
/** /**
* This function will return all available PDF structure definitions for the submitted * This function will return all available PDF structure definitions for the submitted

6
lam/lib/types.inc
View File

@ -29,11 +29,11 @@ namespace LAM\TYPES;
*/ */
/** parent class of account types */ /** parent class of account types */
include_once("baseType.inc"); include_once(__DIR__ . "/baseType.inc");
/** parent class of list views */ /** parent class of list views */
include_once("lists.inc"); include_once(__DIR__ . "/lists.inc");
/** Used to check if this is a LAM Pro release. */ /** Used to check if this is a LAM Pro release. */
include_once("selfService.inc"); include_once(__DIR__ . "/selfService.inc");
/** /**

10
lam/templates/config/confmain.php
View File

@ -51,15 +51,15 @@ use \htmlGroup;
/** Access to config functions */ /** Access to config functions */
include_once("../../lib/config.inc"); include_once(__DIR__ . "/../../lib/config.inc");
/** access to module settings */ /** access to module settings */
include_once("../../lib/modules.inc"); include_once(__DIR__ . "/../../lib/modules.inc");
/** access to tools */ /** access to tools */
include_once("../../lib/tools.inc"); include_once(__DIR__ . "/../../lib/tools.inc");
/** 2-factor */ /** 2-factor */
include_once '../../lib/2factor.inc'; include_once __DIR__ . '/../../lib/2factor.inc';
/** common functions */ /** common functions */
include_once '../../lib/configPages.inc'; include_once __DIR__ . '/../../lib/configPages.inc';
// start session // start session
if (strtolower(session_module_name()) == 'files') { if (strtolower(session_module_name()) == 'files') {

4
lam/templates/config/confsave.php
View File

@ -34,10 +34,10 @@ $Id$
/** Access to config functions */ /** Access to config functions */
include_once("../../lib/config.inc"); include_once(__DIR__ . "/../../lib/config.inc");
/** access to module settings */ /** access to module settings */
include_once("../../lib/modules.inc"); include_once(__DIR__ . "/../../lib/modules.inc");
// start session // start session
if (strtolower(session_module_name()) == 'files') { if (strtolower(session_module_name()) == 'files') {

2
lam/templates/config/index.php
View File

@ -107,7 +107,7 @@ printHeaderContents(_("Configuration overview"), '../..');
<?php <?php
if (isLAMProVersion()) { if (isLAMProVersion()) {
include_once("../../lib/env.inc"); include_once(__DIR__ . "/../../lib/env.inc");
$printer = new \LAM\ENV\LAMLicenseInfoPrinter(); $printer = new \LAM\ENV\LAMLicenseInfoPrinter();
$printer->printLicenseInfo(); $printer->printLicenseInfo();
echo "<br><br>"; echo "<br><br>";

2
lam/templates/config/mainlogin.php
View File

@ -34,7 +34,7 @@ include_once('../../lib/config.inc');
/** Used to print status messages */ /** Used to print status messages */
include_once('../../lib/status.inc'); include_once('../../lib/status.inc');
if (isLAMProVersion()) { if (isLAMProVersion()) {
include_once("../../lib/env.inc"); include_once(__DIR__ . "/../../lib/env.inc");
} }
// start session // start session

2
lam/templates/lib/141_jquery-validationEngine-lang.php
View File

@ -22,7 +22,7 @@
*/ */
/** access to configuration options */ /** 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 // set session save path
if (strtolower(session_module_name()) == 'files') { if (strtolower(session_module_name()) == 'files') {