Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory
Commits
4766aaad
Commit
4766aaad
authored
7 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(management) Fix code style
parent
3f2ae4ab
dev
6342-update-the-locales-for-1-5
6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen
6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account
6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock
6378-orcid-test-method-is-wrong-and-break-orcid-saving
6388-clear-the-tokens-storage-issues-into-the-fusiondirectory-configuration-backend
core-php8
master
fusiondirectory-1.5
fusiondirectory-1.4
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/management/class_FilterElement.inc
+1
-1
include/management/class_FilterElement.inc
plugins/admin/users/class_userManagement.inc
+0
-43
plugins/admin/users/class_userManagement.inc
with
1 addition
and
44 deletions
+1
-44
include/management/class_FilterElement.inc
+
1
−
1
View file @
4766aaad
...
@@ -108,7 +108,7 @@ class TabFilterElement extends FilterElement
...
@@ -108,7 +108,7 @@ class TabFilterElement extends FilterElement
public
function
getFilters
(
&
$filters
)
public
function
getFilters
(
&
$filters
)
{
{
foreach
(
$this
->
tabs
as
$class
=>
&
$tab
)
{
foreach
(
$this
->
tabs
as
$class
=>
$tab
)
{
if
(
$tab
[
'checked'
])
{
if
(
$tab
[
'checked'
])
{
$filters
[]
=
$tab
[
'filter'
];
$filters
[]
=
$tab
[
'filter'
];
}
}
...
...
This diff is collapsed.
Click to expand it.
plugins/admin/users/class_userManagement.inc
+
0
−
43
View file @
4766aaad
...
@@ -146,49 +146,6 @@ class userManagement extends management
...
@@ -146,49 +146,6 @@ class userManagement extends management
$this
->
actions
[
'lockUsers'
]
->
setSeparator
(
TRUE
);
$this
->
actions
[
'lockUsers'
]
->
setSeparator
(
TRUE
);
}
}
function
configureFilter
()
{
parent
::
configureFilter
();
$classes
=
array
();
if
(
class_available
(
'posixAccount'
))
{
$classes
[]
=
'posixAccount'
;
}
else
{
/* If posix plugin is not installed, ignore posix filter */
$this
->
filter
->
elements
[
'POSIX'
][
'unset'
]
=
''
;
$this
->
filter
->
elements
[
'POSIX'
][
'set'
]
=
''
;
}
if
(
class_available
(
'mailAccount'
))
{
$classes
[]
=
'gosaMailAccount'
;
}
else
{
/* If mail plugin is not installed, ignore mail filter */
$this
->
filter
->
elements
[
'MAIL'
][
'unset'
]
=
''
;
$this
->
filter
->
elements
[
'MAIL'
][
'set'
]
=
''
;
}
if
(
class_available
(
'sambaAccount'
))
{
$classes
[]
=
'sambaSamAccount'
;
}
else
{
/* If samba plugin is not installed, ignore samba filter */
$this
->
filter
->
elements
[
'SAMBA'
][
'unset'
]
=
''
;
$this
->
filter
->
elements
[
'SAMBA'
][
'set'
]
=
''
;
}
if
(
empty
(
$classes
))
{
$this
->
filter
->
elements
[
'FUNCTIONAL'
][
'set'
]
=
'(objectClass=*)'
;
}
else
{
/* The FUNCTIONAL filter must not use inexisting classes */
$this
->
filter
->
elements
[
'FUNCTIONAL'
][
'set'
]
=
'(!(|(objectClass='
.
implode
(
')(objectClass='
,
$classes
)
.
')))'
;
}
}
//~ function renderList ()
//~ {
//~ $smarty = get_smarty();
//~ $smarty->assign('USE_POSIX', class_available('posixAccount'));
//~ $smarty->assign('USE_MAIL', class_available('mailAccount'));
//~ $smarty->assign('USE_SAMBA', class_available('sambaAccount'));
//~ return parent::renderList();
//~ }
/* !\brief Lock/unlock multiple users.
/* !\brief Lock/unlock multiple users.
*/
*/
function
lockUsers
(
array
$action
)
function
lockUsers
(
array
$action
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets