Completed
Push — development ( 6a24df...5afdf5 )
by Nils
07:52
created
includes/language/french_kb.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //FRENCH
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else{
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.
includes/language/dutch_kb.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //DUTCH
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else{
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.
includes/language/spanish_kb.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //SPANISH
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else{
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.
includes/language/turkish_admin_help.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //TURKISH
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else{
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.
includes/language/dutch_admin_help.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //DUTCH
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else{
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.
includes/language/czech_admin_help.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //CZECH
3 3
 if (!isset($_SESSION['settings']['cpassman_url'])) {
4 4
     $TeamPass_url = '';
5
-}else{
5
+} else{
6 6
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
7 7
 }
8 8
 
Please login to merge, or discard this patch.
includes/libraries/LDAP/adLDAP/adLDAP.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -482,8 +482,7 @@  discard block
 block discarded – undo
482 482
             // Set the default port correctly 
483 483
             if($this->useSSL) { 
484 484
             $this->setPort(self::ADLDAP_LDAPS_PORT); 
485
-            }
486
-            else { 
485
+            } else { 
487 486
             $this->setPort(self::ADLDAP_LDAP_PORT); 
488 487
             } 
489 488
     }
@@ -641,8 +640,7 @@  discard block
 block discarded – undo
641 640
                 if ($this->useSSL && !$this->useTLS) {
642 641
                     // If you have problems troubleshooting, remove the @ character from the ldapldapBind command above to get the actual error message
643 642
                     throw new adLDAPException('Bind to Active Directory failed. Either the LDAPs connection failed or the login credentials are incorrect. AD said: '.$this->getLastError());
644
-                }
645
-                else {
643
+                } else {
646 644
                     throw new adLDAPException('Bind to Active Directory failed. Check the login credentials and/or server details. AD said: '.$this->getLastError());
647 645
                 }
648 646
             }
@@ -652,8 +650,7 @@  discard block
 block discarded – undo
652 650
             $this->ldapBind = @ldap_sasl_bind($this->ldapConnection, NULL, NULL, "GSSAPI"); 
653 651
             if (!$this->ldapBind) { 
654 652
                 throw new adLDAPException('Rebind to Active Directory failed. AD said: '.$this->getLastError()); 
655
-            } 
656
-            else {
653
+            } else {
657 654
                 return true;
658 655
             }
659 656
         }
@@ -694,8 +691,7 @@  discard block
 block discarded – undo
694 691
             $this->ldapBind = @ldap_sasl_bind($this->ldapConnection, NULL, NULL, "GSSAPI");
695 692
             if (!$this->ldapBind) {
696 693
                 throw new adLDAPException('Rebind to Active Directory failed. AD said: '.$this->getLastError());
697
-            }
698
-            else {
694
+            } else {
699 695
                 return true;
700 696
             }
701 697
         }
Please login to merge, or discard this patch.
includes/libraries/LDAP/adLDAP/classes/adLDAPUsers.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -215,11 +215,9 @@
 block discarded – undo
215 215
         if ($isGUID === true) {
216 216
             $username = $this->adldap->utilities()->strGuidToHex($username);
217 217
             $filter = "objectguid=" . $username;
218
-        }
219
-        else if (strpos($username, "@")) {
218
+        } else if (strpos($username, "@")) {
220 219
                 $filter = "userPrincipalName=" . $username;
221
-        }
222
-        else {
220
+        } else {
223 221
                 $filter = "samaccountname=" . $username;
224 222
         }
225 223
         $filter = "(&(objectCategory=person)({$filter}))";
Please login to merge, or discard this patch.
includes/libraries/LDAP/adLDAP/classes/adLDAPGroups.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -215,8 +215,7 @@  discard block
 block discarded – undo
215 215
         $info = $this->info($group);
216 216
         if ($info[0]["dn"] === NULL) {
217 217
             return false;
218
-        }
219
-        else {
218
+        } else {
220 219
             $groupDN = $info[0]["dn"];
221 220
         }
222 221
         $newRDN = 'CN='.$newName;
@@ -416,15 +415,13 @@  discard block
 block discarded – undo
416 415
                     $userArray = array_unique($userArray);  
417 416
                 }
418 417
                 continue;  
419
-                } 
420
-                else if ($entries['count'] == 0) {   
418
+                } else if ($entries['count'] == 0) {   
421 419
                 continue; 
422 420
                 } 
423 421
 
424 422
                 if ((!isset($entries[0]['samaccountname'][0]) || $entries[0]['samaccountname'][0] === NULL) && $entries[0]['distinguishedname'][0] !== NULL) {
425 423
                     $userArray[] = $entries[0]['distinguishedname'][0];
426
-                }
427
-                else if ($entries[0]['samaccountname'][0] !== NULL) {
424
+                } else if ($entries[0]['samaccountname'][0] !== NULL) {
428 425
                 $userArray[] = $entries[0]['samaccountname'][0];
429 426
                 }
430 427
         }
Please login to merge, or discard this patch.