[TASK] Latest adoptions

georgringer · Aug 4, 2019 · 56e37f5 · 56e37f5
1 parent 90b7a53
commit 56e37f5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/Classes/Hooks/LinkHook.php b/Classes/Hooks/LinkHook.php
@@ -100,7 +100,7 @@ protected function isInLocalDomain($url)
                 $host = $parsedUrl['host'];
 
                 if (version_compare(TYPO3_version, '9.0', '<')) {
-                    $result = $this->checkSysDomains($parsedUrl, $host);
+                    $result = $this->checkSysDomains($parsedUrl);
                 } else {
                     try {
                         $siteFinder = GeneralUtility::makeInstance(SiteFinder::class);
@@ -111,7 +111,7 @@ protected function isInLocalDomain($url)
                             }
                         }
                     } catch (SiteNotFoundException $e) {
-                        $result = $this->checkSysDomains($parsedUrl, $host);
+                        $result = $this->checkSysDomains($parsedUrl);
                     }
                 }
             }
@@ -121,14 +121,15 @@ protected function isInLocalDomain($url)
     }
 
     /**
-     * @param string $parsedUrl
+     * @param array $parsedUrl
      * @param string $host
      * @return bool
      */
-    protected function checkSysDomains($parsedUrl, $host): bool
+    protected function checkSysDomains($parsedUrl): bool
     {
+        $result = false;
         // Removes the last path segment and slash sequences like /// (if given):
-        $path = preg_replace('#/+[^/]*$#', '', $parsedUrl['path'] ?? '');
+        $path = preg_replace('#/+[^/]*$#', '', $parsedUrl['host'] ?? '');
 
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('sys_domain');
         $queryBuilder->setRestrictions(GeneralUtility::makeInstance(FrontendRestrictionContainer::class));
@@ -141,7 +142,7 @@ protected function checkSysDomains($parsedUrl, $host): bool
             foreach ($localDomains as $localDomain) {
                 // strip trailing slashes (if given)
                 $domainName = rtrim($localDomain['domainName'], '/');
-                if (GeneralUtility::isFirstPartOfStr($host . $path . '/', $domainName . '/')) {
+                if ($domainName === $path) {
                     $result = true;
                     break;
                 }

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -8,7 +8,7 @@
     'author_email' => '[email protected]',
     'state' => 'beta',
     'clearCacheOnLoad' => true,
-    'version' => '0.1.0',
+    'version' => '1.0.0',
     'constraints' => [
         'depends' => [
             'typo3' => '8.7.0-9.5.99'