Skip to content

Commit

Permalink
Fixes #1310
Browse files Browse the repository at this point in the history
  • Loading branch information
@aheinze
aheinze committed Jun 17, 2020
1 parent 0023068 commit 74de99d
Show file tree
Hide file tree
Showing 16 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion modules/Cockpit/views/layouts/login.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
this.error = false;
this.$user = null;
var redirectTo = '{{ $redirectTo }}';
var redirectTo = '{{ htmlspecialchars($redirectTo, ENT_QUOTES, 'UTF-8') }}';
submit(e) {
Expand Down
2 changes: 1 addition & 1 deletion modules/Collections/views/entries.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function CollectionHasFieldAccess(field) {
<li><a href="@route('/collections')">@lang('Collections')</a></li>
<li class="uk-active" data-uk-dropdown="mode:'hover', delay:300">
<a><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$collection['label'] ? $collection['label']:$collection['name']) }}</a>
<a><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$collection['label'] ? $collection['label']:$collection['name'], ENT_QUOTES, 'UTF-8') }}</a>
@if($app->module('collections')->hasaccess($collection['name'], 'collection_edit'))
<div class="uk-dropdown">
Expand Down
2 changes: 1 addition & 1 deletion modules/Collections/views/entry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<ul class="uk-breadcrumb">
<li><a href="@route('/collections')">@lang('Collections')</a></li>
<li data-uk-dropdown="mode:'hover', delay:300">
<a href="@route('/collections/entries/'.$collection['name'])"><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$collection['label'] ? $collection['label']:$collection['name']) }}</a>
<a href="@route('/collections/entries/'.$collection['name'])"><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$collection['label'] ? $collection['label']:$collection['name'], ENT_QUOTES, 'UTF-8') }}</a>

@if($app->module('collections')->hasaccess($collection['name'], 'collection_edit'))
<div class="uk-dropdown">
Expand Down
2 changes: 1 addition & 1 deletion modules/Collections/views/import/collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<li><a href="@route('/collections')">@lang('Collections')</a></li>
<li data-uk-dropdown="mode:'hover, delay:300'">
<a href="@route('/collections/entries/'.$collection['name'])"><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$collection['label'] ? $collection['label']:$collection['name']) }}</a>
<a href="@route('/collections/entries/'.$collection['name'])"><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$collection['label'] ? $collection['label']:$collection['name'], ENT_QUOTES, 'UTF-8') }}</a>
<div class="uk-dropdown">
<ul class="uk-nav uk-nav-dropdown">
Expand Down
2 changes: 1 addition & 1 deletion modules/Collections/views/locked.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ul class="uk-breadcrumb">
<li><a href="@route('/collections')">@lang('Collections')</a></li>
<li data-uk-dropdown="mode:'hover', delay:300">
<a href="@route('/collections/entries/'.$collection['name'])"><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$collection['label'] ? $collection['label']:$collection['name']) }}</a>
<a href="@route('/collections/entries/'.$collection['name'])"><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$collection['label'] ? $collection['label']:$collection['name'], ENT_QUOTES, 'UTF-8') }}</a>

@if($app->module('collections')->hasaccess($collection['name'], 'collection_edit'))
<div class="uk-dropdown">
Expand Down
4 changes: 2 additions & 2 deletions modules/Collections/views/partials/entries.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<img class="uk-svg-adjust" src="@url($collection['icon'] ? 'assets:app/media/icons/'.$collection['icon']:'collections:icon.svg')" width="50" alt="icon" data-uk-svg>
@if($collection['description'])
<div class="uk-container-center uk-margin-top uk-width-medium-1-2">
{{ htmlspecialchars($collection['description']) }}
{{ htmlspecialchars($collection['description'], ENT_QUOTES, 'UTF-8') }}
</div>
@endif
</div>
Expand All @@ -61,7 +61,7 @@
<img class="uk-svg-adjust" src="@url($collection['icon'] ? 'assets:app/media/icons/'.$collection['icon']:'collections:icon.svg')" width="50" alt="icon" data-uk-svg>
@if($collection['description'])
<div class="uk-margin-top uk-text-small uk-text-muted">
{{ htmlspecialchars($collection['description']) }}
{{ htmlspecialchars($collection['description'], ENT_QUOTES, 'UTF-8') }}
</div>
@endif
<hr>
Expand Down
4 changes: 2 additions & 2 deletions modules/Collections/views/partials/entries.sortable.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<img class="uk-svg-adjust" src="@url($collection['icon'] ? 'assets:app/media/icons/'.$collection['icon']:'collections:icon.svg')" width="50" alt="icon" data-uk-svg>
@if($collection['description'])
<div class="uk-container-center uk-margin-top uk-width-medium-1-2">
{{ htmlspecialchars($collection['description']) }}
{{ htmlspecialchars($collection['description'], ENT_QUOTES, 'UTF-8') }}
</div>
@endif
</div>
Expand All @@ -33,7 +33,7 @@
<img class="uk-svg-adjust" src="@url($collection['icon'] ? 'assets:app/media/icons/'.$collection['icon']:'collections:icon.svg')" width="50" alt="icon" data-uk-svg>
@if($collection['description'])
<div class="uk-margin-top uk-text-small uk-text-muted">
{{ htmlspecialchars($collection['description']) }}
{{ htmlspecialchars($collection['description'], ENT_QUOTES, 'UTF-8') }}
</div>
@endif
<hr>
Expand Down
2 changes: 1 addition & 1 deletion modules/Collections/views/revisions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<ul class="uk-breadcrumb">
<li><a href="@route('/collections')">@lang('Collections')</a></li>
<li data-uk-dropdown="mode:'hover', delay:300">
<a href="@route('/collections/entries/'.$collection['name'])"><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$collection['label'] ? $collection['label']:$collection['name']) }}</a>
<a href="@route('/collections/entries/'.$collection['name'])"><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$collection['label'] ? $collection['label']:$collection['name'], ENT_QUOTES, 'UTF-8') }}</a>
@if($app->module('collections')->hasaccess($collection['name'], 'collection_edit'))
<div class="uk-dropdown">
Expand Down
4 changes: 2 additions & 2 deletions modules/Collections/views/trash/collection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<li><a href="@route('/collections')">@lang('Collections')</a></li>
<li class="uk-active" data-uk-dropdown="mode:'hover', delay:300">
<a href="@route('/collections/entries/'.$collection['name'])"><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$collection['label'] ? $collection['label']:$collection['name']) }}</a>
<a href="@route('/collections/entries/'.$collection['name'])"><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$collection['label'] ? $collection['label']:$collection['name'], ENT_QUOTES, 'UTF-8') }}</a>
@if($app->module('collections')->hasaccess($collection['name'], 'collection_edit'))
<div class="uk-dropdown">
Expand Down Expand Up @@ -65,7 +65,7 @@
</div>
<h3>
<strong>{{ htmlspecialchars(@$collection['label'] ? $collection['label']:$collection['name']) }}</strong>
<strong>{{ htmlspecialchars(@$collection['label'] ? $collection['label']:$collection['name'], ENT_QUOTES, 'UTF-8') }}</strong>
@lang('Trash')
</h3>
</div>
Expand Down
2 changes: 1 addition & 1 deletion modules/Collections/views/widgets/dashboard.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<img class="uk-margin-small-right uk-svg-adjust" src="@url(isset($col['icon']) && $col['icon'] ? 'assets:app/media/icons/'.$col['icon']:'collections:icon.svg')" width="18px" alt="icon" data-uk-svg>
{{ htmlspecialchars(@$col['label'] ? $col['label'] : $col['name']) }}
{{ htmlspecialchars(@$col['label'] ? $col['label'] : $col['name'], ENT_QUOTES, 'UTF-8') }}
</a>
</div>
<div>
Expand Down
8 changes: 4 additions & 4 deletions modules/Forms/views/entries.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<li><a href="@route('/forms')">@lang('Forms')</a></li>
<li class="uk-active" data-uk-dropdown>
<a><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$form['label'] ? $form['label']:$form['name']) }}</a>
<a><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$form['label'] ? $form['label']:$form['name'], ENT_QUOTES, 'UTF-8') }}</a>
<div class="uk-dropdown">
<ul class="uk-nav uk-nav-dropdown">
Expand All @@ -33,7 +33,7 @@
<img class="uk-svg-adjust" src="@url($form['icon'] ? 'assets:app/media/icons/'.$form['icon']:'forms:icon.svg')" width="50" alt="icon" data-uk-svg>
@if($form['description'])
<div class="uk-container-center uk-margin-top uk-width-medium-1-2">
{{ htmlspecialchars($form['description']) }}
{{ htmlspecialchars($form['description'], ENT_QUOTES, 'UTF-8') }}
</div>
@endif
</div>
Expand All @@ -57,7 +57,7 @@
<img class="uk-svg-adjust" src="@url($form['icon'] ? 'assets:app/media/icons/'.$form['icon']:'forms:icon.svg')" width="50" alt="icon" data-uk-svg>
@if($form['description'])
<div class="uk-margin-top uk-text-small">
{{ htmlspecialchars($form['description']) }}
{{ htmlspecialchars($form['description'], ENT_QUOTES, 'UTF-8') }}
</div>
@endif
<hr>
Expand All @@ -71,7 +71,7 @@
<div class="uk-flex-item-1 uk-flex uk-flex-middle uk-h3">
<div class="uk-margin-small-right"><img src="@url($form['icon'] ? 'assets:app/media/icons/'.$form['icon']:'forms:icon.svg')" width="40" alt="icon"></div>
<strong class="uk-margin-small-right">{{ htmlspecialchars(@$form['label'] ? $form['label']:$form['name']) }}</strong>
<strong class="uk-margin-small-right">{{ htmlspecialchars(@$form['label'] ? $form['label']:$form['name'], ENT_QUOTES, 'UTF-8') }}</strong>
@lang('Entries')
</div>
Expand Down
2 changes: 1 addition & 1 deletion modules/Forms/views/widgets/dashboard.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<img class="uk-margin-small-right uk-svg-adjust" src="@url(isset($form['icon']) && $form['icon'] ? 'assets:app/media/icons/'.$form['icon']:'forms:icon.svg')" width="18px" alt="icon" data-uk-svg>
{{ htmlspecialchars(@$form['label'] ? $form['label'] : $form['name']) }}
{{ htmlspecialchars(@$form['label'] ? $form['label'] : $form['name'], ENT_QUOTES, 'UTF-8') }}
</a>
</li>
@endforeach
Expand Down
4 changes: 2 additions & 2 deletions modules/Singletons/views/form.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<li><a href="@route('/singletons')">@lang('Singletons')</a></li>
<li class="uk-active" data-uk-dropdown>
<a><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$singleton['label'] ? $singleton['label']:$singleton['name']) }}</a>
<a><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$singleton['label'] ? $singleton['label']:$singleton['name'], ENT_QUOTES, 'UTF-8') }}</a>
@if($app->module('singletons')->hasaccess($singleton['name'], 'edit'))
<div class="uk-dropdown">
Expand Down Expand Up @@ -73,7 +73,7 @@
@if($singleton['description'])
<div class="uk-margin uk-text-muted">
{{ htmlspecialchars($singleton['description']) }}
{{ htmlspecialchars($singleton['description'], ENT_QUOTES, 'UTF-8') }}
</div>
@endif
Expand Down
2 changes: 1 addition & 1 deletion modules/Singletons/views/locked.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<li><a href="@route('/singletons')">@lang('Singletons')</a></li>
<li class="uk-active" data-uk-dropdown>

<a><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$singleton['label'] ? $singleton['label']:$singleton['name']) }}</a>
<a><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$singleton['label'] ? $singleton['label']:$singleton['name'], ENT_QUOTES, 'UTF-8') }}</a>

@if($app->module('singletons')->hasaccess($singleton['name'], 'edit'))
<div class="uk-dropdown">
Expand Down
2 changes: 1 addition & 1 deletion modules/Singletons/views/revisions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<ul class="uk-breadcrumb">
<li><a href="@route('/singletons')">@lang('Singletons')</a></li>
<li data-uk-dropdown="mode:'hover', delay:300">
<a href="@route('/singletons/form/'.$singleton['name'])"><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$singleton['label'] ? $singleton['label']:$singleton['name']) }}</a>
<a href="@route('/singletons/form/'.$singleton['name'])"><i class="uk-icon-bars"></i> {{ htmlspecialchars(@$singleton['label'] ? $singleton['label']:$singleton['name'], ENT_QUOTES, 'UTF-8') }}</a>
@if($app->module('singletons')->hasaccess($singleton['name'], 'edit'))
<div class="uk-dropdown">
Expand Down
2 changes: 1 addition & 1 deletion modules/Singletons/views/widgets/dashboard.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<img class="uk-margin-small-right uk-svg-adjust" src="@url(isset($singleton['icon']) && $singleton['icon'] ? 'assets:app/media/icons/'.$singleton['icon']:'singletons:icon.svg')" width="18px" alt="icon" data-uk-svg>
{{ htmlspecialchars(@$singleton['label'] ? $singleton['label'] : $singleton['name']) }}
{{ htmlspecialchars(@$singleton['label'] ? $singleton['label'] : $singleton['name'], ENT_QUOTES, 'UTF-8') }}
</a>
</li>
@endforeach
Expand Down

0 comments on commit 74de99d

Please sign in to comment.