Skip intermediate login page with single provider

[bookstack] / app / Entities / Tools / BookContents.php

diff --git a/app/Entities/Tools/BookContents.php b/app/Entities/Tools/BookContents.php
index 99602de414034a44ca9db88a4cd47655d814254f..6f11e8cbe528f3002008f8a03d78248d0f3fdb0d 100644 (file)
--- a/app/Entities/Tools/BookContents.php
+++ b/app/Entities/Tools/BookContents.php
@@ -119,9 +119,10 @@ class BookContents
         // Sort our changes from our map to be chapters first
         // Since they need to be process to ensure book alignment for child page changes.
         $sortMapItems = $sortMap->all();
         // Sort our changes from our map to be chapters first
         // Since they need to be process to ensure book alignment for child page changes.
         $sortMapItems = $sortMap->all();

-        usort($sortMapItems, function(BookSortMapItem $itemA, BookSortMapItem $itemB) {
+        usort($sortMapItems, function (BookSortMapItem $itemA, BookSortMapItem $itemB) {

             $aScore = $itemA->type === 'page' ? 2 : 1;
             $bScore = $itemB->type === 'page' ? 2 : 1;
             $aScore = $itemA->type === 'page' ? 2 : 1;
             $bScore = $itemB->type === 'page' ? 2 : 1;

+

             return $aScore - $bScore;
         });
 
             return $aScore - $bScore;
         });
 


@@ -167,9 +168,9 @@ class BookContents
             return;
         }
 
             return;
         }
 

-        $currentParentKey =  'book:' . $model->book_id;
+        $currentParentKey = 'book:' . $model->book_id;

         if ($model instanceof Page && $model->chapter_id) {
         if ($model instanceof Page && $model->chapter_id) {

-             $currentParentKey = 'chapter:' . $model->chapter_id;
+            $currentParentKey = 'chapter:' . $model->chapter_id;

         }
 
         $currentParent = $modelMap[$currentParentKey] ?? null;
         }
 
         $currentParent = $modelMap[$currentParentKey] ?? null;


@@ -265,6 +266,7 @@ class BookContents
 
     /**
      * Load models from the database into the given sort map.
 
     /**
      * Load models from the database into the given sort map.

+     *

      * @return array<string, Entity>
      */
     protected function loadModelsFromSortMap(BookSortMap $sortMap): array
      * @return array<string, Entity>
      */
     protected function loadModelsFromSortMap(BookSortMap $sortMap): array


@@ -272,8 +274,8 @@ class BookContents
         $modelMap = [];
         $ids = [
             'chapter' => [],
         $modelMap = [];
         $ids = [
             'chapter' => [],

-            'page' => [],
-            'book' => [],
+            'page'    => [],
+            'book'    => [],

         ];
 
         foreach ($sortMap->all() as $sortMapItem) {
         ];
 
         foreach ($sortMap->all() as $sortMapItem) {