Merge pull request #15 from oveleon/develop

Consider urlPrefix with disabled legacy routing for logo module
oveleon · Apr 13, 2022 · b8b57fb · b8b57fb
2 parents f68af1a + dc22347
commit b8b57fb
Showing 1 changed file with 29 additions and 24 deletions.
diff --git a/src/Resources/contao/modules/ModuleLogo.php b/src/Resources/contao/modules/ModuleLogo.php
@@ -50,19 +50,19 @@ class ModuleLogo extends Module
      */
     public function generate()
     {
-	    $request = System::getContainer()->get('request_stack')->getCurrentRequest();
+        $request = System::getContainer()->get('request_stack')->getCurrentRequest();
 
-	    if ($request && System::getContainer()->get('contao.routing.scope_matcher')->isBackendRequest($request))
-	    {
-		    $objTemplate = new BackendTemplate('be_wildcard');
-		    $objTemplate->wildcard = '### ' . mb_strtoupper($GLOBALS['TL_LANG']['FMD']['logo'][0], 'UTF-8') . ' ###';
-		    $objTemplate->title = $this->headline;
-		    $objTemplate->id = $this->id;
-		    $objTemplate->link = $this->name;
-		    $objTemplate->href = 'contao/main.php?do=themes&amp;table=tl_module&amp;act=edit&amp;id=' . $this->id;
-
-		    return $objTemplate->parse();
-	    }
+        if ($request && System::getContainer()->get('contao.routing.scope_matcher')->isBackendRequest($request))
+        {
+            $objTemplate = new BackendTemplate('be_wildcard');
+            $objTemplate->wildcard = '### ' . mb_strtoupper($GLOBALS['TL_LANG']['FMD']['logo'][0], 'UTF-8') . ' ###';
+            $objTemplate->title = $this->headline;
+            $objTemplate->id = $this->id;
+            $objTemplate->link = $this->name;
+            $objTemplate->href = 'contao/main.php?do=themes&amp;table=tl_module&amp;act=edit&amp;id=' . $this->id;
+
+            return $objTemplate->parse();
+        }
 
         $singleSRC = Company::get('logo');
 
@@ -94,27 +94,32 @@ protected function compile(): void
 
         $this->addImageToTemplate($this->Template, $this->arrData, null, null, $this->objFile);
 
-		// Create rootHref URL
+        // Create rootHref URL
         $strPageUrl = Environment::get('url');
         $prependLocale = System::getContainer()->getParameter('contao.prepend_locale');
 
         if($prependLocale)
         {
-	        $strPageUrl .= '/' . $objPage->language;
+            $strPageUrl .= '/' . $objPage->language;
+        }
+        // consider urlPrefix with disabled legacy routing (Contao 4.10 and up)
+        else if(!!$objPage->urlPrefix)
+        {
+            $strPageUrl .= '/' . $objPage->urlPrefix;
         }
 
-	    $strPageUrl .= '/';
+        $strPageUrl .= '/';
 
-		// Set URI as title tag
-		$strCompanyName = $strPageUrl;
+        // Set URI as title tag
+        $strCompanyName = $strPageUrl;
 
-	    // Override title tag with company name if it is set
-	    if (!empty(Company::get('name')))
-		{
-			$strCompanyName = Company::get('name');
-	    }
+        // Override title tag with company name if it is set
+        if (!empty(Company::get('name')))
+        {
+            $strCompanyName = Company::get('name');
+        }
 
-	    $this->Template->rootHref = $strPageUrl;
-	    $this->Template->title = $strCompanyName;
+        $this->Template->rootHref = $strPageUrl;
+        $this->Template->title = $strCompanyName;
     }
 }