silverstripe / silverstripe-ldap

src/Extensions/LDAPMemberExtension.php

Spacing +5 added lines, -5 removed lines

@@ -106,14 +106,14 @@ 
             'IsExpired',
             $ldapMetadata[] = ReadonlyField::create(
                 'IsExpired',
-                _t(__CLASS__ . '.ISEXPIRED', 'Has user\'s LDAP/AD login expired?')
+                _t(__CLASS__.'.ISEXPIRED', 'Has user\'s LDAP/AD login expired?')
             )
         );
         $fields->replaceField(
             'LastSynced',
             $ldapMetadata[] = ReadonlyField::create(
                 'LastSynced',
-                _t(__CLASS__ . '.LASTSYNCED', 'Last synced')
+                _t(__CLASS__.'.LASTSYNCED', 'Last synced')
             )
         );
         $fields->addFieldsToTab('Root.LDAP', $ldapMetadata);
@@ -121,7 +121,7 @@ 
         $message = '';
         if ($this->owner->GUID && $this->owner->config()->update_ldap_from_local) {
             $message = _t(
-                __CLASS__ . '.CHANGEFIELDSUPDATELDAP',
+                __CLASS__.'.CHANGEFIELDSUPDATELDAP',
                 'Changing fields here will update them in LDAP.'
             );
         } elseif ($this->owner->GUID && !$this->owner->config()->update_ldap_from_local) {
@@ -133,11 +133,11 @@ 
                     // Set to readonly, but not disabled so that the data is still sent to the
                     // server and doesn't break Member_Validator
                     $field->setReadonly(true);
-                    $field->setTitle($field->Title()._t(__CLASS__ . '.IMPORTEDFIELD', ' (imported)'));
+                    $field->setTitle($field->Title()._t(__CLASS__.'.IMPORTEDFIELD', ' (imported)'));
                 }
             }
             $message = _t(
-                __CLASS__ . '.INFOIMPORTED',
+                __CLASS__.'.INFOIMPORTED',
                 'This user is automatically imported from LDAP. '.
                     'Manual changes to imported fields will be removed upon sync.'
             );

src/Control/LDAPDebugController.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
      * @var array
      */
     private static $dependencies = [
-        'ldapService' => '%$' . LDAPService::class
+        'ldapService' => '%$'.LDAPService::class
     ];
 
     /**

src/Tasks/LDAPMemberSyncTask.php

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
      * @var array
      */
     private static $dependencies = [
-        'ldapService' => '%$' . LDAPService::class,
+        'ldapService' => '%$'.LDAPService::class,
     ];
 
     /**
@@ -45,7 +45,7 @@ 
      */
     public function getTitle()
     {
-        return _t(__CLASS__ . '.SYNCTITLE', 'Sync all users from Active Directory');
+        return _t(__CLASS__.'.SYNCTITLE', 'Sync all users from Active Directory');
     }
 
     /**
@@ -146,7 +146,7 @@ 
      */
     protected function log($message)
     {
-        $message = sprintf('[%s] ', date('Y-m-d H:i:s')) . $message;
-        echo Director::is_cli() ? ($message . PHP_EOL) : ($message . '<br>');
+        $message = sprintf('[%s] ', date('Y-m-d H:i:s')).$message;
+        echo Director::is_cli() ? ($message.PHP_EOL) : ($message.'<br>');
     }
 }

src/Forms/LDAPLoginForm.php

Spacing +3 added lines, -3 removed lines

@@ -45,13 +45,13 @@ 
         if (Config::inst()->get(LDAPAuthenticator::class, 'allow_email_login') === 'yes') {
             $loginField = TextField::create(
                 'Login',
-                _t(__CLASS__ . '.USERNAMEOREMAIL', 'Username or email'),
+                _t(__CLASS__.'.USERNAMEOREMAIL', 'Username or email'),
                 null,
                 null,
                 $this
             );
         } else {
-            $loginField = TextField::create('Login', _t(__CLASS__ . '.USERNAME', 'Username'), null, null, $this);
+            $loginField = TextField::create('Login', _t(__CLASS__.'.USERNAME', 'Username'), null, null, $this);
         }
 
         $this->Fields()->replaceField('Email', $loginField);
@@ -98,6 +98,6 @@ 
      */
     public function getAuthenticatorName()
     {
-        return _t(__CLASS__ . '.AUTHENTICATORNAME', 'LDAP');
+        return _t(__CLASS__.'.AUTHENTICATORNAME', 'LDAP');
     }
 }

src/Forms/LDAPChangePasswordForm.php

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
         ) {
             $emailField = TextField::create(
                 'Email',
-                _t(__CLASS__ . '.USERNAMEOREMAIL', 'Email'),
+                _t(__CLASS__.'.USERNAMEOREMAIL', 'Email'),
                 $member->Email,
                 null,
                 $this
@@ -68,7 +68,7 @@ 
         if (!empty($data['samaccountname'])) {
             $usernameField = TextField::create(
                 'Username',
-                _t(__CLASS__ . '.USERNAME', 'Username'),
+                _t(__CLASS__.'.USERNAME', 'Username'),
                 $data['samaccountname'],
                 null,
                 $this

src/Services/LDAPService.php

Spacing +21 added lines, -21 removed lines

@@ -47,7 +47,7 @@ 
      * @var array
      */
     private static $dependencies = [
-        'gateway' => '%$' . LDAPGateway::class
+        'gateway' => '%$'.LDAPGateway::class
     ];
 
     /**
@@ -123,7 +123,7 @@ 
      */
     public static function get_cache()
     {
-        return Injector::inst()->get(CacheInterface::class . '.ldap');
+        return Injector::inst()->get(CacheInterface::class.'.ldap');
     }
 
     /**
@@ -192,14 +192,14 @@ 
         // show better errors than the defaults for various status codes returned by LDAP
         if (!empty($messages[1]) && strpos($messages[1], 'NT_STATUS_ACCOUNT_LOCKED_OUT') !== false) {
             $message = _t(
-                __CLASS__ . '.ACCOUNTLOCKEDOUT',
-                'Your account has been temporarily locked because of too many failed login attempts. ' .
+                __CLASS__.'.ACCOUNTLOCKEDOUT',
+                'Your account has been temporarily locked because of too many failed login attempts. '.
                 'Please try again later.'
             );
         }
         if (!empty($messages[1]) && strpos($messages[1], 'NT_STATUS_LOGON_FAILURE') !== false) {
             $message = _t(
-                __CLASS__ . '.INVALIDCREDENTIALS',
+                __CLASS__.'.INVALIDCREDENTIALS',
                 'The provided details don\'t seem to be correct. Please try again.'
             );
         }
@@ -222,7 +222,7 @@ 
     public function getNodes($cached = true, $attributes = [])
     {
         $cache = self::get_cache();
-        $cacheKey = 'nodes' . md5(implode('', $attributes));
+        $cacheKey = 'nodes'.md5(implode('', $attributes));
         $results = $cache->has($cacheKey);
 
         if (!$results || !$cached) {
@@ -252,7 +252,7 @@ 
     {
         $searchLocations = $this->config()->groups_search_locations ?: [null];
         $cache = self::get_cache();
-        $cacheKey = 'groups' . md5(implode('', array_merge($searchLocations, $attributes)));
+        $cacheKey = 'groups'.md5(implode('', array_merge($searchLocations, $attributes)));
         $results = $cache->has($cacheKey);
 
         if (!$results || !$cached) {
@@ -520,13 +520,13 @@ 
         }
 
         $member->IsExpired = ($data['useraccountcontrol'] & 2) == 2;
-        $member->LastSynced = (string)DBDatetime::now();
+        $member->LastSynced = (string) DBDatetime::now();
 
         foreach ($member->config()->ldap_field_mappings as $attribute => $field) {
             if (!isset($data[$attribute])) {
                 $this->getLogger()->notice(
                     sprintf(
-                        'Attribute %s configured in Member.ldap_field_mappings, ' .
+                        'Attribute %s configured in Member.ldap_field_mappings, '.
                                 'but no available attribute in AD data (GUID: %s, Member ID: %s)',
                         $attribute,
                         $data['objectguid'],
@@ -544,7 +544,7 @@ 
                 ) {
                     $this->getLogger()->warning(
                         sprintf(
-                            'Member field %s configured for thumbnailphoto AD attribute, but it isn\'t a ' .
+                            'Member field %s configured for thumbnailphoto AD attribute, but it isn\'t a '.
                             'valid relation to an Image class',
                             $field
                         )
@@ -554,8 +554,8 @@ 
                 }
 
                 $filename = sprintf('thumbnailphoto-%s.jpg', $data['samaccountname']);
-                $path = ASSETS_DIR . '/' . $member->config()->ldap_thumbnail_path;
-                $absPath = BASE_PATH . '/' . $path;
+                $path = ASSETS_DIR.'/'.$member->config()->ldap_thumbnail_path;
+                $absPath = BASE_PATH.'/'.$path;
                 if (!file_exists($absPath)) {
                     Filesystem::makeFolder($absPath);
                 }
@@ -567,13 +567,13 @@ 
                 }
 
                 // The image data is provided in raw binary.
-                file_put_contents($absPath . '/' . $filename, $data[$attribute]);
+                file_put_contents($absPath.'/'.$filename, $data[$attribute]);
                 $record = new $imageClass();
                 $record->Name = $filename;
-                $record->Filename = $path . '/' . $filename;
+                $record->Filename = $path.'/'.$filename;
                 $record->write();
 
-                $relationField = $field . 'ID';
+                $relationField = $field.'ID';
                 $member->{$relationField} = $record->ID;
             } else {
                 $member->$field = $data[$attribute];
@@ -714,7 +714,7 @@ 
             $group->Description = $data['description'];
         }
         $group->DN = $data['dn'];
-        $group->LastSynced = (string)DBDatetime::now();
+        $group->LastSynced = (string) DBDatetime::now();
         $group->write();
 
         // Mappings on this group are automatically maintained to contain just the group's DN.
@@ -777,7 +777,7 @@ 
                 ),
             ]);
         } catch (Exception $e) {
-            throw new ValidationException('LDAP synchronisation failure: ' . $e->getMessage());
+            throw new ValidationException('LDAP synchronisation failure: '.$e->getMessage());
         }
 
         $user = $this->getUserByUsername($member->Username);
@@ -821,7 +821,7 @@ 
                 'distinguishedname' => $dn
             ]);
         } catch (Exception $e) {
-            throw new ValidationException('LDAP group creation failure: ' . $e->getMessage());
+            throw new ValidationException('LDAP group creation failure: '.$e->getMessage());
         }
 
         $data = $this->getGroupByDN($dn);
@@ -986,7 +986,7 @@ 
             try {
                 $this->update($groupDn, ['member' => $members]);
             } catch (Exception $e) {
-                throw new ValidationException('LDAP group membership remove failure: ' . $e->getMessage());
+                throw new ValidationException('LDAP group membership remove failure: '.$e->getMessage());
             }
         }
     }
@@ -1012,7 +1012,7 @@ 
         try {
             $this->update($groupDn, ['member' => $members]);
         } catch (Exception $e) {
-            throw new ValidationException('LDAP group membership add failure: ' . $e->getMessage());
+            throw new ValidationException('LDAP group membership add failure: '.$e->getMessage());
         }
     }
 
@@ -1095,7 +1095,7 @@ 
         try {
             $this->delete($data['distinguishedname']);
         } catch (Exception $e) {
-            throw new ValidationException('LDAP delete user failed: ' . $e->getMessage());
+            throw new ValidationException('LDAP delete user failed: '.$e->getMessage());
         }
     }
 

src/Model/LDAPUtil.php

Spacing +5 added lines, -5 removed lines

@@ -42,8 +42,8 @@ 
         for ($k = 1; $k <= 2; ++$k) {
             $hex_guid_to_guid_str .= substr($hex_guid, 16 - 2 * $k, 2);
         }
-        $hex_guid_to_guid_str .= '-' . substr($hex_guid, 16, 4);
-        $hex_guid_to_guid_str .= '-' . substr($hex_guid, 20);
+        $hex_guid_to_guid_str .= '-'.substr($hex_guid, 16, 4);
+        $hex_guid_to_guid_str .= '-'.substr($hex_guid, 20);
 
         return strtoupper($hex_guid_to_guid_str);
     }
@@ -69,7 +69,7 @@ 
 
         if ($escape) {
             $escaped = '\\';
-            for ($i = 0; $i < strlen($octet_str); $i+=2) {
+            for ($i = 0; $i < strlen($octet_str); $i += 2) {
                 $escaped .= substr($octet_str, $i, 2);
                 if ($i != strlen($octet_str) - 2) {
                     $escaped .= '\\';
@@ -95,11 +95,11 @@ 
 
         for ($x = 0; $x < $subcount; $x++) {
             $subauth[$x] = hexdec(self::little_endian(substr($hex_sid, 16 + ($x * 8), 8)));
-            $result .= '-' . $subauth[$x];
+            $result .= '-'.$subauth[$x];
         }
 
         // Cheat by tacking on the S-
-        return 'S-' . $result;
+        return 'S-'.$result;
     }
 
     /**

src/Jobs/LDAPAllSyncJob.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
      */
     public function getTitle()
     {
-        return _t(__CLASS__ . '.SYNCTITLE', 'Sync all groups and users from Active Directory, and set mappings up.');
+        return _t(__CLASS__.'.SYNCTITLE', 'Sync all groups and users from Active Directory, and set mappings up.');
     }
 
     /**

src/Jobs/LDAPMemberSyncJob.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
      */
     public function getTitle()
     {
-        return _t(__CLASS__ . '.SYNCTITLE', 'Sync all users from Active Directory');
+        return _t(__CLASS__.'.SYNCTITLE', 'Sync all users from Active Directory');
     }
 
     /**