Completed
Push — development ( 5afdf5...813154 )
by Nils
07:21
created
includes/language/norwegian_admin_help.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //NORWEGIAN
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/japanese_kb.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //JAPANESE
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/chinese_kb.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //CHINESE
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/swedish_kb.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //SWEDISH
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/italian_kb.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 //ITALIAN
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_admin_help.php 1 patch
Spacing   +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/dutch_kb.php 1 patch
Spacing   +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/libraries/LDAP/adLDAP/adLDAP.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -480,7 +480,7 @@
 block discarded – undo
480 480
     public function setUseSSL($useSSL) {
481 481
             $this->useSSL = $useSSL;
482 482
             // Set the default port correctly 
483
-            if($this->useSSL) { 
483
+            if ($this->useSSL) { 
484 484
             $this->setPort(self::ADLDAP_LDAPS_PORT); 
485 485
             }
486 486
             else { 
Please login to merge, or discard this patch.
includes/libraries/LDAP/adLDAP/classes/adLDAPUsers.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -214,17 +214,17 @@  discard block
 block discarded – undo
214 214
 
215 215
         if ($isGUID === true) {
216 216
             $username = $this->adldap->utilities()->strGuidToHex($username);
217
-            $filter = "objectguid=" . $username;
217
+            $filter = "objectguid=".$username;
218 218
         }
219 219
         else if (strpos($username, "@")) {
220
-                $filter = "userPrincipalName=" . $username;
220
+                $filter = "userPrincipalName=".$username;
221 221
         }
222 222
         else {
223
-                $filter = "samaccountname=" . $username;
223
+                $filter = "samaccountname=".$username;
224 224
         }
225 225
         $filter = "(&(objectCategory=person)({$filter}))";
226 226
         if ($fields === NULL) { 
227
-            $fields = array("samaccountname","mail","memberof","department","displayname","telephonenumber","primarygroupid","objectsid"); 
227
+            $fields = array("samaccountname", "mail", "memberof", "department", "displayname", "telephonenumber", "primarygroupid", "objectsid"); 
228 228
         }
229 229
         if (!in_array("objectsid", $fields)) {
230 230
             $fields[] = "objectsid";
@@ -508,7 +508,7 @@  discard block
 block discarded – undo
508 508
      * @param bool $isGUID Is the username passed a GUID or a samAccountName
509 509
      * @return string
510 510
      */
511
-    public function dn($username, $isGUID=false) {
511
+    public function dn($username, $isGUID = false) {
512 512
         $user = $this->info($username, array("cn"), $isGUID);
513 513
         if ($user[0]["dn"] === NULL) { 
514 514
             return false; 
Please login to merge, or discard this patch.