From 870ca1cc7a12f57b02fbbabad971745b201ffe1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Sat, 9 Jul 2016 09:12:43 +0200 Subject: [PATCH 1/2] Use https for wiki links MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- doc/other.rst | 2 +- js/tbl_structure.js | 2 +- libraries/import.lib.php | 4 ++-- libraries/plugins/import/README | 2 +- po/az.po | 2 +- po/bg.po | 8 ++++---- po/bn.po | 16 ++++++++-------- po/ca.po | 8 ++++---- po/cs.po | 16 ++++++++-------- po/da.po | 16 ++++++++-------- po/de.po | 8 ++++---- po/el.po | 8 ++++---- po/en_GB.po | 16 ++++++++-------- po/es.po | 8 ++++---- po/et.po | 10 +++++----- po/fi.po | 18 +++++++++--------- po/fr.po | 8 ++++---- po/gl.po | 18 +++++++++--------- po/hi.po | 2 +- po/hu.po | 18 +++++++++--------- po/ia.po | 18 +++++++++--------- po/id.po | 12 ++++++------ po/it.po | 8 ++++---- po/ja.po | 16 ++++++++-------- po/ko.po | 6 +++--- po/lt.po | 18 +++++++++--------- po/nb.po | 16 ++++++++-------- po/nl.po | 8 ++++---- po/pl.po | 16 ++++++++-------- po/pt.po | 18 +++++++++--------- po/pt_BR.po | 18 +++++++++--------- po/ro.po | 18 +++++++++--------- po/ru.po | 18 +++++++++--------- po/si.po | 16 ++++++++-------- po/sk.po | 18 +++++++++--------- po/sl.po | 8 ++++---- po/sq.po | 8 ++++---- po/sv.po | 18 +++++++++--------- po/th.po | 4 ++-- po/tr.po | 8 ++++---- po/uk.po | 14 +++++++------- po/ur.po | 12 ++++++------ po/uz.po | 18 +++++++++--------- po/uz@latin.po | 18 +++++++++--------- po/vi.po | 16 ++++++++-------- po/zh_CN.po | 18 +++++++++--------- po/zh_TW.po | 8 ++++---- scripts/create-release.sh | 2 +- test/libraries/core/PMA_getLinks_test.php | 4 ++-- 49 files changed, 285 insertions(+), 285 deletions(-) diff --git a/doc/other.rst b/doc/other.rst index bb6de86dc8..61e83accbb 100644 --- a/doc/other.rst +++ b/doc/other.rst @@ -15,4 +15,4 @@ Tutorials Third party tutorials and articles are listed on our `wiki page`_. -.. _wiki page: http://wiki.phpmyadmin.net/pma/Articles +.. _wiki page: https://wiki.phpmyadmin.net/pma/Articles diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 3dbfa32809..6dd5ce0ab6 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -173,7 +173,7 @@ AJAX.registerOnload('tbl_structure.js', function () { // If Collation is changed, Warn and Confirm if (checkIfConfirmRequired($form, field_cnt)){ var question = sprintf( - PMA_messages.strChangeColumnCollation, 'http://wiki.phpmyadmin.net/pma/Garbled_data' + PMA_messages.strChangeColumnCollation, 'https://wiki.phpmyadmin.net/pma/Garbled_data' ); $form.PMA_confirm(question, $form.attr('action'), function (url) { submitForm(); diff --git a/libraries/import.lib.php b/libraries/import.lib.php index f2d4515c5b..65f10071ba 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -870,7 +870,7 @@ function PMA_detectType($last_cumulative_type, $cell) * @return array array(array $types, array $sizes) * @access public * - * @link http://wiki.phpmyadmin.net/pma/Import + * @link https://wiki.phpmyadmin.net/pma/Import * * @todo Handle the error case more elegantly */ @@ -977,7 +977,7 @@ $import_notice = null; * @return void * @access public * - * @link http://wiki.phpmyadmin.net/pma/Import + * @link https://wiki.phpmyadmin.net/pma/Import */ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = null, $options = null, &$sql_data diff --git a/libraries/plugins/import/README b/libraries/plugins/import/README index 9ec4df7d50..a7e60dd132 100644 --- a/libraries/plugins/import/README +++ b/libraries/plugins/import/README @@ -1,6 +1,6 @@ This directory holds import plugins for phpMyAdmin. Any new plugin should basically follow the structure presented here. The messages must use our -gettext mechanism, see http://wiki.phpmyadmin.net/pma/Gettext_for_developers. +gettext mechanism, see https://wiki.phpmyadmin.net/pma/Gettext_for_developers. Date: Mon, 18 Jul 2016 16:22:33 +0200 Subject: [PATCH 2/2] Use https to access phpmyadmin.net MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- doc/config.rst | 2 +- libraries/plugins/export/ExportXml.php | 2 +- test/classes/plugin/auth/AuthenticationCookieTest.php | 4 ++-- test/classes/plugin/export/ExportXmlTest.php | 2 +- .../plugin/transformations/TransformationPluginsTest.php | 4 ++-- test/libraries/PMA_FormDisplay_tpl_test.php | 4 ++-- test/test_data/exploit_test.sql | 2 +- test/test_data/phpmyadmin_importXML_For_Testing.xml | 6 +++--- test/test_data/pma_bookmark.sql | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/config.rst b/doc/config.rst index 77e38442cb..22205fa13c 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -2902,7 +2902,7 @@ Developer :default: false Enable to let server present itself as demo server. - This is used for . + This is used for . Examples diff --git a/libraries/plugins/export/ExportXml.php b/libraries/plugins/export/ExportXml.php index 325e2e6e37..b29c655db9 100644 --- a/libraries/plugins/export/ExportXml.php +++ b/libraries/plugins/export/ExportXml.php @@ -245,7 +245,7 @@ class ExportXml extends ExportPlugin $head .= '' . $crlf; diff --git a/test/classes/plugin/auth/AuthenticationCookieTest.php b/test/classes/plugin/auth/AuthenticationCookieTest.php index 3c49ddc17d..1aff47852e 100644 --- a/test/classes/plugin/auth/AuthenticationCookieTest.php +++ b/test/classes/plugin/auth/AuthenticationCookieTest.php @@ -391,13 +391,13 @@ class AuthenticationCookieTest extends PMATestCase $mockResponse->expects($this->once()) ->method('header') - ->with('Location: http://www.phpmyadmin.net/logout'); + ->with('Location: https://www.phpmyadmin.net/logout'); $attrInstance = new ReflectionProperty('PMA\libraries\Response', '_instance'); $attrInstance->setAccessible(true); $attrInstance->setValue($mockResponse); - $GLOBALS['cfg']['Server']['LogoutURL'] = 'http://www.phpmyadmin.net/logout'; + $GLOBALS['cfg']['Server']['LogoutURL'] = 'https://www.phpmyadmin.net/logout'; $this->object->logOut(); diff --git a/test/classes/plugin/export/ExportXmlTest.php b/test/classes/plugin/export/ExportXmlTest.php index 887d201c50..604c2ba072 100644 --- a/test/classes/plugin/export/ExportXmlTest.php +++ b/test/classes/plugin/export/ExportXmlTest.php @@ -327,7 +327,7 @@ class ExportXmlTest extends PMATestCase $this->assertContains( '<pma_xml_export version="1.0" xmlns:pma="' . - 'http://www.phpmyadmin.net/some_doc_url/">', + 'https://www.phpmyadmin.net/some_doc_url/">', $result ); diff --git a/test/classes/plugin/transformations/TransformationPluginsTest.php b/test/classes/plugin/transformations/TransformationPluginsTest.php index 872adb352c..6b9cb22cd1 100644 --- a/test/classes/plugin/transformations/TransformationPluginsTest.php +++ b/test/classes/plugin/transformations/TransformationPluginsTest.php @@ -863,10 +863,10 @@ class TransformationPluginsTest extends PMATestCase array( new Text_Plain_Formatted(), array( - "PMA_BUFFER", + "PMA_BUFFER", array("option1", "option2") ), - "PMA_BUFFER" + "PMA_BUFFER" ), array( new Text_Plain_Imagelink(), diff --git a/test/libraries/PMA_FormDisplay_tpl_test.php b/test/libraries/PMA_FormDisplay_tpl_test.php index 4c2c0bd1bc..3f0d4aa57e 100644 --- a/test/libraries/PMA_FormDisplay_tpl_test.php +++ b/test/libraries/PMA_FormDisplay_tpl_test.php @@ -27,12 +27,12 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase */ public function testDisplayFormTop() { - $_SERVER['REQUEST_URI'] = 'http://www.phpmyadmin.net'; + $_SERVER['REQUEST_URI'] = 'https://www.phpmyadmin.net'; $GLOBALS['cfg']['ServerDefault'] = ''; $result = PMA_displayFormTop(null, 'posted', array(1)); $this->assertContains( - '
', $result ); diff --git a/test/test_data/exploit_test.sql b/test/test_data/exploit_test.sql index 6ac7fba4b3..c6264c05c3 100644 --- a/test/test_data/exploit_test.sql +++ b/test/test_data/exploit_test.sql @@ -1,6 +1,6 @@ -- phpMyAdmin SQL Dump -- version 3.5.0-dev --- http://www.phpmyadmin.net +-- https://www.phpmyadmin.net -- -- Host: barclay -- Generation Time: Aug 06, 2011 at 04:53 PM diff --git a/test/test_data/phpmyadmin_importXML_For_Testing.xml b/test/test_data/phpmyadmin_importXML_For_Testing.xml index 60ef4d7aa2..b8988e3a97 100644 --- a/test/test_data/phpmyadmin_importXML_For_Testing.xml +++ b/test/test_data/phpmyadmin_importXML_For_Testing.xml @@ -2,7 +2,7 @@ - + @@ -42,4 +42,4 @@ SELECT * FROM `db_content` WHERE 1 - \ No newline at end of file + diff --git a/test/test_data/pma_bookmark.sql b/test/test_data/pma_bookmark.sql index c7ecf0a8b2..a72a205feb 100644 --- a/test/test_data/pma_bookmark.sql +++ b/test/test_data/pma_bookmark.sql @@ -1,6 +1,6 @@ -- phpMyAdmin SQL Dump -- version 4.1-dev --- http://www.phpmyadmin.net +-- https://www.phpmyadmin.net -- -- Host: 127.0.0.1 -- Generation Time: Jun 25, 2013 at 05:44 PM