Completed
Push — development ( 6a24df...5afdf5 )
by Nils
07:52
created
includes/language/french_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
 //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
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/language/spanish_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
 //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
Spacing   +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
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/language/czech_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
 //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
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.
includes/libraries/LDAP/adLDAP/classes/adLDAPGroups.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
      * @param string $child The child group name
61 61
      * @return bool
62 62
      */
63
-    public function addGroup($parent,$child) {
63
+    public function addGroup($parent, $child) {
64 64
 
65 65
         // Find the parent group's dn
66 66
         $parentGroup = $this->ginfo($parent, array("cn"));
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
      * @param string $child The child group name
241 241
      * @return bool
242 242
      */
243
-    public function removeGroup($parent , $child) {
243
+    public function removeGroup($parent, $child) {
244 244
     
245 245
         // Find the parent dn
246 246
         $parentGroup = $this->info($parent, array("cn"));
@@ -345,15 +345,15 @@  discard block
 block discarded – undo
345 345
  
346 346
         $groupArray = array();
347 347
 
348
-        for ($i=0; $i<$groups["count"]; $i++) { 
349
-                $filter = "(&(objectCategory=group)(distinguishedName=" . $this->adldap->utilities()->ldapSlashes($groups[$i]) . "))";
348
+        for ($i = 0; $i < $groups["count"]; $i++) { 
349
+                $filter = "(&(objectCategory=group)(distinguishedName=".$this->adldap->utilities()->ldapSlashes($groups[$i])."))";
350 350
                 $fields = array("samaccountname", "distinguishedname", "objectClass");
351 351
                 $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);
352 352
                 $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);
353 353
 
354 354
                 // not a person, look for a group  
355 355
                 if ($entries['count'] == 0 && $recursive == true) {  
356
-                $filter = "(&(objectCategory=group)(distinguishedName=" . $this->adldap->utilities()->ldapSlashes($groups[$i]) . "))";  
356
+                $filter = "(&(objectCategory=group)(distinguishedName=".$this->adldap->utilities()->ldapSlashes($groups[$i])."))";  
357 357
                 $fields = array("distinguishedname");  
358 358
                 $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);  
359 359
                 $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);  
@@ -395,15 +395,15 @@  discard block
 block discarded – undo
395 395
  
396 396
         $userArray = array();
397 397
 
398
-        for ($i=0; $i<$users["count"]; $i++) { 
399
-                $filter = "(&(objectCategory=person)(distinguishedName=" . $this->adldap->utilities()->ldapSlashes($users[$i]) . "))";
398
+        for ($i = 0; $i < $users["count"]; $i++) { 
399
+                $filter = "(&(objectCategory=person)(distinguishedName=".$this->adldap->utilities()->ldapSlashes($users[$i])."))";
400 400
                 $fields = array("samaccountname", "distinguishedname", "objectClass");
401 401
                 $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);
402 402
                 $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);
403 403
 
404 404
                 // not a person, look for a group  
405 405
                 if ($entries['count'] == 0 && $recursive == true) {  
406
-                $filter = "(&(objectCategory=group)(distinguishedName=" . $this->adldap->utilities()->ldapSlashes($users[$i]) . "))";  
406
+                $filter = "(&(objectCategory=group)(distinguishedName=".$this->adldap->utilities()->ldapSlashes($users[$i])."))";  
407 407
                 $fields = array("samaccountname");  
408 408
                 $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);  
409 409
                 $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);  
Please login to merge, or discard this patch.