diff options
| author | Greg Roach <fisharebest@gmail.com> | 2017-11-21 17:57:52 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2017-11-21 17:57:52 +0000 |
| commit | 78f07ab5bc1e5a259d876b2292039bdd6fab5f50 (patch) | |
| tree | 5b7049870f2cf1f6d2bd1671bb3a538a5e6dba4b /resources/views/layouts | |
| parent | ead969c74a05ff82d0a7e6c0cb584ce20ad84954 (diff) | |
| download | webtrees-78f07ab5bc1e5a259d876b2292039bdd6fab5f50.tar.gz webtrees-78f07ab5bc1e5a259d876b2292039bdd6fab5f50.tar.bz2 webtrees-78f07ab5bc1e5a259d876b2292039bdd6fab5f50.zip | |
Use laravel-style e() function to escape HTML in views
Diffstat (limited to 'resources/views/layouts')
| -rw-r--r-- | resources/views/layouts/administration.php | 41 | ||||
| -rw-r--r-- | resources/views/layouts/default.php | 15 |
2 files changed, 27 insertions, 29 deletions
diff --git a/resources/views/layouts/administration.php b/resources/views/layouts/administration.php index 69309b6104..da510a9a27 100644 --- a/resources/views/layouts/administration.php +++ b/resources/views/layouts/administration.php @@ -1,28 +1,27 @@ <?php use Fisharebest\Webtrees\DebugBar; ?> <?php use Fisharebest\Webtrees\Filter; ?> <?php use Fisharebest\Webtrees\FlashMessages; ?> -<?php use Fisharebest\Webtrees\Html; ?> <?php use Fisharebest\Webtrees\I18N; ?> <!DOCTYPE html> <html <?= I18N::htmlAttributes() ?>> <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> - <meta name="csrf" content="<?= Html::escape(Filter::getCsrfToken()) ?>"> + <meta name="csrf" content="<?= e(Filter::getCsrfToken()) ?>"> <title><?= $title ?></title> <link rel="icon" href="favicon.ico" type="image/x-icon"> - <link rel="stylesheet" type="text/css" href="<?= Html::escape(WT_BOOTSTRAP_CSS_URL) ?>"> - <link rel="stylesheet" type="text/css" href="<?= Html::escape(WT_FONT_AWESOME_CSS_URL) ?>"> - <link rel="stylesheet" type="text/css" href="<?= Html::escape(WT_FONT_AWESOME_RTL_CSS_URL) ?>"> - <link rel="stylesheet" type="text/css" href="<?= Html::escape(WT_DATATABLES_BOOTSTRAP_CSS_URL) ?>"> - <link rel="stylesheet" type="text/css" href="<?= Html::escape(WT_SELECT2_CSS_URL) ?>"> - <link rel="stylesheet" type="text/css" href="<?= Html::escape(WT_DATATABLES_BOOTSTRAP_CSS_URL) ?>"> - <link rel="stylesheet" type="text/css" href="<?= Html::escape(WT_BOOTSTRAP_DATETIMEPICKER_CSS_URL) ?>"> - <link rel="stylesheet" type="text/css" href="<?= Html::escape($common_url) ?>style.css"> - <link rel="stylesheet" type="text/css" href="<?= Html::escape($theme_url) ?>style.css"> + <link rel="stylesheet" type="text/css" href="<?= e(WT_BOOTSTRAP_CSS_URL) ?>"> + <link rel="stylesheet" type="text/css" href="<?= e(WT_FONT_AWESOME_CSS_URL) ?>"> + <link rel="stylesheet" type="text/css" href="<?= e(WT_FONT_AWESOME_RTL_CSS_URL) ?>"> + <link rel="stylesheet" type="text/css" href="<?= e(WT_DATATABLES_BOOTSTRAP_CSS_URL) ?>"> + <link rel="stylesheet" type="text/css" href="<?= e(WT_SELECT2_CSS_URL) ?>"> + <link rel="stylesheet" type="text/css" href="<?= e(WT_DATATABLES_BOOTSTRAP_CSS_URL) ?>"> + <link rel="stylesheet" type="text/css" href="<?= e(WT_BOOTSTRAP_DATETIMEPICKER_CSS_URL) ?>"> + <link rel="stylesheet" type="text/css" href="<?= e($common_url) ?>style.css"> + <link rel="stylesheet" type="text/css" href="<?= e($theme_url) ?>style.css"> <?php if (I18N::direction() === 'rtl'): ?> <link rel="stylesheet" type="text/css" href="<?= WT_BOOTSTRAP_RTL_CSS_URL ?>"> @@ -71,16 +70,16 @@ <?= $content ?> - <script src="<?= Html::escape(WT_JQUERY_JS_URL) ?>"></script> - <script src="<?= Html::escape(WT_POPPER_JS_URL) ?>"></script> - <script src="<?= Html::escape(WT_BOOTSTRAP_JS_URL) ?>"></script> - <script src="<?= Html::escape(WT_DATATABLES_JS_URL) ?>"></script> - <script src="<?= Html::escape(WT_DATATABLES_BOOTSTRAP_JS_URL) ?>"></script> - <script src="<?= Html::escape(WT_SELECT2_JS_URL) ?>"></script> - <script src="<?= Html::escape(WT_MOMENT_JS_URL) ?>"></script> - <script src="<?= Html::escape(WT_BOOTSTRAP_DATETIMEPICKER_JS_URL) ?>"></script> - <script src="<?= Html::escape(WT_WEBTREES_JS_URL) ?>"></script> - <script src="<?= Html::escape(WT_ADMIN_JS_URL) ?>"></script> + <script src="<?= e(WT_JQUERY_JS_URL) ?>"></script> + <script src="<?= e(WT_POPPER_JS_URL) ?>"></script> + <script src="<?= e(WT_BOOTSTRAP_JS_URL) ?>"></script> + <script src="<?= e(WT_DATATABLES_JS_URL) ?>"></script> + <script src="<?= e(WT_DATATABLES_BOOTSTRAP_JS_URL) ?>"></script> + <script src="<?= e(WT_SELECT2_JS_URL) ?>"></script> + <script src="<?= e(WT_MOMENT_JS_URL) ?>"></script> + <script src="<?= e(WT_BOOTSTRAP_DATETIMEPICKER_JS_URL) ?>"></script> + <script src="<?= e(WT_WEBTREES_JS_URL) ?>"></script> + <script src="<?= e(WT_ADMIN_JS_URL) ?>"></script> <?= DebugBar::render() ?> </body> diff --git a/resources/views/layouts/default.php b/resources/views/layouts/default.php index 979023640c..65df9e7455 100644 --- a/resources/views/layouts/default.php +++ b/resources/views/layouts/default.php @@ -1,6 +1,5 @@ <?php use Fisharebest\Webtrees\Database; ?> <?php use Fisharebest\Webtrees\DebugBar; ?> -<?php use Fisharebest\Webtrees\Html; ?> <?php use Fisharebest\Webtrees\I18N; ?> <!DOCTYPE html> <html <?= I18N::htmlAttributes() ?>> @@ -19,13 +18,13 @@ var WT_LOCALE = <?= json_encode(WT_LOCALE) ?>; </script> - <script src="<?= Html::escape(WT_JQUERY_JS_URL) ?>"></script> - <script src="<?= Html::escape(WT_POPPER_JS_URL) ?>"></script> - <script src="<?= Html::escape(WT_BOOTSTRAP_JS_URL) ?>"></script> - <script src="<?= Html::escape(WT_DATATABLES_JS_URL) ?>"></script> - <script src="<?= Html::escape(WT_DATATABLES_BOOTSTRAP_JS_URL) ?>"></script> - <script src="<?= Html::escape(WT_SELECT2_JS_URL) ?>"></script> - <script src="<?= Html::escape(WT_WEBTREES_JS_URL) ?>"></script> + <script src="<?= e(WT_JQUERY_JS_URL) ?>"></script> + <script src="<?= e(WT_POPPER_JS_URL) ?>"></script> + <script src="<?= e(WT_BOOTSTRAP_JS_URL) ?>"></script> + <script src="<?= e(WT_DATATABLES_JS_URL) ?>"></script> + <script src="<?= e(WT_DATATABLES_BOOTSTRAP_JS_URL) ?>"></script> + <script src="<?= e(WT_SELECT2_JS_URL) ?>"></script> + <script src="<?= e(WT_WEBTREES_JS_URL) ?>"></script> <?= DebugBar::renderHead() ?> <?= DebugBar::render() ?> |