X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/ddb7f33868ea499ab8f48a7062f145e8c0fbe02f..refs/pull/3598/head:/app/helpers.php diff --git a/app/helpers.php b/app/helpers.php index 6211f41be..191eddf4d 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -1,15 +1,13 @@ can($permission); } // Check permission on ownable item - $permissionService = app(PermissionService::class); - return $permissionService->checkOwnableUserAccess($ownable, $permission); + $permissions = app(PermissionApplicator::class); + + return $permissions->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 + * Check if the current user can perform the given action on any items in the system. + * Can be provided the class name of an entity to filter ability to that specific entity type. */ -function userCanOnAny(string $permission, string $entityClass = null): bool +function userCanOnAny(string $action, string $entityClass = ''): bool { - $permissionService = app(PermissionService::class); - return $permissionService->checkUserHasPermissionOnAnything($permission, $entityClass); + $permissions = app(PermissionApplicator::class); + + return $permissions->checkUserHasEntityPermissionOnAny($action, $entityClass); } /** * Helper to access system settings. - * @param string $key - * @param $default - * @return bool|string|SettingService + * + * @return mixed|SettingService */ -function setting(string $key = null, $default = false) +function setting(string $key = null, $default = null) { $settingService = resolve(SettingService::class); + if (is_null($key)) { return $settingService; } + return $settingService->get($key, $default); } /** * Get a path to a theme resource. - * @param string $path - * @return string + * Returns null if a theme is not configured and + * therefore a full path is not available for use. */ -function theme_path(string $path = ''): string +function theme_path(string $path = ''): ?string { $theme = config('view.theme'); + if (!$theme) { - return ''; + return null; } - return base_path('themes/' . $theme .($path ? DIRECTORY_SEPARATOR.$path : $path)); + return base_path('themes/' . $theme . ($path ? DIRECTORY_SEPARATOR . $path : $path)); } /** @@ -126,9 +119,6 @@ function theme_path(string $path = ''): string * to the 'resources/assets/icons' folder. * * Returns an empty string if icon file not found. - * @param $name - * @param array $attrs - * @return mixed */ function icon(string $name, array $attrs = []): string { @@ -139,18 +129,20 @@ function icon(string $name, array $attrs = []): string ], $attrs); $attrString = ' '; foreach ($attrs as $attrName => $attr) { - $attrString .= $attrName . '="' . $attr . '" '; + $attrString .= $attrName . '="' . $attr . '" '; } $iconPath = resource_path('icons/' . $name . '.svg'); $themeIconPath = theme_path('icons/' . $name . '.svg'); + if ($themeIconPath && file_exists($themeIconPath)) { $iconPath = $themeIconPath; - } else if (!file_exists($iconPath)) { + } elseif (!file_exists($iconPath)) { return ''; } $fileContents = file_get_contents($iconPath); + return str_replace('