added routes for zip export

[bookstack] / app / App / helpers.php

diff --git a/app/App/helpers.php b/app/App/helpers.php
index b59a63448340d716fd5a24e5b2328f2c2b7d273e..eec86553fb431c9fe7c638529b5ca80626c3feba 100644 (file)
--- a/app/App/helpers.php
+++ b/app/App/helpers.php
@@ -1,6 +1,7 @@
 <?php
 
 use BookStack\App\Model;
 <?php
 
 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;


@@ -42,14 +43,14 @@ 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);
     }
 
     // Check permission on ownable item
         return user()->can($permission);
     }
 
     // Check permission on ownable item

-    $permissions = app(PermissionApplicator::class);
+    $permissions = app()->make(PermissionApplicator::class);

 
     return $permissions->checkOwnableUserAccess($ownable, $permission);
 }
 
     return $permissions->checkOwnableUserAccess($ownable, $permission);
 }


@@ -60,7 +61,7 @@ function userCan(string $permission, Model $ownable = null): bool
  */
 function userCanOnAny(string $action, string $entityClass = ''): bool
 {
  */
 function userCanOnAny(string $action, string $entityClass = ''): bool
 {

-    $permissions = app(PermissionApplicator::class);
+    $permissions = app()->make(PermissionApplicator::class);

 
     return $permissions->checkUserHasEntityPermissionOnAny($action, $entityClass);
 }
 
     return $permissions->checkUserHasEntityPermissionOnAny($action, $entityClass);
 }


@@ -70,9 +71,9 @@ 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 = resolve(SettingService::class);
+    $settingService = app()->make(SettingService::class);

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


@@ -88,76 +89,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));
 }

-
-/**
- * Get fetch an SVG icon as a string.
- * Checks for icons defined within a custom theme before defaulting back
- * to the 'resources/assets/icons' folder.
- *
- * Returns an empty string if icon file not found.
- */
-function icon(string $name, array $attrs = []): string
-{
-    $attrs = array_merge([
-        'class'     => 'svg-icon',
-        'data-icon' => $name,
-        'role'      => 'presentation',
-    ], $attrs);
-    $attrString = ' ';
-    foreach ($attrs as $attrName => $attr) {
-        $attrString .= $attrName . '="' . $attr . '" ';
-    }
-
-    $iconPath = resource_path('icons/' . $name . '.svg');
-    $themeIconPath = theme_path('icons/' . $name . '.svg');
-
-    if ($themeIconPath && file_exists($themeIconPath)) {
-        $iconPath = $themeIconPath;
-    } elseif (!file_exists($iconPath)) {
-        return '';
-    }
-
-    $fileContents = file_get_contents($iconPath);
-
-    return  str_replace('<svg', '<svg' . $attrString, $fileContents);
-}
-
-/**
- * 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));
-}