Perms: Fixed some issues made when adding transactions

[bookstack] / app / App / helpers.php

diff --git a/app/App/helpers.php b/app/App/helpers.php
index af6dbcfc39787da06e9d9387685733e932da17b6..2305c2d72a19f41f240de42f2234fc6ee24c55db 100644 (file)
--- a/app/App/helpers.php
+++ b/app/App/helpers.php
@@ -1,6 +1,8 @@
 <?php
 
 <?php
 

+use BookStack\App\AppVersion;

 use BookStack\App\Model;
 use BookStack\App\Model;

+use BookStack\Facades\Theme;

 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Settings\SettingService;
 use BookStack\Users\Models\User;
 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Settings\SettingService;
 use BookStack\Users\Models\User;


@@ -12,12 +14,7 @@ use BookStack\Users\Models\User;
  */
 function versioned_asset(string $file = ''): string
 {
  */
 function versioned_asset(string $file = ''): string
 {

-    static $version = null;
-
-    if (is_null($version)) {
-        $versionFile = base_path('version');
-        $version = trim(file_get_contents($versionFile));
-    }
+    $version = AppVersion::get();

 
     $additional = '';
     if (config('app.env') === 'development') {
 
     $additional = '';
     if (config('app.env') === 'development') {


@@ -42,9 +39,9 @@ function user(): User
  * 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, Model $ownable = null): bool
+function userCan(string $permission, ?Model $ownable = null): bool

 {
 {

-    if ($ownable === null) {
+    if (is_null($ownable)) {

         return user()->can($permission);
     }
 
         return user()->can($permission);
     }
 


@@ -70,7 +67,7 @@ function userCanOnAny(string $action, string $entityClass = ''): bool
  *
  * @return mixed|SettingService
  */
  *
  * @return mixed|SettingService
  */

-function setting(string $key = null, $default = null)
+function setting(?string $key = null, mixed $default = null): mixed

 {
     $settingService = app()->make(SettingService::class);
 
 {
     $settingService = app()->make(SettingService::class);
 


@@ -88,43 +85,10 @@ function setting(string $key = null, $default = null)
  */
 function theme_path(string $path = ''): ?string
 {
  */
 function theme_path(string $path = ''): ?string
 {

-    $theme = config('view.theme');
-
+    $theme = Theme::getTheme();

     if (!$theme) {
         return null;
     }
 
     return base_path('themes/' . $theme . ($path ? DIRECTORY_SEPARATOR . $path : $path));
 }
     if (!$theme) {
         return null;
     }
 
     return base_path('themes/' . $theme . ($path ? DIRECTORY_SEPARATOR . $path : $path));
 }

-
-/**
- * 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.
- */
-function sortUrl(string $path, array $data, array $overrideData = []): string
-{
-    $queryStringSections = [];
-    $queryData = array_merge($data, $overrideData);
-
-    // Change sorting direction is already sorted on current attribute
-    if (isset($overrideData['sort']) && $overrideData['sort'] === $data['sort']) {
-        $queryData['order'] = ($data['order'] === 'asc') ? 'desc' : 'asc';
-    } elseif (isset($overrideData['sort'])) {
-        $queryData['order'] = 'asc';
-    }
-
-    foreach ($queryData as $name => $value) {
-        $trimmedVal = trim($value);
-        if ($trimmedVal === '') {
-            continue;
-        }
-        $queryStringSections[] = urlencode($name) . '=' . urlencode($trimmedVal);
-    }
-
-    if (count($queryStringSections) === 0) {
-        return url($path);
-    }
-
-    return url($path . '?' . implode('&', $queryStringSections));
-}