PageHelper has better multilang support if aliases equal, sorting is …

…used in more cases
DieSchittigs · Sep 28, 2017 · 3c07170 · 3c07170
1 parent 62dd4b8
commit 3c07170
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/src/Resources/contao/classes/ArticleHelper.php b/src/Resources/contao/classes/ArticleHelper.php
@@ -24,7 +24,7 @@ public static function pageArticles($pageId)
                 $articles->{$article->inColumn} = [];
             }
             $_article = Helper::toObj($article);
-            $contents = ContentModel::findPublishedByPidAndTable($article->id, 'tl_article');
+            $contents = ContentModel::findPublishedByPidAndTable($article->id, 'tl_article', ['order' => 'sorting ASC']);
             if (!$contents) {
                 continue;
             }

diff --git a/src/Resources/contao/classes/Helper.php b/src/Resources/contao/classes/Helper.php
@@ -86,6 +86,15 @@ public static function replaceURL($url){
         return str_replace($apiScript, '', $url);
     }
 
+    public static function urlToLanguage($url)
+    {
+        if (Config::get('addLanguageToUrl')){
+            $parts = explode('/', $url);
+            if(count($parts) >=  3 && strlen($parts[1]) == 2) return $parts[1];
+        }
+        return static::defaultLang();
+    }
+
     public static function urlToAlias($url)
     {
         $suffix = Config::get('urlSuffix');

diff --git a/src/Resources/contao/classes/PageHelper.php b/src/Resources/contao/classes/PageHelper.php
@@ -47,7 +47,8 @@ public static function parsePage($page, $includeSubPages = true, $includeParentP
 
     public static function getPage($url, $ignoreUnequalAlias = false)
     {
-        if($url == '/' || $url == '/'.Helper::defaultLang().'/'){
+        $urlLanguage = Helper::urlToLanguage($url);
+        if($url == '/' || $url == '/'.$urlLanguage.'/'){
             $rootId = Frontend::getRootPageFromUrl()->id;
             $rootPage = PageModel::findByIdOrAlias($rootId);
             $page = PageModel::findFirstPublishedByPid($rootId);
@@ -60,7 +61,11 @@ public static function getPage($url, $ignoreUnequalAlias = false)
             if (!$ignoreUnequalAlias && $urlAlias != $pageAlias) {
                 return null;
             }
-            $page = PageModel::findByIdOrAlias($pageAlias);
+            $pages = PageModel::findPublishedByIdOrAlias($pageAlias);
+            foreach($pages as $page){
+                $page->loadDetails();
+                if($page->language == $urlLanguage) break;
+            }
         }
         if (!$page) {
             return;

diff --git a/src/Resources/contao/classes/ReaderHelper.php b/src/Resources/contao/classes/ReaderHelper.php
@@ -23,7 +23,7 @@ public static function handle($readerClass, $url)
         if (!$readerModel || !Controller::isVisibleElement($readerModel)) {
             return null;
         }
-        $contents = ContentModel::findPublishedByPidAndTable($readerModel->id, $readerClass::getTable());
+        $contents = ContentModel::findPublishedByPidAndTable($readerModel->id, $readerClass::getTable(), ['order' => 'sorting ASC']);
         $_reader = Helper::toObj($readerModel);
         if ($contents) {
             foreach ($contents as $content) {

diff --git a/src/Resources/contao/classes/SitemapHelper.php b/src/Resources/contao/classes/SitemapHelper.php
@@ -10,7 +10,7 @@ public static function getSitemap($lang = null)
     {
         if (!$lang) $lang = Helper::defaultLang();
         $sitemap = [];
-        $rootPages = PageModel::findPublishedRootPages();
+        $rootPages = PageModel::findPublishedRootPages(['order' => 'sorting ASC']);
         foreach($rootPages as $rootPage){
             if($rootPage->language == $lang) break;
         }