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

Use https for documentation links

Browse Source 
Fixes #12225

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2016-05-10 15:04:29 +02:00
parent c7c9918886
commit bbe8efaf7c
10 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -3,6 +3,8 @@ phpMyAdmin - ChangeLog
4.6.2 (not yet released)
- issue #12225 Use https for documentation links
4.6.1 (2016-05-02)
- issue #12120 PMA_Util not found in insert_edit.lib.php
- issue #12118 Fixed activation of some languages

2
README
View File

@ -12,7 +12,7 @@ Summary
phpMyAdmin is intended to handle the administration of MySQL over the web.
For a summary of features, list of requirements, and installation instructions,
please see the documentation in the ./doc/ folder or at http://docs.phpmyadmin.net/
please see the documentation in the ./doc/ folder or at https://docs.phpmyadmin.net/
Copyright
---------

2
README.rst
View File

@ -44,7 +44,7 @@ If you prefer to follow the git repository, the following branch and tag names m
More Information
----------------
Please see the documentation in the doc folder or at http://docs.phpmyadmin.net/.
Please see the documentation in the doc folder or at https://docs.phpmyadmin.net/.
For support or to learn how to contribute code or by translating to your language,
visit https://www.phpmyadmin.net/

2
changelog.php
View File

@ -52,7 +52,7 @@ $tracker_url_bug = 'https://sourceforge.net/p/phpmyadmin/bugs/\\1/';
$tracker_url_rfe = 'https://sourceforge.net/p/phpmyadmin/feature-requests/\\1/';
$tracker_url_patch = 'https://sourceforge.net/p/phpmyadmin/patches/\\1/';
$github_url = 'https://github.com/phpmyadmin/phpmyadmin/';
$faq_url = 'http://docs.phpmyadmin.net/en/latest/faq.html';
$faq_url = 'https://docs.phpmyadmin.net/en/latest/faq.html';
$replaces = array(
'@(https?://[./a-zA-Z0-9.-_-]*[/a-zA-Z0-9_])@'

4
config.sample.inc.php
View File

@ -5,7 +5,7 @@
* manual configuration. For easier setup you can use setup/
*
* All directives are explained in documentation in the doc/ folder
* or at <http://docs.phpmyadmin.net/>.
* or at <https://docs.phpmyadmin.net/>.
*
* @package PhpMyAdmin
*/
@ -153,5 +153,5 @@ $cfg['SaveDir'] = '';
/**
* You can find more configuration options in the documentation
* in the doc/ folder or at <http://docs.phpmyadmin.net/>.
* in the doc/ folder or at <https://docs.phpmyadmin.net/>.
*/

4
libraries/Util.php
View File

@ -540,7 +540,7 @@ class Util
/* Check if we have built local documentation */
if (defined('TESTSUITE')) {
/* Provide consistent URL for testsuite */
return PMA_linkURL('http://docs.phpmyadmin.net/en/latest/' . $url);
return PMA_linkURL('https://docs.phpmyadmin.net/en/latest/' . $url);
} elseif (@file_exists('doc/html/index.html')) {
if (defined('PMA_SETUP')) {
return '../doc/html/' . $url;
@ -549,7 +549,7 @@ class Util
}
} else {
/* TODO: Should link to correct branch for released versions */
return PMA_linkURL('http://docs.phpmyadmin.net/en/latest/' . $url);
return PMA_linkURL('https://docs.phpmyadmin.net/en/latest/' . $url);
}
}

4
test/classes/MessageTest.php
View File

@ -361,7 +361,7 @@ class MessageTest extends PMATestCase
),
array(
'[doc@foo]link[/doc]',
'<a href="./url.php?url=http%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2F'
'<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2F'
. 'latest%2Fsetup.html%23foo" '
. 'target="documentation">link</a>'
),
@ -486,7 +486,7 @@ class MessageTest extends PMATestCase
{
$this->object->setMessage('[kbd]test[/kbd] [doc@cfg_Example]test[/doc]');
$this->assertEquals(
'<kbd>test</kbd> <a href="./url.php?url=http%3A%2F%2Fdocs.phpmyadmin.'
'<kbd>test</kbd> <a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.'
. 'net%2Fen%2Flatest%2Fcfg.html%23cfg_Example"'
. ' target="documentation">test</a>',
$this->object->getMessage()

2
test/classes/config/FormDisplayTest.php
View File

@ -335,7 +335,7 @@ class FormDisplayTest extends PMATestCase
public function testGetDocLink()
{
$this->assertEquals(
"./url.php?url=http%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2F" .
"./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2F" .
"config.html%23cfg_Servers_3_test_2_",
$this->object->getDocLink("Servers/3/test/2/")
);

6
test/libraries/PMA_sanitize_test.php
View File

@ -66,7 +66,7 @@ class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase
public function testDoc()
{
$this->assertEquals(
'<a href="./url.php?url=http%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fsetup.html%23foo" target="documentation">doclink</a>',
'<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fsetup.html%23foo" target="documentation">doclink</a>',
PMA_sanitize('[doc@foo]doclink[/doc]')
);
}
@ -105,8 +105,8 @@ class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase
public function testLinkAndXssInHref()
{
$this->assertEquals(
'<a href="./url.php?url=http%3A%2F%2Fdocs.phpmyadmin.net%2F">doc</a>[a@javascript:alert(\'XSS\');@target]link</a>',
PMA_sanitize('[a@http://docs.phpmyadmin.net/]doc[/a][a@javascript:alert(\'XSS\');@target]link[/a]')
'<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2F">doc</a>[a@javascript:alert(\'XSS\');@target]link</a>',
PMA_sanitize('[a@https://docs.phpmyadmin.net/]doc[/a][a@javascript:alert(\'XSS\');@target]link[/a]')
);
}

2
test/libraries/common/PMA_showDocu_test.php
View File

@ -43,7 +43,7 @@ class PMA_ShowDocu_Test extends PHPUnit_Framework_TestCase
function testShowDocu()
{
$this->assertEquals(
'<a href="./url.php?url=http%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fpage.html%23anchor" target="documentation"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help" /></a>',
'<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fpage.html%23anchor" target="documentation"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help" /></a>',
PMA\libraries\Util::showDocu('page', 'anchor')
);