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
416f8b18
Commit
416f8b18
authored
10 years ago
by
Lukas Reschke
Browse files
Options
Downloads
Patches
Plain Diff
Use @return instead of @returns
parent
cd3ed014
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
apps/user_ldap/lib/access.php
+4
-4
4 additions, 4 deletions
apps/user_ldap/lib/access.php
apps/user_ldap/lib/connection.php
+1
-1
1 addition, 1 deletion
apps/user_ldap/lib/connection.php
apps/user_ldap/lib/wizard.php
+4
-4
4 additions, 4 deletions
apps/user_ldap/lib/wizard.php
with
9 additions
and
9 deletions
apps/user_ldap/lib/access.php
+
4
−
4
View file @
416f8b18
...
...
@@ -765,7 +765,7 @@ class Access extends LDAPUtility {
* @param bool $pagedSearchOK whether a paged search has been executed
* @param bool $skipHandling required for paged search when cookies to
* prior results need to be gained
* @return
s
array|false array with the search result as first value and pagedSearchOK as
* @return array|false array with the search result as first value and pagedSearchOK as
* second | false if not successful
*/
private
function
processPagedSearchStatus
(
$sr
,
$filter
,
$base
,
$iFoundItems
,
$limit
,
$offset
,
$pagedSearchOK
,
$skipHandling
)
{
...
...
@@ -805,7 +805,7 @@ class Access extends LDAPUtility {
* @param int $offset optional, a starting point
* @param bool $skipHandling indicates whether the pages search operation is
* completed
* @return
s
int|false Integer or false if the search could not be initialized
* @return int|false Integer or false if the search could not be initialized
*
*/
private
function
count
(
$filter
,
$base
,
$attr
=
null
,
$limit
=
null
,
$offset
=
null
,
$skipHandling
=
false
)
{
...
...
@@ -1111,7 +1111,7 @@ class Access extends LDAPUtility {
* @param string $dn a known DN used to check against
* @param bool $isUser
* @param bool $force the detection should be run, even if it is not set to auto
* @return
s
true on success, false otherwise
* @return
bool
true on success, false otherwise
*/
private
function
detectUuidAttribute
(
$dn
,
$isUser
=
true
,
$force
=
false
)
{
if
(
$isUser
)
{
...
...
@@ -1245,7 +1245,7 @@ class Access extends LDAPUtility {
* @param string $filter the search filter to identify the correct search
* @param int $limit the limit (or 'pageSize'), to identify the correct search well
* @param int $offset the offset for the new search to identify the correct search really good
* @return
s
string containing the key or empty if none is cached
* @return string containing the key or empty if none is cached
*/
private
function
getPagedResultCookie
(
$base
,
$filter
,
$limit
,
$offset
)
{
if
(
$offset
===
0
)
{
...
...
This diff is collapsed.
Click to expand it.
apps/user_ldap/lib/connection.php
+
1
−
1
View file @
416f8b18
...
...
@@ -434,7 +434,7 @@ class Connection extends LDAPUtility {
/**
* @brief Validates the user specified configuration
* @return
s
true if configuration seems OK, false otherwise
* @return true if configuration seems OK, false otherwise
*/
private
function
validateConfiguration
()
{
...
...
This diff is collapsed.
Click to expand it.
apps/user_ldap/lib/wizard.php
+
4
−
4
View file @
416f8b18
...
...
@@ -236,7 +236,7 @@ class Wizard extends LDAPUtility {
/**
* @brief detects the available LDAP groups
* @return
s
WizardResult the instance's WizardResult instance
* @return WizardResult the instance's WizardResult instance
*/
public
function
determineGroupsForGroups
()
{
return
$this
->
determineGroups
(
'ldap_groupfilter_groups'
,
...
...
@@ -246,7 +246,7 @@ class Wizard extends LDAPUtility {
/**
* @brief detects the available LDAP groups
* @return
s
WizardResult the instance's WizardResult instance
* @return WizardResult the instance's WizardResult instance
*/
public
function
determineGroupsForUsers
()
{
return
$this
->
determineGroups
(
'ldap_userfilter_groups'
,
...
...
@@ -441,7 +441,7 @@ class Wizard extends LDAPUtility {
/**
* Tries to determine the port, requires given Host, User DN and Password
* @return
s
WizardResult|false WizardResult on success, false otherwise
* @return WizardResult|false WizardResult on success, false otherwise
* @throws \Exception
*/
public
function
guessPortAndTLS
()
{
...
...
@@ -480,7 +480,7 @@ class Wizard extends LDAPUtility {
/**
* @brief tries to determine a base dn from User DN or LDAP Host
* @return
s
mixed WizardResult on success, false otherwise
* @return mixed WizardResult on success, false otherwise
*/
public
function
guessBaseDN
()
{
if
(
!
$this
->
checkRequirements
(
array
(
'ldapHost'
,
...
...
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