silverstripe / silverstripe-ldap

src/Extensions/LDAPGroupExtension.php

Spacing +5 added lines, -5 removed lines

@@ -64,7 +64,7 @@ 
             'Root.LDAP',
             ReadonlyField::create(
                 'LastSynced',
-                _t(__CLASS__ . '.LASTSYNCED', 'Last synced')
+                _t(__CLASS__.'.LASTSYNCED', 'Last synced')
             )
         );
 
@@ -75,7 +75,7 @@ 
             $fields->addFieldToTab('Root.Members', ReadonlyField::create('Code'), 'Members');
 
             $message = _t(
-                __CLASS__ . '.INFOIMPORTED',
+                __CLASS__.'.INFOIMPORTED',
                 'This group is automatically imported from LDAP.'
             );
             $fields->addFieldToTab(
@@ -89,18 +89,18 @@ 
 
             $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 {
             $field = GridField::create(
                 'LDAPGroupMappings',
-                _t(__CLASS__ . '.MAPPEDGROUPS', 'Mapped LDAP Groups'),
+                _t(__CLASS__.'.MAPPEDGROUPS', 'Mapped LDAP Groups'),
                 $this->owner->LDAPGroupMappings()
             );
             $config = GridFieldConfig_RecordEditor::create();
             $config->getComponentByType(GridFieldAddNewButton::class)
-                ->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/Authenticators/LDAPLostPasswordHandler.php

Spacing +7 added lines, -8 removed lines

@@ -37,7 +37,7 @@ 
     ];
 
     private static $dependencies = [
-        'service' => '%$' . LDAPService::class,
+        'service' => '%$'.LDAPService::class,
     ];
 
     /**
@@ -136,8 +136,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(
@@ -158,13 +157,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'
             );
         }
@@ -180,17 +179,17 @@ 
         $username = Convert::raw2xml(
             rawurldecode($this->getRequest()->param('OtherID'))
         );
-        $username .= ($extension = $this->getRequest()->getExtension()) ? '.' . $extension : '';
+        $username .= ($extension = $this->getRequest()->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/Authenticators/LDAPAuthenticator.php

Spacing +5 added lines, -5 removed lines

@@ -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,8 +200,8 @@ 
     {
         $result = Authenticator::LOGIN | Authenticator::LOGOUT | Authenticator::CHECK_PASSWORD;
 
-        if ((bool)LDAPService::config()->get('allow_password_change')) {
-            $result |=  Authenticator::RESET_PASSWORD | Authenticator::CHANGE_PASSWORD;
+        if ((bool) LDAPService::config()->get('allow_password_change')) {
+            $result |= Authenticator::RESET_PASSWORD | Authenticator::CHANGE_PASSWORD;
         }
         return $result;
     }

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,
     ];
 
     /**
@@ -50,7 +50,7 @@ 
      */
     public function getTitle()
     {
-        return _t(__CLASS__ . '.SYNCTITLE', 'Sync all users from Active Directory');
+        return _t(__CLASS__.'.SYNCTITLE', 'Sync all users from Active Directory');
     }
 
     /**
@@ -154,8 +154,8 @@ 
      */
     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/LDAPMemberSyncOneTask.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
      * @var array
      */
     private static $dependencies = [
-        'ldapService' => '%$' . LDAPService::class,
+        'ldapService' => '%$'.LDAPService::class,
     ];
 
     /**
@@ -35,7 +35,7 @@ 
      */
     public function getTitle()
     {
-        return _t(__CLASS__ . '.SYNCONETITLE', 'Sync single user from LDAP');
+        return _t(__CLASS__.'.SYNCONETITLE', 'Sync single user from LDAP');
     }
 
     /**

src/Services/LDAPService.php

Spacing +17 added lines, -17 removed lines

@@ -56,7 +56,7 @@ 
      * @var array
      */
     private static $dependencies = [
-        'gateway' => '%$' . LDAPGateway::class
+        'gateway' => '%$'.LDAPGateway::class
     ];
 
     /**
@@ -132,7 +132,7 @@ 
      */
     public static function get_cache()
     {
-        return Injector::inst()->get(CacheInterface::class . '.ldap');
+        return Injector::inst()->get(CacheInterface::class.'.ldap');
     }
 
     /**
@@ -214,14 +214,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.'
             );
         }
@@ -244,7 +244,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) {
@@ -274,7 +274,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) {
@@ -542,13 +542,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'],
@@ -566,7 +566,7 @@ 
                 ) {
                     $this->getLogger()->debug(
                         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
                         )
@@ -603,7 +603,7 @@ 
                 // Disable is_uploaded_file() check in Upload_Validator
                 $oldUseIsUploadedFile = Upload_Validator::config()->get('use_is_uploaded_file');
                 Upload_Validator::config()->set('use_is_uploaded_file', false);
-                if(!$upload->validate($tmpUpload)) {
+                if (!$upload->validate($tmpUpload)) {
                     $errors = $upload->getErrors();
                     $message = array_shift($errors);
                     $message = sprintf('Error while populating from file %s: %s', $tmpFilename, $message);
@@ -775,7 +775,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.
@@ -838,7 +838,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);
@@ -882,7 +882,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);
@@ -1047,7 +1047,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());
             }
         }
     }
@@ -1073,7 +1073,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());
         }
     }
 
@@ -1156,7 +1156,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/Iterators/LDAPIterator.php

Spacing +7 added lines, -7 removed lines

@@ -113,11 +113,11 @@ 
         } else {
             $resultResource = ldap_search($resource, $baseDn, $this->getFilter());
         }
-        if (! is_resource($resultResource)) {
+        if (!is_resource($resultResource)) {
             /*
              * @TODO better exception msg
              */
-            throw new \Exception('ldap_search returned something wrong...' . ldap_error($resource));
+            throw new \Exception('ldap_search returned something wrong...'.ldap_error($resource));
         }
 
         $entries = ldap_get_entries($resource, $resultResource);
@@ -204,7 +204,7 @@ 
         $attributeValue = [];
 
         $limit = $offset + $maxPerRequest - 1;
-        $searchedAttribute = $attrName . ';range=' . $offset . '-' . $limit;
+        $searchedAttribute = $attrName.';range='.$offset.'-'.$limit;
 
         $ldap = $this->getLdap();
         $entry = $ldap->getEntry($dn, [
@@ -234,10 +234,10 @@ 
     }
     public function current()
     {
-        if (! is_array($this->current)) {
+        if (!is_array($this->current)) {
             $this->rewind();
         }
-        if (! is_array($this->current)) {
+        if (!is_array($this->current)) {
             return;
         }
 
@@ -245,10 +245,10 @@ 
     }
     public function key()
     {
-        if (! is_array($this->current)) {
+        if (!is_array($this->current)) {
             $this->rewind();
         }
-        if (! is_array($this->current)) {
+        if (!is_array($this->current)) {
             return;
         }