fix(wysiwyg): preserves line feeds in code block mode

[bookstack] / app / helpers.php

diff --git a/app/helpers.php b/app/helpers.php
index 65da1853b54e54bb43a8cb8fe5d9959a3a877578..9edc22c403d9b1a7859baaec7983a8ad14e898a4 100644 (file)
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -2,14 +2,12 @@
 
 use BookStack\Auth\Permissions\PermissionService;
 use BookStack\Auth\User;
 
 use BookStack\Auth\Permissions\PermissionService;
 use BookStack\Auth\User;

-use BookStack\Ownable;
+use BookStack\Model;

 use BookStack\Settings\SettingService;
 
 /**
  * Get the path to a versioned file.
  *
 use BookStack\Settings\SettingService;
 
 /**
  * Get the path to a versioned file.
  *

- * @param  string $file
- * @return string

  * @throws Exception
  */
 function versioned_asset(string $file = ''): string
  * @throws Exception
  */
 function versioned_asset(string $file = ''): string


@@ -27,13 +25,13 @@ function versioned_asset(string $file = ''): string
     }
 
     $path = $file . '?version=' . urlencode($version) . $additional;
     }
 
     $path = $file . '?version=' . urlencode($version) . $additional;

+

     return url($path);
 }
 
 /**
  * Helper method to get the current User.
  * Defaults to public 'Guest' user if not logged in.
     return url($path);
 }
 
 /**
  * Helper method to get the current User.
  * Defaults to public 'Guest' user if not logged in.

- * @return User

  */
 function user(): User
 {
  */
 function user(): User
 {


@@ -57,11 +55,10 @@ function hasAppAccess(): bool
 }
 
 /**
 }
 
 /**

- * Check if the current user has a permission.
- * If an ownable element is passed in the jointPermissions are checked against
- * that particular item.
+ * Check if the current user has a permission. If an ownable element
+ * is passed in the jointPermissions are checked against that particular item.

  */
  */

-function userCan(string $permission, Ownable $ownable = null): bool
+function userCan(string $permission, Model $ownable = null): bool

 {
     if ($ownable === null) {
         return user() && user()->can($permission);
 {
     if ($ownable === null) {
         return user() && user()->can($permission);


@@ -69,50 +66,51 @@ function userCan(string $permission, Ownable $ownable = null): bool
 
     // Check permission on ownable item
     $permissionService = app(PermissionService::class);
 
     // Check permission on ownable item
     $permissionService = app(PermissionService::class);

+

     return $permissionService->checkOwnableUserAccess($ownable, $permission);
 }
 
 /**
  * Check if the current user has the given permission
  * on any item in the system.
     return $permissionService->checkOwnableUserAccess($ownable, $permission);
 }
 
 /**
  * Check if the current user has the given permission
  * on any item in the system.

- * @param string $permission
- * @param string|null $entityClass
- * @return bool

  */
 function userCanOnAny(string $permission, string $entityClass = null): bool
 {
     $permissionService = app(PermissionService::class);
  */
 function userCanOnAny(string $permission, string $entityClass = null): bool
 {
     $permissionService = app(PermissionService::class);

+

     return $permissionService->checkUserHasPermissionOnAnything($permission, $entityClass);
 }
 
 /**
  * Helper to access system settings.
     return $permissionService->checkUserHasPermissionOnAnything($permission, $entityClass);
 }
 
 /**
  * Helper to access system settings.

- * @param string $key
- * @param $default
- * @return bool|string|SettingService
+ *
+ * @return mixed|SettingService

  */
  */

-function setting(string $key = null, $default = false)
+function setting(string $key = null, $default = null)

 {
     $settingService = resolve(SettingService::class);
 {
     $settingService = resolve(SettingService::class);

+

     if (is_null($key)) {
         return $settingService;
     }
     if (is_null($key)) {
         return $settingService;
     }

+

     return $settingService->get($key, $default);
 }
 
 /**
  * Get a path to a theme resource.
     return $settingService->get($key, $default);
 }
 
 /**
  * Get a path to a theme resource.

- * @param string $path
- * @return string
+ * Returns null if a theme is not configured and
+ * therefore a full path is not available for use.

  */
  */

-function theme_path(string $path = ''): string
+function theme_path(string $path = ''): ?string

 {
     $theme = config('view.theme');
 {
     $theme = config('view.theme');

+

     if (!$theme) {
     if (!$theme) {

-        return '';
+        return null;

     }
 
     }
 

-    return base_path('themes/' . $theme .($path ? DIRECTORY_SEPARATOR.$path : $path));
+    return base_path('themes/' . $theme . ($path ? DIRECTORY_SEPARATOR . $path : $path));

 }
 
 /**
 }
 
 /**


@@ -121,9 +119,6 @@ function theme_path(string $path = ''): string
  * to the 'resources/assets/icons' folder.
  *
  * Returns an empty string if icon file not found.
  * to the 'resources/assets/icons' folder.
  *
  * Returns an empty string if icon file not found.

- * @param $name
- * @param array $attrs
- * @return mixed

  */
 function icon(string $name, array $attrs = []): string
 {
  */
 function icon(string $name, array $attrs = []): string
 {


@@ -134,18 +129,20 @@ function icon(string $name, array $attrs = []): string
     ], $attrs);
     $attrString = ' ';
     foreach ($attrs as $attrName => $attr) {
     ], $attrs);
     $attrString = ' ';
     foreach ($attrs as $attrName => $attr) {

-        $attrString .=  $attrName . '="' . $attr . '" ';
+        $attrString .= $attrName . '="' . $attr . '" ';

     }
 
     $iconPath = resource_path('icons/' . $name . '.svg');
     $themeIconPath = theme_path('icons/' . $name . '.svg');
     }
 
     $iconPath = resource_path('icons/' . $name . '.svg');
     $themeIconPath = theme_path('icons/' . $name . '.svg');

+

     if ($themeIconPath && file_exists($themeIconPath)) {
         $iconPath = $themeIconPath;
     if ($themeIconPath && file_exists($themeIconPath)) {
         $iconPath = $themeIconPath;

-    } else if (!file_exists($iconPath)) {
+    } elseif (!file_exists($iconPath)) {

         return '';
     }
 
     $fileContents = file_get_contents($iconPath);
         return '';
     }
 
     $fileContents = file_get_contents($iconPath);

+

     return  str_replace('<svg', '<svg' . $attrString, $fileContents);
 }
 
     return  str_replace('<svg', '<svg' . $attrString, $fileContents);
 }
 


@@ -153,10 +150,6 @@ function icon(string $name, array $attrs = []): string
  * Generate a url with multiple parameters for sorting purposes.
  * Works out the logic to set the correct sorting direction
  * Discards empty parameters and allows overriding.
  * Generate a url with multiple parameters for sorting purposes.
  * Works out the logic to set the correct sorting direction
  * Discards empty parameters and allows overriding.

- * @param string $path
- * @param array $data
- * @param array $overrideData
- * @return string

  */
 function sortUrl(string $path, array $data, array $overrideData = []): string
 {
  */
 function sortUrl(string $path, array $data, array $overrideData = []): string
 {


@@ -166,7 +159,7 @@ function sortUrl(string $path, array $data, array $overrideData = []): string
     // Change sorting direction is already sorted on current attribute
     if (isset($overrideData['sort']) && $overrideData['sort'] === $data['sort']) {
         $queryData['order'] = ($data['order'] === 'asc') ? 'desc' : 'asc';
     // Change sorting direction is already sorted on current attribute
     if (isset($overrideData['sort']) && $overrideData['sort'] === $data['sort']) {
         $queryData['order'] = ($data['order'] === 'asc') ? 'desc' : 'asc';

-    } else {
+    } elseif (isset($overrideData['sort'])) {

         $queryData['order'] = 'asc';
     }
 
         $queryData['order'] = 'asc';
     }