diff --git a/app/Auth/User.php b/app/Auth/User.php index 259b8eec0..e5a8a3931 100644 --- a/app/Auth/User.php +++ b/app/Auth/User.php @@ -168,14 +168,14 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon */ public function getAvatar($size = 50) { - $default = baseUrl('/user_avatar.png'); + $default = url('/user_avatar.png'); $imageId = $this->image_id; if ($imageId === 0 || $imageId === '0' || $imageId === null) { return $default; } try { - $avatar = $this->avatar ? baseUrl($this->avatar->getThumb($size, $size, false)) : $default; + $avatar = $this->avatar ? url($this->avatar->getThumb($size, $size, false)) : $default; } catch (\Exception $err) { $avatar = $default; } @@ -197,7 +197,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon */ public function getEditUrl() { - return baseUrl('/settings/users/' . $this->id); + return url('/settings/users/' . $this->id); } /** @@ -206,7 +206,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon */ public function getProfileUrl() { - return baseUrl('/user/' . $this->id); + return url('/user/' . $this->id); } /** diff --git a/app/Config/app.php b/app/Config/app.php index aaeafb98d..0a0c17a53 100755 --- a/app/Config/app.php +++ b/app/Config/app.php @@ -45,6 +45,10 @@ return [ // and used by BookStack in URL generation. 'url' => env('APP_URL', '') === 'http://bookstack.dev' ? '' : env('APP_URL', ''), + // Rewrite URL, Used to rewrite the base of request URLs + // for scenarios + 'url_base_rewrite' => env('APP_URL_BASE_REWRITE', null), + // Application timezone for back-end date functions. 'timezone' => env('APP_TIMEZONE', 'UTC'), diff --git a/app/Entities/Book.php b/app/Entities/Book.php index decdde9dc..7d3d5e4ae 100644 --- a/app/Entities/Book.php +++ b/app/Entities/Book.php @@ -25,9 +25,9 @@ class Book extends Entity public function getUrl($path = false) { if ($path !== false) { - return baseUrl('/books/' . urlencode($this->slug) . '/' . trim($path, '/')); + return url('/books/' . urlencode($this->slug) . '/' . trim($path, '/')); } - return baseUrl('/books/' . urlencode($this->slug)); + return url('/books/' . urlencode($this->slug)); } /** @@ -44,7 +44,7 @@ class Book extends Entity } try { - $cover = $this->cover ? baseUrl($this->cover->getThumb($width, $height, false)) : $default; + $cover = $this->cover ? url($this->cover->getThumb($width, $height, false)) : $default; } catch (\Exception $err) { $cover = $default; } diff --git a/app/Entities/Bookshelf.php b/app/Entities/Bookshelf.php index c8f8b990c..db6685688 100644 --- a/app/Entities/Bookshelf.php +++ b/app/Entities/Bookshelf.php @@ -39,9 +39,9 @@ class Bookshelf extends Entity public function getUrl($path = false) { if ($path !== false) { - return baseUrl('/shelves/' . urlencode($this->slug) . '/' . trim($path, '/')); + return url('/shelves/' . urlencode($this->slug) . '/' . trim($path, '/')); } - return baseUrl('/shelves/' . urlencode($this->slug)); + return url('/shelves/' . urlencode($this->slug)); } /** @@ -59,7 +59,7 @@ class Bookshelf extends Entity } try { - $cover = $this->cover ? baseUrl($this->cover->getThumb($width, $height, false)) : $default; + $cover = $this->cover ? url($this->cover->getThumb($width, $height, false)) : $default; } catch (\Exception $err) { $cover = $default; } diff --git a/app/Entities/Chapter.php b/app/Entities/Chapter.php index 936404758..b204f1903 100644 --- a/app/Entities/Chapter.php +++ b/app/Entities/Chapter.php @@ -42,10 +42,13 @@ class Chapter extends Entity public function getUrl($path = false) { $bookSlug = $this->getAttribute('bookSlug') ? $this->getAttribute('bookSlug') : $this->book->slug; + $fullPath = '/books/' . urlencode($bookSlug) . '/chapter/' . urlencode($this->slug); + if ($path !== false) { - return baseUrl('/books/' . urlencode($bookSlug) . '/chapter/' . urlencode($this->slug) . '/' . trim($path, '/')); + $fullPath .= '/' . trim($path, '/'); } - return baseUrl('/books/' . urlencode($bookSlug) . '/chapter/' . urlencode($this->slug)); + + return url($fullPath); } /** diff --git a/app/Entities/Page.php b/app/Entities/Page.php index 1c2cc5cff..c32417418 100644 --- a/app/Entities/Page.php +++ b/app/Entities/Page.php @@ -96,10 +96,10 @@ class Page extends Entity $idComponent = $this->draft ? $this->id : urlencode($this->slug); if ($path !== false) { - return baseUrl('/books/' . urlencode($bookSlug) . $midText . $idComponent . '/' . trim($path, '/')); + return url('/books/' . urlencode($bookSlug) . $midText . $idComponent . '/' . trim($path, '/')); } - return baseUrl('/books/' . urlencode($bookSlug) . $midText . $idComponent); + return url('/books/' . urlencode($bookSlug) . $midText . $idComponent); } /** diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 21ded2355..c739fd9a3 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -53,8 +53,8 @@ class LoginController extends Controller $this->socialAuthService = $socialAuthService; $this->ldapService = $ldapService; $this->userRepo = $userRepo; - $this->redirectPath = baseUrl('/'); - $this->redirectAfterLogout = baseUrl('/login'); + $this->redirectPath = url('/'); + $this->redirectAfterLogout = url('/login'); parent::__construct(); } diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index d57105b62..a285899cc 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -2,17 +2,23 @@ namespace BookStack\Http\Controllers\Auth; +use BookStack\Auth\Access\EmailConfirmationService; +use BookStack\Auth\Access\SocialAuthService; use BookStack\Auth\SocialAccount; use BookStack\Auth\User; use BookStack\Auth\UserRepo; +use BookStack\Exceptions\SocialDriverNotConfigured; use BookStack\Exceptions\SocialSignInAccountNotUsed; use BookStack\Exceptions\SocialSignInException; use BookStack\Exceptions\UserRegistrationException; use BookStack\Http\Controllers\Controller; use Exception; use Illuminate\Foundation\Auth\RegistersUsers; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Http\Response; +use Illuminate\Routing\Redirector; +use Illuminate\View\View; use Laravel\Socialite\Contracts\User as SocialUser; use Validator; @@ -46,18 +52,18 @@ class RegisterController extends Controller /** * Create a new controller instance. * - * @param \BookStack\Auth\Access\SocialAuthService $socialAuthService + * @param SocialAuthService $socialAuthService * @param \BookStack\Auth\EmailConfirmationService $emailConfirmationService - * @param \BookStack\Auth\UserRepo $userRepo + * @param UserRepo $userRepo */ - public function __construct(\BookStack\Auth\Access\SocialAuthService $socialAuthService, \BookStack\Auth\Access\EmailConfirmationService $emailConfirmationService, UserRepo $userRepo) + public function __construct(SocialAuthService $socialAuthService, EmailConfirmationService $emailConfirmationService, UserRepo $userRepo) { $this->middleware('guest')->only(['getRegister', 'postRegister', 'socialRegister']); $this->socialAuthService = $socialAuthService; $this->emailConfirmationService = $emailConfirmationService; $this->userRepo = $userRepo; - $this->redirectTo = baseUrl('/'); - $this->redirectPath = baseUrl('/'); + $this->redirectTo = url('/'); + $this->redirectPath = url('/'); parent::__construct(); } @@ -101,8 +107,8 @@ class RegisterController extends Controller /** * Handle a registration request for the application. - * @param Request|\Illuminate\Http\Request $request - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @param Request|Request $request + * @return RedirectResponse|Redirector * @throws UserRegistrationException */ public function postRegister(Request $request) @@ -117,7 +123,7 @@ class RegisterController extends Controller /** * Create a new user instance after a valid registration. * @param array $data - * @return \BookStack\Auth\User + * @return User */ protected function create(array $data) { @@ -133,7 +139,7 @@ class RegisterController extends Controller * @param array $userData * @param bool|false|SocialAccount $socialAccount * @param bool $emailVerified - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @return RedirectResponse|Redirector * @throws UserRegistrationException */ protected function registerUser(array $userData, $socialAccount = false, $emailVerified = false) @@ -182,7 +188,7 @@ class RegisterController extends Controller /** * Confirms an email via a token and logs the user into the system. * @param $token - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @return RedirectResponse|Redirector * @throws UserRegistrationException */ public function confirmEmail($token) @@ -200,7 +206,7 @@ class RegisterController extends Controller /** * Shows a notice that a user's email address has not been confirmed, * Also has the option to re-send the confirmation email. - * @return \Illuminate\View\View + * @return View */ public function showAwaitingConfirmation() { @@ -210,7 +216,7 @@ class RegisterController extends Controller /** * Resend the confirmation email * @param Request $request - * @return \Illuminate\View\View + * @return View */ public function resendConfirmation(Request $request) { @@ -235,7 +241,7 @@ class RegisterController extends Controller * @param $socialDriver * @return mixed * @throws UserRegistrationException - * @throws \BookStack\Exceptions\SocialDriverNotConfigured + * @throws SocialDriverNotConfigured */ public function socialRegister($socialDriver) { @@ -248,10 +254,10 @@ class RegisterController extends Controller * The callback for social login services. * @param $socialDriver * @param Request $request - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @return RedirectResponse|Redirector * @throws SocialSignInException * @throws UserRegistrationException - * @throws \BookStack\Exceptions\SocialDriverNotConfigured + * @throws SocialDriverNotConfigured */ public function socialCallback($socialDriver, Request $request) { @@ -292,7 +298,7 @@ class RegisterController extends Controller /** * Detach a social account from a user. * @param $socialDriver - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @return RedirectResponse|Redirector */ public function detachSocialAccount($socialDriver) { @@ -303,7 +309,7 @@ class RegisterController extends Controller * Register a new user after a registration callback. * @param string $socialDriver * @param SocialUser $socialUser - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @return RedirectResponse|Redirector * @throws UserRegistrationException */ protected function socialRegisterCallback(string $socialDriver, SocialUser $socialUser) diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index 16a7d5a5e..89fb83fd9 100644 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -541,7 +541,7 @@ class PageController extends Controller public function showRecentlyUpdated() { // TODO - Still exist? - $pages = $this->pageRepo->getRecentlyUpdatedPaginated('page', 20)->setPath(baseUrl('/pages/recently-updated')); + $pages = $this->pageRepo->getRecentlyUpdatedPaginated('page', 20)->setPath(url('/pages/recently-updated')); return view('pages.detailed-listing', [ 'title' => trans('entities.recently_updated_pages'), 'pages' => $pages diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 4bcf7b40e..1691ee9b0 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -48,7 +48,7 @@ class SearchController extends Controller $this->setPageTitle(trans('entities.search_for_term', ['term' => $searchTerm])); $page = intval($request->get('page', '0')) ?: 1; - $nextPageLink = baseUrl('/search?term=' . urlencode($searchTerm) . '&page=' . ($page+1)); + $nextPageLink = url('/search?term=' . urlencode($searchTerm) . '&page=' . ($page+1)); $results = $this->searchService->searchEntities($searchTerm, 'all', $page, 20); diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index 1a3384367..d840a9b2e 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -41,7 +41,7 @@ class Authenticate if ($request->ajax()) { return response('Unauthorized.', 401); } else { - return redirect()->guest(baseUrl('/login')); + return redirect()->guest(url('/login')); } } diff --git a/app/Http/Request.php b/app/Http/Request.php new file mode 100644 index 000000000..bd2761a0b --- /dev/null +++ b/app/Http/Request.php @@ -0,0 +1,26 @@ +getScheme().'://'.$this->getHttpHost(); + } + + return $base; + } + +} \ No newline at end of file diff --git a/app/Notifications/ConfirmEmail.php b/app/Notifications/ConfirmEmail.php index 7ecadc298..229408f5c 100644 --- a/app/Notifications/ConfirmEmail.php +++ b/app/Notifications/ConfirmEmail.php @@ -26,6 +26,6 @@ class ConfirmEmail extends MailNotification ->subject(trans('auth.email_confirm_subject', $appName)) ->greeting(trans('auth.email_confirm_greeting', $appName)) ->line(trans('auth.email_confirm_text')) - ->action(trans('auth.email_confirm_action'), baseUrl('/register/confirm/' . $this->token)); + ->action(trans('auth.email_confirm_action'), url('/register/confirm/' . $this->token)); } } diff --git a/app/Notifications/ResetPassword.php b/app/Notifications/ResetPassword.php index 305a7da72..208752764 100644 --- a/app/Notifications/ResetPassword.php +++ b/app/Notifications/ResetPassword.php @@ -29,7 +29,7 @@ class ResetPassword extends MailNotification return $this->newMailMessage() ->subject(trans('auth.email_reset_subject', ['appName' => setting('app-name')])) ->line(trans('auth.email_reset_text')) - ->action(trans('auth.reset_password'), baseUrl('password/reset/' . $this->token)) + ->action(trans('auth.reset_password'), url('password/reset/' . $this->token)) ->line(trans('auth.email_reset_not_requested')); } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 6bc1f9047..a2fc673f4 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -8,11 +8,11 @@ use BookStack\Entities\Chapter; use BookStack\Entities\Page; use BookStack\Settings\Setting; use BookStack\Settings\SettingService; -use BookStack\UrlGenerator; use Illuminate\Database\Eloquent\Relations\Relation; use Illuminate\Support\Facades\View; use Illuminate\Support\ServiceProvider; use Schema; +use URL; use Validator; class AppServiceProvider extends ServiceProvider @@ -24,6 +24,9 @@ class AppServiceProvider extends ServiceProvider */ public function boot() { + // Set root URL + URL::forceRootUrl(config('app.url')); + // Custom validation methods Validator::extend('image_extension', function ($attribute, $value, $parameters, $validator) { $validImageExtensions = ['png', 'jpg', 'jpeg', 'bmp', 'gif', 'tiff', 'webp']; @@ -73,10 +76,5 @@ class AppServiceProvider extends ServiceProvider $this->app->singleton(SettingService::class, function ($app) { return new SettingService($app->make(Setting::class), $app->make('Illuminate\Contracts\Cache\Repository')); }); - - $this->app->bind( - \Illuminate\Contracts\Routing\UrlGenerator::class, - UrlGenerator::class - ); } } diff --git a/app/Providers/PaginationServiceProvider.php b/app/Providers/PaginationServiceProvider.php index 3a695c5e3..1c982b82e 100644 --- a/app/Providers/PaginationServiceProvider.php +++ b/app/Providers/PaginationServiceProvider.php @@ -18,7 +18,7 @@ class PaginationServiceProvider extends IlluminatePaginationServiceProvider }); Paginator::currentPathResolver(function () { - return baseUrl($this->app['request']->path()); + return url($this->app['request']->path()); }); Paginator::currentPageResolver(function ($pageName = 'page') { diff --git a/app/Uploads/Attachment.php b/app/Uploads/Attachment.php index eb9a0fe68..8720d3c09 100644 --- a/app/Uploads/Attachment.php +++ b/app/Uploads/Attachment.php @@ -37,6 +37,6 @@ class Attachment extends Ownable if ($this->external && strpos($this->path, 'http') !== 0) { return $this->path; } - return baseUrl('/attachments/' . $this->id); + return url('/attachments/' . $this->id); } } diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php index ae1c6a254..860230d00 100644 --- a/app/Uploads/ImageService.php +++ b/app/Uploads/ImageService.php @@ -417,7 +417,7 @@ class ImageService extends UploadService $isLocal = strpos(trim($uri), 'http') !== 0; // Attempt to find local files even if url not absolute - $base = baseUrl('/'); + $base = url('/'); if (!$isLocal && strpos($uri, $base) === 0) { $isLocal = true; $uri = str_replace($base, '', $uri); @@ -474,7 +474,7 @@ class ImageService extends UploadService $this->storageUrl = $storageUrl; } - $basePath = ($this->storageUrl == false) ? baseUrl('/') : $this->storageUrl; + $basePath = ($this->storageUrl == false) ? url('/') : $this->storageUrl; return rtrim($basePath, '/') . $filePath; } } diff --git a/app/UrlGenerator.php b/app/UrlGenerator.php deleted file mode 100644 index 471792cdf..000000000 --- a/app/UrlGenerator.php +++ /dev/null @@ -1,58 +0,0 @@ -formatParameters($extra)) - ); - - $defaultRoot = $this->formatRoot($this->formatScheme($secure)); - - list($path, $query) = $this->extractQueryString($path); - - return $this->formatWithBase( - $defaultRoot, trim($path.'/'.$tail, '/') - ).$query; - } - - /** - * Format the given URL segments into a single URL. - * - * @param string $defaultRoot - * @param string $path - * @return string - */ - public function formatWithBase($defaultRoot, $path) - { - $isFullPath = strpos($path, 'http') === 0; - $setBasePath = trim(config('app.url'), '/'); - - if ($isFullPath) { - return $path; - } - - if (! empty($setBasePath)) { - $defaultRoot = $setBasePath; - } - - // TODO - Add mechanism to set path correctly for intended() and back() redirects - // TODO - Update tests to align with new system - // TODO - Clean up helpers and refactor their usage. - - return trim($defaultRoot. '/' .$path, '/'); - } - -} \ No newline at end of file diff --git a/app/helpers.php b/app/helpers.php index 7bc116555..9bbfcfbf0 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -1,8 +1,9 @@ user() ?: \BookStack\Auth\User::getDefault(); + return auth()->user() ?: User::getDefault(); } /** @@ -63,9 +64,9 @@ function hasAppAccess() : bool * that particular item. * @param string $permission * @param Ownable $ownable - * @return mixed + * @return bool */ -function userCan(string $permission, Ownable $ownable = null) +function userCan(string $permission, Ownable $ownable = null) : bool { if ($ownable === null) { return user() && user()->can($permission); @@ -83,7 +84,7 @@ function userCan(string $permission, Ownable $ownable = null) * @param string|null $entityClass * @return bool */ -function userCanOnAny(string $permission, string $entityClass = null) +function userCanOnAny(string $permission, string $entityClass = null) : bool { $permissionService = app(PermissionService::class); return $permissionService->checkUserHasPermissionOnAnything($permission, $entityClass); @@ -93,84 +94,27 @@ function userCanOnAny(string $permission, string $entityClass = null) * Helper to access system settings. * @param $key * @param bool $default - * @return bool|string|\BookStack\Settings\SettingService + * @return bool|string|SettingService */ function setting($key = null, $default = false) { - $settingService = resolve(\BookStack\Settings\SettingService::class); + $settingService = resolve(SettingService::class); if (is_null($key)) { return $settingService; } 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) -{ - return url($path); - $isFullUrl = strpos($path, 'http') === 0; - if ($isFullUrl && !$forceAppDomain) { - return $path; - } - - $path = trim($path, '/'); - $base = rtrim(config('app.url'), '/'); - - // Remove non-specified domain if forced and we have a domain - if ($isFullUrl && $forceAppDomain) { - if (!empty($base) && strpos($path, $base) === 0) { - $path = mb_substr($path, mb_strlen($base)); - } else { - $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 $base . '/' . ltrim($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); -} - /** * Get a path to a theme resource. * @param string $path - * @return string|boolean + * @return string */ -function theme_path($path = '') +function theme_path($path = '') : string { $theme = config('view.theme'); if (!$theme) { - return false; + return ''; } return base_path('themes/' . $theme .($path ? DIRECTORY_SEPARATOR.$path : $path)); @@ -242,5 +186,5 @@ function sortUrl($path, $data, $overrideData = []) return $path; } - return baseUrl($path . '?' . implode('&', $queryStringSections)); + return url($path . '?' . implode('&', $queryStringSections)); } diff --git a/public/index.php b/public/index.php index ad378d7e0..820576472 100644 --- a/public/index.php +++ b/public/index.php @@ -34,6 +34,7 @@ require __DIR__.'/../bootstrap/init.php'; */ $app = require_once __DIR__.'/../bootstrap/app.php'; +$app->alias('request', \BookStack\Http\Request::class); /* |-------------------------------------------------------------------------- @@ -50,7 +51,7 @@ $app = require_once __DIR__.'/../bootstrap/app.php'; $kernel = $app->make(Illuminate\Contracts\Http\Kernel::class); $response = $kernel->handle( - $request = Illuminate\Http\Request::capture() + $request = \BookStack\Http\Request::capture() ); $response->send(); diff --git a/resources/views/auth/forms/login/standard.blade.php b/resources/views/auth/forms/login/standard.blade.php index ea63cf7ac..dc6081637 100644 --- a/resources/views/auth/forms/login/standard.blade.php +++ b/resources/views/auth/forms/login/standard.blade.php @@ -7,6 +7,6 @@ @include('form.password', ['name' => 'password', 'tabindex' => 1]) - {{ trans('auth.forgot_password') }} + {{ trans('auth.forgot_password') }} diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index a0e5f716c..76aa3a6e9 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -9,7 +9,7 @@

{{ title_case(trans('auth.log_in')) }}

-
+ {!! csrf_field() !!}
@@ -38,7 +38,7 @@
@foreach($socialDrivers as $driver => $name)
- + @icon('auth/' . $driver) {{ trans('auth.log_in_with', ['socialDriver' => $name]) }} @@ -49,7 +49,7 @@ @if(setting('registration-enabled', false))
- {{ trans('auth.dont_have_account') }} + {{ trans('auth.dont_have_account') }}
@endif
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php index de4edff0a..864b4e7d2 100644 --- a/resources/views/auth/passwords/email.blade.php +++ b/resources/views/auth/passwords/email.blade.php @@ -7,7 +7,7 @@

{{ trans('auth.reset_password_send_instructions') }}

- + {!! csrf_field() !!}
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php index fa6ad5b9a..227b39079 100644 --- a/resources/views/auth/passwords/reset.blade.php +++ b/resources/views/auth/passwords/reset.blade.php @@ -6,7 +6,7 @@

{{ trans('auth.reset_password') }}

- + {!! csrf_field() !!} diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 38904f63b..9cf34f501 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -8,7 +8,7 @@

{{ title_case(trans('auth.sign_up')) }}

- + {!! csrf_field() !!}
@@ -28,7 +28,7 @@
- {{ trans('auth.already_have_account') }} + {{ trans('auth.already_have_account') }}
@@ -42,7 +42,7 @@
@foreach($socialDrivers as $driver => $name)
- + @icon('auth/' . $driver) {{ trans('auth.sign_up_with', ['socialDriver' => $name]) }} diff --git a/resources/views/auth/user-unconfirmed.blade.php b/resources/views/auth/user-unconfirmed.blade.php index 54bf6eda3..2142a5dcb 100644 --- a/resources/views/auth/user-unconfirmed.blade.php +++ b/resources/views/auth/user-unconfirmed.blade.php @@ -13,7 +13,7 @@ {{ trans('auth.email_not_confirmed_resend') }}

- + {!! csrf_field() !!}
diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index f5459a717..da0e6eb44 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -6,7 +6,7 @@ - + diff --git a/resources/views/books/create.blade.php b/resources/views/books/create.blade.php index 40b781441..65958e137 100644 --- a/resources/views/books/create.blade.php +++ b/resources/views/books/create.blade.php @@ -27,7 +27,7 @@

{{ trans('entities.books_create') }}

- + @include('books.form')
diff --git a/resources/views/books/form.blade.php b/resources/views/books/form.blade.php index 4edec240a..5d3f11e2e 100644 --- a/resources/views/books/form.blade.php +++ b/resources/views/books/form.blade.php @@ -18,8 +18,8 @@

{{ trans('common.cover_image_description') }}

@include('components.image-picker', [ - 'defaultImage' => baseUrl('/book_default_cover.png'), - 'currentImage' => (isset($model) && $model->cover) ? $model->getBookCover() : baseUrl('/book_default_cover.png') , + 'defaultImage' => url('/book_default_cover.png'), + 'currentImage' => (isset($model) && $model->cover) ? $model->getBookCover() : url('/book_default_cover.png') , 'name' => 'image', 'imageClass' => 'cover' ]) @@ -36,6 +36,6 @@
- {{ trans('common.cancel') }} + {{ trans('common.cancel') }}
\ No newline at end of file diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php index 61d998489..b9bd987a9 100644 --- a/resources/views/books/index.blade.php +++ b/resources/views/books/index.blade.php @@ -37,7 +37,7 @@
{{ trans('common.actions') }}
@if($currentUser->can('book-create-all')) - + @icon('add') {{ trans('entities.books_create') }} diff --git a/resources/views/books/list.blade.php b/resources/views/books/list.blade.php index 93d927ec7..84578e3a5 100644 --- a/resources/views/books/list.blade.php +++ b/resources/views/books/list.blade.php @@ -28,7 +28,7 @@ @else

{{ trans('entities.books_empty') }}

@if(userCan('books-create-all')) - @icon('edit'){{ trans('entities.create_now') }} + @icon('edit'){{ trans('entities.create_now') }} @endif @endif
\ No newline at end of file diff --git a/resources/views/common/header.blade.php b/resources/views/common/header.blade.php index 734789899..a5336c3f8 100644 --- a/resources/views/common/header.blade.php +++ b/resources/views/common/header.blade.php @@ -2,9 +2,9 @@
-
@icon('search'){{ trans('common.search') }} + @icon('search'){{ trans('common.search') }} @if(userCanOnAny('view', \BookStack\Entities\Bookshelf::class) || userCan('bookshelf-view-all') || userCan('bookshelf-view-own')) - @icon('bookshelf'){{ trans('entities.shelves') }} + @icon('bookshelf'){{ trans('entities.shelves') }} @endif - @icon('books'){{ trans('entities.books') }} + @icon('books'){{ trans('entities.books') }} @if(signedInUser() && userCan('settings-manage')) - @icon('settings'){{ trans('settings.settings') }} + @icon('settings'){{ trans('settings.settings') }} @endif @if(signedInUser() && userCan('users-manage') && !userCan('settings-manage')) - @icon('users'){{ trans('settings.users') }} + @icon('users'){{ trans('settings.users') }} @endif @endif @if(!signedInUser()) @if(setting('registration-enabled', false)) - @icon('new-user') {{ trans('auth.sign_up') }} + @icon('new-user') {{ trans('auth.sign_up') }} @endif - @icon('login') {{ trans('auth.log_in') }} + @icon('login') {{ trans('auth.log_in') }} @endif
@if(signedInUser()) @@ -55,13 +55,13 @@
diff --git a/resources/views/common/home-sidebar.blade.php b/resources/views/common/home-sidebar.blade.php index 07eda2cff..12adda618 100644 --- a/resources/views/common/home-sidebar.blade.php +++ b/resources/views/common/home-sidebar.blade.php @@ -15,7 +15,7 @@
-
{{ trans('entities.recently_updated_pages') }}
+
{{ trans('entities.recently_updated_pages') }}
@include('partials.entity-list', [ 'entities' => $recentlyUpdatedPages, diff --git a/resources/views/common/home.blade.php b/resources/views/common/home.blade.php index 2f0189f87..cd27ff568 100644 --- a/resources/views/common/home.blade.php +++ b/resources/views/common/home.blade.php @@ -34,7 +34,7 @@
-

{{ trans('entities.recently_updated_pages') }}

+

{{ trans('entities.recently_updated_pages') }}

@include('partials.entity-list', [ 'entities' => $recentlyUpdatedPages, diff --git a/resources/views/components/expand-toggle.blade.php b/resources/views/components/expand-toggle.blade.php index e8b2220e5..28af63caf 100644 --- a/resources/views/components/expand-toggle.blade.php +++ b/resources/views/components/expand-toggle.blade.php @@ -4,7 +4,7 @@ $key - Unique key for checking existing stored state. --}} getForCurrentUser('section_expansion#'. $key); ?> @icon('expand-text') diff --git a/resources/views/components/page-picker.blade.php b/resources/views/components/page-picker.blade.php index 7a3285fa7..e24ea49f1 100644 --- a/resources/views/components/page-picker.blade.php +++ b/resources/views/components/page-picker.blade.php @@ -3,7 +3,7 @@
- +

diff --git a/resources/views/components/tag-list.blade.php b/resources/views/components/tag-list.blade.php index 1d1cc2d80..f7a9c6c48 100644 --- a/resources/views/components/tag-list.blade.php +++ b/resources/views/components/tag-list.blade.php @@ -1,6 +1,6 @@ @foreach($entity->tags as $tag)
-
@icon('tag'){{ $tag->name }}
- @if($tag->value)
{{$tag->value}}
@endif +
@icon('tag'){{ $tag->name }}
+ @if($tag->value)
{{$tag->value}}
@endif
@endforeach \ No newline at end of file diff --git a/resources/views/components/tag-manager.blade.php b/resources/views/components/tag-manager.blade.php index 5ae383198..31585dc41 100644 --- a/resources/views/components/tag-manager.blade.php +++ b/resources/views/components/tag-manager.blade.php @@ -7,11 +7,11 @@
@icon('grip')
-
-
@icon('close')
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php index 228c51520..c1937ff23 100644 --- a/resources/views/errors/404.blade.php +++ b/resources/views/errors/404.blade.php @@ -10,7 +10,7 @@
{{ trans('errors.sorry_page_not_found') }}
- {{ trans('errors.return_home') }} + {{ trans('errors.return_home') }}
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php index 3745f2292..8c6822767 100644 --- a/resources/views/errors/500.blade.php +++ b/resources/views/errors/500.blade.php @@ -7,7 +7,7 @@

{{ trans('errors.error_occurred') }}

{{ $message ?? 'An unknown error occurred' }}
-

{{ trans('errors.return_home') }}

+

{{ trans('errors.return_home') }}

diff --git a/resources/views/pages/edit.blade.php b/resources/views/pages/edit.blade.php index 15f5d5d96..4930e30a3 100644 --- a/resources/views/pages/edit.blade.php +++ b/resources/views/pages/edit.blade.php @@ -1,7 +1,7 @@ @extends('base') @section('head') - + @stop @section('body-class', 'flexbox') diff --git a/resources/views/partials/breadcrumbs.blade.php b/resources/views/partials/breadcrumbs.blade.php index df5d1aa04..28c7196ee 100644 --- a/resources/views/partials/breadcrumbs.blade.php +++ b/resources/views/partials/breadcrumbs.blade.php @@ -3,7 +3,7 @@ {{-- Show top level books item --}} @if (count($crumbs) > 0 && array_first($crumbs) instanceof \BookStack\Entities\Book) - + @icon('books') {{ trans('entities.books') }} @@ -12,7 +12,7 @@ {{-- Show top level shelves item --}} @if (count($crumbs) > 0 && array_first($crumbs) instanceof \BookStack\Entities\Bookshelf) - + @icon('bookshelf') {{ trans('entities.shelves') }} @@ -30,11 +30,11 @@ @endif @if (is_string($crumb)) - + {{ $crumb }} @elseif (is_array($crumb)) - + @icon($crumb['icon']) {{ $crumb['text'] }} diff --git a/resources/views/partials/sort.blade.php b/resources/views/partials/sort.blade.php index 9544bcee1..38145df21 100644 --- a/resources/views/partials/sort.blade.php +++ b/resources/views/partials/sort.blade.php @@ -4,7 +4,7 @@ ?>
{{ trans('common.sort') }}
-
id}/change-sort/{$type}") }}" method="post"> + id}/change-sort/{$type}") }}" method="post"> {!! csrf_field() !!} {!! method_field('PATCH') !!} diff --git a/resources/views/partials/view-toggle.blade.php b/resources/views/partials/view-toggle.blade.php index 9eb00e1d9..9f911c882 100644 --- a/resources/views/partials/view-toggle.blade.php +++ b/resources/views/partials/view-toggle.blade.php @@ -1,5 +1,5 @@
- id}/switch-${type}-view") }}" method="POST" class="inline"> + id}/switch-${type}-view") }}" method="POST" class="inline"> {!! csrf_field() !!} {!! method_field('PATCH') !!} diff --git a/resources/views/search/all.blade.php b/resources/views/search/all.blade.php index 03c0b93e7..7a2cf65bd 100644 --- a/resources/views/search/all.blade.php +++ b/resources/views/search/all.blade.php @@ -190,7 +190,7 @@

{{ trans('entities.search_results') }}

- + diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index 4aa88b047..510e3af1b 100644 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -15,7 +15,7 @@

{{ trans('settings.app_features_security') }}

- + {!! csrf_field() !!}
@@ -27,7 +27,7 @@

{!! trans('settings.app_public_access_desc') !!}

@if(userCan('users-manage'))

- {!! trans('settings.app_public_access_desc_guest') !!} + {!! trans('settings.app_public_access_desc_guest') !!}

@endif
@@ -79,7 +79,7 @@

{{ trans('settings.app_customization') }}

- + {!! csrf_field() !!}
@@ -121,7 +121,7 @@ @include('components.image-picker', [ 'removeName' => 'setting-app-logo', 'removeValue' => 'none', - 'defaultImage' => baseUrl('/logo.png'), + 'defaultImage' => url('/logo.png'), 'currentImage' => setting('app-logo'), 'name' => 'app_logo', 'imageClass' => 'logo-image', @@ -180,7 +180,7 @@

{{ trans('settings.reg_settings') }}

- + {!! csrf_field() !!}
diff --git a/resources/views/settings/maintenance.blade.php b/resources/views/settings/maintenance.blade.php index c3ca8c96f..6be49cdf2 100644 --- a/resources/views/settings/maintenance.blade.php +++ b/resources/views/settings/maintenance.blade.php @@ -21,7 +21,7 @@

{{ trans('settings.maint_image_cleanup_desc') }}

- + {!! csrf_field() !!}
diff --git a/resources/views/settings/navbar.blade.php b/resources/views/settings/navbar.blade.php index ddbaa3f2a..51fda5b90 100644 --- a/resources/views/settings/navbar.blade.php +++ b/resources/views/settings/navbar.blade.php @@ -1,13 +1,13 @@
@if($currentUser->can('settings-manage')) - @icon('settings'){{ trans('settings.settings') }} - @icon('spanner'){{ trans('settings.maint') }} + @icon('settings'){{ trans('settings.settings') }} + @icon('spanner'){{ trans('settings.maint') }} @endif @if($currentUser->can('users-manage')) - @icon('users'){{ trans('settings.users') }} + @icon('users'){{ trans('settings.users') }} @endif @if($currentUser->can('user-roles-manage')) - @icon('lock-open'){{ trans('settings.roles') }} + @icon('lock-open'){{ trans('settings.roles') }} @endif
\ No newline at end of file diff --git a/resources/views/settings/roles/create.blade.php b/resources/views/settings/roles/create.blade.php index 80a6fc382..df902133f 100644 --- a/resources/views/settings/roles/create.blade.php +++ b/resources/views/settings/roles/create.blade.php @@ -8,7 +8,7 @@ @include('settings.navbar', ['selected' => 'roles'])
- + @include('settings.roles.form', ['title' => trans('settings.role_create')])
diff --git a/resources/views/settings/roles/delete.blade.php b/resources/views/settings/roles/delete.blade.php index a2ea0d728..e0075fa8a 100644 --- a/resources/views/settings/roles/delete.blade.php +++ b/resources/views/settings/roles/delete.blade.php @@ -12,7 +12,7 @@

{{ trans('settings.role_delete_confirm', ['roleName' => $role->display_name]) }}

-
id}") }}" method="POST"> + id}") }}" method="POST"> {!! csrf_field() !!} @@ -31,7 +31,7 @@
diff --git a/resources/views/settings/roles/edit.blade.php b/resources/views/settings/roles/edit.blade.php index a7b813229..0f83bdb0b 100644 --- a/resources/views/settings/roles/edit.blade.php +++ b/resources/views/settings/roles/edit.blade.php @@ -7,7 +7,7 @@ @include('settings.navbar', ['selected' => 'roles'])
- id}") }}" method="POST"> + id}") }}" method="POST"> @include('settings.roles.form', ['model' => $role, 'title' => trans('settings.role_edit'), 'icon' => 'edit']) diff --git a/resources/views/settings/roles/form.blade.php b/resources/views/settings/roles/form.blade.php index 6d7230867..68b841e03 100644 --- a/resources/views/settings/roles/form.blade.php +++ b/resources/views/settings/roles/form.blade.php @@ -219,9 +219,9 @@
- {{ trans('common.cancel') }} + {{ trans('common.cancel') }} @if (isset($role) && $role->id) - id}") }}" class="button outline">{{ trans('settings.role_delete') }} + id}") }}" class="button outline">{{ trans('settings.role_delete') }} @endif
@@ -239,7 +239,7 @@
@@ -26,7 +26,7 @@ @foreach($roles as $role) - id}") }}">{{ $role->display_name }} + id}") }}">{{ $role->display_name }} {{ $role->description }} {{ $role->users->count() }} diff --git a/resources/views/shelves/create.blade.php b/resources/views/shelves/create.blade.php index 706e15d07..aee1c5a42 100644 --- a/resources/views/shelves/create.blade.php +++ b/resources/views/shelves/create.blade.php @@ -19,7 +19,7 @@

{{ trans('entities.shelves_create') }}

-
+ @include('shelves.form', ['shelf' => null, 'books' => $books])
diff --git a/resources/views/shelves/form.blade.php b/resources/views/shelves/form.blade.php index 5803275df..1d152a143 100644 --- a/resources/views/shelves/form.blade.php +++ b/resources/views/shelves/form.blade.php @@ -47,8 +47,8 @@

{{ trans('common.cover_image_description') }}

@include('components.image-picker', [ - 'defaultImage' => baseUrl('/book_default_cover.png'), - 'currentImage' => (isset($shelf) && $shelf->cover) ? $shelf->getBookCover() : baseUrl('/book_default_cover.png') , + 'defaultImage' => url('/book_default_cover.png'), + 'currentImage' => (isset($shelf) && $shelf->cover) ? $shelf->getBookCover() : url('/book_default_cover.png') , 'name' => 'image', 'imageClass' => 'cover' ]) @@ -65,6 +65,6 @@
- {{ trans('common.cancel') }} + {{ trans('common.cancel') }}
\ No newline at end of file diff --git a/resources/views/shelves/index.blade.php b/resources/views/shelves/index.blade.php index 8cf959b1e..98f97f133 100644 --- a/resources/views/shelves/index.blade.php +++ b/resources/views/shelves/index.blade.php @@ -10,7 +10,7 @@
{{ trans('common.actions') }}
@if($currentUser->can('bookshelf-create-all')) - + @icon('add') {{ trans('entities.shelves_new_action') }} diff --git a/resources/views/shelves/list.blade.php b/resources/views/shelves/list.blade.php index 70787f7e8..3f8c266e9 100644 --- a/resources/views/shelves/list.blade.php +++ b/resources/views/shelves/list.blade.php @@ -31,7 +31,7 @@ @else

{{ trans('entities.shelves_empty') }}

@if(userCan('bookshelf-create-all')) - @icon('edit'){{ trans('entities.create_now') }} + @icon('edit'){{ trans('entities.create_now') }} @endif @endif diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php index cd5d75f8f..b9f404bb7 100644 --- a/resources/views/users/create.blade.php +++ b/resources/views/users/create.blade.php @@ -11,7 +11,7 @@

{{ trans('settings.users_add_new') }}

-
+ {!! csrf_field() !!}
@@ -19,7 +19,7 @@
- {{ trans('common.cancel') }} + {{ trans('common.cancel') }}
diff --git a/resources/views/users/delete.blade.php b/resources/views/users/delete.blade.php index 15ad7a9ec..aa9811bf5 100644 --- a/resources/views/users/delete.blade.php +++ b/resources/views/users/delete.blade.php @@ -15,11 +15,11 @@

{{ trans('settings.users_delete_confirm') }}

- id}") }}" method="POST" class="text-right"> + id}") }}" method="POST" class="text-right"> {!! csrf_field() !!} - id}") }}" class="button outline">{{ trans('common.cancel') }} + id}") }}" class="button outline">{{ trans('common.cancel') }}
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 377500193..92a36c943 100644 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -9,7 +9,7 @@

{{ $user->id === $currentUser->id ? trans('settings.users_edit_profile') : trans('settings.users_edit') }}

-
id}") }}" method="post" enctype="multipart/form-data"> + id}") }}" method="post" enctype="multipart/form-data"> {!! csrf_field() !!} @@ -26,7 +26,7 @@ 'resizeHeight' => '512', 'resizeWidth' => '512', 'showRemove' => false, - 'defaultImage' => baseUrl('/user_avatar.png'), + 'defaultImage' => url('/user_avatar.png'), 'currentImage' => $user->getAvatar(80), 'currentId' => $user->image_id, 'name' => 'profile_image', @@ -54,9 +54,9 @@
- {{ trans('common.cancel') }} + {{ trans('common.cancel') }} @if($authMethod !== 'system') - id}/delete") }}" class="button outline">{{ trans('settings.users_delete') }} + id}/delete") }}" class="button outline">{{ trans('settings.users_delete') }} @endif
@@ -74,9 +74,9 @@
@icon('auth/'. $driver, ['style' => 'width: 56px;height: 56px;'])
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index af6b4d4f9..72db24075 100644 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -14,7 +14,7 @@
- + @foreach(collect($listDetails)->except('search') as $name => $val) @endforeach @@ -22,7 +22,7 @@
@if(userCan('users-manage')) - {{ trans('settings.users_add_new') }} + {{ trans('settings.users_add_new') }} @endif
@@ -43,7 +43,7 @@ {{ $user->name }} @if(userCan('users-manage') || $currentUser->id == $user->id) - id}") }}"> + id}") }}"> @endif {{ $user->name }}
{{ $user->email }} @if(userCan('users-manage') || $currentUser->id == $user->id) @@ -52,7 +52,7 @@ @foreach($user->roles as $index => $role) - id}") }}">{{$role->display_name}}@if($index !== count($user->roles) -1),@endif + id}") }}">{{$role->display_name}}@if($index !== count($user->roles) -1),@endif @endforeach diff --git a/resources/views/users/profile.blade.php b/resources/views/users/profile.blade.php index e2689790f..f817e328f 100644 --- a/resources/views/users/profile.blade.php +++ b/resources/views/users/profile.blade.php @@ -60,7 +60,7 @@

{{ trans('entities.recently_created_pages') }} @if (count($recentlyCreated['pages']) > 0) - {{ trans('common.view_all') }} + {{ trans('common.view_all') }} @endif

@if (count($recentlyCreated['pages']) > 0) @@ -74,7 +74,7 @@

{{ trans('entities.recently_created_chapters') }} @if (count($recentlyCreated['chapters']) > 0) - {{ trans('common.view_all') }} + {{ trans('common.view_all') }} @endif

@if (count($recentlyCreated['chapters']) > 0) @@ -88,7 +88,7 @@

{{ trans('entities.recently_created_books') }} @if (count($recentlyCreated['books']) > 0) - {{ trans('common.view_all') }} + {{ trans('common.view_all') }} @endif

@if (count($recentlyCreated['books']) > 0) @@ -102,7 +102,7 @@

{{ trans('entities.recently_created_shelves') }} @if (count($recentlyCreated['shelves']) > 0) - {{ trans('common.view_all') }} + {{ trans('common.view_all') }} @endif

@if (count($recentlyCreated['shelves']) > 0) diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php index 3e02cbba9..b8a93643a 100644 --- a/resources/views/vendor/notifications/email.blade.php +++ b/resources/views/vendor/notifications/email.blade.php @@ -83,7 +83,7 @@ $style = [ - + {{ setting('app-name') }} @@ -186,7 +186,7 @@ $style = [

© {{ date('Y') }} - {{ setting('app-name') }}. + {{ setting('app-name') }}. {{ trans('common.email_rights') }}

diff --git a/tests/Auth/AuthTest.php b/tests/Auth/AuthTest.php index 0399f2b81..3d36d85b2 100644 --- a/tests/Auth/AuthTest.php +++ b/tests/Auth/AuthTest.php @@ -341,7 +341,7 @@ class AuthTest extends BrowserKitTest $page = Page::query()->first(); $this->visit($page->getUrl()) - ->seePageUrlIs(baseUrl('/login')); + ->seePageUrlIs(url('/login')); $this->login('admin@admin.com', 'password') ->seePageUrlIs($page->getUrl()); } diff --git a/tests/Unit/HelpersTest.php b/tests/Unit/HelpersTest.php deleted file mode 100644 index c8f4ce294..000000000 --- a/tests/Unit/HelpersTest.php +++ /dev/null @@ -1,33 +0,0 @@ -set('app.url', 'http://example.com/bookstack'); - $result = baseUrl('/'); - $this->assertEquals('http://example.com/bookstack/', $result); - } - - public function test_base_url_takes_extra_path_into_account_on_forced_domain() - { - config()->set('app.url', 'http://example.com/bookstack'); - $result = baseUrl('http://example.com/bookstack/', true); - $this->assertEquals('http://example.com/bookstack/', $result); - } - - public function test_base_url_force_domain_works_as_expected_with_full_url_given() - { - config()->set('app.url', 'http://example.com'); - $result = baseUrl('http://examps.com/books/test/page/cat', true); - $this->assertEquals('http://example.com/books/test/page/cat', $result); - } - - public function test_base_url_force_domain_works_when_app_domain_is_same_as_given_url() - { - config()->set('app.url', 'http://example.com'); - $result = baseUrl('http://example.com/books/test/page/cat', true); - $this->assertEquals('http://example.com/books/test/page/cat', $result); - } -} \ No newline at end of file diff --git a/tests/Unit/UrlTest.php b/tests/Unit/UrlTest.php new file mode 100644 index 000000000..c7d33312c --- /dev/null +++ b/tests/Unit/UrlTest.php @@ -0,0 +1,25 @@ +set('app.url', 'http://example.com/bookstack'); + $this->get('/'); + $this->assertEquals('http://example.com/bookstack', request()->getUri()); + + config()->set('app.url', 'http://example.com/docs/content'); + $this->get('/'); + $this->assertEquals('http://example.com/docs/content', request()->getUri()); + } + + public function test_url_helper_takes_custom_url_into_account() + { + putenv('APP_URL=http://example.com/bookstack'); + $this->refreshApplication(); + $this->assertEquals('http://example.com/bookstack/books', url('/books')); + putenv('APP_URL='); + } + +} \ No newline at end of file