Update maintenance.php

[bookstack] / app / helpers.php

diff --git a/app/helpers.php b/app/helpers.php
index b0886d02b9762c27383e37f5b7989014607ed03c..0fedf2e8db30a009a805635b09544d1b2e0c1e0c 100644 (file)
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -1,5 +1,7 @@
 <?php
 
 <?php
 

+use BookStack\Auth\Permissions\PermissionService;
+use BookStack\Entities\Entity;

 use BookStack\Ownable;
 
 /**
 use BookStack\Ownable;
 
 /**


@@ -41,30 +43,52 @@ function user()
  * Check if current user is a signed in user.
  * @return bool
  */
  * 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 general access.
+ * @return bool
+ */
+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.
 /**
  * Check if the current user has a permission.
  * If an ownable element is passed in the jointPermissions are checked against
  * that particular item.

- * @param $permission
+ * @param string $permission

  * @param Ownable $ownable
  * @return mixed
  */
  * @param Ownable $ownable
  * @return mixed
  */

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

 {
     if ($ownable === null) {
         return user() && user()->can($permission);
     }
 
     // Check permission on ownable item
 {
     if ($ownable === null) {
         return user() && user()->can($permission);
     }
 
     // Check permission on ownable item

-    $permissionService = app(\BookStack\Auth\Permissions\PermissionService::class);
+    $permissionService = app(PermissionService::class);

     return $permissionService->checkOwnableUserAccess($ownable, $permission);
 }
 
     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)
+{
+    $permissionService = app(PermissionService::class);
+    return $permissionService->checkUserHasPermissionOnAnything($permission, $entityClass);
+}
+

 /**
  * Helper to access system settings.
  * @param $key
 /**
  * Helper to access system settings.
  * @param $key


@@ -99,10 +123,11 @@ function baseUrl($path, $forceAppDomain = false)
     // Remove non-specified domain if forced and we have a domain
     if ($isFullUrl && $forceAppDomain) {
         if (!empty($base) && strpos($path, $base) === 0) {
     // 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));
+            $path = substr($path, strlen($base));
+        } else {
+            $explodedPath = explode('/', $path);
+            $path = implode('/', array_splice($explodedPath, 3));

         }
         }

-        $explodedPath = explode('/', $path);
-        $path = implode('/', array_splice($explodedPath, 3));

     }
 
     // Return normal url path if not specified in config
     }
 
     // Return normal url path if not specified in config


@@ -110,7 +135,7 @@ function baseUrl($path, $forceAppDomain = false)
         return url($path);
     }
 
         return url($path);
     }
 

-    return $base . '/' . $path;
+    return $base . '/' . ltrim($path, '/');

 }
 
 /**
 }
 
 /**