diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ad567efbcd..e0068e8062 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -22,4 +22,4 @@ tag, you are giving permission to license the patch as GPLv2-or-later. See
You can find more information on our website:
-http://www.phpmyadmin.net/home_page/improve.php
+https://www.phpmyadmin.net/contribute/
diff --git a/README b/README
index 6eefba8575..297c7c2acf 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ Version 4.5.0-dev
A set of PHP-scripts to manage MySQL over the web.
-http://www.phpmyadmin.net/
+https://www.phpmyadmin.net/
Summary
-------
diff --git a/README.rst b/README.rst
index a1d421855d..a5f5b08dba 100644
--- a/README.rst
+++ b/README.rst
@@ -3,7 +3,7 @@ phpMyAdmin
A set of PHP-scripts to manage MySQL over the web.
-http://www.phpmyadmin.net/
+https://www.phpmyadmin.net/
Code status
-----------
@@ -23,12 +23,12 @@ Code status
:target: https://scrutinizer-ci.com/g/phpmyadmin/phpmyadmin/
.. image:: https://img.shields.io/sourceforge/dm/phpmyadmin.svg
- :target: http://www.phpmyadmin.net/home_page/downloads.php
+ :target: https://www.phpmyadmin.net/downloads/
Download
--------
-You can get the newest release at http://www.phpmyadmin.net/.
+You can get the newest release at https://www.phpmyadmin.net/.
If you prefer to follow the git repository, the following branch and tag names may be of interest:
@@ -42,5 +42,4 @@ More Information
Please see the documentation in the doc folder or at http://docs.phpmyadmin.net/.
For support or to learn how to contribute code or by translating to your language,
-visit http://www.phpmyadmin.net/
-
+visit https://www.phpmyadmin.net/
diff --git a/changelog.php b/changelog.php
index 7cdc6759fa..77ca4484a8 100644
--- a/changelog.php
+++ b/changelog.php
@@ -111,7 +111,7 @@ $replaces = array(
// PMASAentries
'/(PMASA-[0-9]+-[0-9]+)/'
- => '\\1',
+ => '\\1',
// Highlight releases (with links)
'/([0-9]+)\.([0-9]+)\.([0-9]+)\.0 (\([0-9-]+\))/'
diff --git a/composer.json b/composer.json
index e5c79ed78c..9848334405 100644
--- a/composer.json
+++ b/composer.json
@@ -3,17 +3,17 @@
"type": "application",
"description": "MySQL web administration tool",
"keywords": ["phpmyadmin","mysql","web"],
- "homepage": "http://www.phpmyadmin.net/",
+ "homepage": "https://www.phpmyadmin.net/",
"license": "GPL-2.0+",
"authors": [
{
"name": "The phpMyAdmin Team",
"email": "phpmyadmin-devel@lists.sourceforge.net",
- "homepage": "http://www.phpmyadmin.net/home_page/team.php"
+ "homepage": "https://www.phpmyadmin.net/team/"
}
],
"support": {
- "forum": "https://sourceforge.net/p/phpmyadmin/discussion/Help",
+ "forum": "https://www.phpmyadmin.net/support/",
"issues": "https://sourceforge.net/p/phpmyadmin/bugs/",
"wiki": "http://wiki.phpmyadmin.net/",
"source": "https://github.com/phpmyadmin/phpmyadmin"
diff --git a/doc/developers.rst b/doc/developers.rst
index ba4cfa87a7..2b2f5868b7 100644
--- a/doc/developers.rst
+++ b/doc/developers.rst
@@ -9,4 +9,4 @@ to make phpMyAdmin a useful tool.
You can check out all the possibilities to contribute in the
`contribute section on our website
-`_.
+`_.
diff --git a/doc/faq.rst b/doc/faq.rst
index 48649158d9..69d9d55bc5 100644
--- a/doc/faq.rst
+++ b/doc/faq.rst
@@ -4,7 +4,7 @@ FAQ - Frequently Asked Questions
================================
Please have a look at our `Link section
-`_ on the official
+`_ on the official
phpMyAdmin homepage for in-depth coverage of phpMyAdmin's features and
or interface.
@@ -902,7 +902,7 @@ just put your own input-elements inside. If you use a custom submit
input field, the form will submit itself to the displaying page again,
where you can validate the $HTTP\_POST\_VARS in a transformation. For
a tutorial on how to effectively use transformations, see our `Link
-section `_ on the
+section `_ on the
official phpMyAdmin-homepage.
.. _faq3_9:
@@ -2080,7 +2080,7 @@ phpMyAdmin project
Our Bug Tracker is located at under the
Bugs section. But please first discuss your bug with other users:
-.
+
.. _faq7_2:
@@ -2091,7 +2091,7 @@ Translations are very welcome and all you need to have are the
language skills. The easiest way is to use our `online translation
service `_. You can check
out all the possibilities to translate in the `translate section on
-our website `_.
+our website `_.
.. _faq7_3:
@@ -2101,7 +2101,7 @@ our website `_.
We welcome every contribution to the development of phpMyAdmin. You
can check out all the possibilities to contribute in the `contribute
section on our website
-`_.
+`_.
.. seealso:: :ref:`developers`
@@ -2115,7 +2115,7 @@ Security
8.1 Where can I get information about the security alerts issued for phpMyAdmin?
--------------------------------------------------------------------------------
-Please refer to .
+Please refer to .
.. _faq8_2:
diff --git a/doc/intro.rst b/doc/intro.rst
index cace64e47e..b8c348dfbe 100644
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -44,8 +44,8 @@ Currently phpMyAdmin can:
* support mysqli, the improved MySQL extension see :ref:`faq1_17`
* create, edit, call, export and drop stored procedures and functions
* create, edit, export and drop events and triggers
-* communicate in `62 different languages
- `_
+* communicate in `80 different languages
+ `_
A word about users
diff --git a/doc/other.rst b/doc/other.rst
index aa9545121f..bb6de86dc8 100644
--- a/doc/other.rst
+++ b/doc/other.rst
@@ -8,7 +8,7 @@ The definitive guide to using phpMyAdmin is the book Mastering phpMyAdmin for
Effective MySQL Management by Marc Delisle. You can get information on that
book and other officially endorsed `books at the phpMyAdmin site`_.
-.. _books at the phpMyAdmin site: http://www.phpmyadmin.net/home_page/docs.php?books
+.. _books at the phpMyAdmin site: https://www.phpmyadmin.net/docs/
Tutorials
---------
diff --git a/doc/setup.rst b/doc/setup.rst
index 12db812a7c..0cee342d35 100644
--- a/doc/setup.rst
+++ b/doc/setup.rst
@@ -588,7 +588,7 @@ each user with their Swekey Id. It is important to place this file
outside of your web server's document root (in the example, it is
located in ``/etc``). Feel free to use it with your own users'
information. If you want to purchase a Swekey please visit
-`http://phpmyadmin.net/auth\_key `_
+`https://www.phpmyadmin.net/auth\_key/ `_
since this link provides funding for phpMyAdmin.
A self documented sample file is provided in the
diff --git a/examples/swekey.sample.conf b/examples/swekey.sample.conf
index 5de2007da3..49392bd94c 100644
--- a/examples/swekey.sample.conf
+++ b/examples/swekey.sample.conf
@@ -9,7 +9,7 @@
# If you don't know the id of a Swekey just visit http://www.swekey.com?sel=support
# while your Swekey is connected.
#
-# If you need to purchase a Swekey please visit http://phpmyadmin.net/auth_key
+# If you need to purchase a Swekey please visit https://www.phpmyadmin.net/auth_key/
# since this link provides funding to PhpMyAdmin.
#
diff --git a/index.php b/index.php
index 5d27ef28c6..8b4d5feda7 100644
--- a/index.php
+++ b/index.php
@@ -414,14 +414,14 @@ PMA_printListItem(
PMA_printListItem(
__('Contribute'),
'li_pma_contribute',
- PMA_linkURL('http://www.phpmyadmin.net/home_page/improve.php'),
+ PMA_linkURL('https://www.phpmyadmin.net/contribute/'),
null,
'_blank'
);
PMA_printListItem(
__('Get support'),
'li_pma_support',
- PMA_linkURL('http://www.phpmyadmin.net/home_page/support.php'),
+ PMA_linkURL('https://www.phpmyadmin.net/support/'),
null,
'_blank'
);
@@ -647,7 +647,7 @@ if (file_exists('libraries/language_stats.inc.php')) {
) {
trigger_error(
'You are using an incomplete translation, please help to make it '
- . 'better by [a@http://www.phpmyadmin.net/home_page/improve.php'
+ . 'better by [a@https://www.phpmyadmin.net/contribute/'
. '#translate@_blank]contributing[/a].',
E_USER_NOTICE
);
diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index 9aae997600..20ac88a786 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -4514,7 +4514,7 @@ class PMA_Util
$response = $_SESSION['cache']['version_check']['response'];
} else {
$save = true;
- $file = 'http://www.phpmyadmin.net/home_page/version.json';
+ $file = 'https://www.phpmyadmin.net/home_page/version.json';
if (ini_get('allow_url_fopen')) {
$context = array(
'http' => array(
diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php
index af838e74ed..ebefa4e511 100644
--- a/libraries/plugins/auth/AuthenticationCookie.class.php
+++ b/libraries/plugins/auth/AuthenticationCookie.class.php
@@ -117,7 +117,7 @@ class AuthenticationCookie extends AuthenticationPlugin
echo '