diff options
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/installation.php | 7 | ||||
| -rw-r--r-- | core/templates/layout.base.php | 2 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 2 | ||||
| -rw-r--r-- | core/templates/layout.noscript.warning.php | 11 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 2 |
5 files changed, 14 insertions, 10 deletions
diff --git a/core/templates/installation.php b/core/templates/installation.php index 53ab4a0b877..4e9cde205d8 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -26,13 +26,6 @@ script('core', [ <?php endforeach; ?> </fieldset> <?php endif; ?> - <?php if($_['vulnerableToNullByte']): ?> - <fieldset class="warning"> - <legend><strong><?php p($l->t('Security Warning'));?></strong></legend> - <p><?php p($l->t('Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)'));?><br/> - <?php p($l->t('Please update your PHP installation to use %s securely.', $theme->getName() )); ?></p> - </fieldset> - <?php endif; ?> <?php if(!$_['htaccessWorking']): ?> <fieldset class="warning"> <legend><strong><?php p($l->t('Security Warning'));?></strong></legend> diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 96229fd370a..7069c0c2634 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -24,7 +24,7 @@ <?php print_unescaped($_['headers']); ?> </head> <body id="body-public"> - <noscript><div id="nojavascript"><div><?php print_unescaped($l->t('This application requires JavaScript for correct operation. Please <a href="http://enable-javascript.com/" target="_blank">enable JavaScript</a> and reload the page.')); ?></div></div></noscript> + <?php include('layout.noscript.warning.php'); ?> <?php print_unescaped($_['content']); ?> </body> </html> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index c799205b7cf..8deda443d98 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -25,7 +25,7 @@ <?php print_unescaped($_['headers']); ?> </head> <body id="<?php p($_['bodyid']);?>"> - <noscript><div id="nojavascript"><div><?php print_unescaped($l->t('This application requires JavaScript for correct operation. Please <a href="http://enable-javascript.com/" target="_blank">enable JavaScript</a> and reload the page.')); ?></div></div></noscript> + <?php include('layout.noscript.warning.php'); ?> <div class="wrapper"><!-- for sticky footer --> <div class="v-align"><!-- vertically centred box --> <?php if ($_['bodyid'] === 'body-login' ): ?> diff --git a/core/templates/layout.noscript.warning.php b/core/templates/layout.noscript.warning.php new file mode 100644 index 00000000000..ba781f5502e --- /dev/null +++ b/core/templates/layout.noscript.warning.php @@ -0,0 +1,11 @@ +<noscript> + <div id="nojavascript"> + <div> + <?php print_unescaped(str_replace( + ['{linkstart}', '{linkend}'], + ['<a href="http://enable-javascript.com/" target="_blank" rel="noreferrer">', '</a>'], + $l->t('This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.') + )); ?> + </div> + </div> +</noscript> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index ffa5e557c64..075f72021c2 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -32,7 +32,7 @@ <?php print_unescaped($_['headers']); ?> </head> <body id="<?php p($_['bodyid']);?>"> - <noscript><div id="nojavascript"><div><?php print_unescaped($l->t('This application requires JavaScript for correct operation. Please <a href="http://enable-javascript.com/" target="_blank">enable JavaScript</a> and reload the page.')); ?></div></div></noscript> + <?php include('layout.noscript.warning.php'); ?> <div id="notification-container"> <div id="notification"></div> <?php if ($_['updateAvailable']): ?> |