Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
die_coolen_jungs
our_own_cloud_project
Commits
a2f2ffb8
Commit
a2f2ffb8
authored
9 years ago
by
Arthur Schiwon
Browse files
Options
Downloads
Patches
Plain Diff
if a user that is flag as deleted shows up again, remove that flag. Fixes #20090
parent
6911d8f0
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/user_ldap/lib/access.php
+5
-0
5 additions, 0 deletions
apps/user_ldap/lib/access.php
apps/user_ldap/lib/user/offlineuser.php
+7
-0
7 additions, 0 deletions
apps/user_ldap/lib/user/offlineuser.php
with
12 additions
and
0 deletions
apps/user_ldap/lib/access.php
+
5
−
0
View file @
a2f2ffb8
...
...
@@ -35,6 +35,7 @@
namespace
OCA\user_ldap\lib
;
use
OCA\user_ldap
\lib\user\OfflineUser
;
use
OCA\User_LDAP
\Mapping\AbstractMapping
;
/**
...
...
@@ -696,6 +697,10 @@ class Access extends LDAPUtility implements user\IUserTools {
$ocName
=
$this
->
dn2ocname
(
$userRecord
[
'dn'
][
0
],
$userRecord
[
$displayNameAttribute
]);
$this
->
cacheUserExists
(
$ocName
);
$user
=
$this
->
userManager
->
get
(
$ocName
);
if
(
$user
instanceof
OfflineUser
)
{
$user
->
unmark
();
$user
=
$this
->
userManager
->
get
(
$ocName
);
}
$user
->
processAttributes
(
$userRecord
);
}
}
...
...
This diff is collapsed.
Click to expand it.
apps/user_ldap/lib/user/offlineuser.php
+
7
−
0
View file @
a2f2ffb8
...
...
@@ -85,6 +85,13 @@ class OfflineUser {
$this
->
fetchDetails
();
}
/**
* remove the Delete-flag from the user.
*/
public
function
unmark
()
{
$this
->
config
->
setUserValue
(
$this
->
ocName
,
'user_ldap'
,
'isDeleted'
,
'0'
);
}
/**
* exports the user details in an assoc array
* @return array
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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