Merge pull request #11 from kerli81/master

Kirby 3.6 Issues solved
sylvainjule · Feb 23, 2022 · 5a00179 · 5a00179
2 parents be31b1d + 9580364
commit 5a00179
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/index.php b/index.php
@@ -14,6 +14,12 @@
             $user  = kirby()->user();
             if(!$user) return;
 
+            if (str_starts_with($path, "dialogs")
+                || str_starts_with($path, "dropdowns")
+                || str_starts_with($path, "search")) {
+                return;
+            }
+
             $currentRole = $user->role()->name();
 
             foreach(option('sylvainjule.bouncer.list') as $role => $options) {

diff --git a/lib/bouncer.php b/lib/bouncer.php
@@ -2,6 +2,27 @@
 
 class Bouncer {
 
+    private static function getChildren($allowed, Kirby\Cms\Page $page) {
+        if (!$page->hasChildren()) {
+            return [];
+        }
+
+        $allowed = [];
+        $pages = $page->childrenAndDrafts();
+        foreach($pages as $p) {
+            $allowed[] = [
+                'title' => $p->title()->value(),
+                'path'  => $p->panelUrl(true)
+            ];
+
+
+            $children = Bouncer::getChildren($allowed, $p);
+            $allowed = array_merge($allowed, $children);
+        }
+
+        return $allowed;
+    }
+
     public static function getAllowedPages($user, $fieldname, $extra = false) {
         $kirby   = kirby();
         $allowed = [];
@@ -15,6 +36,9 @@ public static function getAllowedPages($user, $fieldname, $extra = false) {
                     'title' => $page->title()->value(),
                     'path'  => $page->panelUrl(true)
                 ];
+
+                $children = $extra ? Bouncer::getChildren($allowed, $page) : [];
+                $allowed = array_merge($allowed, $children);
             }
         }