Adds overflow:auto to popup content to allow it to scroll in lower res.

[bookstack] / app / Repos / EntityRepo.php

diff --git a/app/Repos/EntityRepo.php b/app/Repos/EntityRepo.php
index 25d229be13512ec055ce40fd586f5c35b19f1a0c..24c680234241471caa275462832cd4f977178336 100644 (file)
--- a/app/Repos/EntityRepo.php
+++ b/app/Repos/EntityRepo.php
@@ -442,9 +442,10 @@ class EntityRepo
      */
     public function updateEntityPermissionsFromRequest($request, Entity $entity)
     {
      */
     public function updateEntityPermissionsFromRequest($request, Entity $entity)
     {

-        $entity->restricted = $request->has('restricted') && $request->get('restricted') === 'true';
+        $entity->restricted = $request->get('restricted', '') === 'true';

         $entity->permissions()->delete();
         $entity->permissions()->delete();

-        if ($request->has('restrictions')) {
+
+        if ($request->filled('restrictions')) {

             foreach ($request->get('restrictions') as $roleId => $restrictions) {
                 foreach ($restrictions as $action => $value) {
                     $entity->permissions()->create([
             foreach ($request->get('restrictions') as $roleId => $restrictions) {
                 foreach ($restrictions as $action => $value) {
                     $entity->permissions()->create([


@@ -454,6 +455,7 @@ class EntityRepo
                 }
             }
         }
                 }
             }
         }

+

         $entity->save();
         $this->permissionService->buildJointPermissionsForEntity($entity);
     }
         $entity->save();
         $this->permissionService->buildJointPermissionsForEntity($entity);
     }


@@ -553,8 +555,9 @@ class EntityRepo
      */
     protected function nameToSlug($name)
     {
      */
     protected function nameToSlug($name)
     {

-        $slug = str_replace(' ', '-', function_exists('mb_strtolower') ? mb_strtolower($name) : strtolower($name));
-        $slug = preg_replace('/[\+\/\\\?\@\}\{\.\,\=\[\]\#\&\!\*\'\;\:\$\%]/', '', $slug);
+        $slug = preg_replace('/[\+\/\\\?\@\}\{\.\,\=\[\]\#\&\!\*\'\;\:\$\%]/', '', mb_strtolower($name));
+        $slug = preg_replace('/\s{2,}/', ' ', $slug);
+        $slug = str_replace(' ', '-', $slug);

         if ($slug === "") $slug = substr(md5(rand(1, 500)), 0, 5);
         return $slug;
     }
         if ($slug === "") $slug = substr(md5(rand(1, 500)), 0, 5);
         return $slug;
     }


@@ -687,6 +690,7 @@ class EntityRepo
         preg_match_all("/{{@\s?([0-9].*?)}}/", $content, $matches);
         if (count($matches[0]) === 0) return $content;
 
         preg_match_all("/{{@\s?([0-9].*?)}}/", $content, $matches);
         if (count($matches[0]) === 0) return $content;
 

+        $topLevelTags = ['table', 'ul', 'ol'];

         foreach ($matches[1] as $index => $includeId) {
             $splitInclude = explode('#', $includeId, 2);
             $pageId = intval($splitInclude[0]);
         foreach ($matches[1] as $index => $includeId) {
             $splitInclude = explode('#', $includeId, 2);
             $pageId = intval($splitInclude[0]);


@@ -711,8 +715,13 @@ class EntityRepo
                 continue;
             }
             $innerContent = '';
                 continue;
             }
             $innerContent = '';

-            foreach ($matchingElem->childNodes as $childNode) {
-                $innerContent .= $doc->saveHTML($childNode);
+            $isTopLevel = in_array(strtolower($matchingElem->nodeName), $topLevelTags);
+            if ($isTopLevel) {
+                $innerContent .= $doc->saveHTML($matchingElem);
+            } else {
+                foreach ($matchingElem->childNodes as $childNode) {
+                    $innerContent .= $doc->saveHTML($childNode);
+                }

             }
             $content = str_replace($matches[0][$index], trim($innerContent), $content);
         }
             }
             $content = str_replace($matches[0][$index], trim($innerContent), $content);
         }