Skip to content
Snippets Groups Projects
Commit 26ecf206 authored by Andreas Fischer's avatar Andreas Fischer
Browse files

Merge pull request #5656 from owncloud/fix-wizard-typo

Fix typo in LDAP wizard

* owncloud/fix-wizard-typo:
  Excpetion->Exception
parents e89f080f 4e9a23df
No related branches found
No related tags found
No related merge requests found
...@@ -81,7 +81,7 @@ class Wizard extends LDAPUtility { ...@@ -81,7 +81,7 @@ class Wizard extends LDAPUtility {
} }
$cr = $this->getConnection(); $cr = $this->getConnection();
if(!$cr) { if(!$cr) {
throw new \Excpetion('Could not connect to LDAP'); throw new \Exception('Could not connect to LDAP');
} }
$rr = $this->ldap->search($cr, $base, $filter, array('dn')); $rr = $this->ldap->search($cr, $base, $filter, array('dn'));
if(!$this->ldap->isResource($rr)) { if(!$this->ldap->isResource($rr)) {
...@@ -108,7 +108,7 @@ class Wizard extends LDAPUtility { ...@@ -108,7 +108,7 @@ class Wizard extends LDAPUtility {
$cr = $this->getConnection(); $cr = $this->getConnection();
if(!$cr) { if(!$cr) {
throw new \Excpetion('Could not connect to LDAP'); throw new \Exception('Could not connect to LDAP');
} }
$base = $this->configuration->ldapBase[0]; $base = $this->configuration->ldapBase[0];
...@@ -169,7 +169,7 @@ class Wizard extends LDAPUtility { ...@@ -169,7 +169,7 @@ class Wizard extends LDAPUtility {
} }
$cr = $this->getConnection(); $cr = $this->getConnection();
if(!$cr) { if(!$cr) {
throw new \Excpetion('Could not connect to LDAP'); throw new \Exception('Could not connect to LDAP');
} }
$base = $this->configuration->ldapBase[0]; $base = $this->configuration->ldapBase[0];
...@@ -222,7 +222,7 @@ class Wizard extends LDAPUtility { ...@@ -222,7 +222,7 @@ class Wizard extends LDAPUtility {
} }
$cr = $this->getConnection(); $cr = $this->getConnection();
if(!$cr) { if(!$cr) {
throw new \Excpetion('Could not connect to LDAP'); throw new \Exception('Could not connect to LDAP');
} }
$obclasses = array('posixGroup', 'group', '*'); $obclasses = array('posixGroup', 'group', '*');
...@@ -274,7 +274,7 @@ class Wizard extends LDAPUtility { ...@@ -274,7 +274,7 @@ class Wizard extends LDAPUtility {
} }
$cr = $this->getConnection(); $cr = $this->getConnection();
if(!$cr) { if(!$cr) {
throw new \Excpetion('Could not connect to LDAP'); throw new \Exception('Could not connect to LDAP');
} }
$obclasses = array('group', 'posixGroup', '*'); $obclasses = array('group', 'posixGroup', '*');
...@@ -302,7 +302,7 @@ class Wizard extends LDAPUtility { ...@@ -302,7 +302,7 @@ class Wizard extends LDAPUtility {
} }
$cr = $this->getConnection(); $cr = $this->getConnection();
if(!$cr) { if(!$cr) {
throw new \Excpetion('Could not connect to LDAP'); throw new \Exception('Could not connect to LDAP');
} }
$obclasses = array('inetOrgPerson', 'person', 'organizationalPerson', $obclasses = array('inetOrgPerson', 'person', 'organizationalPerson',
...@@ -498,7 +498,7 @@ class Wizard extends LDAPUtility { ...@@ -498,7 +498,7 @@ class Wizard extends LDAPUtility {
} }
$cr = $this->getConnection(); $cr = $this->getConnection();
if(!$cr) { if(!$cr) {
throw new \Excpetion('Could not connect to LDAP'); throw new \Exception('Could not connect to LDAP');
} }
$base = $this->configuration->ldapBase[0]; $base = $this->configuration->ldapBase[0];
$rr = $this->ldap->search($cr, $base, $filter, $possibleAttrs); $rr = $this->ldap->search($cr, $base, $filter, $possibleAttrs);
...@@ -534,7 +534,7 @@ class Wizard extends LDAPUtility { ...@@ -534,7 +534,7 @@ class Wizard extends LDAPUtility {
private function testBaseDN($base) { private function testBaseDN($base) {
$cr = $this->getConnection(); $cr = $this->getConnection();
if(!$cr) { if(!$cr) {
throw new \Excpetion('Could not connect to LDAP'); throw new \Exception('Could not connect to LDAP');
} }
//base is there, let's validate it. If we search for anything, we should //base is there, let's validate it. If we search for anything, we should
...@@ -556,7 +556,7 @@ class Wizard extends LDAPUtility { ...@@ -556,7 +556,7 @@ class Wizard extends LDAPUtility {
private function testMemberOf() { private function testMemberOf() {
$cr = $this->getConnection(); $cr = $this->getConnection();
if(!$cr) { if(!$cr) {
throw new \Excpetion('Could not connect to LDAP'); throw new \Exception('Could not connect to LDAP');
} }
if(!is_array($this->configuration->ldapBase) if(!is_array($this->configuration->ldapBase)
|| !isset($this->configuration->ldapBase[0])) { || !isset($this->configuration->ldapBase[0])) {
...@@ -616,7 +616,7 @@ class Wizard extends LDAPUtility { ...@@ -616,7 +616,7 @@ class Wizard extends LDAPUtility {
$filter .= '(|'; $filter .= '(|';
$cr = $this->getConnection(); $cr = $this->getConnection();
if(!$cr) { if(!$cr) {
throw new \Excpetion('Could not connect to LDAP'); throw new \Exception('Could not connect to LDAP');
} }
$base = $this->configuration->ldapBase[0]; $base = $this->configuration->ldapBase[0];
foreach($cns as $cn) { foreach($cns as $cn) {
...@@ -890,7 +890,7 @@ class Wizard extends LDAPUtility { ...@@ -890,7 +890,7 @@ class Wizard extends LDAPUtility {
private function determineFeature($objectclasses, $attr, $dbkey, $confkey, $po = false) { private function determineFeature($objectclasses, $attr, $dbkey, $confkey, $po = false) {
$cr = $this->getConnection(); $cr = $this->getConnection();
if(!$cr) { if(!$cr) {
throw new \Excpetion('Could not connect to LDAP'); throw new \Exception('Could not connect to LDAP');
} }
$p = 'objectclass='; $p = 'objectclass=';
foreach($objectclasses as $key => $value) { foreach($objectclasses as $key => $value) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment