silverstripe / silverstripe-ldap

src/Extensions/LDAPGroupExtension.php

Spacing +4 added lines, -4 removed lines

@@ -63,7 +63,7 @@ 
             'Root.LDAP',
             ReadonlyField::create(
                 'LastSynced',
-                _t(__CLASS__ . '.LASTSYNCED', 'Last synced')
+                _t(__CLASS__.'.LASTSYNCED', 'Last synced')
             )
         );
 
@@ -74,7 +74,7 @@ 
             $fields->addFieldToTab('Root.Members', ReadonlyField::create('Code'), 'Members');
 
             $message = _t(
-                __CLASS__ . '.INFOIMPORTED',
+                __CLASS__.'.INFOIMPORTED',
                 'This group is automatically imported from LDAP.'
             );
             $fields->addFieldToTab(
@@ -88,7 +88,7 @@ 
 
             $fields->addFieldToTab('Root.LDAP', ReadonlyField::create(
                 'LDAPGroupMappingsRO',
-                _t(__CLASS__ . '.AUTOMAPPEDGROUPS', 'Automatically mapped LDAP Groups'),
+                _t(__CLASS__.'.AUTOMAPPEDGROUPS', 'Automatically mapped LDAP Groups'),
                 implode('; ', $this->owner->LDAPGroupMappings()->column('DN'))
             ));
         } else {
@@ -99,7 +99,7 @@ 
             );
             $config = GridFieldConfig_RecordEditor::create();
             $config->getComponentByType('GridFieldAddNewButton')
-                ->setButtonName(_t(__CLASS__ . '.ADDMAPPEDGROUP', 'Add LDAP group mapping'));
+                ->setButtonName(_t(__CLASS__.'.ADDMAPPEDGROUP', 'Add LDAP group mapping'));
 
             $field->setConfig($config);
             $fields->addFieldToTab('Root.LDAP', $field);

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/Authenticators/LDAPAuthenticator.php

Spacing +5 added lines, -5 removed lines

@@ -80,7 +80,7 @@ 
      * @param ValidationResult|null $result
      * @return null|Member
      */
-    public function authenticate(array $data, HTTPRequest $request, ValidationResult &$result = null)
+    public function authenticate(array $data, HTTPRequest $request, ValidationResult & $result = null)
     {
         $result = $result ?: ValidationResult::create();
         /** @var LDAPService $service */
@@ -90,7 +90,7 @@ 
             if (Config::inst()->get(self::class, 'allow_email_login') != 'yes') {
                 $result->addError(
                     _t(
-                        __CLASS__ . '.PLEASEUSEUSERNAME',
+                        __CLASS__.'.PLEASEUSEUSERNAME',
                         'Please enter your username instead of your email to log in.'
                     )
                 );
@@ -108,7 +108,7 @@ 
                     }
                 }
 
-                $result->addError(_t(__CLASS__ . '.INVALIDCREDENTIALS', 'Invalid credentials'));
+                $result->addError(_t(__CLASS__.'.INVALIDCREDENTIALS', 'Invalid credentials'));
                 return null;
             }
         } else {
@@ -141,7 +141,7 @@ 
         if (!$data) {
             $result->addError(
                 _t(
-                    __CLASS__ . '.PROBLEMFINDINGDATA',
+                    __CLASS__.'.PROBLEMFINDINGDATA',
                     'There was a problem retrieving your user data'
                 )
             );
@@ -200,7 +200,7 @@ 
     {
         $result = Authenticator::LOGIN | Authenticator::LOGOUT | Authenticator::RESET_PASSWORD;
 
-        if ((bool)LDAPService::config()->get('allow_password_change')) {
+        if ((bool) LDAPService::config()->get('allow_password_change')) {
             $result |= Authenticator::CHANGE_PASSWORD;
         }
         return $result;

src/Authenticators/LDAPChangePasswordHandler.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
                 $form->clearMessage();
                 $form->sessionMessage(
                     _t(
-                        __CLASS__ . '.NOUSER',
+                        __CLASS__.'.NOUSER',
                         'Your account hasn\'t been setup properly, please contact an administrator.'
                     ),
                     'bad'
@@ -109,7 +109,7 @@ 
             // Providing OldPassword to perform password _change_ operation. This will respect the
             // password history policy. Unfortunately we cannot support password history policy on password _reset_
             // at the moment, which means it will not be enforced on SilverStripe-driven email password reset.
-            $oldPassword = !empty($data['OldPassword']) ? $data['OldPassword']: null;
+            $oldPassword = !empty($data['OldPassword']) ? $data['OldPassword'] : null;
 
             /** @var ValidationResult $validationResult */
             $validationResult = $service->setPassword($member, $data['NewPassword1'], $oldPassword);

src/Authenticators/LDAPLostPasswordHandler.php

Spacing +8 added lines, -9 removed lines

@@ -124,11 +124,11 @@ 
                 ->setData(['PasswordResetLink' => Security::getPasswordResetLink($member, $token)]);
             $e->setTo($member->Email);
             $e->send();
-            return $controller->redirect($controller->Link('passwordsent/') . urlencode($data['Login']));
+            return $controller->redirect($controller->Link('passwordsent/').urlencode($data['Login']));
         } elseif ($data['Login']) {
             // Avoid information disclosure by displaying the same status,
             // regardless whether the email address actually exists
-            return $controller->redirect($controller->Link('passwordsent/') . urlencode($data['Login']));
+            return $controller->redirect($controller->Link('passwordsent/').urlencode($data['Login']));
         } else {
             if (Config::inst()->get(LDAPAuthenticator::class, 'allow_email_login') === 'yes') {
                 $form->sessionMessage(
@@ -159,8 +159,7 @@ 
     public function lostPasswordForm()
     {
         $loginFieldLabel = (Config::inst()->get(LDAPAuthenticator::class, 'allow_email_login') === 'yes') ?
-            _t('SilverStripe\\LDAP\\Forms\\LDAPLoginForm.USERNAMEOREMAIL', 'Username or email') :
-            _t('SilverStripe\\LDAP\\Forms\\LDAPLoginForm.USERNAME', 'Username');
+            _t('SilverStripe\\LDAP\\Forms\\LDAPLoginForm.USERNAMEOREMAIL', 'Username or email') : _t('SilverStripe\\LDAP\\Forms\\LDAPLoginForm.USERNAME', 'Username');
         $loginField = TextField::create('Login', $loginFieldLabel);
 
         $action = FormAction::create(
@@ -181,13 +180,13 @@ 
     {
         if (Config::inst()->get(LDAPAuthenticator::class, 'allow_email_login') === 'yes') {
             $message = _t(
-                __CLASS__ . '.NOTERESETPASSWORDUSERNAMEOREMAIL',
+                __CLASS__.'.NOTERESETPASSWORDUSERNAMEOREMAIL',
                 'Enter your username or your email address and we will send you a link with which '
                 . 'you can reset your password'
             );
         } else {
             $message = _t(
-                __CLASS__ . '.NOTERESETPASSWORDUSERNAME',
+                __CLASS__.'.NOTERESETPASSWORDUSERNAME',
                 'Enter your username and we will send you a link with which you can reset your password'
             );
         }
@@ -203,17 +202,17 @@ 
         $username = Convert::raw2xml(
             rawurldecode($this->getRequest()->param('OtherID'))
         );
-        $username .= ($extension = $this->request->getExtension()) ? '.' . $extension : '';
+        $username .= ($extension = $this->request->getExtension()) ? '.'.$extension : '';
 
         return [
             'Title' => _t(
-                __CLASS__ . '.PASSWORDSENTHEADER',
+                __CLASS__.'.PASSWORDSENTHEADER',
                 "Password reset link sent to '{username}'",
                 ['username' => $username]
             ),
             'Content' =>
                 _t(
-                    __CLASS__ . '.PASSWORDSENTTEXT',
+                    __CLASS__.'.PASSWORDSENTTEXT',
                     "Thank you! A reset link has been sent to '{username}', provided an account exists.",
                     ['username' => $username]
                 ),

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/Tasks/LDAPGroupSyncTask.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 groups from Active Directory');
+        return _t(__CLASS__.'.SYNCTITLE', 'Sync all groups from Active Directory');
     }
 
     /**
@@ -150,7 +150,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/Tasks/LDAPMigrateExistingMembersTask.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
      * @var array
      */
     private static $dependencies = [
-        'ldapService' => '%$' . LDAPService::class,
+        'ldapService' => '%$'.LDAPService::class,
     ];
 
     /**
@@ -80,7 +80,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>');
     }
 }