nystudio107 / craft-seomatic

src/helpers/MetaValue.php

Spacing +2 added lines, -2 removed lines

@@ -294,7 +294,7 @@ 
                 $metaValue = Craft::t(
                     'seomatic',
                     'Error rendering `{template}` -> {error}',
-                    ['template' => $metaValue, 'error' => $e->getMessage() . ' - ' . print_r($metaValue, true)]
+                    ['template' => $metaValue, 'error' => $e->getMessage().' - '.print_r($metaValue, true)]
                 );
                 Craft::error($metaValue, __METHOD__);
                 Craft::$app->getErrorHandler()->logException($e);
@@ -313,7 +313,7 @@ 
         // Handle being passed in an object
         if (is_object($metaValue)) {
             if ($metaValue instanceof Markup) {
-                return trim(html_entity_decode((string)$metaValue, ENT_NOQUOTES, 'UTF-8'));
+                return trim(html_entity_decode((string) $metaValue, ENT_NOQUOTES, 'UTF-8'));
             }
             if ($metaValue instanceof Asset) {
                 /** @var Asset $metaValue */

src/helpers/PullField.php

Spacing +75 added lines, -75 removed lines

@@ -65,19 +65,19 @@ 
         }
         foreach (self::PULL_TEXT_FIELDS as $fields) {
             $fieldName = $fields['fieldName'];
-            $source = $bundleSettings[$fieldName . 'Source'] ?? '';
-            $sourceField = $bundleSettings[$fieldName . 'Field'] ?? '';
+            $source = $bundleSettings[$fieldName.'Source'] ?? '';
+            $sourceField = $bundleSettings[$fieldName.'Field'] ?? '';
             if (!empty($source)) {
                 $seoField = $fields['seoField'];
                 switch ($source) {
                     case 'sameAsSeo':
                         $globalsSettings[$fieldName] =
-                            '{{ seomatic.meta.' . $seoField . ' }}';
+                            '{{ seomatic.meta.'.$seoField.' }}';
                         break;
 
                     case 'sameAsSiteTwitter':
                         $globalsSettings[$fieldName] =
-                            '{{ seomatic.site.' . $seoField . ' }}';
+                            '{{ seomatic.site.'.$seoField.' }}';
                         break;
 
                     case 'sameAsGlobal':
@@ -88,28 +88,28 @@ 
                     case 'fromField':
                         $globalsSettings[$fieldName] =
                             '{{ seomatic.helper.extractTextFromField('
-                            . $objectPrefix . $elementName . $sourceField
+                            . $objectPrefix.$elementName.$sourceField
                             . ') }}';
                         break;
 
                     case 'fromUserField':
                         $globalsSettings[$fieldName] =
                             '{{ seomatic.helper.extractTextFromField('
-                            . $objectPrefix . $elementName . 'author.' . $sourceField
+                            . $objectPrefix.$elementName.'author.'.$sourceField
                             . ') }}';
                         break;
 
                     case 'summaryFromField':
                         $globalsSettings[$fieldName] =
                             '{{ seomatic.helper.extractSummary(seomatic.helper.extractTextFromField('
-                            . $objectPrefix . $elementName . $sourceField
+                            . $objectPrefix.$elementName.$sourceField
                             . ')) }}';
                         break;
 
                     case 'keywordsFromField':
                         $globalsSettings[$fieldName] =
                             '{{ seomatic.helper.extractKeywords(seomatic.helper.extractTextFromField('
-                            . $objectPrefix . $elementName . $sourceField
+                            . $objectPrefix.$elementName.$sourceField
                             . ')) }}';
                         break;
 
@@ -140,25 +140,25 @@ 
         }
         foreach (self::PULL_ASSET_FIELDS as $fields) {
             $fieldName = $fields['fieldName'];
-            $fieldNameWidth = $fields['fieldName'] . 'Width';
-            $fieldNameHeight = $fields['fieldName'] . 'Height';
-            $source = $bundleSettings[$fieldName . 'Source'] ?? '';
-            $ids = $bundleSettings[$fieldName . 'Ids'] ?? [];
-            $sourceField = $bundleSettings[$fieldName . 'Field'] ?? '';
+            $fieldNameWidth = $fields['fieldName'].'Width';
+            $fieldNameHeight = $fields['fieldName'].'Height';
+            $source = $bundleSettings[$fieldName.'Source'] ?? '';
+            $ids = $bundleSettings[$fieldName.'Ids'] ?? [];
+            $sourceField = $bundleSettings[$fieldName.'Field'] ?? '';
             if (!empty($source)) {
-                $transformImage = $bundleSettings[$fieldName . 'Transform'] ?? true;
+                $transformImage = $bundleSettings[$fieldName.'Transform'] ?? true;
                 $seoField = $fields['seoField'];
                 $tranformModeField = $fields['transformModeField'];
                 $transformMode = $bundleSettings[$tranformModeField] ?? 'crop';
                 if (empty($transformMode)) {
                     $transformMode = 'crop';
                 }
-                $seoFieldWidth = $fields['seoField'] . 'Width';
-                $seoFieldHeight = $fields['seoField'] . 'Height';
+                $seoFieldWidth = $fields['seoField'].'Width';
+                $seoFieldHeight = $fields['seoField'].'Height';
                 $transformName = $fields['transformName'] ?? 'base';
                 // Quote all the things here for clarity
-                $transformName = '"' . $transformName . '"';
-                $transformMode = '"' . $transformMode . '"';
+                $transformName = '"'.$transformName.'"';
+                $transformMode = '"'.$transformMode.'"';
                 // Special-case Twitter transforms
                 if ($fieldName === 'twitterImage') {
                     $transformName = 'seomatic.helper.twitterTransform()';
@@ -173,30 +173,30 @@ 
                 if ($transformImage) {
                     switch ($source) {
                         case 'sameAsSeo':
-                            $seoSource = $bundleSettings[$seoField . 'Source'] ?? '';
-                            $seoIds = $bundleSettings[$seoField . 'Ids'] ?? [];
-                            $seoSourceField = $bundleSettings[$seoField . 'Field'] ?? '';
+                            $seoSource = $bundleSettings[$seoField.'Source'] ?? '';
+                            $seoIds = $bundleSettings[$seoField.'Ids'] ?? [];
+                            $seoSourceField = $bundleSettings[$seoField.'Field'] ?? '';
                             if (!empty($seoSource)) {
                                 switch ($seoSource) {
                                     case 'fromField':
                                         if (!empty($seoSourceField)) {
                                             $globalsSettings[$fieldName] = '{{ seomatic.helper.socialTransform('
-                                                . $objectPrefix . $elementName . $seoSourceField
-                                                . ', ' . $transformName
-                                                . ', ' . $siteId
-                                                . ', ' . $transformMode
+                                                . $objectPrefix.$elementName.$seoSourceField
+                                                . ', '.$transformName
+                                                . ', '.$siteId
+                                                . ', '.$transformMode
                                                 . ') }}';
                                             $globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth('
-                                                . $objectPrefix . $elementName . $seoSourceField
-                                                . ', ' . $transformName
-                                                . ', ' . $siteId
-                                                . ', ' . $transformMode
+                                                . $objectPrefix.$elementName.$seoSourceField
+                                                . ', '.$transformName
+                                                . ', '.$siteId
+                                                . ', '.$transformMode
                                                 . ') }}';
                                             $globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight('
-                                                . $objectPrefix . $elementName . $seoSourceField
-                                                . ', ' . $transformName
-                                                . ', ' . $siteId
-                                                . ', ' . $transformMode
+                                                . $objectPrefix.$elementName.$seoSourceField
+                                                . ', '.$transformName
+                                                . ', '.$siteId
+                                                . ', '.$transformMode
                                                 . ') }}';
                                         }
                                         break;
@@ -204,28 +204,28 @@ 
                                         if (!empty($seoIds)) {
                                             $globalsSettings[$fieldName] = '{{ seomatic.helper.socialTransform('
                                                 . $seoIds[0]
-                                                . ', ' . $transformName
-                                                . ', ' . $siteId
-                                                . ', ' . $transformMode
+                                                . ', '.$transformName
+                                                . ', '.$siteId
+                                                . ', '.$transformMode
                                                 . ') }}';
                                             $globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth('
                                                 . $seoIds[0]
-                                                . ', ' . $transformName
-                                                . ', ' . $siteId
-                                                . ', ' . $transformMode
+                                                . ', '.$transformName
+                                                . ', '.$siteId
+                                                . ', '.$transformMode
                                                 . ') }}';
                                             $globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight('
                                                 . $seoIds[0]
-                                                . ', ' . $transformName
-                                                . ', ' . $siteId
-                                                . ', ' . $transformMode
+                                                . ', '.$transformName
+                                                . ', '.$siteId
+                                                . ', '.$transformMode
                                                 . ') }}';
                                         }
                                         break;
                                     default:
-                                        $globalsSettings[$fieldName] = '{{ seomatic.meta.' . $seoField . ' }}';
-                                        $globalsSettings[$fieldNameWidth] = '{{ seomatic.meta.' . $seoFieldWidth . ' }}';
-                                        $globalsSettings[$fieldNameHeight] = '{{ seomatic.meta.' . $seoFieldHeight . ' }}';
+                                        $globalsSettings[$fieldName] = '{{ seomatic.meta.'.$seoField.' }}';
+                                        $globalsSettings[$fieldNameWidth] = '{{ seomatic.meta.'.$seoFieldWidth.' }}';
+                                        $globalsSettings[$fieldNameHeight] = '{{ seomatic.meta.'.$seoFieldHeight.' }}';
                                         break;
                                 }
                             }
@@ -233,22 +233,22 @@ 
                         case 'fromField':
                             if (!empty($sourceField)) {
                                 $globalsSettings[$fieldName] = '{{ seomatic.helper.socialTransform('
-                                    . $objectPrefix . $elementName . $sourceField
-                                    . ', ' . $transformName
-                                    . ', ' . $siteId
-                                    . ', ' . $transformMode
+                                    . $objectPrefix.$elementName.$sourceField
+                                    . ', '.$transformName
+                                    . ', '.$siteId
+                                    . ', '.$transformMode
                                     . ') }}';
                                 $globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth('
-                                    . $objectPrefix . $elementName . $sourceField
-                                    . ', ' . $transformName
-                                    . ', ' . $siteId
-                                    . ', ' . $transformMode
+                                    . $objectPrefix.$elementName.$sourceField
+                                    . ', '.$transformName
+                                    . ', '.$siteId
+                                    . ', '.$transformMode
                                     . ') }}';
                                 $globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight('
-                                    . $objectPrefix . $elementName . $sourceField
-                                    . ', ' . $transformName
-                                    . ', ' . $siteId
-                                    . ', ' . $transformMode
+                                    . $objectPrefix.$elementName.$sourceField
+                                    . ', '.$transformName
+                                    . ', '.$siteId
+                                    . ', '.$transformMode
                                     . ') }}';
                             }
                             break;
@@ -256,21 +256,21 @@ 
                             if (!empty($ids)) {
                                 $globalsSettings[$fieldName] = '{{ seomatic.helper.socialTransform('
                                     . $ids[0]
-                                    . ', ' . $transformName
-                                    . ', ' . $siteId
-                                    . ', ' . $transformMode
+                                    . ', '.$transformName
+                                    . ', '.$siteId
+                                    . ', '.$transformMode
                                     . ') }}';
                                 $globalsSettings[$fieldNameWidth] = '{{ seomatic.helper.socialTransformWidth('
                                     . $ids[0]
-                                    . ', ' . $transformName
-                                    . ', ' . $siteId
-                                    . ', ' . $transformMode
+                                    . ', '.$transformName
+                                    . ', '.$siteId
+                                    . ', '.$transformMode
                                     . ') }}';
                                 $globalsSettings[$fieldNameHeight] = '{{ seomatic.helper.socialTransformHeight('
                                     . $ids[0]
-                                    . ', ' . $transformName
-                                    . ', ' . $siteId
-                                    . ', ' . $transformMode
+                                    . ', '.$transformName
+                                    . ', '.$siteId
+                                    . ', '.$transformMode
                                     . ') }}';
                             }
                             break;
@@ -278,20 +278,20 @@ 
                 } else {
                     switch ($source) {
                         case 'sameAsSeo':
-                            $globalsSettings[$fieldName] = '{{ seomatic.meta.' . $seoField . ' }}';
-                            $globalsSettings[$fieldNameWidth] = '{{ seomatic.meta.' . $seoFieldWidth . ' }}';
-                            $globalsSettings[$fieldNameHeight] = '{{ seomatic.meta.' . $seoFieldHeight . ' }}';
+                            $globalsSettings[$fieldName] = '{{ seomatic.meta.'.$seoField.' }}';
+                            $globalsSettings[$fieldNameWidth] = '{{ seomatic.meta.'.$seoFieldWidth.' }}';
+                            $globalsSettings[$fieldNameHeight] = '{{ seomatic.meta.'.$seoFieldHeight.' }}';
                             break;
                         case 'fromField':
                             if (!empty($sourceField)) {
                                 $globalsSettings[$fieldName] = '{{ '
-                                    . $elementName . $sourceField . '[0].url'
+                                    . $elementName.$sourceField.'[0].url'
                                     . ' }}';
                                 $globalsSettings[$fieldNameWidth] = '{{ '
-                                    . $elementName . $sourceField . '[0].width'
+                                    . $elementName.$sourceField.'[0].width'
                                     . ' }}';
                                 $globalsSettings[$fieldNameHeight] = '{{ '
-                                    . $elementName . $sourceField . '[0].height'
+                                    . $elementName.$sourceField.'[0].height'
                                     . ' }}';
                             }
                             break;
@@ -299,13 +299,13 @@ 
                             if (!empty($ids)) {
                                 $globalsSettings[$fieldName] = '{{ craft.app.assets.assetById('
                                     . $ids[0]
-                                    . ', ' . $siteId . ').url }}';
+                                    . ', '.$siteId.').url }}';
                                 $globalsSettings[$fieldNameWidth] = '{{ craft.app.assets.assetById('
                                     . $ids[0]
-                                    . ', ' . $siteId . ').width }}';
+                                    . ', '.$siteId.').width }}';
                                 $globalsSettings[$fieldNameHeight] = '{{ craft.app.assets.assetById('
                                     . $ids[0]
-                                    . ', ' . $siteId . ').height }}';
+                                    . ', '.$siteId.').height }}';
                             }
                             break;
                     }

src/helpers/ImageTransform.php

Spacing +5 added lines, -5 removed lines

@@ -187,7 +187,7 @@ 
         }
         $asset = self::assetFromAssetOrIdOrQuery($asset, $siteId);
         if (($asset !== null) && ($asset instanceof Asset)) {
-            $width = (string)$asset->getWidth($transform);
+            $width = (string) $asset->getWidth($transform);
             if ($width === null) {
                 $width = '';
             }
@@ -219,7 +219,7 @@ 
         }
         $asset = self::assetFromAssetOrIdOrQuery($asset, $siteId);
         if (($asset !== null) && ($asset instanceof Asset)) {
-            $height = (string)$asset->getHeight($transform);
+            $height = (string) $asset->getHeight($transform);
             if ($height === null) {
                 $height = '';
             }
@@ -244,13 +244,13 @@ 
             if (\is_array($assetIds)) {
                 foreach ($assetIds as $assetId) {
                     if (!empty($assetId)) {
-                        $assets[] = $elements->getElementById((int)$assetId, Asset::class, $siteId);
+                        $assets[] = $elements->getElementById((int) $assetId, Asset::class, $siteId);
                     }
                 }
             } else {
                 $assetId = $assetIds;
                 if (!empty($assetId)) {
-                    $assets[] = $elements->getElementById((int)$assetId, Asset::class, $siteId);
+                    $assets[] = $elements->getElementById((int) $assetId, Asset::class, $siteId);
                 }
             }
         }
@@ -287,7 +287,7 @@ 
             return $asset->one();
         }
 
-        $resolvedAssetId = (int)$asset;
+        $resolvedAssetId = (int) $asset;
         $resolvedSiteId = $siteId ?? 0;
         if (isset(self::$cachedAssetsElements[$resolvedAssetId][$resolvedSiteId])) {
             return self::$cachedAssetsElements[$resolvedAssetId][$resolvedSiteId];

src/fields/SeoSettings.php

Spacing +8 added lines, -8 removed lines

@@ -254,7 +254,7 @@ 
                 $value = StringHelper::encodeMb4($value);
             }
             if (\is_array($value)) {
-                array_walk_recursive($value, function (&$arrayValue, $arrayKey) {
+                array_walk_recursive($value, function(&$arrayValue, $arrayKey) {
                     if ($arrayValue !== null && \is_string($arrayValue)) {
                         $arrayValue = StringHelper::encodeMb4($arrayValue);
                     }
@@ -390,7 +390,7 @@ 
         if ($element !== null && $element->uri !== null) {
             $siteId = $element->siteId;
             $uri = $element->uri;
-            $cacheKey = self::CACHE_KEY . $uri . $siteId . $this->elementDisplayPreviewType;
+            $cacheKey = self::CACHE_KEY.$uri.$siteId.$this->elementDisplayPreviewType;
             $metaBundleSourceType = Seomatic::$plugin->seoElements->getMetaBundleTypeFromElement($element);
             $seoElement = Seomatic::$plugin->seoElements->getSeoElementByMetaBundleType($metaBundleSourceType);
             $metaBundleSourceType = SeoEntry::getMetaBundleType();
@@ -401,15 +401,15 @@ 
             $dependency = new TagDependency([
                 'tags' => [
                     MetaContainers::GLOBAL_METACONTAINER_CACHE_TAG,
-                    MetaContainers::METACONTAINER_CACHE_TAG . $metaBundleSourceId . $metaBundleSourceType . $siteId,
-                    MetaContainers::METACONTAINER_CACHE_TAG . $uri . $siteId,
+                    MetaContainers::METACONTAINER_CACHE_TAG.$metaBundleSourceId.$metaBundleSourceType.$siteId,
+                    MetaContainers::METACONTAINER_CACHE_TAG.$uri.$siteId,
                 ],
             ]);
             $cache = Craft::$app->getCache();
             $cacheDuration = null;
             $html = $cache->getOrSet(
-                self::CACHE_KEY . $cacheKey,
-                function () use ($uri, $siteId, $element) {
+                self::CACHE_KEY.$cacheKey,
+                function() use ($uri, $siteId, $element) {
                     Seomatic::$plugin->metaContainers->previewMetaContainers($uri, $siteId, true);
                     $variables = [
                         'previewTypes' => [
@@ -451,7 +451,7 @@ 
     )
     {
         $variables['textFieldSources'] = array_merge(
-            ['entryGroup' => ['optgroup' => $groupName . ' Fields'], 'title' => 'Title'],
+            ['entryGroup' => ['optgroup' => $groupName.' Fields'], 'title' => 'Title'],
             FieldHelper::fieldsOfTypeFromElement(
                 $element,
                 FieldHelper::TEXT_FIELD_CLASS_KEY,
@@ -459,7 +459,7 @@ 
             )
         );
         $variables['assetFieldSources'] = array_merge(
-            ['entryGroup' => ['optgroup' => $groupName . ' Fields']],
+            ['entryGroup' => ['optgroup' => $groupName.' Fields']],
             FieldHelper::fieldsOfTypeFromElement(
                 $element,
                 FieldHelper::ASSET_FIELD_CLASS_KEY,

src/seomatic-config/globalmeta/TitleContainer.php

Spacing +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
  */
 
 return [
-    MetaTitleContainer::CONTAINER_TYPE . TitleService::GENERAL_HANDLE => [
+    MetaTitleContainer::CONTAINER_TYPE.TitleService::GENERAL_HANDLE => [
         'name' => 'General',
         'description' => 'Meta Title Tag',
         'handle' => TitleService::GENERAL_HANDLE,
-        'class' => (string)MetaTitleContainer::class,
+        'class' => (string) MetaTitleContainer::class,
         'include' => true,
         'dependencies' => [
         ],

src/seomatic-config/globalmeta/JsonLdContainer.php

Spacing +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
  */
 
 return [
-    MetaJsonLdContainer::CONTAINER_TYPE . JsonLdService::GENERAL_HANDLE => [
+    MetaJsonLdContainer::CONTAINER_TYPE.JsonLdService::GENERAL_HANDLE => [
         'name' => 'General',
         'description' => 'JsonLd Tags',
         'handle' => JsonLdService::GENERAL_HANDLE,
-        'class' => (string)MetaJsonLdContainer::class,
+        'class' => (string) MetaJsonLdContainer::class,
         'include' => true,
         'dependencies' => [
         ],

src/seomatic-config/globalmeta/LinkContainer.php

Spacing +2 added lines, -2 removed lines

@@ -21,11 +21,11 @@
  */
 
 return [
-    MetaLinkContainer::CONTAINER_TYPE . LinkService::GENERAL_HANDLE => [
+    MetaLinkContainer::CONTAINER_TYPE.LinkService::GENERAL_HANDLE => [
         'name' => 'General',
         'description' => 'Link Tags',
         'handle' => LinkService::GENERAL_HANDLE,
-        'class' => (string)MetaLinkContainer::class,
+        'class' => (string) MetaLinkContainer::class,
         'include' => true,
         'dependencies' => [
         ],

src/seomatic-config/globalmeta/TagContainer.php

Spacing +8 added lines, -8 removed lines

@@ -20,11 +20,11 @@ 
  */
 
 return [
-    MetaTagContainer::CONTAINER_TYPE . TagService::GENERAL_HANDLE => [
+    MetaTagContainer::CONTAINER_TYPE.TagService::GENERAL_HANDLE => [
         'name' => 'General',
         'description' => 'General Meta Tags',
         'handle' => TagService::GENERAL_HANDLE,
-        'class' => (string)MetaTagContainer::class,
+        'class' => (string) MetaTagContainer::class,
         'include' => true,
         'dependencies' => [
         ],
@@ -76,11 +76,11 @@ 
             ],
         ],
     ],
-    MetaTagContainer::CONTAINER_TYPE . TagService::FACEBOOK_HANDLE => [
+    MetaTagContainer::CONTAINER_TYPE.TagService::FACEBOOK_HANDLE => [
         'name' => 'Facebook',
         'description' => 'Facebook OpenGraph Meta Tags',
         'handle' => TagService::FACEBOOK_HANDLE,
-        'class' => (string)MetaTagContainer::class,
+        'class' => (string) MetaTagContainer::class,
         'include' => true,
         'dependencies' => [
         ],
@@ -206,12 +206,12 @@ 
             ],
         ],
     ],
-    MetaTagContainer::CONTAINER_TYPE . TagService::TWITTER_HANDLE => [
+    MetaTagContainer::CONTAINER_TYPE.TagService::TWITTER_HANDLE => [
         'name' => 'Twitter',
         'description' => 'Twitter Card Meta Tags',
         'handle' => TagService::TWITTER_HANDLE,
         'include' => true,
-        'class' => (string)MetaTagContainer::class,
+        'class' => (string) MetaTagContainer::class,
         'dependencies' => [
             Dependency::SITE_DEPENDENCY => ['twitterHandle'],
         ],
@@ -290,11 +290,11 @@ 
             ],
         ],
     ],
-    MetaTagContainer::CONTAINER_TYPE . TagService::MISC_HANDLE => [
+    MetaTagContainer::CONTAINER_TYPE.TagService::MISC_HANDLE => [
         'name' => 'Miscellaneous',
         'description' => 'Miscellaneous Meta Tags',
         'handle' => TagService::MISC_HANDLE,
-        'class' => (string)MetaTagContainer::class,
+        'class' => (string) MetaTagContainer::class,
         'include' => true,
         'dependencies' => [
         ],

src/services/Helper.php

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
     {
         $baseUrl = UrlHelper::hostInfo(UrlHelper::siteUrl($path));
 
-        return rtrim($baseUrl, '/') . '/' . ltrim($path, '/');
+        return rtrim($baseUrl, '/').'/'.ltrim($path, '/');
     }
 
     /**
@@ -107,7 +107,7 @@ 
 
         $metaSiteVars = Seomatic::$plugin->metaContainers->metaSiteVars;
         if ($metaSiteVars && !empty($metaSiteVars->siteLinksQueryInput)) {
-            $result = 'required name=' . $metaSiteVars->siteLinksQueryInput;
+            $result = 'required name='.$metaSiteVars->siteLinksQueryInput;
         }
 
         return $result;
@@ -568,8 +568,8 @@ 
      */
     public function isInherited(InheritableSettingsModel $settingCollection, $settingName)
     {
-        $explicitInherit = array_key_exists($settingName, (array)$settingCollection->inherited);
-        $explicitOverride = array_key_exists($settingName, (array)$settingCollection->overrides);
+        $explicitInherit = array_key_exists($settingName, (array) $settingCollection->inherited);
+        $explicitOverride = array_key_exists($settingName, (array) $settingCollection->overrides);
 
         if ($explicitInherit || $explicitOverride) {
             return $explicitInherit && !$explicitOverride;