X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/04287745e40b951252a67b048fdff87ef613075b..refs/pull/1462/head:/app/helpers.php

diff --git a/app/helpers.php b/app/helpers.php
index 0825a2e4a..0fedf2e8d 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -1,6 +1,7 @@
 <?php
 
 use BookStack\Auth\Permissions\PermissionService;
+use BookStack\Entities\Entity;
 use BookStack\Ownable;
 
 /**
@@ -42,11 +43,20 @@ function user()
  * Check if current user is a signed in user.
  * @return bool
  */
-function signedInUser()
+function signedInUser() : bool
 {
     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
@@ -70,12 +80,13 @@ function userCan(string $permission, Ownable $ownable = null)
  * 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)
+function userCanOnAny(string $permission, string $entityClass = null)
 {
     $permissionService = app(PermissionService::class);
-    return $permissionService->checkUserHasPermissionOnAnything($permission);
+    return $permissionService->checkUserHasPermissionOnAnything($permission, $entityClass);
 }
 
 /**
@@ -112,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) {
-            $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
@@ -123,7 +135,7 @@ function baseUrl($path, $forceAppDomain = false)
         return url($path);
     }
 
-    return $base . '/' . $path;
+    return $base . '/' . ltrim($path, '/');
 }
 
 /**