X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/e9b596d3bc291f11996a338c2abeb1382da76ecf..refs/pull/236/head:/app/helpers.php diff --git a/app/helpers.php b/app/helpers.php index eab8ca1c8..b5be0fd11 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -1,64 +1,59 @@ user() ?: \BookStack\User::getDefault(); } /** * Check if the current user has a permission. - * If an ownable element is passed in the permissions are checked against + * If an ownable element is passed in the jointPermissions are checked against * that particular item. * @param $permission - * @param \BookStack\Ownable $ownable + * @param Ownable $ownable * @return mixed */ -function userCan($permission, \BookStack\Ownable $ownable = null) +function userCan($permission, Ownable $ownable = null) { - if (!auth()->check()) return false; if ($ownable === null) { - return auth()->user() && auth()->user()->can($permission); + return user() && user()->can($permission); } // Check permission on ownable item - $permissionBaseName = strtolower($permission) . '-'; - $hasPermission = false; - if (auth()->user()->can($permissionBaseName . 'all')) $hasPermission = true; - if (auth()->user()->can($permissionBaseName . 'own') && $ownable->createdBy && $ownable->createdBy->id === auth()->user()->id) $hasPermission = true; - - if (!$ownable instanceof \BookStack\Entity) return $hasPermission; - - // Check restrictions on the entity - $restrictionService = app('BookStack\Services\RestrictionService'); - $explodedPermission = explode('-', $permission); - $action = end($explodedPermission); - $hasAccess = $restrictionService->checkIfEntityRestricted($ownable, $action); - $restrictionsSet = $restrictionService->checkIfRestrictionsSet($ownable, $action); - return ($hasAccess && $restrictionsSet) || (!$restrictionsSet && $hasPermission); + $permissionService = app(\BookStack\Services\PermissionService::class); + return $permissionService->checkOwnableUserAccess($ownable, $permission); } /** @@ -69,6 +64,86 @@ function userCan($permission, \BookStack\Ownable $ownable = null) */ function setting($key, $default = false) { - $settingService = app('BookStack\Services\SettingService'); + $settingService = app(\BookStack\Services\SettingService::class); 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, '/'); + + // Remove non-specified domain if forced and we have a domain + if ($isFullUrl && $forceAppDomain) { + $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 rtrim(config('app.url'), '/') . '/' . $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); +} + +/** + * 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 = []) +{ + $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'; + } else { + $queryData['order'] = 'asc'; + } + + foreach ($queryData as $name => $value) { + $trimmedVal = trim($value); + if ($trimmedVal === '') continue; + $queryStringSections[] = urlencode($name) . '=' . urlencode($trimmedVal); + } + + if (count($queryStringSections) === 0) return $path; + + return baseUrl($path . '?' . implode('&', $queryStringSections)); +}