diff options
Diffstat (limited to 'apps/user_ldap/lib')
| -rw-r--r-- | apps/user_ldap/lib/Access.php | 3 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Configuration.php | 5 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Connection.php | 4 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Jobs/UpdateGroups.php | 1 | ||||
| -rw-r--r-- | apps/user_ldap/lib/LDAP.php | 1 | ||||
| -rw-r--r-- | apps/user_ldap/lib/User_LDAP.php | 5 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Wizard.php | 1 |
7 files changed, 8 insertions, 12 deletions
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index 299ad581644..12d71b1528a 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -869,7 +869,7 @@ class Access extends LDAPUtility implements IUserTools { //browsing through prior pages to get the cookie for the new one if($skipHandling) { - return; + return false; } // if count is bigger, then the server does not support // paged search. Instead, he did a normal search. We set a @@ -983,7 +983,6 @@ class Access extends LDAPUtility implements IUserTools { $findings = array(); $savedoffset = $offset; do { - $continue = false; $search = $this->executeSearch($filter, $base, $attr, $limit, $offset); if($search === false) { return array(); diff --git a/apps/user_ldap/lib/Configuration.php b/apps/user_ldap/lib/Configuration.php index 2fa42efda26..54dfe6779ba 100644 --- a/apps/user_ldap/lib/Configuration.php +++ b/apps/user_ldap/lib/Configuration.php @@ -106,12 +106,13 @@ class Configuration { /** * @param string $name - * @return mixed|void + * @return mixed|null */ public function __get($name) { if(isset($this->config[$name])) { return $this->config[$name]; } + return null; } /** @@ -182,7 +183,7 @@ class Configuration { $applied[] = $inputKey; } } - + return null; } public function readConfiguration() { diff --git a/apps/user_ldap/lib/Connection.php b/apps/user_ldap/lib/Connection.php index 7fb26526195..07a595f0529 100644 --- a/apps/user_ldap/lib/Connection.php +++ b/apps/user_ldap/lib/Connection.php @@ -558,12 +558,13 @@ class Connection extends LDAPUtility { } return $bindStatus; } + return null; } /** * @param string $host * @param string $port - * @return false|void + * @return bool * @throws \OC\ServerNotAvailableException */ private function doConnect($host, $port) { @@ -580,6 +581,7 @@ class Connection extends LDAPUtility { } else { throw new \OC\ServerNotAvailableException('Could not set required LDAP Protocol version.'); } + return true; } /** diff --git a/apps/user_ldap/lib/Jobs/UpdateGroups.php b/apps/user_ldap/lib/Jobs/UpdateGroups.php index 047b95a6d9b..3b951d20c43 100644 --- a/apps/user_ldap/lib/Jobs/UpdateGroups.php +++ b/apps/user_ldap/lib/Jobs/UpdateGroups.php @@ -44,7 +44,6 @@ class UpdateGroups extends \OC\BackgroundJob\TimedJob { static private $groupsFromDB; static private $groupBE; - static private $connector; public function __construct(){ $this->interval = self::getRefreshInterval(); diff --git a/apps/user_ldap/lib/LDAP.php b/apps/user_ldap/lib/LDAP.php index 5376d92a742..74d83e4ab4f 100644 --- a/apps/user_ldap/lib/LDAP.php +++ b/apps/user_ldap/lib/LDAP.php @@ -259,6 +259,7 @@ class LDAP implements ILDAPWrapper { } return $result; } + return null; } /** diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php index ce1aafc210e..13e61c63c08 100644 --- a/apps/user_ldap/lib/User_LDAP.php +++ b/apps/user_ldap/lib/User_LDAP.php @@ -189,11 +189,6 @@ class User_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn $this->access->connection->ldapUserDisplayName . '=*', $this->access->getFilterPartForUserSearch($search) )); - $attrs = array($this->access->connection->ldapUserDisplayName, 'dn'); - $additionalAttribute = $this->access->connection->ldapUserDisplayName2; - if(!empty($additionalAttribute)) { - $attrs[] = $additionalAttribute; - } \OCP\Util::writeLog('user_ldap', 'getUsers: Options: search '.$search.' limit '.$limit.' offset '.$offset.' Filter: '.$filter, diff --git a/apps/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php index 573d30f0005..852c806b104 100644 --- a/apps/user_ldap/lib/Wizard.php +++ b/apps/user_ldap/lib/Wizard.php @@ -943,7 +943,6 @@ class Wizard extends LDAPUtility { $cns = $this->configuration->ldapGroupFilterGroups; if(is_array($cns) && count($cns) > 0) { $filter .= '(|'; - $base = $this->configuration->ldapBase[0]; foreach($cns as $cn) { $filter .= '(cn=' . $cn . ')'; } |