webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00
Code Activity

Apply fixes from StyleCI

Browse Source
This commit is contained in:
Dan Brown
2021-06-26 15:23:15 +00:00
committed by StyleCI Bot
parent 3a402f6adc
commit 934a833818
349 changed files with 3655 additions and 2625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Middleware/ApiAuthenticate.php
View File

@ -29,6 +29,7 @@ class ApiAuthenticate
/**
* Ensure the current user can access authenticated API routes, either via existing session
* authentication or via API Token authentication.
*
* @throws UnauthorizedException
*/
protected function ensureAuthorizedBySessionOrToken(): void
@ -40,6 +41,7 @@ class ApiAuthenticate
if (!user()->can('access-api')) {
throw new ApiAuthException(trans('errors.api_user_no_api_permission'), 403);
}
return;
}
@ -58,9 +60,9 @@ class ApiAuthenticate
{
return response()->json([
'error' => [
'code' => $code,
'code' => $code,
'message' => $message,
]
],
], $code);
}
}

6
app/Http/Middleware/Authenticate.php
View File

@ -38,9 +38,9 @@ class Authenticate
if ($request->wantsJson()) {
return response()->json([
'error' => [
'code' => 401,
'message' => trans('errors.email_confirmation_awaiting')
]
'code' => 401,
'message' => trans('errors.email_confirmation_awaiting'),
],
], 401);
}

8
app/Http/Middleware/CheckGuard.php
View File

@ -9,9 +9,10 @@ class CheckGuard
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string $allowedGuards
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string $allowedGuards
*
* @return mixed
*/
public function handle($request, Closure $next, ...$allowedGuards)
@ -19,6 +20,7 @@ class CheckGuard
$activeGuard = config('auth.method');
if (!in_array($activeGuard, $allowedGuards)) {
session()->flash('error', trans('errors.permission'));
return redirect('/');
}

2
app/Http/Middleware/ChecksForEmailConfirmation.php
View File

@ -3,13 +3,13 @@
namespace BookStack\Http\Middleware;
use BookStack\Exceptions\UnauthorizedException;
use Illuminate\Http\Request;
trait ChecksForEmailConfirmation
{
/**
* Check if the current user has a confirmed email if the instance deems it as required.
* Throws if confirmation is required by the user.
*
* @throws UnauthorizedException
*/
protected function ensureEmailConfirmedIfRequested()

7
app/Http/Middleware/ControlIframeSecurity.php
View File

@ -3,7 +3,6 @@
namespace BookStack\Http\Middleware;
use Closure;
use Symfony\Component\HttpFoundation\Response;
/**
* Sets CSP headers to restrict the hosts that BookStack can be
@ -15,8 +14,9 @@ class ControlIframeSecurity
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param \Illuminate\Http\Request $request
* @param \Closure $next
*
* @return mixed
*/
public function handle($request, Closure $next)
@ -31,6 +31,7 @@ class ControlIframeSecurity
$response = $next($request);
$cspValue = 'frame-ancestors ' . $iframeHosts->join(' ');
$response->headers->set('Content-Security-Policy', $cspValue);
return $response;
}
}

78
app/Http/Middleware/Localization.php
View File

@ -1,4 +1,6 @@
<?php namespace BookStack\Http\Middleware;
<?php
namespace BookStack\Http\Middleware;
use Carbon\Carbon;
use Closure;
@ -6,9 +8,8 @@ use Illuminate\Http\Request;
class Localization
{
/**
* Array of right-to-left locales
* Array of right-to-left locales.
*/
protected $rtlLocales = ['ar', 'he'];
@ -16,45 +17,46 @@ class Localization
* Map of BookStack locale names to best-estimate system locale names.
*/
protected $localeMap = [
'ar' => 'ar',
'bg' => 'bg_BG',
'bs' => 'bs_BA',
'ca' => 'ca',
'da' => 'da_DK',
'de' => 'de_DE',
'ar' => 'ar',
'bg' => 'bg_BG',
'bs' => 'bs_BA',
'ca' => 'ca',
'da' => 'da_DK',
'de' => 'de_DE',
'de_informal' => 'de_DE',
'en' => 'en_GB',
'es' => 'es_ES',
'es_AR' => 'es_AR',
'fr' => 'fr_FR',
'he' => 'he_IL',
'hr' => 'hr_HR',
'id' => 'id_ID',
'it' => 'it_IT',
'ja' => 'ja',
'ko' => 'ko_KR',
'lv' => 'lv_LV',
'nl' => 'nl_NL',
'nb' => 'nb_NO',
'pl' => 'pl_PL',
'pt' => 'pt_PT',
'pt_BR' => 'pt_BR',
'ru' => 'ru',
'sk' => 'sk_SK',
'sl' => 'sl_SI',
'sv' => 'sv_SE',
'uk' => 'uk_UA',
'vi' => 'vi_VN',
'zh_CN' => 'zh_CN',
'zh_TW' => 'zh_TW',
'tr' => 'tr_TR',
'en' => 'en_GB',
'es' => 'es_ES',
'es_AR' => 'es_AR',
'fr' => 'fr_FR',
'he' => 'he_IL',
'hr' => 'hr_HR',
'id' => 'id_ID',
'it' => 'it_IT',
'ja' => 'ja',
'ko' => 'ko_KR',
'lv' => 'lv_LV',
'nl' => 'nl_NL',
'nb' => 'nb_NO',
'pl' => 'pl_PL',
'pt' => 'pt_PT',
'pt_BR' => 'pt_BR',
'ru' => 'ru',
'sk' => 'sk_SK',
'sl' => 'sl_SI',
'sv' => 'sv_SE',
'uk' => 'uk_UA',
'vi' => 'vi_VN',
'zh_CN' => 'zh_CN',
'zh_TW' => 'zh_TW',
'tr' => 'tr_TR',
];
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param \Illuminate\Http\Request $request
* @param \Closure $next
*
* @return mixed
*/
public function handle($request, Closure $next)
@ -73,6 +75,7 @@ class Localization
app()->setLocale($locale);
Carbon::setLocale($locale);
$this->setSystemDateLocale($locale);
return $next($request);
}
@ -106,11 +109,12 @@ class Localization
return $lang;
}
}
return $default;
}
/**
* Get the ISO version of a BookStack language name
* Get the ISO version of a BookStack language name.
*/
public function getLocaleIso(string $locale): string
{

10
app/Http/Middleware/PermissionMiddleware.php
View File

@ -3,23 +3,23 @@
namespace BookStack\Http\Middleware;
use Closure;
use Illuminate\Support\Facades\Session;
class PermissionMiddleware
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param $permission
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param $permission
*
* @return mixed
*/
public function handle($request, Closure $next, $permission)
{
if (!$request->user() || !$request->user()->can($permission)) {
session()->flash('error', trans('errors.permission'));
return redirect()->back();
}

12
app/Http/Middleware/RedirectIfAuthenticated.php
View File

@ -1,4 +1,6 @@
<?php namespace BookStack\Http\Middleware;
<?php
namespace BookStack\Http\Middleware;
use Closure;
use Illuminate\Contracts\Auth\Guard;
@ -15,7 +17,8 @@ class RedirectIfAuthenticated
/**
* Create a new filter instance.
*
* @param Guard $auth
* @param Guard $auth
*
* @return void
*/
public function __construct(Guard $auth)
@ -26,8 +29,9 @@ class RedirectIfAuthenticated
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param \Illuminate\Http\Request $request
* @param \Closure $next
*
* @return mixed
*/
public function handle($request, Closure $next)

6
app/Http/Middleware/RunThemeActions.php
View File

@ -11,8 +11,9 @@ class RunThemeActions
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param \Illuminate\Http\Request $request
* @param \Closure $next
*
* @return mixed
*/
public function handle($request, Closure $next)
@ -24,6 +25,7 @@ class RunThemeActions
$response = $next($request);
$response = Theme::dispatch(ThemeEvents::WEB_MIDDLEWARE_AFTER, $request, $response) ?? $response;
return $response;
}
}

1
app/Http/Middleware/ThrottleApiRequests.php
View File

@ -6,7 +6,6 @@ use Illuminate\Routing\Middleware\ThrottleRequests as Middleware;
class ThrottleApiRequests extends Middleware
{
/**
* Resolve the number of attempts if the user is authenticated or not.
*/

2
app/Http/Middleware/TrustProxies.php
View File

@ -24,8 +24,10 @@ class TrustProxies extends Middleware
/**
* Handle the request, Set the correct user-configured proxy information.
*
* @param Request $request
* @param Closure $next
*
* @return mixed
*/
public function handle(Request $request, Closure $next)

2
app/Http/Middleware/VerifyCsrfToken.php
View File

@ -19,6 +19,6 @@ class VerifyCsrfToken extends Middleware
* @var array
*/
protected $except = [
'saml2/*'
'saml2/*',
];
}