gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_6'

Browse Source
This commit is contained in:
Michal Čihař 2016-08-18 17:37:34 +02:00
commit 46b329c32b
10 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.php
View File

@ -156,7 +156,7 @@ if ($server > 0 || count($cfg['Servers']) > 1
. 'please do not change root, debian-sys-maint and pma users. '
. 'More information is available at %s.'
),
'<a href="url.php?url=https://demo.phpmyadmin.net/" target="_blank">demo.phpmyadmin.net</a>'
'<a href="url.php?url=https://demo.phpmyadmin.net/" target="_blank" rel="noopener noreferrer">demo.phpmyadmin.net</a>'
);
echo '</p>';
echo '</div>';

5
js/functions.js
View File

@ -4834,11 +4834,6 @@ function formatBytes(bytes, subdecimals, pointchar) {
}
AJAX.registerOnload('functions.js', function () {
/**
* Opens pma more themes link in themes browser, in new window instead of popup
* This way, we don't break HTML validity
*/
$("a._blank").prop("target", "_blank");
/**
* Reveal the login form to users with JS enabled
* and focus the appropriate input field

2
libraries/Advisor.php
View File

@ -353,7 +353,7 @@ class Advisor
*/
private function replaceLinkURL($matches)
{
return 'href="' . PMA_linkURL($matches[2]) . '" target="_blank"';
return 'href="' . PMA_linkURL($matches[2]) . '" target="_blank" rel="noopener noreferrer"';
}
/**

6
libraries/Footer.php
View File

@ -72,9 +72,9 @@ class Footer
include './revision-info.php';
$message .= sprintf(
__('Currently running Git revision %1$s from the %2$s branch.'),
'<a target="_blank" href="' . $repobase . $fullrevision . '">'
'<a target="_blank" rel="noopener noreferrer" href="' . $repobase . $fullrevision . '">'
. $revision . '</a>',
'<a target="_blank" href="' . $repobranchbase . $branch . '">'
'<a target="_blank" rel="noopener noreferrer" href="' . $repobranchbase . $branch . '">'
. $branch . '</a>'
);
} else {
@ -193,7 +193,7 @@ class Footer
$retval = '';
$retval .= '<div id="selflink" class="print_ignore">';
$retval .= '<a href="' . htmlspecialchars($url) . '"'
. ' title="' . __('Open new phpMyAdmin window') . '" target="_blank">';
. ' title="' . __('Open new phpMyAdmin window') . '" target="_blank" rel="noopener noreferrer">';
if (Util::showIcons('TabsMode')) {
$retval .= Util::getImage(
'window-new.png',

3
libraries/Util.php
View File

@ -1908,6 +1908,9 @@ class Util
}
if (! empty($target)) {
$tag_params['target'] = htmlentities($target);
if ($target === '_blank' && strncmp($url, 'url.php?', 8) == 0) {
$tag_params['rel'] = 'noopener noreferrer';
}
}
$displayed_message = '';

4
libraries/navigation/NavigationHeader.php
View File

@ -116,7 +116,7 @@ class NavigationHeader
}
switch ($GLOBALS['cfg']['NavigationLogoLinkWindow']) {
case 'new':
$linkAttriks = 'target="_blank"';
$linkAttriks = 'target="_blank" rel="noopener noreferrer"';
break;
case 'main':
// do not add our parameters for an external link
@ -127,7 +127,7 @@ class NavigationHeader
if (empty($host)) {
$logoLink .= URL::getCommon();
} else {
$linkAttriks = 'target="_blank"';
$linkAttriks = 'target="_blank" rel="noopener noreferrer"';
}
}

2
libraries/plugins/auth/AuthenticationCookie.php
View File

@ -94,7 +94,7 @@ class AuthenticationCookie extends AuthenticationPlugin
<div class="container">
<a href="';
echo PMA_linkURL('https://www.phpmyadmin.net/');
echo '" target="_blank" class="logo">';
echo '" target="_blank" rel="noopener noreferrer" class="logo">';
$logo_image = $GLOBALS['pmaThemeImage'] . 'logo_right.png';
if (@file_exists($logo_image)) {
echo '<img src="' , $logo_image

2
test/classes/AdvisorTest.php
View File

@ -263,7 +263,7 @@ class AdvisorTest extends PMATestCase
'name' => 'Distribution',
'issue' => 'official MySQL binaries.',
'recommendation' => 'See <a href="./url.php?url=https%3A%2F%2F' .
'example.com%2F" target="_blank">web</a>',
'example.com%2F" target="_blank" rel="noopener noreferrer">web</a>',
'id' => 'Distribution'
),
null,

4
test/classes/FooterTest.php
View File

@ -158,7 +158,7 @@ class FooterTest extends PMATestCase
'<div id="selflink" class="print_ignore"><a href="index.php?db=&amp;'
. 'table=&amp;server=1&amp;target=&amp;lang=en&amp;collation_connection='
. 'utf8_general_ci" title="Open new phpMyAdmin window" '
. 'target="_blank">Open new phpMyAdmin window</a></div>',
. 'target="_blank" rel="noopener noreferrer">Open new phpMyAdmin window</a></div>',
$this->_callPrivateFunction(
'_getSelfLink',
array(
@ -183,7 +183,7 @@ class FooterTest extends PMATestCase
'<div id="selflink" class="print_ignore"><a href="index.php?db=&amp;'
. 'table=&amp;server=1&amp;target=&amp;lang=en&amp;collation_connection='
. 'utf8_general_ci" title="Open new phpMyAdmin window" '
. 'target="_blank"><img src="themes/dot.gif" title="Open new '
. 'target="_blank" rel="noopener noreferrer"><img src="themes/dot.gif" title="Open new '
. 'phpMyAdmin window" alt="Open new phpMyAdmin window" '
. 'class="icon ic_window-new" /></a></div>',
$this->_callPrivateFunction(

2
themes.php
View File

@ -23,7 +23,7 @@ $hash = '#pma_' . preg_replace('/([0-9]*)\.([0-9]*)\..*/', '\1_\2', PMA_VERSI
$url = PMA_linkURL('https://www.phpmyadmin.net/themes/') . $hash;
$output = '<h1>phpMyAdmin - ' . __('Theme') . '</h1>';
$output .= '<p>';
$output .= '<a href="' . $url . '" rel="noopener noreferrer" class="_blank">';
$output .= '<a href="' . $url . '" rel="noopener noreferrer" target="_blank">';
$output .= __('Get more themes!');
$output .= '</a>';
$output .= '</p>';