diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 64cac8df2..6b52b74f9 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.13 # Apache + PHP RUN apk add --no-cache \ apache2 \ diff --git a/app/Http/Middleware/SecurityHeaders.php b/app/Http/Middleware/SecurityHeaders.php index 4a75d6ec2..8a3800ffe 100644 --- a/app/Http/Middleware/SecurityHeaders.php +++ b/app/Http/Middleware/SecurityHeaders.php @@ -99,7 +99,7 @@ class SecurityHeaders // We have to exclude debug mode here because debugbar pulls from a CDN or two // and it will break things. - if ((config('app.debug')!='true') || (config('app.enable_csp')=='true')) { + if ((config('app.debug')!='true') && (config('app.enable_csp')=='true')) { $csp_policy[] = "default-src 'self'"; $csp_policy[] = "style-src 'self' 'unsafe-inline'"; $csp_policy[] = "script-src 'self' 'unsafe-inline' 'unsafe-eval'"; diff --git a/app/Models/Location.php b/app/Models/Location.php index dc8aa6a04..1f48f96e7 100755 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -23,7 +23,7 @@ class Location extends SnipeModel protected $rules = array( 'name' => 'required|min:2|max:255|unique_undeleted', 'city' => 'min:2|max:255|nullable', - 'country' => 'min:2|max:2|nullable', + 'country' => 'min:2|max:255|nullable', 'address' => 'max:80|nullable', 'address2' => 'max:80|nullable', 'zip' => 'min:3|max:10|nullable', diff --git a/resources/views/settings/backups.blade.php b/resources/views/settings/backups.blade.php index 3af4d8ba9..742ae25c9 100644 --- a/resources/views/settings/backups.blade.php +++ b/resources/views/settings/backups.blade.php @@ -29,7 +29,6 @@ data-sort-order="asc" id="system-backups" class="table table-striped snipe-table"> - File Created