yetangitu/lam
1
0
Fork 0
mirror of https://github.com/LDAPAccountManager/lam.git synced 2025-10-03 09:49:16 +02:00
Code Issues Releases Wiki Activity

refactoring

Browse source
This commit is contained in:
Roland Gruber 2025-07-29 07:56:34 +02:00
parent 6c589065ad
commit e52cfd54b6
13 changed files with 34 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lam/lib/account.inc
View file

@ -966,7 +966,7 @@ function ldapGetDN($dn, $attributes = ['dn'], $handle = null): ?array {
* @param String $dn DN * @param String $dn DN
* @param String $filter LDAP filter * @param String $filter LDAP filter
* @param array $attributes list of attributes to fetch * @param array $attributes list of attributes to fetch
* @param handle $handle LDAP handle (optional for admin interface pages) * @param Connection|null $handle LDAP handle (optional for admin interface pages)
* @param int $limit result limit * @param int $limit result limit
* @return array attributes or null if not found * @return array attributes or null if not found
*/ */

4
lam/lib/modules/imapAccess.inc
View file

@ -306,8 +306,8 @@ class imapAccess extends baseModule {
* Display the mailbox quota. * Display the mailbox quota.
* *
* @param htmlResponsiveRow $container structure that contained information to be displayed * @param htmlResponsiveRow $container structure that contained information to be displayed
* @param Horde_Imap_Client_Socket $client IMAP client * @param Client $client IMAP client
* @param String $username user name to connect to IMAP server * @param String $username username to connect to IMAP server
* @return htmlResponsiveRow table with added information about user quotas or controls to add quota * @return htmlResponsiveRow table with added information about user quotas or controls to add quota
*/ */
function renderQuotasForMailbox($container, $client, $username) { function renderQuotasForMailbox($container, $client, $username) {

10
lam/lib/plugins/extendedInvalidCredentials/ExtraInvalidCredentials.inc
View file

@ -23,6 +23,8 @@ namespace LAM\PLUGINS\EXTRA_INVALID_CREDENTIALS;
*/ */
use LDAP\Connection;
/** /**
* Extra messages for invalid credentials. * Extra messages for invalid credentials.
* *
@ -39,7 +41,7 @@ class ExtraInvalidCredentials {
/** /**
* Tries to get additional information why invalid credentials was returned. E.g. account is locked. * Tries to get additional information why invalid credentials was returned. E.g. account is locked.
* *
* @param LDAP\Connection $ldap LDAP object to connect for getting extra data * @param Connection $ldap LDAP object to connect for getting extra data
* @param string $userDn failed DN * @param string $userDn failed DN
* @return null|string extra message * @return null|string extra message
*/ */
@ -99,7 +101,7 @@ class ExtraInvalidCredentials {
* *
* @param string $userDn user DN * @param string $userDn user DN
* @param array $attributes attribute names * @param array $attributes attribute names
* @param LDAP\Connection $ldap LDAP handle * @param Connection $ldap LDAP handle
* @return array|null attribute values * @return array|null attribute values
*/ */
protected function getLdapData(string $userDn, array $attributes, $ldap) { protected function getLdapData(string $userDn, array $attributes, $ldap) {
@ -116,7 +118,7 @@ class ExtraInvalidCredentials {
* *
* @param ExtraInvalidCredentialsProvider[] $providers providers * @param ExtraInvalidCredentialsProvider[] $providers providers
* @param array $userData LDAP data * @param array $userData LDAP data
* @param LDAP\Connection $ldap LDAP handle * @param Connection $ldap LDAP handle
* @return null|string extra message * @return null|string extra message
*/ */
protected function getMessageFromProviders(array $providers, array $userData, $ldap) { protected function getMessageFromProviders(array $providers, array $userData, $ldap) {
@ -149,7 +151,7 @@ interface ExtraInvalidCredentialsProvider {
* Returns an extra message if any. * Returns an extra message if any.
* *
* @param array $attributes LDAP attributes * @param array $attributes LDAP attributes
* @param LDAP\Connection $ldap LDAP handle * @param Connection $ldap LDAP handle
* @return null|string message * @return null|string message
*/ */
public function getExtraMessage(array $attributes, $ldap); public function getExtraMessage(array $attributes, $ldap);

4
lam/lib/types/asteriskExt.inc
View file

@ -4,7 +4,7 @@
This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam) This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
Copyright (C) 2009 - 2012 Pozdnyak Pavel Copyright (C) 2009 - 2012 Pozdnyak Pavel
2010 - 2024 Roland Gruber 2010 - 2025 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
@ -30,6 +30,8 @@
* @author Roland Gruber * @author Roland Gruber
*/ */
use LAM\TYPES\ConfiguredType;
/** /**
* The account type for Asterisk extensions. * The account type for Asterisk extensions.
* *

1
lam/lib/types/group.inc
View file

@ -1,5 +1,6 @@
<?php <?php
use LAM\TYPES\ConfiguredType;
use \LAM\TYPES\TypeManager; use \LAM\TYPES\TypeManager;
/* /*

4
lam/lib/types/host.inc
View file

@ -2,7 +2,7 @@
/* /*
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) 2005 - 2024 Roland Gruber Copyright (C) 2005 - 2025 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
@ -27,6 +27,8 @@
* @author Roland Gruber * @author Roland Gruber
*/ */
use LAM\TYPES\ConfiguredType;
/** /**
* The account type for host accounts (e.g. Samba). * The account type for host accounts (e.g. Samba).
* *

4
lam/lib/types/kolabSharedFolderType.inc
View file

@ -2,7 +2,7 @@
/* /*
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) 2013 - 2024 Roland Gruber Copyright (C) 2013 - 2025 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
@ -27,6 +27,8 @@
* @author Roland Gruber * @author Roland Gruber
*/ */
use LAM\TYPES\ConfiguredType;
/** /**
* The account type for Kolab shared folders. * The account type for Kolab shared folders.
* *

4
lam/lib/types/mailAlias.inc
View file

@ -2,7 +2,7 @@
/* /*
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) 2005 - 2024 Roland Gruber Copyright (C) 2005 - 2025 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
@ -27,6 +27,8 @@
* @author Roland Gruber * @author Roland Gruber
*/ */
use LAM\TYPES\ConfiguredType;
/** /**
* The account type for mail aliases. * The account type for mail aliases.
* *

4
lam/lib/types/netgroup.inc
View file

@ -2,7 +2,7 @@
/* /*
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) 2009 - 2024 Roland Gruber Copyright (C) 2009 - 2025 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
@ -27,6 +27,8 @@
* @author Roland Gruber * @author Roland Gruber
*/ */
use LAM\TYPES\ConfiguredType;
/** /**
* The account type for NIS netgroups. * The account type for NIS netgroups.
* *

4
lam/lib/types/pykotaBillingCodeType.inc
View file

@ -2,7 +2,7 @@
/* /*
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) 2013 - 2024 Roland Gruber Copyright (C) 2013 - 2025 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
@ -27,6 +27,8 @@
* @author Roland Gruber * @author Roland Gruber
*/ */
use LAM\TYPES\ConfiguredType;
/** /**
* The account type for PyKota billing codes. * The account type for PyKota billing codes.
* *

4
lam/lib/types/pykotaPrinterType.inc
View file

@ -2,7 +2,7 @@
/* /*
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) 2013 - 2024 Roland Gruber Copyright (C) 2013 - 2025 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
@ -27,6 +27,8 @@
* @author Roland Gruber * @author Roland Gruber
*/ */
use LAM\TYPES\ConfiguredType;
/** /**
* The account type for PyKota printers. * The account type for PyKota printers.
* *

4
lam/lib/types/smbDomain.inc
View file

@ -2,7 +2,7 @@
/* /*
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) 2005 - 2024 Roland Gruber Copyright (C) 2005 - 2025 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
@ -27,6 +27,8 @@
* @author Roland Gruber * @author Roland Gruber
*/ */
use LAM\TYPES\ConfiguredType;
/** /**
* The account type for Samba domains. * The account type for Samba domains.
* *

1
phpstan.neon
View file

@ -15,7 +15,6 @@ parameters:
analyseAndScan: analyseAndScan:
- */lists/changePassword.php - */lists/changePassword.php
ignoreErrors: ignoreErrors:
- '#.* has invalid type .*#'
- '#Function [a-zA-Z0-9\\_-]+ not found.#' - '#Function [a-zA-Z0-9\\_-]+ not found.#'
- '#Used function [a-zA-Z0-9\\_-]+ not found.#' - '#Used function [a-zA-Z0-9\\_-]+ not found.#'
- '#Variable \$helpArray might not be defined.#' - '#Variable \$helpArray might not be defined.#'