Improve sorting Shelf Books

[bookstack] / app / helpers.php

diff --git a/app/helpers.php b/app/helpers.php
index 0825a2e4aff87fde91afe6eaf0f67e65ffe2f587..c090bfd055acc400e1ad4c46e7059b6c19820f60 100644 (file)
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -1,16 +1,15 @@
 <?php
 
 use BookStack\Auth\Permissions\PermissionService;
 <?php
 
 use BookStack\Auth\Permissions\PermissionService;

-use BookStack\Ownable;
+use BookStack\Auth\User;
+use BookStack\Model;
+use BookStack\Settings\SettingService;

 
 /**
  * Get the path to a versioned file.
 
 /**
  * Get the path to a versioned file.

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

  * @throws Exception
  */
  * @throws Exception
  */

-function versioned_asset($file = '')
+function versioned_asset(string $file = ''): string

 {
     static $version = null;
 
 {
     static $version = null;
 


@@ -25,37 +24,39 @@ function versioned_asset($file = '')
     }
 
     $path = $file . '?version=' . urlencode($version) . $additional;
     }
 
     $path = $file . '?version=' . urlencode($version) . $additional;

-    return baseUrl($path);
+    return url($path);

 }
 
 /**
  * Helper method to get the current User.
  * Defaults to public 'Guest' user if not logged in.
 }
 
 /**
  * Helper method to get the current User.
  * Defaults to public 'Guest' user if not logged in.

- * @return \BookStack\Auth\User

  */
  */

-function user()
+function user(): User

 {
 {

-    return auth()->user() ?: \BookStack\Auth\User::getDefault();
+    return auth()->user() ?: User::getDefault();

 }
 
 /**
  * Check if current user is a signed in user.
 }
 
 /**
  * Check if current user is a signed in user.

- * @return bool

  */
  */

-function signedInUser()
+function signedInUser(): bool

 {
     return auth()->user() && !auth()->user()->isDefault();
 }
 
 /**
 {
     return auth()->user() && !auth()->user()->isDefault();
 }
 
 /**

- * Check if the current user has a permission.
- * If an ownable element is passed in the jointPermissions are checked against
- * that particular item.
- * @param string $permission
- * @param Ownable $ownable
- * @return mixed
+ * Check if the current user has general access.

  */
  */

-function userCan(string $permission, Ownable $ownable = null)
+function hasAppAccess(): bool
+{
+    return !auth()->guest() || setting('app-public');
+}
+
+/**
+ * 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

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


@@ -69,95 +70,37 @@ function userCan(string $permission, Ownable $ownable = null)
 /**
  * Check if the current user has the given permission
  * on any item in the system.
 /**
  * Check if the current user has the given permission
  * on any item in the system.

- * @param string $permission
- * @return bool

  */
  */

-function userCanOnAny(string $permission)
+function userCanOnAny(string $permission, string $entityClass = null): bool

 {
     $permissionService = app(PermissionService::class);
 {
     $permissionService = app(PermissionService::class);

-    return $permissionService->checkUserHasPermissionOnAnything($permission);
+    return $permissionService->checkUserHasPermissionOnAnything($permission, $entityClass);

 }
 
 /**
  * Helper to access system settings.
 }
 
 /**
  * Helper to access system settings.

- * @param $key
- * @param bool $default
- * @return bool|string|\BookStack\Settings\SettingService
+ * @return bool|string|SettingService

  */
  */

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

 {
 {

-    $settingService = resolve(\BookStack\Settings\SettingService::class);
+    $settingService = resolve(SettingService::class);
+

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

-    return $settingService->get($key, $default);
-}
-
-/**
- * Helper to create url's relative to the applications root path.
- * @param string $path
- * @param bool $forceAppDomain
- * @return string
- */
-function baseUrl($path, $forceAppDomain = false)
-{
-    $isFullUrl = strpos($path, 'http') === 0;
-    if ($isFullUrl && !$forceAppDomain) {
-        return $path;
-    }
-
-    $path = trim($path, '/');
-    $base = rtrim(config('app.url'), '/');
-
-    // Remove non-specified domain if forced and we have a domain
-    if ($isFullUrl && $forceAppDomain) {
-        if (!empty($base) && strpos($path, $base) === 0) {
-            $path = trim(substr($path, strlen($base) - 1));
-        }
-        $explodedPath = explode('/', $path);
-        $path = implode('/', array_splice($explodedPath, 3));
-    }

 
 

-    // Return normal url path if not specified in config
-    if (config('app.url') === '') {
-        return url($path);
-    }
-
-    return $base . '/' . $path;
-}
-
-/**
- * Get an instance of the redirector.
- * Overrides the default laravel redirect helper.
- * Ensures it redirects even when the app is in a subdirectory.
- *
- * @param  string|null  $to
- * @param  int     $status
- * @param  array   $headers
- * @param  bool    $secure
- * @return \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse
- */
-function redirect($to = null, $status = 302, $headers = [], $secure = null)
-{
-    if (is_null($to)) {
-        return app('redirect');
-    }
-
-    $to = baseUrl($to);
-
-    return app('redirect')->to($to, $status, $headers, $secure);
+    return $settingService->get($key, $default);

 }
 
 /**
  * Get a path to a theme resource.
 }
 
 /**
  * Get a path to a theme resource.

- * @param string $path
- * @return string|boolean

  */
  */

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

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

+

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

-        return false;
+        return '';

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


@@ -169,23 +112,22 @@ function theme_path($path = '')
  * 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($name, $attrs = [])
+function icon(string $name, array $attrs = []): string

 {
     $attrs = array_merge([
 {
     $attrs = array_merge([

-        'class' => 'svg-icon',
-        'data-icon' => $name
+        'class'     => 'svg-icon',
+        'data-icon' => $name,
+        'role'      => 'presentation',

     ], $attrs);
     $attrString = ' ';
     foreach ($attrs as $attrName => $attr) {
         $attrString .=  $attrName . '="' . $attr . '" ';
     }
 
     ], $attrs);
     $attrString = ' ';
     foreach ($attrs as $attrName => $attr) {
         $attrString .=  $attrName . '="' . $attr . '" ';
     }
 

-    $iconPath = resource_path('assets/icons/' . $name . '.svg');
+    $iconPath = resource_path('icons/' . $name . '.svg');

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

+

     if ($themeIconPath && file_exists($themeIconPath)) {
         $iconPath = $themeIconPath;
     } else if (!file_exists($iconPath)) {
     if ($themeIconPath && file_exists($themeIconPath)) {
         $iconPath = $themeIconPath;
     } else if (!file_exists($iconPath)) {


@@ -200,12 +142,8 @@ function icon($name, $attrs = [])
  * 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 $path
- * @param array $data
- * @param array $overrideData
- * @return string

  */
  */

-function sortUrl($path, $data, $overrideData = [])
+function sortUrl(string $path, array $data, array $overrideData = []): string

 {
     $queryStringSections = [];
     $queryData = array_merge($data, $overrideData);
 {
     $queryStringSections = [];
     $queryData = array_merge($data, $overrideData);


@@ -213,7 +151,7 @@ function sortUrl($path, $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';
     // 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';
     }
 


@@ -229,5 +167,5 @@ function sortUrl($path, $data, $overrideData = [])
         return $path;
     }
 
         return $path;
     }
 

-    return baseUrl($path . '?' . implode('&', $queryStringSections));
+    return url($path . '?' . implode('&', $queryStringSections));

 }
 }