From 0b64827930ef5232149ea211647cb7c95719d2d5 Mon Sep 17 00:00:00 2001
From: Durgesh <007durgesh219@gmail.com>
Date: Fri, 19 Feb 2016 19:03:11 +0530
Subject: [PATCH 1/2] Refactored url parmeters generating, Issue #11990

Signed-off-by: Durgesh <007durgesh219@gmail.com>
---
 db_central_columns.php                        |   4 +-
 db_datadict.php                               |   3 +-
 db_qbe.php                                    |   3 +-
 export.php                                    |   7 +-
 gis_data_editor.php                           |   3 +-
 import.php                                    |  13 +-
 index.php                                     |   9 +-
 libraries/Advisor.php                         |   3 +-
 libraries/Config.php                          |   3 +-
 libraries/DatabaseInterface.php               |   3 +-
 libraries/DbQbe.php                           |   6 +-
 libraries/DbSearch.php                        |  10 +-
 libraries/DisplayResults.php                  |  55 ++--
 libraries/Footer.php                          |   5 +-
 libraries/Header.php                          |   8 +-
 libraries/Index.php                           |   6 +-
 libraries/Menu.php                            |   8 +-
 libraries/RecentFavoriteTable.php             |  12 +-
 libraries/Scripts.php                         |   6 +-
 libraries/ServerStatusData.php                |  16 +-
 libraries/Theme.php                           |   4 +-
 libraries/ThemeManager.php                    |   4 +-
 libraries/URL.php                             | 251 ++++++++++++++++++
 libraries/Util.php                            |  41 +--
 libraries/browse_foreigners.lib.php           |   3 +-
 libraries/central_columns.lib.php             |  13 +-
 libraries/common.inc.php                      |   5 -
 libraries/config/FormDisplay.tpl.php          |   5 +-
 libraries/config/ServerConfigChecks.php       |  30 ++-
 .../database/DatabaseStructureController.php  |   3 +-
 .../server/ServerBinlogController.php         |   9 +-
 .../server/ServerDatabasesController.php      |   7 +-
 .../server/ServerVariablesController.php      |   3 +-
 .../table/TableGisVisualizationController.php |   3 +-
 .../table/TableStructureController.php        |   5 +-
 libraries/core.lib.php                        |   9 +-
 libraries/db_common.inc.php                   |   9 +-
 libraries/db_table_exists.lib.php             |   3 +-
 libraries/display_change_password.lib.php     |   3 +-
 libraries/display_export.lib.php              |   7 +-
 libraries/display_import.lib.php              |  11 +-
 libraries/display_select_lang.lib.php         |   3 +-
 libraries/error_report.lib.php                |   5 +-
 libraries/export.lib.php                      |   8 +-
 libraries/import.lib.php                      |  13 +-
 libraries/index.lib.php                       |   3 +-
 libraries/insert_edit.lib.php                 |  17 +-
 libraries/mult_submits.lib.php                |   9 +-
 libraries/navigation/Navigation.php           |   5 +-
 libraries/navigation/NavigationHeader.php     |   9 +-
 libraries/navigation/NavigationTree.php       |   7 +-
 libraries/navigation/nodes/NodeDatabase.php   |   3 +-
 .../navigation/nodes/NodeDatabaseChild.php    |   3 +-
 libraries/normalization.lib.php               |   3 +-
 libraries/operations.lib.php                  |  27 +-
 .../plugins/auth/AuthenticationConfig.php     |   3 +-
 .../plugins/auth/AuthenticationCookie.php     |   5 +-
 .../plugins/schema/ExportRelationSchema.php   |   3 +-
 libraries/relation.lib.php                    |   3 +-
 libraries/replication_gui.lib.php             |  31 +--
 libraries/rte/rte_events.lib.php              |   3 +-
 libraries/rte/rte_list.lib.php                |   4 +-
 libraries/rte/rte_main.inc.php                |   4 +-
 libraries/rte/rte_routines.lib.php            |   5 +-
 libraries/rte/rte_triggers.lib.php            |   3 +-
 libraries/select_server.lib.php               |   4 +-
 libraries/server_common.inc.php               |   4 +-
 libraries/server_privileges.lib.php           |  45 ++--
 libraries/server_status_processes.lib.php     |  11 +-
 libraries/server_status_variables.lib.php     |   3 +-
 libraries/server_user_groups.lib.php          |  13 +-
 libraries/server_users.lib.php                |   3 +-
 libraries/sql.lib.php                         |   9 +-
 libraries/sql_query_form.lib.php              |   8 +-
 libraries/tbl_common.inc.php                  |   8 +-
 libraries/tracking.lib.php                    |  21 +-
 libraries/url_generating.lib.php              | 248 -----------------
 libraries/user_preferences.lib.php            |   5 +-
 normalization.php                             |   5 +-
 prefs_forms.php                               |   3 +-
 prefs_manage.php                              |   9 +-
 setup/config.php                              |  11 +-
 setup/frames/index.inc.php                    |  11 +-
 setup/frames/menu.inc.php                     |   7 +-
 setup/frames/servers.inc.php                  |   3 +-
 setup/lib/common.inc.php                      |   1 -
 setup/lib/form_processing.lib.php             |  11 +-
 sql.php                                       |   5 +-
 tbl_addfield.php                              |   3 +-
 tbl_change.php                                |   5 +-
 tbl_create.php                                |   3 +-
 tbl_row_action.php                            |   5 +-
 .../column_definitions_form.phtml             |   5 +-
 .../table_fields_definitions.phtml            |   6 +-
 templates/database/create_table.phtml         |   4 +-
 .../database/designer/edit_delete_pages.phtml |   4 +-
 .../database/designer/page_save_as.phtml      |   4 +-
 .../database/designer/query_details.phtml     |   4 +-
 .../database/designer/schema_export.phtml     |   4 +-
 .../structure/body_for_table_summary.phtml    |   4 +-
 .../database/structure/favorite_anchor.phtml  |   4 +-
 .../database/structure/sortable_header.phtml  |   4 +-
 .../structure/structure_table_row.phtml       |   4 +-
 .../database/structure/table_header.phtml     |   4 +-
 .../privileges/edit_routine_privileges.phtml  |   4 +-
 templates/privileges/privileges_summary.phtml |   4 +-
 templates/server/binlog/log_selector.phtml    |   4 +-
 templates/server/databases/create.phtml       |   4 +-
 templates/server/databases/table_header.phtml |   6 +-
 templates/server/engines/engine.phtml         |   6 +-
 templates/server/engines/engines.phtml        |   4 +-
 templates/table/chart/tbl_chart.phtml         |   5 +-
 .../gis_visualization/gis_visualization.phtml |   2 +-
 templates/table/index_form.phtml              |   4 +-
 templates/table/relation/common_form.phtml    |   4 +-
 .../table/relation/foreign_key_row.phtml      |   5 +-
 templates/table/search/form_tag.phtml         |   4 +-
 templates/table/search/input_box.phtml        |   6 +-
 templates/table/search/replace_preview.phtml  |   4 +-
 templates/table/search/zoom_result_form.phtml |   4 +-
 templates/table/structure/add_column.phtml    |   4 +-
 .../table/structure/display_partitions.phtml  |   7 +-
 .../table/structure/display_structure.phtml   |   5 +-
 .../table/structure/move_columns_dialog.phtml |   4 +-
 .../structure/partition_definition_form.phtml |   4 +-
 test/classes/AdvisorTest.php                  |   1 -
 test/classes/ConfigTest.php                   |   1 -
 test/classes/DbSearchTest.php                 |   1 -
 test/classes/DisplayResultsTest.php           |   1 -
 test/classes/FooterTest.php                   |   1 -
 test/classes/HeaderTest.php                   |   1 -
 test/classes/MenuTest.php                     |   1 -
 test/classes/ScriptsTest.php                  |   1 -
 test/classes/ServerStatusDataTest.php         |   1 -
 test/classes/TableTest.php                    |   1 -
 test/classes/ThemeManagerTest.php             |   1 -
 test/classes/ThemeTest.php                    |   1 -
 .../URL.php}                                  |  33 ++-
 .../ServerBinlogControllerTest.php            |   1 -
 .../ServerCollationsControllerTest.php        |   3 -
 .../ServerDatabasesControllerTest.php         |   1 -
 .../ServerEnginesControllerTest.php           |   7 +-
 .../ServerVariablesControllerTest.php         |   4 +-
 .../TableIndexesControllerTest.php            |   6 +-
 .../TableRelationControllerTest.php           |   1 -
 test/classes/dbi/DBIMysqlTest.php             |   1 -
 test/classes/dbi/DBIMysqliTest.php            |   1 -
 test/classes/navigation/NavigationTest.php    |   4 +-
 .../classes/navigation/NavigationTreeTest.php |   1 -
 .../navigation/NodeDatabaseChildTest.php      |   4 +-
 test/classes/plugin/import/ImportCsvTest.php  |   1 -
 test/classes/plugin/import/ImportLdiTest.php  |   1 -
 .../plugin/import/ImportMediawikiTest.php     |   1 -
 test/classes/plugin/import/ImportOdsTest.php  |   1 -
 test/classes/plugin/import/ImportShpTest.php  |   1 -
 test/classes/plugin/import/ImportSqlTest.php  |   1 -
 test/classes/plugin/import/ImportXmlTest.php  |   1 -
 test/classes/schema/DiaRelationSchemaTest.php |   1 -
 test/classes/schema/EpsRelationSchemaTest.php |   1 -
 .../schema/ExportRelationSchemaTest.php       |   1 -
 test/classes/schema/PdfRelationSchemaTest.php |   1 -
 test/classes/schema/SvgRelationSchemaTest.php |   1 -
 test/libraries/PMA_FormDisplay_tpl_test.php   |   1 -
 test/libraries/PMA_browse_foreigners_test.php |   2 -
 test/libraries/PMA_central_columns_test.php   |  10 +-
 test/libraries/PMA_designer_test.php          |   1 -
 .../PMA_display_change_password_test.php      |   6 +-
 .../PMA_display_create_table_test.php         |   7 +-
 test/libraries/PMA_display_export_test.php    |   5 +-
 test/libraries/PMA_import_test.php            |   4 +-
 test/libraries/PMA_insert_edit_test.php       |   1 -
 test/libraries/PMA_mult_submits_test.php      |  11 +-
 test/libraries/PMA_normalization_test.php     |   1 -
 test/libraries/PMA_operations_test.php        |   1 -
 test/libraries/PMA_sanitize_test.php          |   2 -
 test/libraries/PMA_select_server_test.php     |   1 -
 test/libraries/PMA_server_common_test.php     |   1 -
 test/libraries/PMA_server_privileges_test.php |  59 ++--
 .../libraries/PMA_server_replication_test.php |   2 -
 .../PMA_server_status_advisor_test.php        |   1 -
 .../PMA_server_status_monitor_test.php        |   2 -
 .../PMA_server_status_processes_test.php      |   4 +-
 .../PMA_server_status_queries_test.php        |   2 -
 test/libraries/PMA_server_status_test.php     |   2 -
 .../PMA_server_status_variables_test.php      |   1 -
 .../libraries/PMA_server_user_groups_test.php |  10 +-
 test/libraries/PMA_server_users_test.php      |   2 -
 test/libraries/PMA_sql_query_form_test.php    |   4 +-
 test/libraries/PMA_tbl_tracking_test.php      |   6 +-
 test/libraries/PMA_user_preferences_test.php  |   1 -
 test/libraries/common/PMA_getDbLink_test.php  |   6 -
 test/libraries/core/PMA_fatalError_test.php   |   2 -
 test/libraries/core/PMA_getLinks_test.php     |   4 -
 .../core/PMA_getTableCount_test_dis.php       |   2 -
 .../core/PMA_headerLocation_test.php          |   6 +-
 .../rte/PMA_EVN_getEditorForm_test.php        |   2 -
 .../rte/PMA_RTN_getEditorForm_test.php        |   2 -
 .../rte/PMA_RTN_getExecuteForm_test.php       |   2 -
 .../rte/PMA_TRI_getEditorForm_test.php        |   2 -
 user_password.php                             |   5 +-
 view_create.php                               |   3 +-
 view_operations.php                           |   3 +-
 202 files changed, 848 insertions(+), 831 deletions(-)
 create mode 100644 libraries/URL.php
 delete mode 100644 libraries/url_generating.lib.php
 rename test/{libraries/PMA_generateCommonUrl_test.php => classes/URL.php} (78%)

diff --git a/db_central_columns.php b/db_central_columns.php
index 29b71832e8..493b8937ef 100644
--- a/db_central_columns.php
+++ b/db_central_columns.php
@@ -6,6 +6,8 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\URL;
+
 /**
  * Gets some core libraries
  */
@@ -114,7 +116,7 @@ $response->addHTML($table_navigation_html);
 $columnAdd = PMA_getHTMLforAddCentralColumn($total_rows, $pos, $db);
 $response->addHTML($columnAdd);
 $deleteRowForm = '<form method="post" id="del_form" action="db_central_columns.php">'
-        . PMA_URL_getHiddenInputs(
+        . URL::getHiddenInputs(
             $db
         )
         . '<input id="del_col_name" type="hidden" name="col_name" value="">'
diff --git a/db_datadict.php b/db_datadict.php
index d94bebf015..9e74204771 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\URL;
 
 /**
  * Gets the variables sent or posted to this script, then displays headers
@@ -45,7 +46,7 @@ PMA\libraries\Util::checkParameters(array('db'));
 /**
  * Defines the url to return to in case of error in a sql statement
  */
-$err_url = 'db_sql.php' . PMA_URL_getCommon(array('db' => $db));
+$err_url = 'db_sql.php' . URL::getCommon(array('db' => $db));
 
 if ($cfgRelation['commwork']) {
     $comment = PMA_getDbComment($db);
diff --git a/db_qbe.php b/db_qbe.php
index c2baaf62a0..de17ec2ce2 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\SavedSearches;
+use PMA\libraries\URL;
 
 /**
  * requirements
@@ -131,7 +132,7 @@ unset($message_to_display);
 // create new qbe search instance
 $db_qbe = new PMA\libraries\DbQbe($GLOBALS['db'], $savedSearchList, $savedSearch);
 
-$url = 'db_designer.php' . PMA_URL_getCommon(
+$url = 'db_designer.php' . URL::getCommon(
     array_merge(
         $url_params,
         array('query' => 1)
diff --git a/export.php b/export.php
index c88f6c89f6..c3d38ce57a 100644
--- a/export.php
+++ b/export.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\plugins\ExportPlugin;
+use PMA\libraries\URL;
 
 /**
  * Get the variables sent or posted to this script and a core script
@@ -254,11 +255,11 @@ if (!defined('TESTSUITE')) {
 
     // Generate error url and check for needed variables
     if ($export_type == 'server') {
-        $err_url = 'server_export.php' . PMA_URL_getCommon();
+        $err_url = 'server_export.php' . URL::getCommon();
     } elseif ($export_type == 'database'
         && mb_strlen($db)
     ) {
-        $err_url = 'db_export.php' . PMA_URL_getCommon(array('db' => $db));
+        $err_url = 'db_export.php' . URL::getCommon(array('db' => $db));
         // Check if we have something to export
         if (isset($table_select)) {
             $tables = $table_select;
@@ -268,7 +269,7 @@ if (!defined('TESTSUITE')) {
     } elseif ($export_type == 'table' && mb_strlen($db)
         && mb_strlen($table)
     ) {
-        $err_url = 'tbl_export.php' . PMA_URL_getCommon(
+        $err_url = 'tbl_export.php' . URL::getCommon(
             array(
                 'db' => $db, 'table' => $table
             )
diff --git a/gis_data_editor.php b/gis_data_editor.php
index 7268724128..8f710703d8 100644
--- a/gis_data_editor.php
+++ b/gis_data_editor.php
@@ -7,6 +7,7 @@
  */
 use PMA\libraries\gis\GISFactory;
 use PMA\libraries\gis\GISVisualization;
+use PMA\libraries\URL;
 
 /**
  * Escapes special characters if the variable is set.
@@ -127,7 +128,7 @@ if (isset($_REQUEST['input_name'])) {
     echo '<input type="hidden" name="input_name" value="'
         , htmlspecialchars($_REQUEST['input_name']) , '" />';
 }
-echo PMA_URL_getHiddenInputs();
+echo URL::getHiddenInputs();
 
 echo '<!-- Visualization section -->';
 echo '<div id="placeholder" style="width:450px;height:300px;'
diff --git a/import.php b/import.php
index cd4c22721e..c38d7c1e40 100644
--- a/import.php
+++ b/import.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\plugins\ImportPlugin;
+use PMA\libraries\URL;
 
 /**
  * Get the variables sent or posted to this script and a core script
@@ -241,7 +242,7 @@ $format = PMA_securePath($format);
 
 // Create error and goto url
 if ($import_type == 'table') {
-    $err_url = 'tbl_import.php' . PMA_URL_getCommon(
+    $err_url = 'tbl_import.php' . URL::getCommon(
         array(
             'db' => $db, 'table' => $table
         )
@@ -249,11 +250,11 @@ if ($import_type == 'table') {
     $_SESSION['Import_message']['go_back_url'] = $err_url;
     $goto = 'tbl_import.php';
 } elseif ($import_type == 'database') {
-    $err_url = 'db_import.php' . PMA_URL_getCommon(array('db' => $db));
+    $err_url = 'db_import.php' . URL::getCommon(array('db' => $db));
     $_SESSION['Import_message']['go_back_url'] = $err_url;
     $goto = 'db_import.php';
 } elseif ($import_type == 'server') {
-    $err_url = 'server_import.php' . PMA_URL_getCommon();
+    $err_url = 'server_import.php' . URL::getCommon();
     $_SESSION['Import_message']['go_back_url'] = $err_url;
     $goto = 'server_import.php';
 } else {
@@ -267,11 +268,11 @@ if ($import_type == 'table') {
         }
     }
     if (mb_strlen($table) && mb_strlen($db)) {
-        $common = PMA_URL_getCommon(array('db' => $db, 'table' => $table));
+        $common = URL::getCommon(array('db' => $db, 'table' => $table));
     } elseif (mb_strlen($db)) {
-        $common = PMA_URL_getCommon(array('db' => $db));
+        $common = URL::getCommon(array('db' => $db));
     } else {
-        $common = PMA_URL_getCommon();
+        $common = URL::getCommon();
     }
     $err_url  = $goto . $common
         . (preg_match('@^tbl_[a-z]*\.php$@', $goto)
diff --git a/index.php b/index.php
index 62f1d24a07..c0c90087d8 100644
--- a/index.php
+++ b/index.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\RecentFavoriteTable;
+use PMA\libraries\URL;
 
 /**
  * Gets some core libraries and displays a top message if required
@@ -105,7 +106,7 @@ if (! empty($message)) {
     unset($message);
 }
 
-$common_url_query =  PMA_URL_getCommon();
+$common_url_query =  URL::getCommon();
 $mysql_cur_user_and_host = '';
 
 // when $server > 0, a server has been chosen so we can display
@@ -202,7 +203,7 @@ if ($server > 0 || count($cfg['Servers']) > 1
         } // end if
         echo '    <li id="li_select_mysql_collation" class="no_bullets" >';
         echo '        <form method="post" action="index.php">' , "\n"
-           . PMA_URL_getHiddenInputs(null, null, 4, 'collation_connection')
+           . URL::getHiddenInputs(null, null, 4, 'collation_connection')
            . '            <label for="select_collation_connection">' . "\n"
            . '                ' . PMA\libraries\Util::getImage('s_asci.png')
             . "&nbsp;" . __('Server connection collation') . "\n"
@@ -426,14 +427,14 @@ PMA_printListItem(
 PMA_printListItem(
     __('List of changes'),
     'li_pma_changes',
-    'changelog.php' . PMA_URL_getCommon(),
+    'changelog.php' . URL::getCommon(),
     null,
     '_blank'
 );
 PMA_printListItem(
     __('License'),
     'li_pma_license',
-    'license.php' . PMA_URL_getCommon(),
+    'license.php' . URL::getCommon(),
     null,
     '_blank'
 );
diff --git a/libraries/Advisor.php b/libraries/Advisor.php
index 0c14c45d49..8d5cadcd5d 100644
--- a/libraries/Advisor.php
+++ b/libraries/Advisor.php
@@ -9,6 +9,7 @@
 namespace PMA\libraries;
 
 use \Exception;
+use PMA\libraries\URL;
 
 require_once 'libraries/advisor.lib.php';
 
@@ -326,7 +327,7 @@ class Advisor
             // linking to server_variables.php
             $rule['recommendation'] = preg_replace(
                 '/\{([a-z_0-9]+)\}/Ui',
-                '<a href="server_variables.php' . PMA_URL_getCommon()
+                '<a href="server_variables.php' . URL::getCommon()
                 . '&filter=\1">\1</a>',
                 $this->translate($rule['recommendation'])
             );
diff --git a/libraries/Config.php b/libraries/Config.php
index 62432cc502..9edf47725b 100644
--- a/libraries/Config.php
+++ b/libraries/Config.php
@@ -8,6 +8,7 @@
 namespace PMA\libraries;
 
 use DirectoryIterator;
+use PMA\libraries\URL;
 
 /**
  * Indication for error handler (see end of this file).
@@ -1549,7 +1550,7 @@ class Config
     {
         return '<form name="form_fontsize_selection" id="form_fontsize_selection"'
             . ' method="get" action="index.php" class="disableAjax">' . "\n"
-            . PMA_URL_getHiddenInputs() . "\n"
+            . URL::getHiddenInputs() . "\n"
             . Config::getFontsizeSelection() . "\n"
             . '</form>';
     }
diff --git a/libraries/DatabaseInterface.php b/libraries/DatabaseInterface.php
index 28edcaf440..3610550101 100644
--- a/libraries/DatabaseInterface.php
+++ b/libraries/DatabaseInterface.php
@@ -9,6 +9,7 @@ namespace PMA\libraries;
 
 use PMA\libraries\dbi\DBIExtension;
 use PMA\libraries\LanguageManager;
+use PMA\libraries\URL;
 
 require_once './libraries/logging.lib.php';
 require_once './libraries/util.lib.php';
@@ -2069,7 +2070,7 @@ class DatabaseInterface
                  */
                 $error .= ' - ' . $error_message .
                     ' (<a href="server_engines.php' .
-                    PMA_URL_getCommon(
+                    URL::getCommon(
                         array('engine' => 'InnoDB', 'page' => 'Status')
                     ) . '">' . __('Details…') . '</a>)';
             }
diff --git a/libraries/DbQbe.php b/libraries/DbQbe.php
index 37f268e36e..6aeeee76ea 100644
--- a/libraries/DbQbe.php
+++ b/libraries/DbQbe.php
@@ -7,6 +7,8 @@
  */
 namespace PMA\libraries;
 
+use PMA\libraries\URL;
+
 /**
  * Class to handle database QBE search
  *
@@ -1828,7 +1830,7 @@ class DbQbe
         $url_params['db'] = $this->_db;
         $url_params['criteriaColumnCount'] = $this->_new_column_count;
         $url_params['rows'] = $this->_new_row_count;
-        $html_output .= PMA_URL_getHiddenInputs($url_params);
+        $html_output .= URL::getHiddenInputs($url_params);
         $html_output .= '</fieldset>';
         // get footers
         $html_output .= $this->_getTableFooters();
@@ -1836,7 +1838,7 @@ class DbQbe
         $html_output .= $this->_getTablesList();
         $html_output .= '</form>';
         $html_output .= '<form action="db_qbe.php" method="post" class="lock-page">';
-        $html_output .= PMA_URL_getHiddenInputs(array('db' => $this->_db));
+        $html_output .= URL::getHiddenInputs(array('db' => $this->_db));
         // get SQL query
         $html_output .= '<div class="floatleft" style="width:50%">';
         $html_output .= '<fieldset>';
diff --git a/libraries/DbSearch.php b/libraries/DbSearch.php
index 6fb0a5f37b..54a8e41caa 100644
--- a/libraries/DbSearch.php
+++ b/libraries/DbSearch.php
@@ -7,6 +7,8 @@
  */
 namespace PMA\libraries;
 
+use PMA\libraries\URL;
+
 /**
  * Class to handle database search
  *
@@ -336,12 +338,12 @@ class DbSearch
         // Displays browse/delete link if result count > 0
         if ($res_cnt > 0) {
             $this_url_params['sql_query'] = $newsearchsqls['select_columns'];
-            $browse_result_path = 'sql.php' . PMA_URL_getCommon($this_url_params);
+            $browse_result_path = 'sql.php' . URL::getCommon($this_url_params);
             $html_output .= '<td><a name="browse_search" class="ajax" href="'
                 . $browse_result_path . '" onclick="loadResult(\''
                 . $browse_result_path . '\',\''
                 . PMA_escapeJsString(htmlspecialchars($each_table)) . '\',\''
-                . PMA_URL_getCommon(
+                . URL::getCommon(
                     array(
                         'db' => $GLOBALS['db'], 'table' => $each_table
                     )
@@ -349,7 +351,7 @@ class DbSearch
                 . ');return false;" >'
                 . __('Browse') . '</a></td>';
             $this_url_params['sql_query'] = $newsearchsqls['delete'];
-            $delete_result_path = 'sql.php' . PMA_URL_getCommon($this_url_params);
+            $delete_result_path = 'sql.php' . URL::getCommon($this_url_params);
             $html_output .= '<td><a name="delete_search" class="ajax" href="'
                 . $delete_result_path . '" onclick="deleteResult(\''
                 . $delete_result_path . '\' , \''
@@ -378,7 +380,7 @@ class DbSearch
         $html_output .= '<form id="db_search_form"'
             . ' class="ajax lock-page"'
             . ' method="post" action="db_search.php" name="db_search">';
-        $html_output .= PMA_URL_getHiddenInputs($GLOBALS['db']);
+        $html_output .= URL::getHiddenInputs($GLOBALS['db']);
         $html_output .= '<fieldset>';
         // set legend caption
         $html_output .= '<legend>' . __('Search in database') . '</legend>';
diff --git a/libraries/DisplayResults.php b/libraries/DisplayResults.php
index 6327224d24..29decfb385 100644
--- a/libraries/DisplayResults.php
+++ b/libraries/DisplayResults.php
@@ -9,6 +9,7 @@ namespace PMA\libraries;
 
 use SqlParser\Utils\Query;
 use PMA\libraries\plugins\transformations\Text_Plain_Link;
+use PMA\libraries\URL;
 
 require_once './libraries/transformations.lib.php';
 
@@ -730,7 +731,7 @@ class DisplayResults
 
         return '<td>'
             . '<form action="sql.php" method="post" ' . $onsubmit . '>'
-            . PMA_URL_getHiddenInputs(
+            . URL::getHiddenInputs(
                 $this->__get('db'), $this->__get('table')
             )
             . '<input type="hidden" name="sql_query" value="'
@@ -785,7 +786,7 @@ class DisplayResults
             //<form> to keep the form alignment of button < and <<
             // and also to know what to execute when the selector changes
             $table_navigation_html .= '<form action="sql.php'
-                . PMA_URL_getCommon($_url_params)
+                . URL::getCommon($_url_params)
                 . '" method="post">';
 
             $table_navigation_html .= Util::pageselector(
@@ -935,7 +936,7 @@ class DisplayResults
                 . ')'
             . '">';
 
-        $table_navigation_html .= PMA_URL_getHiddenInputs(
+        $table_navigation_html .= URL::getHiddenInputs(
             $this->__get('db'), $this->__get('table')
         );
 
@@ -1007,7 +1008,7 @@ class DisplayResults
         return "\n"
             . '<td>'
             . '<form action="sql.php" method="post">'
-            . PMA_URL_getHiddenInputs(
+            . URL::getHiddenInputs(
                 $this->__get('db'), $this->__get('table')
             )
             . '<input type="hidden" name="sql_query" value="'
@@ -1286,7 +1287,7 @@ class DisplayResults
         $table_headers_html .= '<input class="save_cells_at_once" type="hidden"'
             . ' value="' . $GLOBALS['cfg']['SaveCellsAtOnce'] . '" />'
             . '<div class="common_hidden_inputs">'
-            . PMA_URL_getHiddenInputs(
+            . URL::getHiddenInputs(
                 $this->__get('db'), $this->__get('table')
             )
             . '</div>';
@@ -1420,11 +1421,11 @@ class DisplayResults
 
         $drop_down_html .= '<form action="sql.php" method="post" ' .
             'class="print_ignore">' . "\n"
-            . PMA_URL_getHiddenInputs(
+            . URL::getHiddenInputs(
                 $this->__get('db'), $this->__get('table')
             )
             // to avoid calling PMA_handleSortOrder() later
-            . PMA_getHiddenFields(array('sort_by_key' => '1'))
+            . URL::getHiddenFields(array('sort_by_key' => '1'))
             . __('Sort by key')
             . ': <select name="sql_query" class="autosubmit">' . "\n";
 
@@ -1705,7 +1706,7 @@ class DisplayResults
             'display_options_form' => 1
         );
 
-        $options_html .= PMA_URL_getHiddenInputs($url_params)
+        $options_html .= URL::getHiddenInputs($url_params)
             . '<br />'
             . Util::getDivForSliderEffect(
                 '', __('Options')
@@ -1830,7 +1831,7 @@ class DisplayResults
 
         $tmp_image = '<img class="fulltext" src="' . $tmp_image_file . '" alt="'
                      . $tmp_txt . '" title="' . $tmp_txt . '" />';
-        $tmp_url = 'sql.php' . PMA_URL_getCommon($url_params_full_text);
+        $tmp_url = 'sql.php' . URL::getCommon($url_params_full_text);
 
         return Util::linkOrButton(
             $tmp_url, $tmp_image, array(), false
@@ -1864,7 +1865,7 @@ class DisplayResults
             $form_html .= ' class="ajax" ';
 
             $form_html .= '>'
-                . PMA_URL_getHiddenInputs(
+                . URL::getHiddenInputs(
                     $this->__get('db'), $this->__get('table'), 1
                 )
                 . '<input type="hidden" name="goto" value="sql.php" />';
@@ -1996,8 +1997,8 @@ class DisplayResults
             'session_max_rows'   => $session_max_rows,
             'is_browse_distinct' => $this->__get('is_browse_distinct'),
         );
-        $single_order_url  = 'sql.php' . PMA_URL_getCommon($_single_url_params);
-        $multi_order_url = 'sql.php' . PMA_URL_getCommon($_multi_url_params);
+        $single_order_url  = 'sql.php' . URL::getCommon($_single_url_params);
+        $multi_order_url = 'sql.php' . URL::getCommon($_multi_url_params);
 
         // Displays the sorting URL
         // enable sort order swapping for image
@@ -3153,7 +3154,7 @@ class DisplayResults
             }
 
             $transform_options['wrapper_link']
-                = PMA_URL_getCommon($_url_params);
+                = URL::getCommon($_url_params);
 
             $display_params = $this->__get('display_params');
 
@@ -3270,7 +3271,7 @@ class DisplayResults
         $divider = strpos($link_relations['default_page'], '?') ? '&' : '?';
         if (empty($link_relations['link_dependancy_params'])) {
             return $link_relations['default_page']
-                . PMA_URL_getCommon($linking_url_params, 'html', $divider);
+                . URL::getCommon($linking_url_params, 'html', $divider);
         }
 
         foreach ($link_relations['link_dependancy_params'] as $new_param) {
@@ -3294,7 +3295,7 @@ class DisplayResults
         }
 
         return $link_relations['default_page']
-            . PMA_URL_getCommon($linking_url_params, 'html', $divider);
+            . URL::getCommon($linking_url_params, 'html', $divider);
     }
 
 
@@ -3459,12 +3460,12 @@ class DisplayResults
             );
 
         $edit_url = 'tbl_change.php'
-            . PMA_URL_getCommon(
+            . URL::getCommon(
                 $_url_params + array('default_action' => 'update')
             );
 
         $copy_url = 'tbl_change.php'
-            . PMA_URL_getCommon(
+            . URL::getCommon(
                 $_url_params + array('default_action' => 'insert')
             );
 
@@ -3518,7 +3519,7 @@ class DisplayResults
                 'goto'      => (empty($goto) ? 'tbl_sql.php' : $goto),
             );
 
-            $lnk_goto = 'sql.php' . PMA_URL_getCommon($_url_params, 'text');
+            $lnk_goto = 'sql.php' . URL::getCommon($_url_params, 'text');
 
             $del_query = 'DELETE FROM '
                 . Util::backquote($this->__get('table'))
@@ -3532,7 +3533,7 @@ class DisplayResults
                     'message_to_show' => __('The row has been deleted.'),
                     'goto'      => $lnk_goto,
                 );
-            $del_url  = 'sql.php' . PMA_URL_getCommon($_url_params);
+            $del_url  = 'sql.php' . URL::getCommon($_url_params);
 
             $js_conf  = 'DELETE FROM ' . PMA_jsFormat($this->__get('table'))
                 . ' WHERE ' . PMA_jsFormat($where_clause, false)
@@ -3550,7 +3551,7 @@ class DisplayResults
                 );
 
             $lnk_goto = 'sql.php'
-                . PMA_URL_getCommon(
+                . URL::getCommon(
                     $_url_params, 'text'
                 );
 
@@ -3562,7 +3563,7 @@ class DisplayResults
                     'goto'      => $lnk_goto,
                 );
 
-            $del_url  = 'sql.php' . PMA_URL_getCommon($_url_params);
+            $del_url  = 'sql.php' . URL::getCommon($_url_params);
             $js_conf  = $kill;
             $del_str = Util::getIcon(
                 'b_drop.png', __('Kill')
@@ -5067,7 +5068,7 @@ class DisplayResults
                     'printview' => '1',
                     'sql_query' => $this->__get('sql_query'),
                 );
-        $url_query = PMA_URL_getCommon($_url_params);
+        $url_query = URL::getCommon($_url_params);
 
         if (!$header_shown) {
             $results_operations_html .= $header;
@@ -5132,7 +5133,7 @@ class DisplayResults
             }
 
             $results_operations_html .= Util::linkOrButton(
-                'tbl_export.php' . PMA_URL_getCommon($_url_params),
+                'tbl_export.php' . URL::getCommon($_url_params),
                 Util::getIcon(
                     'b_tblexport.png', __('Export'), true
                 ),
@@ -5145,7 +5146,7 @@ class DisplayResults
 
             // prepare chart
             $results_operations_html .= Util::linkOrButton(
-                'tbl_chart.php' . PMA_URL_getCommon($_url_params),
+                'tbl_chart.php' . URL::getCommon($_url_params),
                 Util::getIcon(
                     'b_chart.png', __('Display chart'), true
                 ),
@@ -5170,7 +5171,7 @@ class DisplayResults
                 $results_operations_html
                     .= Util::linkOrButton(
                         'tbl_gis_visualization.php'
-                        . PMA_URL_getCommon($_url_params),
+                        . URL::getCommon($_url_params),
                         Util::getIcon(
                             'b_globe.gif', __('Visualize GIS data'), true
                         ),
@@ -5315,7 +5316,7 @@ class DisplayResults
             && (!empty($tmpdb) && !empty($meta->orgtable))
         ) {
             $result = '<a href="tbl_get_field.php'
-                . PMA_URL_getCommon($url_params)
+                . URL::getCommon($url_params)
                 . '" class="disableAjax">'
                 . $result . '</a>';
         }
@@ -5483,7 +5484,7 @@ class DisplayResults
                 );
 
                 $result .= '<a class="ajax" href="sql.php'
-                    . PMA_URL_getCommon($_url_params)
+                    . URL::getCommon($_url_params)
                     . '"' . $title . '>';
 
                 if ($transformation_plugin != $default_function) {
diff --git a/libraries/Footer.php b/libraries/Footer.php
index dac15c0e9b..b051d89a9a 100644
--- a/libraries/Footer.php
+++ b/libraries/Footer.php
@@ -8,6 +8,7 @@
 namespace PMA\libraries;
 
 use Traversable;
+use PMA\libraries\URL;
 
 /**
  * Class used to output the footer
@@ -134,7 +135,7 @@ class Footer
     /**
      * Returns the url of the current page
      *
-     * @param string|null $encode See PMA_URL_getCommon()
+     * @param string|null $encode See URL::getCommon()
      *
      * @return string
      */
@@ -178,7 +179,7 @@ class Footer
         ) {
             $params['single_table'] = $_REQUEST['single_table'];
         }
-        return basename(PMA_getenv('SCRIPT_NAME')) . PMA_URL_getCommon(
+        return basename(PMA_getenv('SCRIPT_NAME')) . URL::getCommon(
             $params,
             $encode
         );
diff --git a/libraries/Header.php b/libraries/Header.php
index 488fdd80d5..99783896a1 100644
--- a/libraries/Header.php
+++ b/libraries/Header.php
@@ -8,9 +8,9 @@
 namespace PMA\libraries;
 
 use PMA\libraries\navigation\Navigation;
+use PMA\libraries\URL;
 
 require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/url_generating.lib.php';
 
 /**
  * Class used to output the HTTP and HTML headers
@@ -155,7 +155,7 @@ class Header
         }
         $this->_scripts->addFile('jquery/jquery-2.1.4.min.js');
         $this->_scripts->addFile(
-            'whitelist.php' . PMA_URL_getCommon($params), false, true
+            'whitelist.php' . URL::getCommon($params), false, true
         );
         $this->_scripts->addFile('sprintf.js');
         $this->_scripts->addFile('ajax.js');
@@ -183,7 +183,7 @@ class Header
         // Here would not be a good place to add CodeMirror because
         // the user preferences have not been merged at this point
 
-        $this->_scripts->addFile('messages.php' . PMA_URL_getCommon($params));
+        $this->_scripts->addFile('messages.php' . URL::getCommon($params));
         // Append the theme id to this url to invalidate
         // the cache on a theme change. Though this might be
         // unavailable for fatal errors.
@@ -224,7 +224,7 @@ class Header
         }
 
         $params = array(
-            'common_query' => PMA_URL_getCommon(array(), 'text'),
+            'common_query' => URL::getCommon(array(), 'text'),
             'opendb_url' => Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
             ),
diff --git a/libraries/Index.php b/libraries/Index.php
index 76b804b849..d9938d2c71 100644
--- a/libraries/Index.php
+++ b/libraries/Index.php
@@ -7,6 +7,8 @@
  */
 namespace PMA\libraries;
 
+use PMA\libraries\URL;
+
 /**
  * Index manipulation class
  *
@@ -717,7 +719,7 @@ class Index
                 $r .= '" ' . $row_span . '>'
                    . '    <a class="';
                 $r .= 'ajax';
-                $r .= '" href="tbl_indexes.php' . PMA_URL_getCommon($this_params)
+                $r .= '" href="tbl_indexes.php' . URL::getCommon($this_params)
                    . '">' . Util::getIcon('b_edit.png', __('Edit')) . '</a>'
                    . '</td>' . "\n";
                 $this_params = $GLOBALS['url_params'];
@@ -750,7 +752,7 @@ class Index
                     . ' value="' . $js_msg . '" />';
                 $r .= '    <a class="drop_primary_key_index_anchor';
                 $r .= ' ajax';
-                $r .= '" href="sql.php' . PMA_URL_getCommon($this_params)
+                $r .= '" href="sql.php' . URL::getCommon($this_params)
                    . '" >'
                    . Util::getIcon('b_drop.png', __('Drop'))  . '</a>'
                    . '</td>' . "\n";
diff --git a/libraries/Menu.php b/libraries/Menu.php
index eb2eb27b75..15979a91fb 100644
--- a/libraries/Menu.php
+++ b/libraries/Menu.php
@@ -7,6 +7,8 @@
  */
 namespace PMA\libraries;
 
+use PMA\libraries\URL;
+
 /**
  * Class for generating the top menu
  *
@@ -196,7 +198,7 @@ class Menu
             Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabServer'], 'server'
             ),
-            PMA_URL_getCommon(),
+            URL::getCommon(),
             htmlspecialchars($server_info),
             __('Server')
         );
@@ -215,7 +217,7 @@ class Menu
                 Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
                 ),
-                PMA_URL_getCommon(array('db' => $this->_db)),
+                URL::getCommon(array('db' => $this->_db)),
                 htmlspecialchars($this->_db),
                 __('Database')
             );
@@ -240,7 +242,7 @@ class Menu
                     Util::getScriptNameForOption(
                         $GLOBALS['cfg']['DefaultTabTable'], 'table'
                     ),
-                    PMA_URL_getCommon(
+                    URL::getCommon(
                         array(
                             'db' => $this->_db, 'table' => $this->_table
                         )
diff --git a/libraries/RecentFavoriteTable.php b/libraries/RecentFavoriteTable.php
index a034e57d92..6d11b2053a 100644
--- a/libraries/RecentFavoriteTable.php
+++ b/libraries/RecentFavoriteTable.php
@@ -7,6 +7,8 @@
  */
 namespace PMA\libraries;
 
+use PMA\libraries\URL;
+
 /**
  * Handles the recently used and favorite tables.
  *
@@ -184,7 +186,7 @@ class RecentFavoriteTable
                         'table' => $table['table']
                     );
                     $recent_url = 'tbl_recent_favorite.php'
-                        . PMA_URL_getCommon($recent_params);
+                        . URL::getCommon($recent_params);
                     $html .= '<a href="' . $recent_url . '">`'
                           . htmlspecialchars($table['db']) . '`.`'
                           . htmlspecialchars($table['table']) . '`</a>';
@@ -202,7 +204,7 @@ class RecentFavoriteTable
                         'remove_favorite' => true
                     );
                     $fav_rm_url = 'db_structure.php'
-                        . PMA_URL_getCommon($fav_params);
+                        . URL::getCommon($fav_params);
                     $html .= 'href="' . $fav_rm_url
                         . '" title="' . __("Remove from Favorites")
                         . '" data-favtargetn="'
@@ -216,7 +218,7 @@ class RecentFavoriteTable
                         'table' => $table['table']
                     );
                     $table_url = 'tbl_recent_favorite.php'
-                        . PMA_URL_getCommon($fav_params);
+                        . URL::getCommon($fav_params);
                     $html .= '<a href="' . $table_url . '">`'
                         . htmlspecialchars($table['db']) . '`.`'
                         . htmlspecialchars($table['table']) . '`</a>';
@@ -347,7 +349,7 @@ class RecentFavoriteTable
         if (!$is_synced) {
             $params  = array('ajax_request' => true, 'favorite_table' => true,
                 'sync_favorite_tables' => true);
-            $url     = 'db_structure.php' . PMA_URL_getCommon($params);
+            $url     = 'db_structure.php' . URL::getCommon($params);
             $retval  = '<a class="hide" id="sync_favorite_tables"';
             $retval .= ' href="' . $url . '"></a>';
         }
@@ -362,7 +364,7 @@ class RecentFavoriteTable
     public static function getHtmlUpdateRecentTables()
     {
         $params  = array('ajax_request' => true, 'recent_table' => true);
-        $url     = 'index.php' . PMA_URL_getCommon($params);
+        $url     = 'index.php' . URL::getCommon($params);
         $retval  = '<a class="hide" id="update_recent_tables"';
         $retval .= ' href="' . $url . '"></a>';
         return $retval;
diff --git a/libraries/Scripts.php b/libraries/Scripts.php
index adc47e6a40..a9d26c00dd 100644
--- a/libraries/Scripts.php
+++ b/libraries/Scripts.php
@@ -7,6 +7,8 @@
  */
 namespace PMA\libraries;
 
+use PMA\libraries\URL;
+
 /**
  * Collects information about which JavaScript
  * files and objects are necessary to render
@@ -51,7 +53,7 @@ class Scripts
         $first_dynamic_scripts = "";
         $dynamic_scripts = "";
         $scripts = array();
-        $separator = PMA_URL_getArgSeparator();
+        $separator = URL::getArgSeparator();
         foreach ($files as $value) {
             if (mb_strpos($value['filename'], "?") !== false) {
                 $file_name = $value['filename'] . $separator
@@ -72,7 +74,7 @@ class Scripts
                 $scripts[] = "scripts%5B%5D=" . $value['filename'];
             }
         }
-        $separator = PMA_URL_getArgSeparator();
+        $separator = URL::getArgSeparator();
         $static_scripts = '';
         // Using chunks of 20 files to avoid too long URLs
         $script_chunks = array_chunk($scripts, 20);
diff --git a/libraries/ServerStatusData.php b/libraries/ServerStatusData.php
index f5085c9c50..c47defcdf7 100644
--- a/libraries/ServerStatusData.php
+++ b/libraries/ServerStatusData.php
@@ -8,6 +8,8 @@
  */
 namespace PMA\libraries;
 
+use PMA\libraries\URL;
+
 /**
  * This class provides data about the server status
  *
@@ -142,13 +144,13 @@ class ServerStatusData
         // variable or section name => (name => url)
 
         $links['table'][__('Flush (close) all tables')] = $this->selfUrl
-            . PMA_URL_getCommon(
+            . URL::getCommon(
                 array(
                     'flush' => 'TABLES'
                 )
             );
         $links['table'][__('Show open tables')]
-            = 'sql.php' . PMA_URL_getCommon(
+            = 'sql.php' . URL::getCommon(
                 array(
                     'sql_query' => 'SHOW OPEN TABLES',
                     'goto' => $this->selfUrl,
@@ -157,7 +159,7 @@ class ServerStatusData
 
         if ($GLOBALS['replication_info']['master']['status']) {
             $links['repl'][__('Show slave hosts')]
-                = 'sql.php' . PMA_URL_getCommon(
+                = 'sql.php' . URL::getCommon(
                     array(
                         'sql_query' => 'SHOW SLAVE HOSTS',
                         'goto' => $this->selfUrl,
@@ -173,7 +175,7 @@ class ServerStatusData
 
         $links['qcache'][__('Flush query cache')]
             = $this->selfUrl
-            . PMA_URL_getCommon(
+            . URL::getCommon(
                 array(
                     'flush' => 'QUERY CACHE'
                 )
@@ -190,10 +192,10 @@ class ServerStatusData
 
         $links['innodb'][__('Variables')]
             = 'server_engines.php?engine=InnoDB&amp;'
-            . PMA_URL_getCommon(array(), 'html', '');
+            . URL::getCommon(array(), 'html', '');
         $links['innodb'][__('InnoDB Status')]
             = 'server_engines.php'
-            . PMA_URL_getCommon(
+            . URL::getCommon(
                 array(
                     'engine' => 'InnoDB',
                     'page' => 'Status'
@@ -416,7 +418,7 @@ class ServerStatusData
      */
     public function getMenuHtml()
     {
-        $url_params = PMA_URL_getCommon();
+        $url_params = URL::getCommon();
         $items = array(
             array(
                 'name' => __('Server'),
diff --git a/libraries/Theme.php b/libraries/Theme.php
index ada76715c7..1c63f66e7f 100644
--- a/libraries/Theme.php
+++ b/libraries/Theme.php
@@ -7,6 +7,8 @@
  */
 namespace PMA\libraries;
 
+use PMA\libraries\URL;
+
 /**
  * handles theme
  *
@@ -402,7 +404,7 @@ class Theme
     public function getPrintPreview()
     {
         $url_params = array('set_theme' => $this->getId());
-        $url = 'index.php' . PMA_URL_getCommon($url_params);
+        $url = 'index.php' . URL::getCommon($url_params);
 
         $retval  = '<div class="theme_preview">';
         $retval .= '<h2>';
diff --git a/libraries/ThemeManager.php b/libraries/ThemeManager.php
index 8a1ed451bb..ea1029b4c6 100644
--- a/libraries/ThemeManager.php
+++ b/libraries/ThemeManager.php
@@ -7,6 +7,8 @@
  */
 namespace PMA\libraries;
 
+use PMA\libraries\URL;
+
 /**
  * phpMyAdmin theme manager
  *
@@ -357,7 +359,7 @@ class ThemeManager
         if ($form) {
             $select_box .= '<form name="setTheme" method="get"';
             $select_box .= ' action="index.php" class="disableAjax">';
-            $select_box .=  PMA_URL_getHiddenInputs();
+            $select_box .=  URL::getHiddenInputs();
         }
 
         $theme_preview_path= './themes.php';
diff --git a/libraries/URL.php b/libraries/URL.php
new file mode 100644
index 0000000000..983fb93ca9
--- /dev/null
+++ b/libraries/URL.php
@@ -0,0 +1,251 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * URL/hidden inputs generating.
+ *
+ * @package PhpMyAdmin
+ */
+namespace PMA\libraries;
+
+class URL {
+
+    /**
+     * Generates text with hidden inputs.
+     *
+     * @param string|array $db     optional database name
+     *                             (can also be an array of parameters)
+     * @param string       $table  optional table name
+     * @param int          $indent indenting level
+     * @param string|array $skip   do not generate a hidden field for this parameter
+     *                             (can be an array of strings)
+     *
+     * @see URL::getCommon()
+     *
+     * @return string   string with input fields
+     *
+     * @access  public
+     */
+    public static function getHiddenInputs($db = '', $table = '',
+        $indent = 0, $skip = array()
+    ) {
+        if (is_array($db)) {
+            $params  =& $db;
+            $_indent = empty($table) ? $indent : $table;
+            $_skip   = empty($indent) ? $skip : $indent;
+            $indent  =& $_indent;
+            $skip    =& $_skip;
+        } else {
+            $params = array();
+            if (mb_strlen($db)) {
+                $params['db'] = $db;
+            }
+            if (mb_strlen($table)) {
+                $params['table'] = $table;
+            }
+        }
+
+        if (! empty($GLOBALS['server'])
+            && $GLOBALS['server'] != $GLOBALS['cfg']['ServerDefault']
+        ) {
+            $params['server'] = $GLOBALS['server'];
+        }
+        if (empty($_COOKIE['pma_lang']) && ! empty($GLOBALS['lang'])) {
+            $params['lang'] = $GLOBALS['lang'];
+        }
+        if (empty($_COOKIE['pma_collation_connection'])
+            && ! empty($GLOBALS['collation_connection'])
+        ) {
+            $params['collation_connection'] = $GLOBALS['collation_connection'];
+        }
+
+        $params['token'] = $_SESSION[' PMA_token '];
+
+        if (! is_array($skip)) {
+            if (isset($params[$skip])) {
+                unset($params[$skip]);
+            }
+        } else {
+            foreach ($skip as $skipping) {
+                if (isset($params[$skipping])) {
+                    unset($params[$skipping]);
+                }
+            }
+        }
+
+        return URL::getHiddenFields($params);
+    }
+
+    /**
+     * create hidden form fields from array with name => value
+     *
+     * <code>
+     * $values = array(
+     *     'aaa' => aaa,
+     *     'bbb' => array(
+     *          'bbb_0',
+     *          'bbb_1',
+     *     ),
+     *     'ccc' => array(
+     *          'a' => 'ccc_a',
+     *          'b' => 'ccc_b',
+     *     ),
+     * );
+     * echo URL::getHiddenFields($values);
+     *
+     * // produces:
+     * <input type="hidden" name="aaa" Value="aaa" />
+     * <input type="hidden" name="bbb[0]" Value="bbb_0" />
+     * <input type="hidden" name="bbb[1]" Value="bbb_1" />
+     * <input type="hidden" name="ccc[a]" Value="ccc_a" />
+     * <input type="hidden" name="ccc[b]" Value="ccc_b" />
+     * </code>
+     *
+     * @param array  $values hidden values
+     * @param string $pre    prefix
+     *
+     * @return string form fields of type hidden
+     */
+    public static function getHiddenFields($values, $pre = '')
+    {
+        $fields = '';
+
+        foreach ($values as $name => $value) {
+            if (! empty($pre)) {
+                $name = $pre . '[' . $name . ']';
+            }
+
+            if (is_array($value)) {
+                $fields .= URL::getHiddenFields($value, $name);
+            } else {
+                // do not generate an ending "\n" because
+                // URL::getHiddenInputs() is sometimes called
+                // from a JS document.write()
+                $fields .= '<input type="hidden" name="' . htmlspecialchars($name)
+                    . '" value="' . htmlspecialchars($value) . '" />';
+            }
+        }
+
+        return $fields;
+    }
+
+    /**
+     * Generates text with URL parameters.
+     *
+     * <code>
+     * $params['myparam'] = 'myvalue';
+     * $params['db']      = 'mysql';
+     * $params['table']   = 'rights';
+     * // note the missing ?
+     * echo 'script.php' . URL::getCommon($params);
+     * // produces with cookies enabled:
+     * // script.php?myparam=myvalue&amp;db=mysql&amp;table=rights
+     * // with cookies disabled:
+     * // script.php?server=1&amp;lang=en&amp;myparam=myvalue&amp;db=mysql
+     * // &amp;table=rights
+     *
+     * // note the missing ?
+     * echo 'script.php' . URL::getCommon();
+     * // produces with cookies enabled:
+     * // script.php
+     * // with cookies disabled:
+     * // script.php?server=1&amp;lang=en
+     * </code>
+     *
+     * @param mixed  $params  optional, Contains an associative array with url params
+     *
+     * @param string $encode  'html' to use htmlspecialchars() on the resulting
+     *                        URL (for a normal URL displayed in HTML) or
+     *                        something else to avoid using htmlspecialchars()
+     *                        (for a URL sent via a header);
+     *                        if not set,'html' is assumed
+     *
+     * @param string $divider optional character to use instead of '?'
+     *
+     * @return string   string with URL parameters
+     * @access  public
+     */
+    public static function getCommon($params = array(), $encode = 'html', $divider = '?')
+    {
+        $separator = URL::getArgSeparator();
+
+        // avoid overwriting when creating navi panel links to servers
+        if (isset($GLOBALS['server'])
+            && $GLOBALS['server'] != $GLOBALS['cfg']['ServerDefault']
+            && ! isset($params['server'])
+            && ! defined('PMA_SETUP')
+        ) {
+            $params['server'] = $GLOBALS['server'];
+        }
+
+        if (empty($_COOKIE['pma_lang']) && ! empty($GLOBALS['lang'])) {
+            $params['lang'] = $GLOBALS['lang'];
+        }
+        if (empty($_COOKIE['pma_collation_connection'])
+            && ! empty($GLOBALS['collation_connection'])
+        ) {
+            $params['collation_connection'] = $GLOBALS['collation_connection'];
+        }
+
+        if (isset($_SESSION[' PMA_token '])) {
+            $params['token'] = $_SESSION[' PMA_token '];
+        }
+
+        if (empty($params)) {
+            return '';
+        }
+
+        $query = $divider . http_build_query($params, null, $separator);
+
+        if ($encode === 'html') {
+            $query = htmlspecialchars($query);
+        }
+
+        return $query;
+    }
+
+    /**
+     * Returns url separator
+     *
+     * extracted from arg_separator.input as set in php.ini
+     * we do not use arg_separator.output to avoid problems with &amp; and &
+     *
+     * @param string $encode whether to encode separator or not,
+     * currently 'none' or 'html'
+     *
+     * @return string  character used for separating url parts usually ; or &
+     * @access  public
+     */
+    public static function getArgSeparator($encode = 'none')
+    {
+        static $separator = null;
+        static $html_separator = null;
+
+        if (null === $separator) {
+            // use separators defined by php, but prefer ';'
+            // as recommended by W3C
+            // (see http://www.w3.org/TR/1999/REC-html401-19991224/appendix
+            // /notes.html#h-B.2.2)
+            $arg_separator = ini_get('arg_separator.input');
+            if (mb_strpos($arg_separator, ';') !== false) {
+                $separator = ';';
+            } elseif (mb_strlen($arg_separator) > 0) {
+                $separator = $arg_separator{0};
+            } else {
+                $separator = '&';
+            }
+            $html_separator = htmlentities($separator);
+        }
+
+        switch ($encode) {
+        case 'html':
+            return $html_separator;
+        case 'text' :
+        case 'none' :
+        default :
+            return $separator;
+        }
+    }
+}
+
+
+
diff --git a/libraries/Util.php b/libraries/Util.php
index 322d57d703..db336edab4 100644
--- a/libraries/Util.php
+++ b/libraries/Util.php
@@ -14,6 +14,7 @@ use SqlParser\Parser;
 use SqlParser\Token;
 use stdClass;
 use SqlParser\Utils\Error as ParserError;
+use PMA\libraries\URL;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -711,14 +712,14 @@ class Util
                     $_url_params['db'] = $db;
                     $_url_params['table'] = $table;
                     $doedit_goto = '<a href="tbl_sql.php'
-                        . PMA_URL_getCommon($_url_params) . '">';
+                        . URL::getCommon($_url_params) . '">';
                 } elseif (mb_strlen($db)) {
                     $_url_params['db'] = $db;
                     $doedit_goto = '<a href="db_sql.php'
-                        . PMA_URL_getCommon($_url_params) . '">';
+                        . URL::getCommon($_url_params) . '">';
                 } else {
                     $doedit_goto = '<a href="server_sql.php'
-                        . PMA_URL_getCommon($_url_params) . '">';
+                        . URL::getCommon($_url_params) . '">';
                 }
 
                 $error_msg .= $doedit_goto
@@ -1195,7 +1196,7 @@ class Util
                     $explain_params['sql_query'] = 'EXPLAIN ' . $sql_query;
                     $explain_link = ' ['
                         . self::linkOrButton(
-                            'import.php' . PMA_URL_getCommon($explain_params),
+                            'import.php' . URL::getCommon($explain_params),
                             __('Explain SQL')
                         ) . ']';
                 } elseif (preg_match(
@@ -1206,7 +1207,7 @@ class Util
                         = mb_substr($sql_query, 8);
                     $explain_link = ' ['
                         . self::linkOrButton(
-                            'import.php' . PMA_URL_getCommon($explain_params),
+                            'import.php' . URL::getCommon($explain_params),
                             __('Skip Explain SQL')
                         ) . ']';
                     $url = 'https://mariadb.org/explain_analyzer/analyze/'
@@ -1230,7 +1231,7 @@ class Util
             // even if the query is big and was truncated, offer the chance
             // to edit it (unless it's enormous, see linkOrButton() )
             if (! empty($cfg['SQLQuery']['Edit'])) {
-                $edit_link .= PMA_URL_getCommon($url_params) . '#querybox';
+                $edit_link .= URL::getCommon($url_params) . '#querybox';
                 $edit_link = ' ['
                     . self::linkOrButton($edit_link, __('Edit'))
                     . ']';
@@ -1245,7 +1246,7 @@ class Util
                 if (! empty($GLOBALS['show_as_php'])) {
                     $php_link = ' ['
                         . self::linkOrButton(
-                            'import.php' . PMA_URL_getCommon($url_params),
+                            'import.php' . URL::getCommon($url_params),
                             __('Without PHP code'),
                             array(),
                             true,
@@ -1257,7 +1258,7 @@ class Util
 
                     $php_link .= ' ['
                         . self::linkOrButton(
-                            'import.php' . PMA_URL_getCommon($url_params),
+                            'import.php' . URL::getCommon($url_params),
                             __('Submit query'),
                             array(),
                             true,
@@ -1272,7 +1273,7 @@ class Util
                     $_message = __('Create PHP code');
                     $php_link = ' ['
                         . self::linkOrButton(
-                            'import.php' . PMA_URL_getCommon($php_params),
+                            'import.php' . URL::getCommon($php_params),
                             $_message
                         )
                         . ']';
@@ -1286,7 +1287,7 @@ class Util
                 && ! isset($GLOBALS['show_as_php']) // 'Submit query' does the same
                 && preg_match('@^(SELECT|SHOW)[[:space:]]+@i', $sql_query)
             ) {
-                $refresh_link = 'import.php' . PMA_URL_getCommon($url_params);
+                $refresh_link = 'import.php' . URL::getCommon($url_params);
                 $refresh_link = ' ['
                     . self::linkOrButton($refresh_link, __('Refresh')) . ']';
             } else {
@@ -1308,7 +1309,7 @@ class Util
 
             $retval .= '<div class="tools print_ignore">';
             $retval .= '<form action="sql.php" method="post">';
-            $retval .= PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
+            $retval .= URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
             $retval .= '<input type="hidden" name="sql_query" value="'
                 . htmlspecialchars($sql_query) . '" />';
 
@@ -1773,10 +1774,10 @@ class Util
         // build the link
         if (! empty($tab['link'])) {
             $tab['link'] = htmlentities($tab['link']);
-            $tab['link'] = $tab['link'] . PMA_URL_getCommon($url_params);
+            $tab['link'] = $tab['link'] . URL::getCommon($url_params);
             if (! empty($tab['args'])) {
                 foreach ($tab['args'] as $param => $value) {
-                    $tab['link'] .= PMA_URL_getArgSeparator('html')
+                    $tab['link'] .= URL::getArgSeparator('html')
                         . urlencode($param) . '=' . urlencode($value);
                 }
             }
@@ -2036,7 +2037,7 @@ class Util
     public static function splitURLQuery($url)
     {
         // decode encoded url separators
-        $separator = PMA_URL_getArgSeparator();
+        $separator = URL::getArgSeparator();
         // on most places separator is still hard coded ...
         if ($separator !== '&') {
             // ... so always replace & with $separator
@@ -2589,19 +2590,19 @@ class Util
 
                 $_url_params[$name] = 0;
                 $list_navigator_html .= '<a' . $class . $title1 . ' href="' . $script
-                    . PMA_URL_getCommon($_url_params) . '">' . $caption1
+                    . URL::getCommon($_url_params) . '">' . $caption1
                     . '</a>';
 
                 $_url_params[$name] = $pos - $max_count;
                 $list_navigator_html .= ' <a' . $class . $title2
-                    . ' href="' . $script . PMA_URL_getCommon($_url_params) . '">'
+                    . ' href="' . $script . URL::getCommon($_url_params) . '">'
                     . $caption2 . '</a>';
             }
 
             $list_navigator_html .= '<form action="' . basename($script)
                 . '" method="post">';
 
-            $list_navigator_html .= PMA_URL_getHiddenInputs($_url_params);
+            $list_navigator_html .= URL::getHiddenInputs($_url_params);
             $list_navigator_html .= self::pageselector(
                 $name,
                 $max_count,
@@ -2628,7 +2629,7 @@ class Util
 
                 $_url_params[$name] = $pos + $max_count;
                 $list_navigator_html .= '<a' . $class . $title3 . ' href="' . $script
-                    . PMA_URL_getCommon($_url_params) . '" >' . $caption3
+                    . URL::getCommon($_url_params) . '" >' . $caption3
                     . '</a>';
 
                 $_url_params[$name] = floor($count / $max_count) * $max_count;
@@ -2637,7 +2638,7 @@ class Util
                 }
 
                 $list_navigator_html .= ' <a' . $class . $title4
-                    . ' href="' . $script . PMA_URL_getCommon($_url_params) . '" >'
+                    . ' href="' . $script . URL::getCommon($_url_params) . '" >'
                     . $caption4 . '</a>';
             }
             $list_navigator_html .= '</div>' . "\n";
@@ -2691,7 +2692,7 @@ class Util
             . Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
             )
-            . PMA_URL_getCommon(array('db' => $database)) . '" title="'
+            . URL::getCommon(array('db' => $database)) . '" title="'
             . htmlspecialchars(
                 sprintf(
                     __('Jump to database "%s".'),
diff --git a/libraries/browse_foreigners.lib.php b/libraries/browse_foreigners.lib.php
index 5d7be5946b..e48aaad948 100644
--- a/libraries/browse_foreigners.lib.php
+++ b/libraries/browse_foreigners.lib.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\URL;
 
 /**
  * Function to get html for one relational key
@@ -116,7 +117,7 @@ function PMA_getHtmlForRelationalFieldSelection($db, $table, $field, $foreignDat
         . 'id="browse_foreign_form" name="browse_foreign_from" '
         . 'action="browse_foreigners.php" method="post">'
         . '<fieldset>'
-        . PMA_URL_getHiddenInputs($db, $table)
+        . URL::getHiddenInputs($db, $table)
         . '<input type="hidden" name="field" value="' . htmlspecialchars($field)
         . '" />'
         . '<input type="hidden" name="fieldkey" value="'
diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php
index a0af804a20..f95bfc776a 100644
--- a/libraries/central_columns.lib.php
+++ b/libraries/central_columns.lib.php
@@ -7,6 +7,7 @@
  */
 use PMA\libraries\Message;
 use PMA\libraries\Util;
+use PMA\libraries\URL;
 
 /**
  * Defines the central_columns parameters for the current user
@@ -613,7 +614,7 @@ function PMA_getHTMLforTableNavigation($total_rows, $pos, $db)
     if ($pos - $max_rows >= 0) {
         $table_navigation_html .= '<td>'
             . '<form action="db_central_columns.php" method="post">'
-            . PMA_URL_getHiddenInputs(
+            . URL::getHiddenInputs(
                 $db
             )
             . '<input type="hidden" name="pos" value="' . ($pos - $max_rows) . '" />'
@@ -628,7 +629,7 @@ function PMA_getHTMLforTableNavigation($total_rows, $pos, $db)
         $table_navigation_html .= '<td>';
         $table_navigation_html .= '<form action="db_central_columns.php'
             . '" method="post">'
-            . PMA_URL_getHiddenInputs(
+            . URL::getHiddenInputs(
                 $db
             )
             . '<input type="hidden" name="total_rows" value="' . $total_rows . '"/>';
@@ -641,7 +642,7 @@ function PMA_getHTMLforTableNavigation($total_rows, $pos, $db)
     if ($pos + $max_rows < $total_rows) {
         $table_navigation_html .= '<td>'
             . '<form action="db_central_columns.php" method="post">'
-            . PMA_URL_getHiddenInputs(
+            . URL::getHiddenInputs(
                 $db
             )
             . '<input type="hidden" name="pos" value="' . ($pos + $max_rows) . '" />'
@@ -801,7 +802,7 @@ function PMA_getHTMLforAddCentralColumn($total_rows, $pos, $db)
             __('Add column')
         )
         . '<form id="add_column" action="db_central_columns.php" method="post">'
-        . PMA_URL_getHiddenInputs(
+        . URL::getHiddenInputs(
             $db
         )
         . '<input type="hidden" name="add_column" value="add">'
@@ -835,7 +836,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db)
 {
     $tableHtml = '<tr data-rownum="' . $row_num . '" id="f_' . $row_num . '" '
         . 'class="' . ($odd_row ? 'odd' : 'even') . '">'
-        . PMA_URL_getHiddenInputs(
+        . URL::getHiddenInputs(
             $db
         )
         . '<input type="hidden" name="edit_save" value="save">'
@@ -1259,7 +1260,7 @@ function PMA_getHTMLforAddNewColumn($db)
         . '<span>+</span> ' . __('Add new column') . '</a>'
         . '<form id="add_new" style="min-width:100%;display:none" '
         . 'method="post" action="db_central_columns.php">'
-        . PMA_URL_getHiddenInputs(
+        . URL::getHiddenInputs(
             $db
         )
         . '<input type="hidden" name="add_new_column" value="add_new_column">'
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index b4e8345f0c..9140236b3d 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -117,11 +117,6 @@ if (! defined('PMA_MINIMUM_COMMON') || defined('PMA_SETUP')) {
      * JavaScript escaping.
      */
     include_once './libraries/js_escape.lib.php';
-
-    /**
-     * Include URL/hidden inputs generating.
-     */
-    include_once './libraries/url_generating.lib.php';
 }
 
 /******************************************************************************/
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 66af3ac606..fd041719fd 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -7,6 +7,7 @@
  */
 use PMA\libraries\Template;
 use PMA\libraries\Util;
+use PMA\libraries\URL;
 
 /**
  * Displays top part of the form
@@ -37,8 +38,8 @@ function PMA_displayFormTop($action = null, $method = 'post', $hidden_fields = n
         $htmlOutput .= '<input type="hidden" name="check_page_refresh" '
             . ' id="check_page_refresh" value="" />' . "\n";
     }
-    $htmlOutput .= PMA_URL_getHiddenInputs('', '', 0, 'server') . "\n";
-    $htmlOutput .= PMA_getHiddenFields((array)$hidden_fields);
+    $htmlOutput .= URL::getHiddenInputs('', '', 0, 'server') . "\n";
+    $htmlOutput .= URL::getHiddenFields((array)$hidden_fields);
     return $htmlOutput;
 }
 
diff --git a/libraries/config/ServerConfigChecks.php b/libraries/config/ServerConfigChecks.php
index ae57be2fc6..566f0d10b0 100644
--- a/libraries/config/ServerConfigChecks.php
+++ b/libraries/config/ServerConfigChecks.php
@@ -7,6 +7,8 @@
  */
 namespace PMA\libraries\config;
 
+use PMA\libraries\URL;
+
 /**
  * Performs various compatibility, security and consistency checks on current config
  *
@@ -376,13 +378,13 @@ class ServerConfigChecks
         );
         $sAllowArbitraryServerWarn = sprintf(
             $sAllowArbitraryServerWarn,
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
+            '[a@?page=form' . URL::getCommon(array(), 'html', '&')
             . '&amp;formset=Features#tab_Security]',
             '[/a]',
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
+            '[a@?page=form' . URL::getCommon(array(), 'html', '&')
             . '&amp;formset=Features#tab_Security]',
             '[/a]',
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
+            '[a@?page=form' . URL::getCommon(array(), 'html', '&')
             . '&amp;formset=Features#tab_Security]',
             '[/a]'
         );
@@ -398,7 +400,7 @@ class ServerConfigChecks
         );
         $sBZipDumpWarning = sprintf(
             $sBZipDumpWarning,
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
+            '[a@?page=form' . URL::getCommon(array(), 'html', '&')
             . '&amp;formset=Features#tab_Import_export]',
             '[/a]', '%s'
         );
@@ -413,7 +415,7 @@ class ServerConfigChecks
         );
         $sGZipDumpWarning = sprintf(
             $sGZipDumpWarning,
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
+            '[a@?page=form' . URL::getCommon(array(), 'html', '&')
             . '&amp;formset=Features#tab_Import_export]',
             '[/a]',
             '%s'
@@ -425,7 +427,7 @@ class ServerConfigChecks
         );
         $sLoginCookieValidityWarn = sprintf(
             $sLoginCookieValidityWarn,
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
+            '[a@?page=form' . URL::getCommon(array(), 'html', '&')
             . '&amp;formset=Features#tab_Security]',
             '[/a]',
             '[a@' . PMA_getPHPDocLink(
@@ -441,7 +443,7 @@ class ServerConfigChecks
         );
         $sLoginCookieValidityWarn2 = sprintf(
             $sLoginCookieValidityWarn2,
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
+            '[a@?page=form' . URL::getCommon(array(), 'html', '&')
             . '&amp;formset=Features#tab_Security]',
             '[/a]'
         );
@@ -452,10 +454,10 @@ class ServerConfigChecks
         );
         $sLoginCookieValidityWarn3 = sprintf(
             $sLoginCookieValidityWarn3,
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
+            '[a@?page=form' . URL::getCommon(array(), 'html', '&')
             . '&amp;formset=Features#tab_Security]',
             '[/a]',
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
+            '[a@?page=form' . URL::getCommon(array(), 'html', '&')
             . '&amp;formset=Features#tab_Security]',
             '[/a]'
         );
@@ -467,10 +469,10 @@ class ServerConfigChecks
         );
         $sSecurityInfoMsg = sprintf(
             $sSecurityInfoMsg,
-            '[a@?page=servers' . PMA_URL_getCommon(array(), 'html', '&')
+            '[a@?page=servers' . URL::getCommon(array(), 'html', '&')
             . '&amp;mode=edit&amp;id=%1$d#tab_Server_config]',
             '[/a]',
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
+            '[a@?page=form' . URL::getCommon(array(), 'html', '&')
             . '&amp;formset=Features#tab_Security]',
             '[/a]'
         );
@@ -483,7 +485,7 @@ class ServerConfigChecks
         );
         $sServerAuthConfigMsg = sprintf(
             $sServerAuthConfigMsg,
-            '[a@?page=servers' . PMA_URL_getCommon(array(), 'html', '&')
+            '[a@?page=servers' . URL::getCommon(array(), 'html', '&')
             . '&amp;mode=edit&amp;id=%1$d#tab_Server]',
             '[/a]'
         );
@@ -493,7 +495,7 @@ class ServerConfigChecks
         );
         $sZipDumpExportWarn = sprintf(
             $sZipDumpExportWarn,
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
+            '[a@?page=form' . URL::getCommon(array(), 'html', '&')
             . '&amp;formset=Features#tab_Import_export]',
             '[/a]',
             '%s'
@@ -504,7 +506,7 @@ class ServerConfigChecks
         );
         $sZipDumpImportWarn = sprintf(
             $sZipDumpImportWarn,
-            '[a@?page=form' . PMA_URL_getCommon(array(), 'html', '&')
+            '[a@?page=form' . URL::getCommon(array(), 'html', '&')
             . '&amp;formset=Features#tab_Import_export]',
             '[/a]',
             '%s'
diff --git a/libraries/controllers/database/DatabaseStructureController.php b/libraries/controllers/database/DatabaseStructureController.php
index 9407f388d0..19aecf409e 100644
--- a/libraries/controllers/database/DatabaseStructureController.php
+++ b/libraries/controllers/database/DatabaseStructureController.php
@@ -16,6 +16,7 @@ use PMA\libraries\RecentFavoriteTable;
 use PMA\libraries\Template;
 use PMA\libraries\Tracker;
 use PMA\libraries\Util;
+use PMA\libraries\URL;
 
 require_once 'libraries/mysql_charsets.inc.php';
 require_once 'libraries/display_create_table.lib.php';
@@ -343,7 +344,7 @@ class DatabaseStructureController extends DatabaseController
     public function multiSubmitAction()
     {
         $action = 'db_structure.php';
-        $err_url = 'db_structure.php' . PMA_URL_getCommon(
+        $err_url = 'db_structure.php' . URL::getCommon(
             array('db' => $this->db)
         );
 
diff --git a/libraries/controllers/server/ServerBinlogController.php b/libraries/controllers/server/ServerBinlogController.php
index 626fb6179e..ea975c0c07 100644
--- a/libraries/controllers/server/ServerBinlogController.php
+++ b/libraries/controllers/server/ServerBinlogController.php
@@ -14,6 +14,7 @@ use PMA\libraries\DatabaseInterface;
 use PMA\libraries\Message;
 use PMA\libraries\Util;
 use PMA\libraries\Template;
+use PMA\libraries\URL;
 
 /**
  * Handles viewing binary logs
@@ -188,7 +189,7 @@ class ServerBinlogController extends Controller
             }
 
             $html .= '<a href="server_binlog.php'
-                . PMA_URL_getCommon($this_url_params) . '"';
+                . URL::getCommon($this_url_params) . '"';
             if (Util::showIcons('TableNavigationLinksMode')) {
                 $html .= ' title="' . _pgettext('Previous page', 'Previous') . '">';
             } else {
@@ -210,7 +211,7 @@ class ServerBinlogController extends Controller
             $tempTitle = __('Show Full Queries');
             $tempImgMode = 'full';
         }
-        $html .= '<a href="server_binlog.php' . PMA_URL_getCommon($this_url_params)
+        $html .= '<a href="server_binlog.php' . URL::getCommon($this_url_params)
             . '" title="' . $tempTitle . '">'
             . '<img src="' . $GLOBALS['pmaThemeImage'] . 's_' . $tempImgMode
             . 'text.png" alt="' . $tempTitle . '" /></a>';
@@ -221,7 +222,7 @@ class ServerBinlogController extends Controller
             $this_url_params = $url_params;
             $this_url_params['pos'] = $pos + $GLOBALS['cfg']['MaxRows'];
             $html .= ' - <a href="server_binlog.php'
-                . PMA_URL_getCommon($this_url_params)
+                . URL::getCommon($this_url_params)
                 . '"';
             if (Util::showIcons('TableNavigationLinksMode')) {
                 $html .= ' title="' . _pgettext('Next page', 'Next') . '">';
@@ -259,4 +260,4 @@ class ServerBinlogController extends Controller
         }
         return $html;
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/controllers/server/ServerDatabasesController.php b/libraries/controllers/server/ServerDatabasesController.php
index 8cb409be3f..8d348be6ed 100644
--- a/libraries/controllers/server/ServerDatabasesController.php
+++ b/libraries/controllers/server/ServerDatabasesController.php
@@ -13,6 +13,7 @@ use PMA\libraries\controllers\Controller;
 use PMA\libraries\Message;
 use PMA\libraries\Template;
 use PMA\libraries\Util;
+use PMA\libraries\URL;
 
 /**
  * Handles viewing and creating and deleting databases
@@ -163,7 +164,7 @@ class ServerDatabasesController extends Controller
                 'sql_query', Util::getMessage(null, $sql_query, 'success')
             );
 
-            $url_query = PMA_URL_getCommon(array('db' => $_POST['new_db']));
+            $url_query = URL::getCommon(array('db' => $_POST['new_db']));
             $this->response->addJSON(
                 'url_query',
                 Util::getScriptNameForOption(
@@ -186,7 +187,7 @@ class ServerDatabasesController extends Controller
             $message = Message::error(__('No databases selected.'));
         } else {
             $action = 'server_databases.php';
-            $err_url = $action . PMA_URL_getCommon();
+            $err_url = $action . URL::getCommon();
 
             $GLOBALS['submit_mult'] = 'drop_db';
             $GLOBALS['mult_btn'] = __('Yes');
@@ -279,7 +280,7 @@ class ServerDatabasesController extends Controller
 
         $html .= '<form class="ajax" action="server_databases.php" ';
         $html .= 'method="post" name="dbStatsForm" id="dbStatsForm">' . "\n";
-        $html .= PMA_URL_getHiddenInputs($_url_params);
+        $html .= URL::getHiddenInputs($_url_params);
 
         $_url_params['sort_by'] = 'SCHEMA_NAME';
         $_url_params['sort_order']
diff --git a/libraries/controllers/server/ServerVariablesController.php b/libraries/controllers/server/ServerVariablesController.php
index 1e2a2ef2cb..d534ceacc5 100644
--- a/libraries/controllers/server/ServerVariablesController.php
+++ b/libraries/controllers/server/ServerVariablesController.php
@@ -13,6 +13,7 @@ use PMA\libraries\controllers\Controller;
 use PMA\libraries\Message;
 use PMA\libraries\Template;
 use PMA\libraries\Util;
+use PMA\libraries\URL;
 
 /**
  * Handles viewing and editing server variables
@@ -254,7 +255,7 @@ class ServerVariablesController extends Controller
      */
     private function _getHtmlForLinkTemplates()
     {
-        $url = 'server_variables.php' . PMA_URL_getCommon();
+        $url = 'server_variables.php' . URL::getCommon();
         return Template::get('server/variables/link_template')
             ->render(array('url' => $url));
     }
diff --git a/libraries/controllers/table/TableGisVisualizationController.php b/libraries/controllers/table/TableGisVisualizationController.php
index b4ea9acd5f..88d4fe998b 100644
--- a/libraries/controllers/table/TableGisVisualizationController.php
+++ b/libraries/controllers/table/TableGisVisualizationController.php
@@ -13,6 +13,7 @@ use PMA\libraries\controllers\TableController;
 use PMA\libraries\Message;
 use PMA\libraries\Template;
 use PMA\libraries\gis\GISVisualization;
+use PMA\libraries\URL;
 
 require_once 'libraries/common.inc.php';
 require_once 'libraries/db_common.inc.php';
@@ -185,7 +186,7 @@ class TableGisVisualizationController extends TableController
          * Displays the page
          */
         $this->url_params['sql_query'] = $this->sql_query;
-        $downloadUrl = 'tbl_gis_visualization.php' . PMA_URL_getCommon(
+        $downloadUrl = 'tbl_gis_visualization.php' . URL::getCommon(
             array_merge(
                 $this->url_params,
                 array(
diff --git a/libraries/controllers/table/TableStructureController.php b/libraries/controllers/table/TableStructureController.php
index 1510f7decb..e8a92b9d68 100644
--- a/libraries/controllers/table/TableStructureController.php
+++ b/libraries/controllers/table/TableStructureController.php
@@ -20,6 +20,7 @@ use SqlParser\Statements\CreateStatement;
 use SqlParser\Utils\Table as SqlTable;
 use PMA\libraries\Table;
 use PMA\libraries\controllers\TableController;
+use PMA\libraries\URL;
 
 require_once 'libraries/mysql_charsets.inc.php';
 require_once 'libraries/transformations.lib.php';
@@ -826,7 +827,7 @@ class TableStructureController extends TableController
      */
     protected function updateColumns()
     {
-        $err_url = 'tbl_structure.php' . PMA_URL_getCommon(
+        $err_url = 'tbl_structure.php' . URL::getCommon(
             array(
                 'db' => $this->db, 'table' => $this->table
             )
@@ -1228,7 +1229,7 @@ class TableStructureController extends TableController
             );
 
             $edit_view_url = 'view_create.php'
-                . PMA_URL_getCommon($url_params) . '&amp;'
+                . URL::getCommon($url_params) . '&amp;'
                 . implode(
                     '&amp;',
                     array_map(
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index dbac54a72a..60fcad6496 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -8,6 +8,8 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\Message;
+use PMA\libraries\URL;
+
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -493,7 +495,7 @@ function PMA_sendHeaderLocation($uri, $use_refresh = false)
         if (mb_strpos($uri, '?') === false) {
             $response->header('Location: ' . $uri . '?' . SID);
         } else {
-            $separator = PMA_URL_getArgSeparator();
+            $separator = URL::getArgSeparator();
             $response->header('Location: ' . $uri . $separator . SID);
         }
         return;
@@ -705,13 +707,10 @@ function PMA_linkURL($url)
         return $url;
     }
 
-    if (!function_exists('PMA_URL_getCommon')) {
-        include_once './libraries/url_generating.lib.php';
-    }
     $params = array();
     $params['url'] = $url;
 
-    $url = PMA_URL_getCommon($params);
+    $url = URL::getCommon($params);
     //strip off token and such sensitive information. Just keep url.
     $arr = parse_url($url);
     parse_str($arr["query"], $vars);
diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php
index 3aa615f63e..1e466e2345 100644
--- a/libraries/db_common.inc.php
+++ b/libraries/db_common.inc.php
@@ -7,6 +7,7 @@
  */
 use PMA\libraries\Message;
 use PMA\libraries\Response;
+use PMA\libraries\URL;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -32,12 +33,12 @@ if ($db_is_system_schema) {
 /**
  * Defines the urls to return to in case of error in a sql statement
  */
-$err_url_0 = 'index.php' . PMA_URL_getCommon();
+$err_url_0 = 'index.php' . URL::getCommon();
 
 $err_url = PMA\libraries\Util::getScriptNameForOption(
     $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
 )
-    . PMA_URL_getCommon(array('db' => $db));
+    . URL::getCommon(array('db' => $db));
 
 /**
  * Ensures the database exists (else move to the "parent" script) and displays
@@ -58,7 +59,7 @@ if (! isset($is_db) || ! $is_db) {
     }
     // Not a valid db name -> back to the welcome page
     $uri = './index.php'
-        . PMA_URL_getCommon(array(), 'text')
+        . URL::getCommon(array(), 'text')
         . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1';
     if (!mb_strlen($db) || ! $is_db) {
         $response = PMA\libraries\Response::getInstance();
@@ -106,5 +107,5 @@ if (isset($_REQUEST['submitcollation'])
 /**
  * Set parameters for links
  */
-$url_query = PMA_URL_getCommon(array('db' => $db));
+$url_query = URL::getCommon(array('db' => $db));
 
diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php
index 4cdeb1d48a..6bd34aa33c 100644
--- a/libraries/db_table_exists.lib.php
+++ b/libraries/db_table_exists.lib.php
@@ -7,6 +7,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\Message;
+use PMA\libraries\URL;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -42,7 +43,7 @@ if (empty($is_db)) {
                 }
                 PMA_sendHeaderLocation(
                     './index.php'
-                    . PMA_URL_getCommon($url_params, 'text')
+                    . URL::getCommon($url_params, 'text')
                 );
             }
             exit;
diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php
index d06a8c10e6..7ab4c38bd4 100644
--- a/libraries/display_change_password.lib.php
+++ b/libraries/display_change_password.lib.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\Message;
+use PMA\libraries\URL;
 
 /**
   * Get HTML for the Change password dialog
@@ -32,7 +33,7 @@ function PMA_getHtmlForChangePassword($mode, $username, $hostname)
         . 'name="chgPassword" '
         . 'class="' . ($is_privileges ? 'submenu-item' : '') . '">';
 
-    $html .= PMA_URL_getHiddenInputs();
+    $html .= URL::getHiddenInputs();
 
     if (strpos($GLOBALS['PMA_PHP_SELF'], 'server_privileges') !== false) {
         $html .= '<input type="hidden" name="username" '
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 5d14369822..21261a2583 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -9,6 +9,7 @@
 use PMA\libraries\Message;
 use PMA\libraries\plugins\ExportPlugin;
 use PMA\libraries\Table;
+use PMA\libraries\URL;
 
 /**
  * Outputs appropriate checked statement for checkbox.
@@ -107,11 +108,11 @@ function PMA_getHtmlForHiddenInput(
     global $cfg;
     $html = "";
     if ($export_type == 'server') {
-        $html .= PMA_URL_getHiddenInputs('', '', 1);
+        $html .= URL::getHiddenInputs('', '', 1);
     } elseif ($export_type == 'database') {
-        $html .= PMA_URL_getHiddenInputs($db, '', 1);
+        $html .= URL::getHiddenInputs($db, '', 1);
     } else {
-        $html .= PMA_URL_getHiddenInputs($db, $table, 1);
+        $html .= URL::getHiddenInputs($db, $table, 1);
     }
 
     // just to keep this value for possible next display of this form after saving
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 7b8cb8f31e..a27f609bf0 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -10,6 +10,7 @@
  */
 use PMA\libraries\Message;
 use PMA\libraries\plugins\ImportPlugin;
+use PMA\libraries\URL;
 
 /**
  * Prints Html For Display Import Hidden Input
@@ -24,11 +25,11 @@ function PMA_getHtmlForHiddenInputs($import_type, $db, $table)
 {
     $html  = '';
     if ($import_type == 'server') {
-        $html .= PMA_URL_getHiddenInputs('', '', 1);
+        $html .= URL::getHiddenInputs('', '', 1);
     } elseif ($import_type == 'database') {
-        $html .= PMA_URL_getHiddenInputs($db, '', 1);
+        $html .= URL::getHiddenInputs($db, '', 1);
     } else {
-        $html .= PMA_URL_getHiddenInputs($db, $table, 1);
+        $html .= URL::getHiddenInputs($db, $table, 1);
     }
     $html .= '    <input type="hidden" name="import_type" value="'
         . $import_type . '" />' . "\n";
@@ -474,7 +475,7 @@ function PMA_getHtmlForImportWithPlugin($upload_id)
 {
     //some variable for javascript
     $ajax_url = "import_status.php?id=" . $upload_id . "&"
-        . PMA_URL_getCommon(array('import_status'=>1), 'text');
+        . URL::getCommon(array('import_status'=>1), 'text');
     $promot_str = PMA_jsFormat(
         __(
             'The file being uploaded is probably larger than '
@@ -492,7 +493,7 @@ function PMA_getHtmlForImportWithPlugin($upload_id)
         __('The file is being processed, please be patient.'),
         false
     );
-    $import_url = PMA_URL_getCommon(array('import_status'=>1), 'text');
+    $import_url = URL::getCommon(array('import_status'=>1), 'text');
 
     //start output
     $html  = 'var finished = false; ';
diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php
index 295894e574..0b0c5e5099 100644
--- a/libraries/display_select_lang.lib.php
+++ b/libraries/display_select_lang.lib.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\LanguageManager;
+use PMA\libraries\URL;
 
 /**
  * Returns HTML code for the language selector
@@ -31,7 +32,7 @@ function PMA_getLanguageSelectorHtml($use_fieldset = false, $show_doc = true)
             'db' => $GLOBALS['db'],
             'table' => $GLOBALS['table'],
         );
-        $retval .= PMA_URL_getHiddenInputs($_form_params);
+        $retval .= URL::getHiddenInputs($_form_params);
 
         // For non-English, display "Language" with emphasis because it's
         // not a proper word in the current language; we show it to help
diff --git a/libraries/error_report.lib.php b/libraries/error_report.lib.php
index 1d7741e816..24fd9ea173 100644
--- a/libraries/error_report.lib.php
+++ b/libraries/error_report.lib.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\URL;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -337,13 +338,13 @@ function PMA_getErrorReportForm()
 {
     $datas = array(
         'report_data' => PMA_getPrettyReportData(),
-        'hidden_inputs' => PMA_URL_getHiddenInputs(),
+        'hidden_inputs' => URL::getHiddenInputs(),
         'hidden_fields' => null,
     );
 
     $reportData = PMA_getReportData();
     if (!empty($reportData)) {
-        $datas['hidden_fields'] = PMA_getHiddenFields($reportData);
+        $datas['hidden_fields'] = URL::getHiddenFields($reportData);
     }
 
     return PMA\libraries\Template::get('error/report_form')
diff --git a/libraries/export.lib.php b/libraries/export.lib.php
index 5032beacbd..1e6c112056 100644
--- a/libraries/export.lib.php
+++ b/libraries/export.lib.php
@@ -10,6 +10,8 @@ use PMA\libraries\Message;
 use PMA\libraries\plugins\ExportPlugin;
 use PMA\libraries\Table;
 use PMA\libraries\ZipFile;
+use PMA\libraries\URL;
+
 
 /**
  * Sets a session variable upon a possible fatal error during export
@@ -475,11 +477,11 @@ function PMA_getHtmlForDisplayedExportHeader($export_type, $db, $table)
      */
     $back_button = '<p>[ <a href="';
     if ($export_type == 'server') {
-        $back_button .= 'server_export.php' . PMA_URL_getCommon();
+        $back_button .= 'server_export.php' . URL::getCommon();
     } elseif ($export_type == 'database') {
-        $back_button .= 'db_export.php' . PMA_URL_getCommon(array('db' => $db));
+        $back_button .= 'db_export.php' . URL::getCommon(array('db' => $db));
     } else {
-        $back_button .= 'tbl_export.php' . PMA_URL_getCommon(
+        $back_button .= 'tbl_export.php' . URL::getCommon(
             array(
                 'db' => $db, 'table' => $table
             )
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index 694903f8e5..14021ac373 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -8,6 +8,7 @@
 use PMA\libraries\Message;
 use PMA\libraries\Table;
 use PMA\libraries\Util;
+use PMA\libraries\URL;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -1246,8 +1247,8 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null,
     }
 
     $params = array('db' => (string)$db_name);
-    $db_url = 'db_structure.php' . PMA_URL_getCommon($params);
-    $db_ops_url = 'db_operations.php' . PMA_URL_getCommon($params);
+    $db_url = 'db_structure.php' . URL::getCommon($params);
+    $db_ops_url = 'db_operations.php' . URL::getCommon($params);
 
     $message = '<br /><br />';
     $message .= '<strong>' . __(
@@ -1287,9 +1288,9 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null,
              'db' => (string) $db_name,
              'table' => (string) $tables[$i][TBL_NAME]
         );
-        $tbl_url = 'sql.php' . PMA_URL_getCommon($params);
-        $tbl_struct_url = 'tbl_structure.php' . PMA_URL_getCommon($params);
-        $tbl_ops_url = 'tbl_operations.php' . PMA_URL_getCommon($params);
+        $tbl_url = 'sql.php' . URL::getCommon($params);
+        $tbl_struct_url = 'tbl_structure.php' . URL::getCommon($params);
+        $tbl_ops_url = 'tbl_operations.php' . URL::getCommon($params);
 
         unset($params);
 
@@ -1469,7 +1470,7 @@ function PMA_getMatchedRows($analyzed_sql_results = array())
         'db'        => $GLOBALS['db'],
         'sql_query' => $matched_row_query
     );
-    $matched_rows_url  = 'sql.php' . PMA_URL_getCommon($_url_params);
+    $matched_rows_url  = 'sql.php' . URL::getCommon($_url_params);
 
     return array(
         'sql_query' => PMA\libraries\Util::formatSql($analyzed_sql_results['query']),
diff --git a/libraries/index.lib.php b/libraries/index.lib.php
index 804faea201..2761fe40a5 100644
--- a/libraries/index.lib.php
+++ b/libraries/index.lib.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\URL;
 
 /**
  * Get HTML for display indexes
@@ -28,7 +29,7 @@ function PMA_getHtmlForDisplayIndexes()
     );
     $html_output .= '<fieldset class="tblFooters print_ignore" style="text-align: '
         . 'left;"><form action="tbl_indexes.php" method="post">';
-    $html_output .= PMA_URL_getHiddenInputs(
+    $html_output .= URL::getHiddenInputs(
         $GLOBALS['db'], $GLOBALS['table']
     );
     $html_output .= sprintf(
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index 8e75536d0b..f4bd208de2 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -7,6 +7,7 @@
  */
 use PMA\libraries\Message;
 use PMA\libraries\plugins\TransformationsPlugin;
+use PMA\libraries\URL;
 
 /**
  * Retrieve form parameters for insert/edit form
@@ -222,12 +223,12 @@ function PMA_showTypeOrFunction($which, $url_params, $is_show)
 
     if (! $is_show) {
         return ' : <a href="tbl_change.php'
-            . PMA_URL_getCommon($this_url_params) . '">'
+            . URL::getCommon($this_url_params) . '">'
             . PMA_showTypeOrFunctionLabel($which)
             . '</a>';
     }
     return '<th><a href="tbl_change.php'
-        . PMA_URL_getCommon($this_url_params)
+        . URL::getCommon($this_url_params)
         . '" title="' . __('Hide') . '">'
         . PMA_showTypeOrFunctionLabel($which)
         . '</a></th>';
@@ -675,7 +676,7 @@ function PMA_getForeignLink($column, $backup_field, $column_name_appendix,
         . 'value="' . htmlspecialchars($data) . '" />';
 
     $html_output .= '<a class="ajax browse_foreign" href="browse_foreigners.php'
-        . PMA_URL_getCommon(
+        . URL::getCommon(
             array(
                 'db' => $db,
                 'table' => $table,
@@ -1377,7 +1378,7 @@ function PMA_getContinueInsertionForm($table, $db, $where_clause_array, $err_url
 {
     $html_output = '<form id="continueForm" method="post"'
         . ' action="tbl_replace.php" name="continueForm">'
-        . PMA_URL_getHiddenInputs($db, $table)
+        . URL::getHiddenInputs($db, $table)
         . '<input type="hidden" name="goto"'
         . ' value="' . htmlspecialchars($GLOBALS['goto']) . '" />'
         . '<input type="hidden" name="err_url"'
@@ -1890,7 +1891,7 @@ function PMA_getErrorUrl($url_params)
     if (isset($_REQUEST['err_url'])) {
         return $_REQUEST['err_url'];
     } else {
-        return 'tbl_change.php' . PMA_URL_getCommon($url_params);
+        return 'tbl_change.php' . URL::getCommon($url_params);
     }
 }
 
@@ -2084,7 +2085,7 @@ function PMA_getLinkForRelationalDisplayField($map, $relation_field,
             . $where_comparison
     );
     $output = '<a href="sql.php'
-        . PMA_URL_getCommon($_url_params) . '"' . $title . '>';
+        . URL::getCommon($_url_params) . '"' . $title . '>';
 
     if ('D' == $_SESSION['tmpval']['relational_display']) {
         // user chose "relational display field" in the
@@ -2131,7 +2132,7 @@ function PMA_transformEditedValues($db, $table,
             : ''
         );
         $transform_options['wrapper_link']
-            = PMA_URL_getCommon($_url_params);
+            = URL::getCommon($_url_params);
         $class_name = PMA_getTransformationClassName($include_file);
         /** @var TransformationsPlugin $transformation_plugin */
         $transformation_plugin = new $class_name();
@@ -2846,7 +2847,7 @@ function PMA_getHtmlForInsertEditFormColumn($table_columns, $column_number,
                 'where_clause'  => $where_clause
             );
             $transformation_options['wrapper_link']
-                = PMA_URL_getCommon($_url_params);
+                = URL::getCommon($_url_params);
             $current_value = '';
             if (isset($current_row[$column['Field']])) {
                 $current_value = $current_row[$column['Field']];
diff --git a/libraries/mult_submits.lib.php b/libraries/mult_submits.lib.php
index 5a07a8b305..840ba079b0 100644
--- a/libraries/mult_submits.lib.php
+++ b/libraries/mult_submits.lib.php
@@ -8,6 +8,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\Table;
+use PMA\libraries\URL;
 
 /**
  * Gets url params
@@ -323,7 +324,7 @@ function PMA_buildOrExecuteQueryForMulti(
 function PMA_getHtmlForCopyMultipleTables($action, $_url_params)
 {
     $html = '<form id="ajax_form" action="' . $action . '" method="post">';
-    $html .= PMA_URL_getHiddenInputs($_url_params);
+    $html .= URL::getHiddenInputs($_url_params);
     $html .= '<fieldset class = "input">';
     $databases_list = $GLOBALS['dblist']->databases;
     foreach ($databases_list as $key => $db_name)
@@ -368,7 +369,7 @@ function PMA_getHtmlForCopyMultipleTables($action, $_url_params)
 function PMA_getHtmlForReplacePrefixTable($action, $_url_params)
 {
     $html  = '<form id="ajax_form" action="' . $action . '" method="post">';
-    $html .= PMA_URL_getHiddenInputs($_url_params);
+    $html .= URL::getHiddenInputs($_url_params);
     $html .= '<fieldset class = "input">';
     $html .= '<table>';
     $html .= '<tr>';
@@ -402,7 +403,7 @@ function PMA_getHtmlForReplacePrefixTable($action, $_url_params)
 function PMA_getHtmlForAddPrefixTable($action, $_url_params)
 {
     $html  = '<form id="ajax_form" action="' . $action . '" method="post">';
-    $html .= PMA_URL_getHiddenInputs($_url_params);
+    $html .= URL::getHiddenInputs($_url_params);
     $html .= '<fieldset class = "input">';
     $html .= '<table>';
     $html .= '<tr>';
@@ -433,7 +434,7 @@ function PMA_getHtmlForAddPrefixTable($action, $_url_params)
 function PMA_getHtmlForOtherActions($what, $action, $_url_params, $full_query)
 {
     $html = '<form action="' . $action . '" method="post">';
-    $html .= PMA_URL_getHiddenInputs($_url_params);
+    $html .= URL::getHiddenInputs($_url_params);
     $html .= '<fieldset class="confirmation">';
     $html .= '<legend>';
     if ($what == 'drop_db') {
diff --git a/libraries/navigation/Navigation.php b/libraries/navigation/Navigation.php
index 6c32b34866..8b4d6b56c1 100644
--- a/libraries/navigation/Navigation.php
+++ b/libraries/navigation/Navigation.php
@@ -12,6 +12,7 @@ use PMA\libraries\config\PageSettings;
 use PMA\libraries\Message;
 use PMA\libraries\Response;
 use PMA\libraries\Util;
+use PMA\libraries\URL;
 
 /**
  * The navigation panel - displays server, db and table selection tree
@@ -163,7 +164,7 @@ class Navigation
     {
         $html  = '<form method="post" action="navigation.php" class="ajax">';
         $html .= '<fieldset>';
-        $html .= PMA_URL_getHiddenInputs($dbName, $tableName);
+        $html .= URL::getHiddenInputs($dbName, $tableName);
 
         $navTable = Util::backquote($GLOBALS['cfgRelation']['db'])
             . "." . Util::backquote($GLOBALS['cfgRelation']['navigationhiding']);
@@ -209,7 +210,7 @@ class Navigation
                         $html .= '<tr class="' . ($odd ? 'odd' : 'even') . '">';
                         $html .= '<td>' . htmlspecialchars($hiddenItem) . '</td>';
                         $html .= '<td style="width:80px"><a href="navigation.php'
-                            . PMA_URL_getCommon()
+                            . URL::getCommon()
                             . '&unhideNavItem=true'
                             . '&itemType=' . urlencode($t)
                             . '&itemName=' . urlencode($hiddenItem)
diff --git a/libraries/navigation/NavigationHeader.php b/libraries/navigation/NavigationHeader.php
index c0b24bc600..be9c833cc9 100644
--- a/libraries/navigation/NavigationHeader.php
+++ b/libraries/navigation/NavigationHeader.php
@@ -9,6 +9,7 @@ namespace PMA\libraries\navigation;
 
 use PMA;
 use PMA\libraries\Template;
+use PMA\libraries\URL;
 
 /**
  * This class renders the logo, links, server selection,
@@ -26,9 +27,9 @@ class NavigationHeader
     public function getDisplay()
     {
         if (empty($GLOBALS['url_query'])) {
-            $GLOBALS['url_query'] = PMA_URL_getCommon();
+            $GLOBALS['url_query'] = URL::getCommon();
         }
-        $link_url = PMA_URL_getCommon(
+        $link_url = URL::getCommon(
             array(
                 'ajax_request' => true,
             )
@@ -124,7 +125,7 @@ class NavigationHeader
                 PHP_URL_HOST
             );
             if (empty($host)) {
-                $logoLink .= PMA_URL_getCommon();
+                $logoLink .= URL::getCommon();
             } else {
                 $linkAttriks = 'target="_blank"';
             }
@@ -157,7 +158,7 @@ class NavigationHeader
         $retval = '<!-- LINKS START -->';
         $retval .= '<div id="navipanellinks">';
         $retval .= PMA\libraries\Util::getNavigationLink(
-            'index.php' . PMA_URL_getCommon(),
+            'index.php' . URL::getCommon(),
             $showText,
             __('Home'),
             $showIcon,
diff --git a/libraries/navigation/NavigationTree.php b/libraries/navigation/NavigationTree.php
index 9bacea9f41..cede929f7f 100644
--- a/libraries/navigation/NavigationTree.php
+++ b/libraries/navigation/NavigationTree.php
@@ -15,6 +15,7 @@ use PMA\libraries\navigation\nodes\NodeViewContainer;
 use PMA\libraries\RecentFavoriteTable;
 use PMA\libraries\Response;
 use PMA\libraries\Util;
+use PMA\libraries\URL;
 
 /**
  * Displays a collapsible of database objects in the navigation frame
@@ -1262,7 +1263,7 @@ class NavigationTree
         );
         $retval .= '<div id="pma_navigation_db_select">';
         $retval .= '<form action="index.php">';
-        $retval .= PMA_getHiddenFields($url_params);
+        $retval .= URL::getHiddenFields($url_params);
         $retval .= '<select name="db" class="hide" id="navi_db_select">'
             . '<option value="" dir="' . $GLOBALS['text_dir'] . '">'
             . '(' . __('Databases') . ') ...</option>' . "\n";
@@ -1350,7 +1351,7 @@ class NavigationTree
             );
             $retval .= '<li class="fast_filter db_fast_filter">';
             $retval .= '<form class="ajax fast_filter">';
-            $retval .= PMA_getHiddenFields($url_params);
+            $retval .= URL::getHiddenFields($url_params);
             $retval .= '<input class="searchClause" type="text"';
             $retval .= ' name="searchClause" accesskey="q"';
             // allow html5 placeholder attribute
@@ -1389,7 +1390,7 @@ class NavigationTree
             );
             $retval .= "<li class='fast_filter'>";
             $retval .= "<form class='ajax fast_filter'>";
-            $retval .= PMA_getHiddenFields($url_params);
+            $retval .= URL::getHiddenFields($url_params);
             $retval .= "<input class='searchClause' type='text'";
             $retval .= " name='searchClause2'";
             // allow html5 placeholder attribute
diff --git a/libraries/navigation/nodes/NodeDatabase.php b/libraries/navigation/nodes/NodeDatabase.php
index 9044c0cded..821fa01db2 100644
--- a/libraries/navigation/nodes/NodeDatabase.php
+++ b/libraries/navigation/nodes/NodeDatabase.php
@@ -8,6 +8,7 @@
 namespace PMA\libraries\navigation\nodes;
 
 use PMA\libraries\Util;
+use PMA\libraries\URL;
 
 /**
  * Represents a database node in the navigation tree
@@ -688,7 +689,7 @@ class NodeDatabase extends Node
             if ($this->hiddenCount > 0) {
                 $ret = '<span class="dbItemControls">'
                     . '<a href="navigation.php'
-                    . PMA_URL_getCommon()
+                    . URL::getCommon()
                     . '&showUnhideDialog=true'
                     . '&dbName=' . urldecode($this->real_name) . '"'
                     . ' class="showUnhide ajax">'
diff --git a/libraries/navigation/nodes/NodeDatabaseChild.php b/libraries/navigation/nodes/NodeDatabaseChild.php
index 94477bdde5..b923649dac 100644
--- a/libraries/navigation/nodes/NodeDatabaseChild.php
+++ b/libraries/navigation/nodes/NodeDatabaseChild.php
@@ -8,6 +8,7 @@
 namespace PMA\libraries\navigation\nodes;
 
 use PMA;
+use PMA\libraries\URL;
 
 /**
  * Represents a node that is a child of a database node
@@ -39,7 +40,7 @@ abstract class NodeDatabaseChild extends Node
             $item = $this->real_name;
             $ret = '<span class="navItemControls">'
                 . '<a href="navigation.php'
-                . PMA_URL_getCommon()
+                . URL::getCommon()
                 . '&hideNavItem=true'
                 . '&itemType=' . urlencode($this->getItemType())
                 . '&itemName=' . urlencode($item)
diff --git a/libraries/normalization.lib.php b/libraries/normalization.lib.php
index 36e866ac12..fcd654133d 100644
--- a/libraries/normalization.lib.php
+++ b/libraries/normalization.lib.php
@@ -7,6 +7,7 @@
  */
 use PMA\libraries\Message;
 use PMA\libraries\Util;
+use PMA\libraries\URL;
 
 /**
  * build the html for columns of $colTypeCategory category
@@ -796,7 +797,7 @@ function PMA_getHtmlForNormalizetable()
         . 'name="normalize" '
         . 'id="normalizeTable" '
         . '>'
-        . PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table'])
+        . URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table'])
         . '<input type="hidden" name="step1" value="1">';
     $html_output .= '<fieldset>';
     $html_output .= '<legend>'
diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
index 597bdd466b..3961906535 100644
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@@ -13,6 +13,7 @@ use PMA\libraries\Response;
 use PMA\libraries\StorageEngine;
 use PMA\libraries\Table;
 use PMA\libraries\Util;
+use PMA\libraries\URL;
 
 /**
  * Get HTML output for database comment
@@ -25,7 +26,7 @@ function PMA_getHtmlForDatabaseComment($db)
 {
     $html_output = '<div class="operations_half_width">'
         . '<form method="post" action="db_operations.php" id="formDatabaseComment">'
-        . PMA_URL_getHiddenInputs($db)
+        . URL::getHiddenInputs($db)
         . '<fieldset>'
         . '<legend>';
     if (PMA\libraries\Util::showIcons('ActionLinksMode')) {
@@ -67,7 +68,7 @@ function PMA_getHtmlForRenameDatabase($db)
     }
     $html_output .= '<input type="hidden" name="what" value="data" />'
         . '<input type="hidden" name="db_rename" value="true" />'
-        . PMA_URL_getHiddenInputs($db)
+        . URL::getHiddenInputs($db)
         . '<fieldset>'
         . '<legend>';
 
@@ -189,7 +190,7 @@ function PMA_getHtmlForCopyDatabase($db)
         . 'value="' . $_REQUEST['db_collation'] . '" />' . "\n";
     }
     $html_output .= '<input type="hidden" name="db_copy" value="true" />' . "\n"
-        . PMA_URL_getHiddenInputs($db);
+        . URL::getHiddenInputs($db);
     $html_output .= '<fieldset>'
         . '<legend>';
 
@@ -276,7 +277,7 @@ function PMA_getHtmlForChangeDatabaseCharset($db, $table)
     $html_output .= 'class="ajax" ';
     $html_output .= 'method="post" action="db_operations.php">';
 
-    $html_output .= PMA_URL_getHiddenInputs($db, $table);
+    $html_output .= URL::getHiddenInputs($db, $table);
 
     $html_output .= '<fieldset>' . "\n"
        . '    <legend>';
@@ -770,7 +771,7 @@ function PMA_getHtmlForOrderTheTable($columns)
     $html_output = '<div class="operations_half_width">';
     $html_output .= '<form method="post" id="alterTableOrderby" '
         . 'action="tbl_operations.php">';
-    $html_output .= PMA_URL_getHiddenInputs(
+    $html_output .= URL::getHiddenInputs(
         $GLOBALS['db'], $GLOBALS['table']
     );
     $html_output .= '<fieldset id="fieldset_table_order">'
@@ -812,7 +813,7 @@ function PMA_getHtmlForMoveTable()
     $html_output .= '<form method="post" action="tbl_operations.php"'
         . ' id="moveTableForm" class="ajax"'
         . ' onsubmit="return emptyCheckTheField(this, \'new_name\')">'
-        . PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
+        . URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
 
     $html_output .= '<input type="hidden" name="reload" value="1" />'
         . '<input type="hidden" name="what" value="data" />'
@@ -898,7 +899,7 @@ function PMA_getTableOptionDiv($comment, $tbl_collation, $tbl_storage_engine,
     $html_output = '<div class="operations_half_width clearfloat">';
     $html_output .= '<form method="post" action="tbl_operations.php"';
     $html_output .= ' id="tableOptionsForm" class="ajax">';
-    $html_output .= PMA_URL_getHiddenInputs(
+    $html_output .= URL::getHiddenInputs(
         $GLOBALS['db'], $GLOBALS['table']
     );
     $html_output .= '<input type="hidden" name="reload" value="1" />';
@@ -1238,7 +1239,7 @@ function PMA_getHtmlForCopytable()
         . 'id="copyTable" '
         . ' class="ajax" '
         . 'onsubmit="return emptyCheckTheField(this, \'new_name\')">'
-        . PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table'])
+        . URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table'])
         . '<input type="hidden" name="reload" value="1" />';
 
     $html_output .= '<fieldset>';
@@ -1499,7 +1500,7 @@ function PMA_getMaintainActionlink($action_message, $params, $url_params, $link)
     return '<li>'
         . '<a class="maintain_action ajax" '
         . 'href="sql.php'
-        . PMA_URL_getCommon(array_merge($url_params, $params)) . '">'
+        . URL::getCommon(array_merge($url_params, $params)) . '">'
         . $action_message
         . '</a>'
         . PMA\libraries\Util::showMySQLDocu($link)
@@ -1558,7 +1559,7 @@ function PMA_getHtmlForDeleteDataOrTable(
 function PMA_getDeleteDataOrTablelink($url_params, $syntax, $link, $htmlId)
 {
     return  '<li><a '
-        . 'href="sql.php' . PMA_URL_getCommon($url_params) . '"'
+        . 'href="sql.php' . URL::getCommon($url_params) . '"'
         . ' id="' . $htmlId . '" class="ajax">'
         . $link . '</a>'
         . PMA\libraries\Util::showMySQLDocu($syntax)
@@ -1597,7 +1598,7 @@ function PMA_getHtmlForPartitionMaintenance($partition_names, $url_params)
     $html_output = '<div class="operations_half_width">'
         . '<form id="partitionsForm" class="ajax" '
         . 'method="post" action="tbl_operations.php" >'
-        . PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table'])
+        . URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table'])
         . '<fieldset>'
         . '<legend>'
         . __('Partition maintenance')
@@ -1634,7 +1635,7 @@ function PMA_getHtmlForPartitionMaintenance($partition_names, $url_params)
     $html_output .= '<div class="clearfloat" /><br />';
 
     $html_output .= '<a href="sql.php'
-        . PMA_URL_getCommon($this_url_params) . '">'
+        . URL::getCommon($this_url_params) . '">'
         . __('Remove partitioning') . '</a>';
 
     $html_output .= '</fieldset>'
@@ -1703,7 +1704,7 @@ function PMA_getHtmlForReferentialIntegrityCheck($foreign, $url_params)
 
         $html_output .= '<li>'
             . '<a href="sql.php'
-            . PMA_URL_getCommon($this_url_params)
+            . URL::getCommon($this_url_params)
             . '">'
             . $master . '&nbsp;->&nbsp;' . $arr['foreign_db'] . '.'
             . $arr['foreign_table'] . '.' . $arr['foreign_field']
diff --git a/libraries/plugins/auth/AuthenticationConfig.php b/libraries/plugins/auth/AuthenticationConfig.php
index a98263b94f..e58fb10844 100644
--- a/libraries/plugins/auth/AuthenticationConfig.php
+++ b/libraries/plugins/auth/AuthenticationConfig.php
@@ -10,6 +10,7 @@ namespace PMA\libraries\plugins\auth;
 
 use PMA\libraries\plugins\AuthenticationPlugin;
 use PMA;
+use PMA\libraries\URL;
 
 /**
  * Handles the config authentication method
@@ -158,7 +159,7 @@ class AuthenticationConfig extends AuthenticationPlugin
                 $GLOBALS['cfg']['DefaultTabServer'],
                 'server'
             )
-            , PMA_URL_getCommon(array()) , '" class="button disableAjax">'
+            , URL::getCommon(array()) , '" class="button disableAjax">'
             , __('Retry to connect')
             , '</a>' , "\n";
         echo '</td>
diff --git a/libraries/plugins/auth/AuthenticationCookie.php b/libraries/plugins/auth/AuthenticationCookie.php
index 7184e27a20..9e0c70eac0 100644
--- a/libraries/plugins/auth/AuthenticationCookie.php
+++ b/libraries/plugins/auth/AuthenticationCookie.php
@@ -14,6 +14,7 @@ use PMA\libraries\plugins\AuthenticationPlugin;
 use PMA\libraries\Response;
 use PMA\libraries\Util;
 use ReCaptcha\ReCaptcha;
+use PMA\libraries\URL;
 
 /**
  * Remember where to redirect the user
@@ -230,7 +231,7 @@ class AuthenticationCookie extends AuthenticationPlugin
         }
         // do not generate a "server" hidden field as we want the "server"
         // drop-down to have priority
-        echo PMA_URL_getHiddenInputs($_form_params, '', 0, 'server');
+        echo URL::getHiddenInputs($_form_params, '', 0, 'server');
         echo '</fieldset>
     </form>';
 
@@ -569,7 +570,7 @@ class AuthenticationCookie extends AuthenticationPlugin
                 ->disable();
 
             PMA_sendHeaderLocation(
-                $redirect_url . PMA_URL_getCommon($url_params, 'text'),
+                $redirect_url . URL::getCommon($url_params, 'text'),
                 true
             );
             if (! defined('TESTSUITE')) {
diff --git a/libraries/plugins/schema/ExportRelationSchema.php b/libraries/plugins/schema/ExportRelationSchema.php
index 4ca5503487..96cc051370 100644
--- a/libraries/plugins/schema/ExportRelationSchema.php
+++ b/libraries/plugins/schema/ExportRelationSchema.php
@@ -9,6 +9,7 @@
 namespace PMA\libraries\plugins\schema;
 
 use PMA;
+use PMA\libraries\URL;
 
 /**
  * This class is inherited by all schema classes
@@ -293,7 +294,7 @@ class ExportRelationSchema
         echo '    ' , $error_message , "\n";
         echo '</p>' , "\n";
         echo '<a href="db_designer.php'
-            , PMA_URL_getCommon(array('db' => $GLOBALS['db']))
+            , URL::getCommon(array('db' => $GLOBALS['db']))
             , '&page=' . htmlspecialchars($pageNumber) , '">' , __('Back') , '</a>';
         echo "\n";
         exit;
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 4ce491081b..556cf57c41 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -9,6 +9,7 @@ use PMA\libraries\Message;
 use PMA\libraries\Table;
 use PMA\libraries\RecentFavoriteTable;
 use SqlParser\Statements\CreateStatement;
+use PMA\libraries\URL;
 
 /**
  * Executes a query as controluser if possible, otherwise as normal user
@@ -1971,7 +1972,7 @@ function PMA_getHtmlFixPMATables($allTables, $createDb = false)
 {
     $retval = '';
 
-    $url_query = PMA_URL_getCommon(array('db' => $GLOBALS['db']));
+    $url_query = URL::getCommon(array('db' => $GLOBALS['db']));
     if ($allTables) {
         if ($createDb) {
             $url_query .= '&amp;goto=db_operations.php&amp;create_pmadb=1';
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index 0c99b535e3..df3effb509 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\Message;
+use PMA\libraries\URL;
 
 /**
  * returns HTML for error message
@@ -59,7 +60,7 @@ function PMA_getHtmlForMasterReplication()
         $_url_params['repl_clear_scr'] = true;
 
         $html .= '  <li><a href="server_replication.php';
-        $html .= PMA_URL_getCommon($_url_params)
+        $html .= URL::getCommon($_url_params)
             . '" id="master_addslaveuser_href">';
         $html .= __('Add slave replication user') . '</a></li>';
     }
@@ -116,7 +117,7 @@ function PMA_getHtmlForMasterConfiguration()
     $html .= '</fieldset>';
     $html .= '<fieldset class="tblFooters">';
     $html .= ' <form method="post" action="server_replication.php" >';
-    $html .= PMA_URL_getHiddenInputs('', '');
+    $html .= URL::getHiddenInputs('', '');
     $html .= '  <input type="submit" value="' . __('Go') . '" id="goButton" />';
     $html .= ' </form>';
     $html .= '</fieldset>';
@@ -146,7 +147,7 @@ function PMA_getHtmlForSlaveConfiguration(
     if ($server_slave_multi_replication) {
         $html .= __('Master connection:');
         $html .= '<form method="get" action="server_replication.php">';
-        $html .= PMA_URL_getHiddenInputs($GLOBALS['url_params']);
+        $html .= URL::getHiddenInputs($GLOBALS['url_params']);
         $html .= ' <select name="master_connection">';
         $html .= '<option value="">' . __('Default') . '</option>';
         foreach ($server_slave_multi_replication as $server) {
@@ -175,7 +176,7 @@ function PMA_getHtmlForSlaveConfiguration(
 
         $_url_params['sr_slave_control_parm'] = 'IO_THREAD';
         $slave_control_io_link = 'server_replication.php'
-            . PMA_URL_getCommon($_url_params);
+            . URL::getCommon($_url_params);
 
         if ($server_slave_replication[0]['Slave_SQL_Running'] == 'No') {
             $_url_params['sr_slave_action'] = 'start';
@@ -185,7 +186,7 @@ function PMA_getHtmlForSlaveConfiguration(
 
         $_url_params['sr_slave_control_parm'] = 'SQL_THREAD';
         $slave_control_sql_link = 'server_replication.php'
-            . PMA_URL_getCommon($_url_params);
+            . URL::getCommon($_url_params);
 
         if ($server_slave_replication[0]['Slave_IO_Running'] == 'No'
             || $server_slave_replication[0]['Slave_SQL_Running'] == 'No'
@@ -197,17 +198,17 @@ function PMA_getHtmlForSlaveConfiguration(
 
         $_url_params['sr_slave_control_parm'] = null;
         $slave_control_full_link = 'server_replication.php'
-            . PMA_URL_getCommon($_url_params);
+            . URL::getCommon($_url_params);
 
         $_url_params['sr_slave_action'] = 'reset';
         $slave_control_reset_link = 'server_replication.php'
-            . PMA_URL_getCommon($_url_params);
+            . URL::getCommon($_url_params);
 
         $_url_params = $GLOBALS['url_params'];
         $_url_params['sr_take_action'] = true;
         $_url_params['sr_slave_skip_error'] = true;
         $slave_skip_error_link = 'server_replication.php'
-            . PMA_URL_getCommon($_url_params);
+            . URL::getCommon($_url_params);
 
         if ($server_slave_replication[0]['Slave_SQL_Running'] == 'No') {
             $html .= Message::error(
@@ -225,7 +226,7 @@ function PMA_getHtmlForSlaveConfiguration(
         $_url_params['repl_clear_scr'] = true;
 
         $reconfiguremaster_link = 'server_replication.php'
-            . PMA_URL_getCommon($_url_params);
+            . URL::getCommon($_url_params);
 
         $html .= __(
             'Server is configured as slave in a replication process. Would you ' .
@@ -285,7 +286,7 @@ function PMA_getHtmlForSlaveConfiguration(
                 'This server is not configured as slave in a replication process. '
                 . 'Would you like to <a href="%s">configure</a> it?'
             ),
-            'server_replication.php' . PMA_URL_getCommon($_url_params)
+            'server_replication.php' . URL::getCommon($_url_params)
         );
     }
     $html .= '</fieldset>';
@@ -314,7 +315,7 @@ function PMA_getHtmlForSlaveErrorManagement($slave_skip_error_link)
     $html .= __('Skip current error') . '</a></li>';
     $html .= '   <li>';
     $html .= '    <form method="post" action="server_replication.php">';
-    $html .= PMA_URL_getHiddenInputs('', '');
+    $html .= URL::getHiddenInputs('', '');
     $html .= sprintf(
         __('Skip next %s errors.'),
         '<input type="text" name="sr_skip_errors_count" value="1" '
@@ -346,7 +347,7 @@ function PMA_getHtmlForNotServerReplication()
             'This server is not configured as master in a replication process. '
             . 'Would you like to <a href="%s">configure</a> it?'
         ),
-        'server_replication.php' . PMA_URL_getCommon($_url_params)
+        'server_replication.php' . URL::getCommon($_url_params)
     );
     $html .= '</fieldset>';
     return $html;
@@ -395,7 +396,7 @@ function PMA_getHtmlForReplicationChangeMaster($submitname)
         = PMA_replicationGetUsernameHostnameLength();
 
     $html .= '<form method="post" action="server_replication.php">';
-    $html .= PMA_URL_getHiddenInputs('', '');
+    $html .= URL::getHiddenInputs('', '');
     $html .= ' <fieldset id="fieldset_add_user_login">';
     $html .= '  <legend>' . __('Slave configuration');
     $html .= ' - ' . __('Change or reconfigure master server') . '</legend>';
@@ -694,7 +695,7 @@ function PMA_getHtmlForReplicationMasterAddSlaveuser()
     $html .= '<form autocomplete="off" method="post" ';
     $html .= 'action="server_privileges.php"';
     $html .= ' onsubmit="return checkAddUser(this);">';
-    $html .= PMA_URL_getHiddenInputs('', '');
+    $html .= URL::getHiddenInputs('', '');
     $html .= '<fieldset id="fieldset_add_user_login">'
         . '<legend>' . __('Add slave replication user') . '</legend>'
         . PMA_getHtmlForAddUserLoginForm($username_length)
@@ -962,7 +963,7 @@ function PMA_handleControlRequest()
             } else {
                 PMA_sendHeaderLocation(
                     './server_replication.php'
-                    . PMA_URL_getCommon($GLOBALS['url_params'], 'text')
+                    . URL::getCommon($GLOBALS['url_params'], 'text')
                 );
             }
         }
diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php
index cd446e886b..f7b15be67d 100644
--- a/libraries/rte/rte_events.lib.php
+++ b/libraries/rte/rte_events.lib.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\Response;
+use PMA\libraries\URL;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -382,7 +383,7 @@ function PMA_EVN_getEditorForm($mode, $operation, $item)
     $retval .= "<form class='rte_form' action='db_events.php' method='post'>\n";
     $retval .= "<input name='{$mode}_item' type='hidden' value='1' />\n";
     $retval .= $original_data;
-    $retval .= PMA_URL_getHiddenInputs($db, $table) . "\n";
+    $retval .= URL::getHiddenInputs($db, $table) . "\n";
     $retval .= "<fieldset>\n";
     $retval .= "<legend>" . __('Details') . "</legend>\n";
     $retval .= "<table class='rte_table' style='width: 100%'>\n";
diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php
index 26ee39f26f..fe9228e779 100644
--- a/libraries/rte/rte_list.lib.php
+++ b/libraries/rte/rte_list.lib.php
@@ -6,6 +6,8 @@
  * @package PhpMyAdmin
  */
 use SqlParser\Statements\CreateStatement;
+use PMA\libraries\URL;
+
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -56,7 +58,7 @@ function PMA_RTE_getList($type, $items)
         break;
     }
     $retval .= '">';
-    $retval .= PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
+    $retval .= URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
     $retval .= "<fieldset>\n";
     $retval .= "    <legend>\n";
     $retval .= "        " . PMA_RTE_getWord('title') . "\n";
diff --git a/libraries/rte/rte_main.inc.php b/libraries/rte/rte_main.inc.php
index 5c45255c4f..32e51cc1b4 100644
--- a/libraries/rte/rte_main.inc.php
+++ b/libraries/rte/rte_main.inc.php
@@ -5,6 +5,8 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\URL;
+
 if (! defined('PHPMYADMIN')) {
     exit;
 }
@@ -50,7 +52,7 @@ if ($GLOBALS['is_ajax_request'] != true) {
     if (mb_strlen($db)) {
         $GLOBALS['dbi']->selectDb($db);
         if (! isset($url_query)) {
-            $url_query = PMA_URL_getCommon(
+            $url_query = URL::getCommon(
                 array(
                     'db' => $db, 'table' => $table
                 )
diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php
index ca42ec9a5a..75db83db90 100644
--- a/libraries/rte/rte_routines.lib.php
+++ b/libraries/rte/rte_routines.lib.php
@@ -9,6 +9,7 @@ use PMA\libraries\Message;
 use PMA\libraries\Response;
 use PMA\libraries\Util;
 use SqlParser\Statements\CreateStatement;
+use PMA\libraries\URL;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -877,7 +878,7 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine)
     $retval .= "<form class='rte_form' action='db_routines.php' method='post'>\n";
     $retval .= "<input name='{$mode}_item' type='hidden' value='1' />\n";
     $retval .= $original_routine;
-    $retval .= PMA_URL_getHiddenInputs($db) . "\n";
+    $retval .= URL::getHiddenInputs($db) . "\n";
     $retval .= "<fieldset>\n";
     $retval .= "<legend>" . __('Details') . "</legend>\n";
     $retval .= "<table class='rte_table' style='width: 100%'>\n";
@@ -1567,7 +1568,7 @@ function PMA_RTN_getExecuteForm($routine)
     $retval .= "       value='{$routine['item_name']}' />\n";
     $retval .= "<input type='hidden' name='item_type'\n";
     $retval .= "       value='{$routine['item_type']}' />\n";
-    $retval .= PMA_URL_getHiddenInputs($db) . "\n";
+    $retval .= URL::getHiddenInputs($db) . "\n";
     $retval .= "<fieldset>\n";
     if ($GLOBALS['is_ajax_request'] != true) {
         $retval .= "<legend>{$routine['item_name']}</legend>\n";
diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php
index fc077ad501..2942a297a2 100644
--- a/libraries/rte/rte_triggers.lib.php
+++ b/libraries/rte/rte_triggers.lib.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\Response;
+use PMA\libraries\URL;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -320,7 +321,7 @@ function PMA_TRI_getEditorForm($mode, $item)
     $retval .= "<form class='rte_form' action='db_triggers.php' method='post'>\n";
     $retval .= "<input name='{$mode}_item' type='hidden' value='1' />\n";
     $retval .= $original_data;
-    $retval .= PMA_URL_getHiddenInputs($db, $table) . "\n";
+    $retval .= URL::getHiddenInputs($db, $table) . "\n";
     $retval .= "<fieldset>\n";
     $retval .= "<legend>" . __('Details') . "</legend>\n";
     $retval .= "<table class='rte_table' style='width: 100%'>\n";
diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php
index 63e1a69029..ccade8d310 100644
--- a/libraries/select_server.lib.php
+++ b/libraries/select_server.lib.php
@@ -14,6 +14,8 @@
  *
  * @return string
  */
+use PMA\libraries\URL;
+
 function PMA_selectServer($not_only_options, $omit_fieldset)
 {
     $retval = '';
@@ -86,7 +88,7 @@ function PMA_selectServer($not_only_options, $omit_fieldset)
                     . PMA\libraries\Util::getScriptNameForOption(
                         $GLOBALS['cfg']['DefaultTabServer'], 'server'
                     )
-                    . PMA_URL_getCommon(array('server' => $key))
+                    . URL::getCommon(array('server' => $key))
                     . '" >' . htmlspecialchars($label) . '</a>';
             }
             $retval .= '</li>';
diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php
index 8661fb2f94..1206ad7b9c 100644
--- a/libraries/server_common.inc.php
+++ b/libraries/server_common.inc.php
@@ -5,6 +5,8 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\URL;
+
 if (! defined('PHPMYADMIN')) {
     exit;
 }
@@ -22,7 +24,7 @@ if (empty($viewing_mode)) {
 /**
  * Set parameters for links
  */
-$GLOBALS['url_query'] = PMA_URL_getCommon(array('db' => $db));
+$GLOBALS['url_query'] = URL::getCommon(array('db' => $db));
 
 /**
  * Defines the urls to return to in case of error in a sql statement
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index fe9259c3e9..d56742a527 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -9,6 +9,7 @@ use PMA\libraries\DatabaseInterface;
 use PMA\libraries\Message;
 use PMA\libraries\Template;
 use PMA\libraries\Util;
+use PMA\libraries\URL;
 
 /**
  * Get Html for User Group Dialog
@@ -522,7 +523,7 @@ function PMA_getHtmlToChooseUserGroup($username)
     $html_output = '<form class="ajax" id="changeUserGroupForm"'
             . ' action="server_privileges.php" method="post">';
     $params = array('username' => $username);
-    $html_output .= PMA_URL_getHiddenInputs($params);
+    $html_output .= URL::getHiddenInputs($params);
     $html_output .= '<fieldset id="fieldset_user_group_selection">';
     $html_output .= '<legend>' . __('User group') . '</legend>';
 
@@ -2299,7 +2300,7 @@ function PMA_getHtmlForAddUser($dbname)
        . '<form name="usersForm" id="addUsersForm"'
        . ' onsubmit="return checkAddUser(this);"'
        . ' action="server_privileges.php" method="post" autocomplete="off" >' . "\n"
-       . PMA_URL_getHiddenInputs('', '')
+       . URL::getHiddenInputs('', '')
        . PMA_getHtmlForLoginInformationFields('new');
 
     $html_output .= '<fieldset id="fieldset_add_user_database">' . "\n"
@@ -2481,7 +2482,7 @@ function PMA_getHtmlForSpecificDbPrivileges($db)
     if ($GLOBALS['is_superuser']) {
         // check the privileges for a particular database.
         $html_output  = '<form id="usersForm" action="server_privileges.php">';
-        $html_output .= PMA_URL_getHiddenInputs($db);
+        $html_output .= URL::getHiddenInputs($db);
         $html_output .= '<fieldset>';
         $html_output .= '<legend>' . "\n"
             . Util::getIcon('b_usrcheck.png')
@@ -2491,7 +2492,7 @@ function PMA_getHtmlForSpecificDbPrivileges($db)
                 '<a href="' . Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
                 )
-                . PMA_URL_getCommon(array('db' => $db)) . '">'
+                . URL::getCommon(array('db' => $db)) . '">'
                 .  htmlspecialchars($db)
                 . '</a>'
             )
@@ -2548,7 +2549,7 @@ function PMA_getHtmlForSpecificTablePrivileges($db, $table)
     if ($GLOBALS['is_superuser']) {
         // check the privileges for a particular table.
         $html_output  = '<form id="usersForm" action="server_privileges.php">';
-        $html_output .= PMA_URL_getHiddenInputs($db, $table);
+        $html_output .= URL::getHiddenInputs($db, $table);
         $html_output .= '<fieldset>';
         $html_output .= '<legend>'
             . Util::getIcon('b_usrcheck.png')
@@ -2557,7 +2558,7 @@ function PMA_getHtmlForSpecificTablePrivileges($db, $table)
                 '<a href="' . Util::getScriptNameForOption(
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 )
-                . PMA_URL_getCommon(
+                . URL::getCommon(
                     array(
                         'db' => $db,
                         'table' => $table,
@@ -2927,7 +2928,7 @@ function PMA_getUserLink(
     }
 
     $html .= ' href="server_privileges.php'
-        . PMA_URL_getCommon($params)
+        . URL::getCommon($params)
         . '">';
 
     switch($linktype) {
@@ -2957,7 +2958,7 @@ function PMA_getUserGroupEditLink($username)
 {
      return '<a class="edit_user_group_anchor ajax"'
         . ' href="server_privileges.php'
-        . PMA_URL_getCommon(array('username' => $username))
+        . URL::getCommon(array('username' => $username))
         . '">'
         . Util::getIcon('b_usrlist.png', __('Edit user group'))
         . '</a>';
@@ -3096,7 +3097,7 @@ function PMA_getExtraDataForAjaxBehavior(
             mb_substr($username, 0, 1)
         );
         $newUserInitialString = '<a href="server_privileges.php'
-            . PMA_URL_getCommon(array('initial' => $new_user_initial)) . '">'
+            . URL::getCommon(array('initial' => $new_user_initial)) . '">'
             . $new_user_initial . '</a>';
         $extra_data['new_user_initial'] = $new_user_initial;
         $extra_data['new_user_initial_string'] = $newUserInitialString;
@@ -3155,7 +3156,7 @@ function PMA_getChangeLoginInformationHtmlForm($username, $hostname)
     $html_output = '<form action="server_privileges.php" '
         . 'onsubmit="return checkAddUser(this);" '
         . 'method="post" class="copyUserForm submenu-item">' . "\n"
-        . PMA_URL_getHiddenInputs('', '')
+        . URL::getHiddenInputs('', '')
         . '<input type="hidden" name="old_username" '
         . 'value="' . htmlspecialchars($username) . '" />' . "\n"
         . '<input type="hidden" name="old_hostname" '
@@ -3201,7 +3202,7 @@ function PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename)
         . ' <a href="' . Util::getScriptNameForOption(
             $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
         )
-        . PMA_URL_getCommon(
+        . URL::getCommon(
             array(
                 'db' => $url_dbname,
                 'reload' => 1
@@ -3219,7 +3220,7 @@ function PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename)
             . Util::getScriptNameForOption(
                 $GLOBALS['cfg']['DefaultTabTable'], 'table'
             )
-            . PMA_URL_getCommon(
+            . URL::getCommon(
                 array(
                     'db' => $url_dbname,
                     'table' => $tablename,
@@ -3574,7 +3575,7 @@ function PMA_getUsersOverview($result, $db_rights, $pmaThemeImage, $text_dir)
     $html_output
         = '<form name="usersForm" id="usersForm" action="server_privileges.php" '
         . 'method="post">' . "\n"
-        . PMA_URL_getHiddenInputs('', '')
+        . URL::getHiddenInputs('', '')
         . '<table id="tableuserrights" class="data">' . "\n"
         . '<thead>' . "\n"
         . '<tr><th></th>' . "\n"
@@ -3856,14 +3857,14 @@ function PMA_getHtmlForInitials($array_initials)
                 && $_REQUEST['initial'] === $tmp_initial
                 ) ? ' active' : '')
             . '" href="server_privileges.php'
-            . PMA_URL_getCommon(array('initial' => $tmp_initial))
+            . URL::getCommon(array('initial' => $tmp_initial))
             . '">' . $tmp_initial
             . '</a>'
             . '</td>' . "\n";
     }
     $html_output .= '<td>'
         . '<a href="server_privileges.php'
-        . PMA_URL_getCommon(array('showall' => 1))
+        . URL::getCommon(array('showall' => 1))
         . '" class="nowrap">' . __('Show all') . '</a></td>' . "\n";
     $html_output .= '</tr></table>';
 
@@ -4586,9 +4587,9 @@ function PMA_getAddUserHtmlFieldset($db = '', $table = '')
     return '<fieldset id="fieldset_add_user">' . "\n"
         . '<legend>' . _pgettext('Create new user', 'New') . '</legend>'
         . '<a id="add_user_anchor" href="server_privileges.php'
-        . PMA_URL_getCommon($url_params) . '" '
+        . URL::getCommon($url_params) . '" '
         . (!empty($rel_params)
-            ? ('rel="' . PMA_URL_getCommon($rel_params) . '" ')
+            ? ('rel="' . URL::getCommon($rel_params) . '" ')
             : '')
         . '>' . "\n"
         . Util::getIcon('b_usradd.png')
@@ -4619,7 +4620,7 @@ function PMA_getHtmlHeaderForUserProperties(
     if (! empty($dbname)) {
         $html_output .= ' <i><a class="edit_user_anchor"'
             . ' href="server_privileges.php'
-            . PMA_URL_getCommon(
+            . URL::getCommon(
                 array(
                     'username' => $username,
                     'hostname' => $hostname,
@@ -4637,7 +4638,7 @@ function PMA_getHtmlHeaderForUserProperties(
             ? __('Databases') : __('Database');
         if (! empty($_REQUEST['tablename'])) {
             $html_output .= ' <i><a href="server_privileges.php'
-                . PMA_URL_getCommon(
+                . URL::getCommon(
                     array(
                         'username' => $username,
                         'hostname' => $hostname,
@@ -4652,7 +4653,7 @@ function PMA_getHtmlHeaderForUserProperties(
                 . ' <i>' . htmlspecialchars($tablename) . '</i>';
         } elseif (! empty($_REQUEST['routinename'])) {
             $html_output .= ' <i><a href="server_privileges.php'
-                . PMA_URL_getCommon(
+                . URL::getCommon(
                     array(
                         'username' => $username,
                         'hostname' => $hostname,
@@ -4826,7 +4827,7 @@ function PMA_getHtmlForUserOverview($pmaThemeImage, $text_dir)
                     Message::NOTICE
                 );
                 $flushLink = '<a href="server_privileges.php'
-                    . PMA_URL_getCommon(array('flush_privileges' => 1))
+                    . URL::getCommon(array('flush_privileges' => 1))
                     . '" id="reload_privileges_anchor">';
                 $flushnote->addParam(
                     $flushLink,
@@ -4906,7 +4907,7 @@ function PMA_getHtmlForUserProperties($dbname_is_wildcard,$url_dbname,
 
     $html_output .= '<form class="submenu-item" name="usersForm" '
         . 'id="addUsersForm" action="server_privileges.php" method="post">' . "\n";
-    $html_output .= PMA_URL_getHiddenInputs($_params);
+    $html_output .= URL::getHiddenInputs($_params);
     $html_output .= PMA_getHtmlToDisplayPrivilegesTable(
         // If $dbname is an array, pass any one db as all have same privs.
         PMA_ifSetOr($dbname, (is_array($dbname)) ? $dbname[0] : '*', 'length'),
diff --git a/libraries/server_status_processes.lib.php b/libraries/server_status_processes.lib.php
index b55226e0e8..ed06479dde 100644
--- a/libraries/server_status_processes.lib.php
+++ b/libraries/server_status_processes.lib.php
@@ -10,6 +10,7 @@
 use PMA\libraries\Message;
 use PMA\libraries\ServerStatusData;
 use PMA\libraries\Util;
+use PMA\libraries\URL;
 
 /**
  * Prints html for auto refreshing processes list
@@ -51,11 +52,11 @@ function PMA_getHtmlForServerProcesslist()
     $show_full_sql = ! empty($_REQUEST['full']);
     if ($show_full_sql) {
         $url_params['full'] = 1;
-        $full_text_link = 'server_status_processes.php' . PMA_URL_getCommon(
+        $full_text_link = 'server_status_processes.php' . URL::getCommon(
             array(), 'html', '?'
         );
     } else {
-        $full_text_link = 'server_status_processes.php' . PMA_URL_getCommon(
+        $full_text_link = 'server_status_processes.php' . URL::getCommon(
             array('full' => 1)
         );
     }
@@ -142,7 +143,7 @@ function PMA_getHtmlForServerProcesslist()
         }
 
         $retval .= '<th>';
-        $columnUrl = PMA_URL_getCommon($column);
+        $columnUrl = URL::getCommon($column);
         $retval .= '<a href="server_status_processes.php' . $columnUrl . '" ';
         if ($is_sorted) {
             $retval .= 'onmouseout="$(\'.soimg\').toggle()" '
@@ -231,7 +232,7 @@ function PMA_getHtmlForProcessListFilter()
     $retval .= '<fieldset id="tableFilter">';
     $retval .= '<legend>' . __('Filters') . '</legend>';
     $retval .= '<form action="server_status_processes.php'
-        . PMA_URL_getCommon($url_params) . '">';
+        . URL::getCommon($url_params) . '">';
     $retval .= '<input type="submit" value="' . __('Refresh') . '" />';
     $retval .= '<div class="formelement">';
     $retval .= '<input' . $showExecuting . ' type="checkbox" name="showExecuting"'
@@ -275,7 +276,7 @@ function PMA_getHtmlForServerProcessItem($process, $odd_row, $show_full_sql)
         'kill' => $process['Id'],
         'ajax_request' => true
     );
-    $kill_process = 'server_status_processes.php' . PMA_URL_getCommon($url_params);
+    $kill_process = 'server_status_processes.php' . URL::getCommon($url_params);
 
     $retval  = '<tr class="' . ($odd_row ? 'odd' : 'even') . '">';
     $retval .= '<td><a class="ajax kill_process" href="' . $kill_process . '">'
diff --git a/libraries/server_status_variables.lib.php b/libraries/server_status_variables.lib.php
index 98ab500f04..aea3d33c83 100644
--- a/libraries/server_status_variables.lib.php
+++ b/libraries/server_status_variables.lib.php
@@ -8,6 +8,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\ServerStatusData;
+use PMA\libraries\URL;
 
 /**
  * Returns the html for the list filter
@@ -35,7 +36,7 @@ function PMA_getHtmlForFilter($ServerStatusData)
     $retval .= '<fieldset id="tableFilter">';
     $retval .= '<legend>' . __('Filters') . '</legend>';
     $retval .= '<form action="server_status_variables.php'
-        . PMA_URL_getCommon() . '">';
+        . URL::getCommon() . '">';
     $retval .= '<input type="submit" value="' . __('Refresh') . '" />';
     $retval .= '<div class="formelement">';
     $retval .= '<label for="filterText">' . __('Containing the word:') . '</label>';
diff --git a/libraries/server_user_groups.lib.php b/libraries/server_user_groups.lib.php
index 32c85189e2..80370745e3 100644
--- a/libraries/server_user_groups.lib.php
+++ b/libraries/server_user_groups.lib.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\URL;
 
 /**
  * Return HTML to list the users belonging to a given user group
@@ -68,7 +69,7 @@ function PMA_getHtmlForUserGroupsTable()
     if ($result && $GLOBALS['dbi']->numRows($result)) {
         $html_output .= '<form name="userGroupsForm" id="userGroupsForm"'
             . ' action="server_privileges.php" method="post">';
-        $html_output .= PMA_URL_getHiddenInputs();
+        $html_output .= URL::getHiddenInputs();
         $html_output .= '<table id="userGroupsTable">';
         $html_output .= '<thead><tr>';
         $html_output .= '<th style="white-space: nowrap">'
@@ -98,7 +99,7 @@ function PMA_getHtmlForUserGroupsTable()
 
             $html_output .= '<td>';
             $html_output .= '<a class="" href="server_user_groups.php'
-                . PMA_URL_getCommon(
+                . URL::getCommon(
                     array(
                         'viewUsers' => 1, 'userGroup' => $groupName
                     )
@@ -108,7 +109,7 @@ function PMA_getHtmlForUserGroupsTable()
                 . '</a>';
             $html_output .= '&nbsp;&nbsp;';
             $html_output .= '<a class="" href="server_user_groups.php'
-                . PMA_URL_getCommon(
+                . URL::getCommon(
                     array(
                         'editUserGroup' => 1, 'userGroup' => $groupName
                     )
@@ -118,7 +119,7 @@ function PMA_getHtmlForUserGroupsTable()
             $html_output .= '&nbsp;&nbsp;';
             $html_output .= '<a class="deleteUserGroup ajax"'
                 . ' href="server_user_groups.php'
-                . PMA_URL_getCommon(
+                . URL::getCommon(
                     array(
                         'deleteUserGroup' => 1, 'userGroup' => $groupName
                     )
@@ -140,7 +141,7 @@ function PMA_getHtmlForUserGroupsTable()
 
     $html_output .= '<fieldset id="fieldset_add_user_group">';
     $html_output .= '<a href="server_user_groups.php'
-        . PMA_URL_getCommon(array('addUserGroup' => 1)) . '">'
+        . URL::getCommon(array('addUserGroup' => 1)) . '">'
         . PMA\libraries\Util::getIcon('b_usradd.png')
         . __('Add user group') . '</a>';
     $html_output .= '</fieldset>';
@@ -222,7 +223,7 @@ function PMA_getHtmlToEditUserGroup($userGroup = null)
     } else {
         $urlParams['addUserGroupSubmit'] = '1';
     }
-    $html_output .= PMA_URL_getHiddenInputs($urlParams);
+    $html_output .= URL::getHiddenInputs($urlParams);
 
     $html_output .= '<fieldset id="fieldset_user_group_rights">';
     $html_output .= '<legend>' . __('User group menu assignments')
diff --git a/libraries/server_users.lib.php b/libraries/server_users.lib.php
index a903173499..bbf0a623c2 100644
--- a/libraries/server_users.lib.php
+++ b/libraries/server_users.lib.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\URL;
 
 /**
  * Get HTML for secondary level menu tabs on 'Users' page
@@ -15,7 +16,7 @@
  */
 function PMA_getHtmlForSubMenusOnUsersPage($selfUrl)
 {
-    $url_params = PMA_URL_getCommon();
+    $url_params = URL::getCommon();
     $items = array(
         array(
             'name' => __('User accounts overview'),
diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php
index e42157bce4..10fb4511cb 100644
--- a/libraries/sql.lib.php
+++ b/libraries/sql.lib.php
@@ -9,6 +9,7 @@ use PMA\libraries\DisplayResults;
 use PMA\libraries\Message;
 use PMA\libraries\Table;
 use PMA\libraries\Response;
+use PMA\libraries\URL;
 
 /**
  * Parses and analyzes the given SQL query.
@@ -188,7 +189,7 @@ function PMA_getHtmlForRelationalColumnDropdown($db, $table, $column, $curr_valu
             . htmlspecialchars($_REQUEST['curr_value'])
             . '</span>'
             . '<a href="browse_foreigners.php'
-            . PMA_URL_getCommon($_url_params) . '"'
+            . URL::getCommon($_url_params) . '"'
             . 'class="ajax browse_foreign" ' . '>'
             . __('Browse foreign values')
             . '</a>';
@@ -222,7 +223,7 @@ function PMA_getHtmlForProfilingChart($url_query, $db, $profiling_results)
         $pma_token = $_SESSION[' PMA_token '];
         $url_query = isset($url_query)
             ? $url_query
-            : PMA_URL_getCommon(array('db' => $db));
+            : URL::getCommon(array('db' => $db));
 
         $profiling_table = '';
         $profiling_table .= '<fieldset><legend>' . __('Profiling')
@@ -536,7 +537,7 @@ function PMA_getHtmlForBookmark($displayParts, $cfgBookmark, $sql_query, $db,
         && ! empty($sql_query)
     ) {
         $goto = 'sql.php'
-            . PMA_URL_getCommon(
+            . URL::getCommon(
                 array(
                     'db' => $db,
                     'table' => $table,
@@ -551,7 +552,7 @@ function PMA_getHtmlForBookmark($displayParts, $cfgBookmark, $sql_query, $db,
             . ' onsubmit="return ! emptyCheckTheField(this,'
             . '\'bkm_fields[bkm_label]\');"'
             . ' class="bookmarkQueryForm print_ignore">';
-        $html .= PMA_URL_getHiddenInputs();
+        $html .= URL::getHiddenInputs();
         $html .= '<input type="hidden" name="db"'
             . ' value="' . htmlspecialchars($db) . '" />';
         $html .= '<input type="hidden" name="goto" value="' . $goto . '" />';
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 35ee7b701c..411c79faad 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -10,6 +10,8 @@
  * @usedby  tbl_tracking.php
  * @package PhpMyAdmin
  */
+use PMA\libraries\URL;
+
 if (! defined('PHPMYADMIN')) {
     exit;
 }
@@ -81,7 +83,7 @@ function PMA_getHtmlForSqlQueryForm(
     $html .= ' id="sqlqueryform" name="sqlform">' . "\n";
 
     $html .= '<input type="hidden" name="is_js_confirmed" value="0" />'
-        . "\n" . PMA_URL_getHiddenInputs($db, $table) . "\n"
+        . "\n" . URL::getHiddenInputs($db, $table) . "\n"
         . '<input type="hidden" name="pos" value="0" />' . "\n"
         . '<input type="hidden" name="goto" value="'
         . htmlspecialchars($goto) . '" />' . "\n"
@@ -147,7 +149,7 @@ function PMA_initQueryForm($query)
         $tmp_db_link = '<a href="' . PMA\libraries\Util::getScriptNameForOption(
             $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
         )
-            . PMA_URL_getCommon(array('db' => $db)) . '"';
+            . URL::getCommon(array('db' => $db)) . '"';
         $tmp_db_link .= '>'
             . htmlspecialchars($db) . '</a>';
         $legend = sprintf(__('Run SQL query/queries on database %s'), $tmp_db_link);
@@ -168,7 +170,7 @@ function PMA_initQueryForm($query)
 
         $tmp_tbl_link = '<a href="' . PMA\libraries\Util::getScriptNameForOption(
             $GLOBALS['cfg']['DefaultTabTable'], 'table'
-        ) . PMA_URL_getCommon(array('db' => $db, 'table' => $table)) . '" >';
+        ) . URL::getCommon(array('db' => $db, 'table' => $table)) . '" >';
         $tmp_tbl_link .= htmlspecialchars($db)
             . '.' . htmlspecialchars($table) . '</a>';
         $legend = sprintf(__('Run SQL query/queries on table %s'), $tmp_tbl_link);
diff --git a/libraries/tbl_common.inc.php b/libraries/tbl_common.inc.php
index 5878717dad..7fbdf2bfd8 100644
--- a/libraries/tbl_common.inc.php
+++ b/libraries/tbl_common.inc.php
@@ -5,6 +5,8 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\URL;
+
 if (! defined('PHPMYADMIN')) {
     exit;
 }
@@ -23,7 +25,7 @@ $db_is_system_schema = $GLOBALS['dbi']->isSystemSchema($db);
  * Set parameters for links
  * @deprecated
  */
-$url_query = PMA_URL_getCommon(array('db' => $db, 'table' => $table));
+$url_query = URL::getCommon(array('db' => $db, 'table' => $table));
 
 /**
  * Set parameters for links
@@ -38,12 +40,12 @@ $url_params['table'] = $table;
 $err_url_0 = PMA\libraries\Util::getScriptNameForOption(
     $GLOBALS['cfg']['DefaultTabDatabase'], 'database'
 )
-    . PMA_URL_getCommon(array('db' => $db));
+    . URL::getCommon(array('db' => $db));
 
 $err_url = PMA\libraries\Util::getScriptNameForOption(
     $GLOBALS['cfg']['DefaultTabTable'], 'table'
 )
-    . PMA_URL_getCommon($url_params);
+    . URL::getCommon($url_params);
 
 
 /**
diff --git a/libraries/tracking.lib.php b/libraries/tracking.lib.php
index 42b6a06c23..4361eeb93b 100644
--- a/libraries/tracking.lib.php
+++ b/libraries/tracking.lib.php
@@ -8,6 +8,7 @@
 use PMA\libraries\Message;
 use PMA\libraries\Response;
 use PMA\libraries\Tracker;
+use PMA\libraries\URL;
 
 /**
  * Filters tracking entries
@@ -59,7 +60,7 @@ function PMA_getHtmlForDataDefinitionAndManipulationStatements($url_query,
 ) {
     $html  = '<div id="div_create_version">';
     $html .= '<form method="post" action="' . $url_query . '">';
-    $html .= PMA_URL_getHiddenInputs($db);
+    $html .= URL::getHiddenInputs($db);
     foreach ($selected as $selected_table) {
         $html .= '<input type="hidden" name="selected[]"'
             . ' value="' . htmlspecialchars($selected_table) . '" />';
@@ -273,7 +274,7 @@ function PMA_getHtmlForTableVersionDetails(
 
     $html  = '<form method="post" action="tbl_tracking.php" name="versionsForm"'
         . ' id="versionsForm" class="ajax">';
-    $html .= PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
+    $html .= URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']);
     $html .= '<table id="versions" class="data">';
     $html .= '<thead>';
     $html .= '<tr>';
@@ -326,7 +327,7 @@ function PMA_getHtmlForTableVersionDetails(
         $html .= '<td><a class="delete_version_anchor ajax"'
             . ' href="' . $delete_link . '" >' . $delete . '</a></td>';
         $html .= '<td><a href="tbl_tracking.php';
-        $html .= PMA_URL_getCommon(
+        $html .= URL::getCommon(
             $url_params + array(
                 'report' => 'true', 'version' => $version['version']
             )
@@ -334,7 +335,7 @@ function PMA_getHtmlForTableVersionDetails(
         $html .= '">' . $report . '</a>';
         $html .= '&nbsp;&nbsp;';
         $html .= '<a href="tbl_tracking.php';
-        $html .= PMA_URL_getCommon(
+        $html .= URL::getCommon(
             $url_params + array(
                 'snapshot' => 'true', 'version' => $version['version']
             )
@@ -575,7 +576,7 @@ function PMA_getHtmlForTrackingReportExportForm1(
     $ddlog_count = 0;
 
     $html = '<form method="post" action="tbl_tracking.php'
-        . PMA_URL_getCommon(
+        . URL::getCommon(
             $url_params + array(
                 'report' => 'true', 'version' => $_REQUEST['version']
             )
@@ -625,7 +626,7 @@ function PMA_getHtmlForTrackingReportExportForm2(
     $url_params, $str1, $str2, $str3, $str4, $str5
 ) {
     $html = '<form method="post" action="tbl_tracking.php'
-        . PMA_URL_getCommon(
+        . URL::getCommon(
             $url_params + array(
                 'report' => 'true', 'version' => $_REQUEST['version']
             )
@@ -638,7 +639,7 @@ function PMA_getHtmlForTrackingReportExportForm2(
     $html .= '</form>';
 
     $html .= '<form class="disableAjax" method="post" action="tbl_tracking.php'
-        . PMA_URL_getCommon(
+        . URL::getCommon(
             $url_params
             + array('report' => 'true', 'version' => $_REQUEST['version'])
         )
@@ -736,7 +737,7 @@ function PMA_getHtmlForOneStatement($entry, $filter_users,
         $html .= '<td>' . $statement . '</td>';
         $html .= '<td class="nowrap"><a  class="delete_entry_anchor ajax"'
             . ' href="tbl_tracking.php'
-            . PMA_URL_getCommon(
+            . URL::getCommon(
                 $url_params + array(
                     'report' => 'true',
                     'version' => $_REQUEST['version'],
@@ -1464,7 +1465,7 @@ function PMA_displayUntrackedTables(
     <form method="post" action="db_tracking.php" name="untrackedForm"
         id="untrackedForm" class="ajax">
     <?php
-    echo PMA_URL_getHiddenInputs($db)
+    echo URL::getHiddenInputs($db)
     ?>
     <table id="noversions" class="data">
     <thead>
@@ -1610,7 +1611,7 @@ function PMA_displayTrackedTables(
     <form method="post" action="db_tracking.php" name="trackedForm"
         id="trackedForm" class="ajax">
     <?php
-    echo PMA_URL_getHiddenInputs($db)
+    echo URL::getHiddenInputs($db)
     ?>
     <table id="versions" class="data">
     <thead>
diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php
deleted file mode 100644
index 3bcd1d7a6e..0000000000
--- a/libraries/url_generating.lib.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * URL/hidden inputs generating.
- *
- * @package PhpMyAdmin
- */
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
-/**
- * Generates text with hidden inputs.
- *
- * @param string|array $db     optional database name
- *                             (can also be an array of parameters)
- * @param string       $table  optional table name
- * @param int          $indent indenting level
- * @param string|array $skip   do not generate a hidden field for this parameter
- *                             (can be an array of strings)
- *
- * @see PMA_URL_getCommon()
- *
- * @return string   string with input fields
- *
- * @access  public
- */
-function PMA_URL_getHiddenInputs($db = '', $table = '',
-    $indent = 0, $skip = array()
-) {
-    if (is_array($db)) {
-        $params  =& $db;
-        $_indent = empty($table) ? $indent : $table;
-        $_skip   = empty($indent) ? $skip : $indent;
-        $indent  =& $_indent;
-        $skip    =& $_skip;
-    } else {
-        $params = array();
-        if (mb_strlen($db)) {
-            $params['db'] = $db;
-        }
-        if (mb_strlen($table)) {
-            $params['table'] = $table;
-        }
-    }
-
-    if (! empty($GLOBALS['server'])
-        && $GLOBALS['server'] != $GLOBALS['cfg']['ServerDefault']
-    ) {
-        $params['server'] = $GLOBALS['server'];
-    }
-    if (empty($_COOKIE['pma_lang']) && ! empty($GLOBALS['lang'])) {
-        $params['lang'] = $GLOBALS['lang'];
-    }
-    if (empty($_COOKIE['pma_collation_connection'])
-        && ! empty($GLOBALS['collation_connection'])
-    ) {
-        $params['collation_connection'] = $GLOBALS['collation_connection'];
-    }
-
-    $params['token'] = $_SESSION[' PMA_token '];
-
-    if (! is_array($skip)) {
-        if (isset($params[$skip])) {
-            unset($params[$skip]);
-        }
-    } else {
-        foreach ($skip as $skipping) {
-            if (isset($params[$skipping])) {
-                unset($params[$skipping]);
-            }
-        }
-    }
-
-    return PMA_getHiddenFields($params);
-}
-
-/**
- * create hidden form fields from array with name => value
- *
- * <code>
- * $values = array(
- *     'aaa' => aaa,
- *     'bbb' => array(
- *          'bbb_0',
- *          'bbb_1',
- *     ),
- *     'ccc' => array(
- *          'a' => 'ccc_a',
- *          'b' => 'ccc_b',
- *     ),
- * );
- * echo PMA_getHiddenFields($values);
- *
- * // produces:
- * <input type="hidden" name="aaa" Value="aaa" />
- * <input type="hidden" name="bbb[0]" Value="bbb_0" />
- * <input type="hidden" name="bbb[1]" Value="bbb_1" />
- * <input type="hidden" name="ccc[a]" Value="ccc_a" />
- * <input type="hidden" name="ccc[b]" Value="ccc_b" />
- * </code>
- *
- * @param array  $values hidden values
- * @param string $pre    prefix
- *
- * @return string form fields of type hidden
- */
-function PMA_getHiddenFields($values, $pre = '')
-{
-    $fields = '';
-
-    foreach ($values as $name => $value) {
-        if (! empty($pre)) {
-            $name = $pre . '[' . $name . ']';
-        }
-
-        if (is_array($value)) {
-            $fields .= PMA_getHiddenFields($value, $name);
-        } else {
-            // do not generate an ending "\n" because
-            // PMA_URL_getHiddenInputs() is sometimes called
-            // from a JS document.write()
-            $fields .= '<input type="hidden" name="' . htmlspecialchars($name)
-                . '" value="' . htmlspecialchars($value) . '" />';
-        }
-    }
-
-    return $fields;
-}
-
-/**
- * Generates text with URL parameters.
- *
- * <code>
- * $params['myparam'] = 'myvalue';
- * $params['db']      = 'mysql';
- * $params['table']   = 'rights';
- * // note the missing ?
- * echo 'script.php' . PMA_URL_getCommon($params);
- * // produces with cookies enabled:
- * // script.php?myparam=myvalue&amp;db=mysql&amp;table=rights
- * // with cookies disabled:
- * // script.php?server=1&amp;lang=en&amp;myparam=myvalue&amp;db=mysql
- * // &amp;table=rights
- *
- * // note the missing ?
- * echo 'script.php' . PMA_URL_getCommon();
- * // produces with cookies enabled:
- * // script.php
- * // with cookies disabled:
- * // script.php?server=1&amp;lang=en
- * </code>
- *
- * @param mixed  $params  optional, Contains an associative array with url params
- *
- * @param string $encode  'html' to use htmlspecialchars() on the resulting
- *                        URL (for a normal URL displayed in HTML) or
- *                        something else to avoid using htmlspecialchars()
- *                        (for a URL sent via a header);
- *                        if not set,'html' is assumed
- *
- * @param string $divider optional character to use instead of '?'
- *
- * @return string   string with URL parameters
- * @access  public
- */
-function PMA_URL_getCommon($params = array(), $encode = 'html', $divider = '?')
-{
-    $separator = PMA_URL_getArgSeparator();
-
-    // avoid overwriting when creating navi panel links to servers
-    if (isset($GLOBALS['server'])
-        && $GLOBALS['server'] != $GLOBALS['cfg']['ServerDefault']
-        && ! isset($params['server'])
-        && ! defined('PMA_SETUP')
-    ) {
-        $params['server'] = $GLOBALS['server'];
-    }
-
-    if (empty($_COOKIE['pma_lang']) && ! empty($GLOBALS['lang'])) {
-        $params['lang'] = $GLOBALS['lang'];
-    }
-    if (empty($_COOKIE['pma_collation_connection'])
-        && ! empty($GLOBALS['collation_connection'])
-    ) {
-        $params['collation_connection'] = $GLOBALS['collation_connection'];
-    }
-
-    if (isset($_SESSION[' PMA_token '])) {
-        $params['token'] = $_SESSION[' PMA_token '];
-    }
-
-    if (empty($params)) {
-        return '';
-    }
-
-    $query = $divider . http_build_query($params, null, $separator);
-
-    if ($encode === 'html') {
-        $query = htmlspecialchars($query);
-    }
-
-    return $query;
-}
-
-/**
- * Returns url separator
- *
- * extracted from arg_separator.input as set in php.ini
- * we do not use arg_separator.output to avoid problems with &amp; and &
- *
- * @param string $encode whether to encode separator or not,
- * currently 'none' or 'html'
- *
- * @return string  character used for separating url parts usually ; or &
- * @access  public
- */
-function PMA_URL_getArgSeparator($encode = 'none')
-{
-    static $separator = null;
-    static $html_separator = null;
-
-    if (null === $separator) {
-        // use separators defined by php, but prefer ';'
-        // as recommended by W3C
-        // (see http://www.w3.org/TR/1999/REC-html401-19991224/appendix
-        // /notes.html#h-B.2.2)
-        $arg_separator = ini_get('arg_separator.input');
-        if (mb_strpos($arg_separator, ';') !== false) {
-            $separator = ';';
-        } elseif (mb_strlen($arg_separator) > 0) {
-            $separator = $arg_separator{0};
-        } else {
-            $separator = '&';
-        }
-        $html_separator = htmlentities($separator);
-    }
-
-    switch ($encode) {
-    case 'html':
-        return $html_separator;
-    case 'text' :
-    case 'none' :
-    default :
-        return $separator;
-    }
-}
-
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index 966b47f3cd..ce146fa0cb 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -7,6 +7,7 @@
  */
 use PMA\libraries\config\ConfigFile;
 use PMA\libraries\Message;
+use PMA\libraries\URL;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -256,7 +257,7 @@ function PMA_userprefsRedirect($file_name,
         $hash = '#' . urlencode($hash);
     }
     PMA_sendHeaderLocation('./' . $file_name
-        . PMA_URL_getCommon($url_params, '&') . $hash
+        . URL::getCommon($url_params, '&') . $hash
     );
 }
 
@@ -283,7 +284,7 @@ function PMA_userprefsAutoloadGetHeader()
     return PMA\libraries\Template::get('prefs_autoload')
         ->render(
             array(
-                'hiddenInputs' => PMA_URL_getHiddenInputs(),
+                'hiddenInputs' => URL::getHiddenInputs(),
                 'return_url' => $return_url,
             )
         );
diff --git a/normalization.php b/normalization.php
index da990da793..c6601ff40d 100644
--- a/normalization.php
+++ b/normalization.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\URL;
 
 /**
  *
@@ -28,7 +29,7 @@ if (isset($_REQUEST['getColumns'])) {
 if (isset($_REQUEST['splitColumn'])) {
     $num_fields = $_REQUEST['numFields'];
     $html = PMA_getHtmlForCreateNewColumn($num_fields, $db, $table);
-    $html .= PMA_URL_getHiddenInputs($db, $table);
+    $html .= URL::getHiddenInputs($db, $table);
     echo $html;
     exit;
 }
@@ -38,7 +39,7 @@ if (isset($_REQUEST['addNewPrimary'])) {
     $html = PMA_getHtmlForCreateNewColumn(
         $num_fields, $db, $table, $columnMeta
     );
-    $html .= PMA_URL_getHiddenInputs($db, $table);
+    $html .= URL::getHiddenInputs($db, $table);
     echo $html;
     exit;
 }
diff --git a/prefs_forms.php b/prefs_forms.php
index 0261f66f3d..c5519ca7d1 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -8,6 +8,7 @@
 use PMA\libraries\config\ConfigFile;
 use PMA\libraries\config\FormDisplay;
 use PMA\libraries\Response;
+use PMA\libraries\URL;
 
 /**
  * Gets some core libraries and displays a top message if required
@@ -45,7 +46,7 @@ if (isset($_POST['revert'])) {
     $url_params = array('form' => $form_param);
     PMA_sendHeaderLocation(
         './prefs_forms.php'
-        . PMA_URL_getCommon($url_params, 'text')
+        . URL::getCommon($url_params, 'text')
     );
     exit;
 }
diff --git a/prefs_manage.php b/prefs_manage.php
index 44964e70de..62aa3d3d22 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -10,6 +10,7 @@ use PMA\libraries\config\FormDisplay;
 use PMA\libraries\Message;
 use PMA\libraries\Response;
 use PMA\libraries\Util;
+use PMA\libraries\URL;
 
 /**
  * Gets some core libraries and displays a top message if required
@@ -122,7 +123,7 @@ if (isset($_POST['submit_export'])
             echo $form_display->displayErrors();
             echo '</div>';
             echo '<form action="prefs_manage.php" method="post">';
-            echo PMA_URL_getHiddenInputs() , "\n";
+            echo URL::getHiddenInputs() , "\n";
             echo '<input type="hidden" name="json" value="'
                 , htmlspecialchars($json) , '" />';
             echo '<input type="hidden" name="fix_errors" value="1" />';
@@ -238,7 +239,7 @@ echo '<h2>' , __('Import') , '</h2>'
     , '<form class="group-cnt prefs-form disableAjax" name="prefs_import"'
     , ' action="prefs_manage.php" method="post" enctype="multipart/form-data">'
     , Util::generateHiddenMaxFileSize($GLOBALS['max_upload_size'])
-    , PMA_URL_getHiddenInputs()
+    , URL::getHiddenInputs()
     , '<input type="hidden" name="json" value="" />'
     , '<input type="radio" id="import_text_file" name="import_type"'
     , ' value="text_file" checked="checked" />'
@@ -309,7 +310,7 @@ if (file_exists('setup/index.php')) {
             </div>
             <form class="group-cnt prefs-form disableAjax" name="prefs_export"
                   action="prefs_manage.php" method="post">
-                <?php echo PMA_URL_getHiddenInputs(); ?>
+                <?php echo URL::getHiddenInputs(); ?>
                 <div style="padding-bottom:0.5em">
                     <input type="radio" id="export_text_file" name="export_type"
                            value="text_file" checked="checked" />
@@ -361,7 +362,7 @@ if (file_exists('setup/index.php')) {
             <form class="group-cnt prefs-form disableAjax" name="prefs_reset"
                   action="prefs_manage.php" method="post">
                 <?php
-                echo PMA_URL_getHiddenInputs() , __(
+                echo URL::getHiddenInputs() , __(
                     'You can reset all your settings and restore them to default '
                     . 'values.'
                 );
diff --git a/setup/config.php b/setup/config.php
index ca76b6ed10..0d5b9fec36 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -7,6 +7,7 @@
  */
 use PMA\libraries\config\FormDisplay;
 use PMA\setup\lib\ConfigGenerator;
+use PMA\libraries\URL;
 
 /**
  * Core libraries.
@@ -31,7 +32,7 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
     $GLOBALS['ConfigFile']->resetConfigData();
     // drop post data
     header('HTTP/1.1 303 See Other');
-    header('Location: index.php' . PMA_URL_getCommon());
+    header('Location: index.php' . URL::getCommon());
     exit;
 } elseif (PMA_ifSetOr($_POST['submit_download'], '')) {
     //
@@ -49,7 +50,7 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
         ConfigGenerator::getConfigFile($GLOBALS['ConfigFile'])
     );
     header('HTTP/1.1 303 See Other');
-    header('Location: index.php' . PMA_URL_getCommon() . '&action_done=config_saved');
+    header('Location: index.php' . URL::getCommon() . '&action_done=config_saved');
     exit;
 } elseif (PMA_ifSetOr($_POST['submit_load'], '')) {
     //
@@ -59,7 +60,7 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
     include_once $config_file_path;
     $GLOBALS['ConfigFile']->setConfigData($cfg);
     header('HTTP/1.1 303 See Other');
-    header('Location: index.php' . PMA_URL_getCommon());
+    header('Location: index.php' . URL::getCommon());
     exit;
 } elseif (PMA_ifSetOr($_POST['submit_delete'], '')) {
     //
@@ -67,13 +68,13 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
     //
     @unlink($config_file_path);
     header('HTTP/1.1 303 See Other');
-    header('Location: index.php' . PMA_URL_getCommon());
+    header('Location: index.php' . URL::getCommon());
     exit;
 } else {
     //
     // Show generated config file in a <textarea>
     //
     header('HTTP/1.1 303 See Other');
-    header('Location: index.php' . PMA_URL_getCommon() . '&page=config');
+    header('Location: index.php' . URL::getCommon() . '&page=config');
     exit;
 }
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 50b59ff2ba..9ec51c5e27 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -10,6 +10,7 @@ use PMA\libraries\config\ConfigFile;
 use PMA\libraries\config\FormDisplay;
 use PMA\libraries\config\ServerConfigChecks;
 use PMA\libraries\LanguageManager;
+use PMA\libraries\URL;
 
 if (!defined('PHPMYADMIN')) {
     exit;
@@ -27,7 +28,7 @@ $all_languages = LanguageManager::getInstance()->sortedLanguages();
 
 /** @var ConfigFile $cf */
 $cf = $GLOBALS['ConfigFile'];
-$separator = PMA_URL_getArgSeparator('html');
+$separator = URL::getArgSeparator('html');
 
 // message handling
 PMA_messagesBegin();
@@ -96,7 +97,7 @@ if (!$is_https) {
 
 echo '<form id="select_lang" method="post" action="'
     , htmlspecialchars($_SERVER['REQUEST_URI']) , '">';
-echo PMA_URL_getHiddenInputs();
+echo URL::getHiddenInputs();
 echo '<bdo lang="en" dir="ltr"><label for="lang">';
 echo __('Language') , (__('Language') != 'Language' ? ' - Language' : '');
 echo '</label></bdo><br />';
@@ -177,11 +178,11 @@ if ($cf->getServerCount() > 0) {
         echo '<td>' , htmlspecialchars($cf->getServerDSN($id)) , '</td>';
         echo '<td style="white-space: nowrap">';
         echo '<small>';
-        echo '<a href="' , PMA_URL_getCommon() , $separator , 'page=servers'
+        echo '<a href="' , URL::getCommon() , $separator , 'page=servers'
             , $separator , 'mode=edit' , $separator , 'id=' , $id , '">'
             , __('Edit') , '</a>';
         echo ' | ';
-        echo '<a href="' , PMA_URL_getCommon() , $separator , 'page=servers'
+        echo '<a href="' , URL::getCommon() , $separator , 'page=servers'
             , $separator , 'mode=remove' , $separator , 'id=' , $id , '">'
             , __('Delete') , '</a>';
         echo '</small>';
@@ -310,6 +311,6 @@ echo '<div id="footer">';
 echo '<a href="https://www.phpmyadmin.net/">' , __('phpMyAdmin homepage') , '</a>';
 echo '<a href="https://www.phpmyadmin.net/donate/">'
     ,  __('Donate') , '</a>';
-echo '<a href="' ,  PMA_URL_getCommon() , $separator , 'version_check=1">'
+echo '<a href="' ,  URL::getCommon() , $separator , 'version_check=1">'
     , __('Check for latest version') , '</a>';
 echo '</div>';
diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php
index 7771afc7a9..879bd7ba79 100644
--- a/setup/frames/menu.inc.php
+++ b/setup/frames/menu.inc.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin-Setup
  */
+use PMA\libraries\URL;
 
 if (!defined('PHPMYADMIN')) {
     exit;
@@ -12,9 +13,9 @@ if (!defined('PHPMYADMIN')) {
 
 $formset_id = isset($_GET['formset']) ? $_GET['formset'] : null;
 
-$separator = PMA_URL_getArgSeparator('html');
+$separator = URL::getArgSeparator('html');
 echo '<ul>';
-echo '<li><a href="index.php' , PMA_URL_getCommon() , '"'
+echo '<li><a href="index.php' , URL::getCommon() , '"'
     , ($formset_id === null ? ' class="active' : '')
     , '">' , __('Overview') , '</a></li>';
 
@@ -28,7 +29,7 @@ $formsets = array(
 );
 
 foreach ($formsets as $formset => $label) {
-    echo '<li><a href="' , PMA_URL_getCommon() , $separator , 'page=form'
+    echo '<li><a href="' , URL::getCommon() , $separator , 'page=form'
         , $separator , 'formset=' , $formset , '" '
         , ($formset_id === $formset ? ' class="active' : '')
         , '">' , $label , '</a></li>';
diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php
index 03fbb077e5..d63d922b46 100644
--- a/setup/frames/servers.inc.php
+++ b/setup/frames/servers.inc.php
@@ -8,6 +8,7 @@
 
 use PMA\libraries\config\ConfigFile;
 use PMA\libraries\config\FormDisplay;
+use PMA\libraries\URL;
 
 if (!defined('PHPMYADMIN')) {
     exit;
@@ -33,7 +34,7 @@ if ($mode == 'edit' && $server_exists) {
         . ' <small>(' . htmlspecialchars($cf->getServerDSN($id)) . ')</small>';
 } elseif ($mode == 'remove' && $server_exists) {
     $cf->removeServer($id);
-    header('Location: index.php' . PMA_URL_getCommon());
+    header('Location: index.php' . URL::getCommon());
     exit;
 } elseif ($mode == 'revert' && $server_exists) {
     // handled by process_formset()
diff --git a/setup/lib/common.inc.php b/setup/lib/common.inc.php
index 0a1df376a5..212dd9f7c4 100644
--- a/setup/lib/common.inc.php
+++ b/setup/lib/common.inc.php
@@ -22,7 +22,6 @@ if (!file_exists('./libraries/common.inc.php')) {
 require_once './libraries/common.inc.php';
 require_once './libraries/config/config_functions.lib.php';
 require_once './libraries/config/messages.inc.php';
-require_once './libraries/url_generating.lib.php';
 require_once './libraries/user_preferences.lib.php';
 
 // use default error handler
diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php
index 421ec56d01..db202f3d11 100644
--- a/setup/lib/form_processing.lib.php
+++ b/setup/lib/form_processing.lib.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin-Setup
  */
 use PMA\libraries\config\FormDisplay;
+use PMA\libraries\URL;
 
 /**
  * Processes forms registered in $form_display, handles error correction
@@ -35,7 +36,7 @@ function PMA_Process_formset(FormDisplay $form_display)
     }
 
     // form has errors, show warning
-    $separator = PMA_URL_getArgSeparator('html');
+    $separator = URL::getArgSeparator('html');
     $page = isset($_GET['page']) ? $_GET['page'] : null;
     $formset = isset($_GET['formset']) ? $_GET['formset'] : null;
     $formset = $formset ? "{$separator}formset=$formset" : '';
@@ -49,16 +50,16 @@ function PMA_Process_formset(FormDisplay $form_display)
     <div class="error">
         <h4><?php echo __('Warning') ?></h4>
         <?php echo __('Submitted form contains errors') ?><br />
-        <a href="<?php echo PMA_URL_getCommon() , $separator ?>page=<?php echo $page , $formset , $formId , $separator ?>mode=revert">
+        <a href="<?php echo URL::getCommon() , $separator ?>page=<?php echo $page , $formset , $formId , $separator ?>mode=revert">
             <?php echo __('Try to revert erroneous fields to their default values') ?>
         </a>
     </div>
     <?php echo $form_display->displayErrors() ?>
-    <a class="btn" href="index.php<?php echo PMA_URL_getCommon() ?>">
+    <a class="btn" href="index.php<?php echo URL::getCommon() ?>">
         <?php echo __('Ignore errors') ?>
     </a>
     &nbsp;
-    <a class="btn" href="<?php echo PMA_URL_getCommon() , $separator ?>page=<?php echo $page , $formset , $formId , $separator ?>mode=edit">
+    <a class="btn" href="<?php echo URL::getCommon() , $separator ?>page=<?php echo $page , $formset , $formId , $separator ?>mode=edit">
         <?php echo __('Show form') ?>
     </a>
     <?php
@@ -73,7 +74,7 @@ function PMA_generateHeader303()
 {
     // drop post data
     header('HTTP/1.1 303 See Other');
-    header('Location: index.php' . PMA_URL_getCommon());
+    header('Location: index.php' . URL::getCommon());
 
     if (!defined('TESTSUITE')) {
         exit;
diff --git a/sql.php b/sql.php
index e7e143cf14..2b0cb77484 100644
--- a/sql.php
+++ b/sql.php
@@ -10,6 +10,7 @@
 use PMA\libraries\config\PageSettings;
 use PMA\libraries\Response;
 use PMA\libraries\Util;
+use PMA\libraries\URL;
 
 /**
  * Gets some core libraries
@@ -60,7 +61,7 @@ if (empty($goto)) {
 
 if (! isset($err_url)) {
     $err_url = (! empty($back) ? $back : $goto)
-        . '?' . PMA_URL_getCommon(array('db' => $GLOBALS['db']))
+        . '?' . URL::getCommon(array('db' => $GLOBALS['db']))
         . ((mb_strpos(' ' . $goto, 'db_') != 1
             && mb_strlen($table))
             ? '&amp;table=' . urlencode($table)
@@ -187,7 +188,7 @@ if (isset($_POST['store_bkm'])) {
  */
 if ($goto == 'sql.php') {
     $is_gotofile = false;
-    $goto = 'sql.php' . PMA_URL_getCommon(
+    $goto = 'sql.php' . URL::getCommon(
         array(
             'db' => $db,
             'table' => $table,
diff --git a/tbl_addfield.php b/tbl_addfield.php
index 18455dc899..2ec8a2972b 100644
--- a/tbl_addfield.php
+++ b/tbl_addfield.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\URL;
 
 /**
  * Get some core libraries
@@ -23,7 +24,7 @@ PMA\libraries\Util::checkParameters(array('db', 'table'));
 /**
  * Defines the url to return to in case of error in a sql statement
  */
-$err_url = 'tbl_sql.php' . PMA_URL_getCommon(
+$err_url = 'tbl_sql.php' . URL::getCommon(
     array(
         'db' => $db, 'table' => $table
     )
diff --git a/tbl_change.php b/tbl_change.php
index a387e6a529..40500b00ec 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -10,6 +10,7 @@
 use PMA\libraries\config\PageSettings;
 use PMA\libraries\Response;
 use PMA\libraries\Util;
+use PMA\libraries\URL;
 
 /**
  * Gets the variables sent or posted to this script and displays the header
@@ -64,7 +65,7 @@ if (empty($GLOBALS['goto'])) {
 
 
 $_url_params = PMA_getUrlParameters($db, $table);
-$err_url = $GLOBALS['goto'] . PMA_URL_getCommon($_url_params);
+$err_url = $GLOBALS['goto'] . URL::getCommon($_url_params);
 unset($_url_params);
 
 $comments_map = PMA_getCommentsMap($db, $table);
@@ -148,7 +149,7 @@ foreach ($table_columns as $column) {
 //If table has blob fields we have to disable ajax.
 $html_output .= PMA_getHtmlForInsertEditFormHeader($has_blob_field, $is_upload);
 
-$html_output .= PMA_URL_getHiddenInputs($_form_params);
+$html_output .= URL::getHiddenInputs($_form_params);
 
 $titles['Browse'] = Util::getIcon('b_browse.png', __('Browse foreign values'));
 
diff --git a/tbl_create.php b/tbl_create.php
index c465c28cf7..d771fb7957 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\URL;
 
 /**
  * Get some core libraries
@@ -40,7 +41,7 @@ if ($GLOBALS['dbi']->getColumns($db, $table)) {
         sprintf(__('Table %s already exists!'), htmlspecialchars($table)),
         '',
         false,
-        'db_structure.php' . PMA_URL_getCommon(array('db' => $db))
+        'db_structure.php' . URL::getCommon(array('db' => $db))
     );
 }
 
diff --git a/tbl_row_action.php b/tbl_row_action.php
index 0780351bf1..aacba36afa 100644
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\URL;
 
 /**
  *
@@ -117,7 +118,7 @@ if (!empty($submit_mult)) {
     default:
         $action = 'tbl_row_action.php';
         $err_url = 'tbl_row_action.php'
-            . PMA_URL_getCommon($GLOBALS['url_params']);
+            . URL::getCommon($GLOBALS['url_params']);
         if (! isset($_REQUEST['mult_btn'])) {
             $original_sql_query = $sql_query;
             if (! empty($url_query)) {
@@ -127,7 +128,7 @@ if (!empty($submit_mult)) {
         include 'libraries/mult_submits.inc.php';
         $_url_params = $GLOBALS['url_params'];
         $_url_params['goto'] = 'tbl_sql.php';
-        $url_query = PMA_URL_getCommon($_url_params);
+        $url_query = URL::getCommon($_url_params);
 
 
         /**
diff --git a/templates/columns_definitions/column_definitions_form.phtml b/templates/columns_definitions/column_definitions_form.phtml
index 7b459639dd..0f80474122 100644
--- a/templates/columns_definitions/column_definitions_form.phtml
+++ b/templates/columns_definitions/column_definitions_form.phtml
@@ -1,12 +1,13 @@
 <?php
 use PMA\libraries\Partition;
 use PMA\libraries\StorageEngine;
+use PMA\libraries\URL;
 
 ?>
 <form method="post"
       action="<?= $action; ?>"
       class="<?= ($action == 'tbl_create.php' ? 'create_table' : 'append_fields'); ?>_form ajax lock-page">
-    <?= PMA_URL_getHiddenInputs($form_params); ?>
+    <?= URL::getHiddenInputs($form_params); ?>
    <!-- happens when an index has been set on a column -->
    <!-- and a column is added to the table creation dialog -->
    <!-- This contains a JSON-encoded string -->
@@ -167,4 +168,4 @@ use PMA\libraries\StorageEngine;
     </fieldset>
     <div id="properties_message">
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/templates/columns_definitions/table_fields_definitions.phtml b/templates/columns_definitions/table_fields_definitions.phtml
index 057c8bc03b..568583ed5b 100644
--- a/templates/columns_definitions/table_fields_definitions.phtml
+++ b/templates/columns_definitions/table_fields_definitions.phtml
@@ -82,7 +82,7 @@
                 <?= __('MIME type'); ?>
             </th>
             <th>
-                <a href="transformation_overview.php<?= PMA_URL_getCommon(); ?>#transformation"
+                <a href="transformation_overview.php<?= PMA\libraries\URL::getCommon(); ?>#transformation"
                    title="<?= __('List of available transformations and their options'); ?>"
                    target="_blank">
                     <?= __('Browser display transformation'); ?>
@@ -101,7 +101,7 @@
                 ); ?>
             </th>
             <th>
-                <a href="transformation_overview.php<?= PMA_URL_getCommon(); ?>#input_transformation"
+                <a href="transformation_overview.php<?= PMA\libraries\URL::getCommon(); ?>#input_transformation"
                    title="<?= __('List of available transformations and their options'); ?>"
                    target="_blank">
                     <?= __('Input transformation'); ?>
@@ -130,4 +130,4 @@
         </tr>
     <?php endforeach; ?>
 </table>
-<br />
\ No newline at end of file
+<br />
diff --git a/templates/database/create_table.phtml b/templates/database/create_table.phtml
index 4599538527..c6876dd0fd 100644
--- a/templates/database/create_table.phtml
+++ b/templates/database/create_table.phtml
@@ -6,7 +6,7 @@
         <?php endif; ?>
         <?= __('Create table'); ?>
         </legend>
-        <?= PMA_URL_getHiddenInputs($db); ?>
+        <?= PMA\libraries\URL::getHiddenInputs($db); ?>
         <div class="formelement">
             <?= __('Name'); ?>:
             <input type="text" name="table" maxlength="64" size="30" required="required" />
@@ -20,4 +20,4 @@
     <fieldset class="tblFooters">
         <input type="submit" value="<?= __('Go'); ?>" />
     </fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/templates/database/designer/edit_delete_pages.phtml b/templates/database/designer/edit_delete_pages.phtml
index 9d39e4997b..25b5502aa0 100644
--- a/templates/database/designer/edit_delete_pages.phtml
+++ b/templates/database/designer/edit_delete_pages.phtml
@@ -1,6 +1,6 @@
 <?php $cfgRelation = PMA_getRelationsParam(); ?>
 <form action="db_designer.php" method="post" name="edit_delete_pages" id="edit_delete_pages" class="ajax">
-    <?= PMA_URL_getHiddenInputs($db); ?>
+    <?= PMA\libraries\URL::getHiddenInputs($db); ?>
     <fieldset id="page_edit_delete_options">
         <input type="hidden" name="operation" value="<?= $operation; ?>" />
         <label for="selected_page">
@@ -8,4 +8,4 @@
         </label>
         <?= PMA_getHtmlForPageSelector($cfgRelation, $db); ?>
     </fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/templates/database/designer/page_save_as.phtml b/templates/database/designer/page_save_as.phtml
index 6bd5c59ac1..fe1605ef34 100644
--- a/templates/database/designer/page_save_as.phtml
+++ b/templates/database/designer/page_save_as.phtml
@@ -6,7 +6,7 @@ $choices = array(
 );
 ?>
 <form action="db_designer.php" method="post" name="save_as_pages" id="save_as_pages" class="ajax">
-    <?= PMA_URL_getHiddenInputs($db); ?>
+    <?= PMA\libraries\URL::getHiddenInputs($db); ?>
     <fieldset id="page_save_as_options">
         <table>
             <tbody>
@@ -30,4 +30,4 @@ $choices = array(
             </tbody>
         </table>
     </fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/templates/database/designer/query_details.phtml b/templates/database/designer/query_details.phtml
index a461bb232d..243f983a2d 100644
--- a/templates/database/designer/query_details.phtml
+++ b/templates/database/designer/query_details.phtml
@@ -14,6 +14,6 @@
         <textarea cols="80" name="sql_query" id="textSqlquery" rows="15">
         </textarea>
         <input type="hidden" name="submit_sql" value="true">
-        <?= PMA_URL_getHiddenInputs($_GET['db']); ?>
+        <?= PMA\libraries\URL::getHiddenInputs($_GET['db']); ?>
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/database/designer/schema_export.phtml b/templates/database/designer/schema_export.phtml
index a31818785e..4aea33bed2 100644
--- a/templates/database/designer/schema_export.phtml
+++ b/templates/database/designer/schema_export.phtml
@@ -1,6 +1,6 @@
 <form method="post" action="schema_export.php" class="disableAjax" id="id_export_pages">
     <fieldset>
-        <?= PMA_URL_getHiddenInputs($db); ?>
+        <?= PMA\libraries\URL::getHiddenInputs($db); ?>
         <label><?= __('Select Export Relational Type'); ?></label><br/>
         <?= PMA_pluginGetChoice(
             'Schema', 'export_type', $export_list, 'format'
@@ -8,4 +8,4 @@
         <input type="hidden" name="page_number" value="<?= htmlspecialchars($page); ?>" />
         <?= PMA_pluginGetOptions('Schema', $export_list); ?>
     </fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/templates/database/structure/body_for_table_summary.phtml b/templates/database/structure/body_for_table_summary.phtml
index 715bebd09f..6aae98b264 100644
--- a/templates/database/structure/body_for_table_summary.phtml
+++ b/templates/database/structure/body_for_table_summary.phtml
@@ -28,7 +28,7 @@ if (isset($approx_rows)) {
     );
 }
 $cell_text = ($approx_rows)
-        ? '<a href="db_structure.php' . PMA_URL_getCommon($row_sum_url)
+        ? '<a href="db_structure.php' . PMA\libraries\URL::getCommon($row_sum_url)
         . '" class="ajax row_count_sum">' . '~' . $row_count_sum . '</a>'
         : $row_count_sum;
 ?>
@@ -90,4 +90,4 @@ $cell_text = ($approx_rows)
                 : '-');?></th>
 <?php endif; ?>
 </tr>
-</tbody>
\ No newline at end of file
+</tbody>
diff --git a/templates/database/structure/favorite_anchor.phtml b/templates/database/structure/favorite_anchor.phtml
index 83b99edf6a..36ed935c59 100644
--- a/templates/database/structure/favorite_anchor.phtml
+++ b/templates/database/structure/favorite_anchor.phtml
@@ -8,8 +8,8 @@ $fav_params = array('db' => $db,
 ?>
 <a id="<?= md5($current_table['TABLE_NAME']); ?>_favorite_anchor"
    class="ajax favorite_table_anchor"
-   href="<?= 'db_structure.php' , PMA_URL_getCommon($fav_params); ?>"
+   href="<?= 'db_structure.php' , PMA\libraries\URL::getCommon($fav_params); ?>"
    title="<?= $already_favorite ? __("Remove from Favorites") : __("Add to Favorites"); ?>"
    data-favtargets="<?= md5($db . "." . $current_table['TABLE_NAME']); ?>" >
     <?= !$already_favorite ? $titles['NoFavorite'] : $titles['Favorite']; ?>
-</a>
\ No newline at end of file
+</a>
diff --git a/templates/database/structure/sortable_header.phtml b/templates/database/structure/sortable_header.phtml
index 31aa4c6a74..e270666645 100644
--- a/templates/database/structure/sortable_header.phtml
+++ b/templates/database/structure/sortable_header.phtml
@@ -52,7 +52,7 @@ if ($requested_sort == $sort) {
 $_url_params = array(
     'db' => $_REQUEST['db'],
 );
-$url = 'db_structure.php' . PMA_URL_getCommon($_url_params);
+$url = 'db_structure.php' . PMA\libraries\URL::getCommon($_url_params);
 // We set the position back to 0 every time they sort.
 $url .= "&amp;pos=0&amp;sort=$sort&amp;sort_order=$future_sort_order";
 if (! empty($_REQUEST['tbl_type'])) {
@@ -63,4 +63,4 @@ if (! empty($_REQUEST['tbl_group'])) {
 }
 echo PMA\libraries\Util::linkOrButton(
     $url, $title . $order_img, $order_link_params
-);
\ No newline at end of file
+);
diff --git a/templates/database/structure/structure_table_row.phtml b/templates/database/structure/structure_table_row.phtml
index 5c2165c2d7..f0a91d2511 100644
--- a/templates/database/structure/structure_table_row.phtml
+++ b/templates/database/structure/structure_table_row.phtml
@@ -71,7 +71,7 @@
         <td class="value tbl_rows"
             data-table="<?= htmlspecialchars($current_table['TABLE_NAME']); ?>">
             <?php if ($approx_rows): ?>
-                <a href="db_structure.php<?= PMA_URL_getCommon(
+                <a href="db_structure.php<?= PMA\libraries\URL::getCommon(
                     array(
                         'ajax_request'   => true,
                         'db'             => $GLOBALS['db'],
@@ -184,4 +184,4 @@
         </td>
 
     <?php endif; ?>
-</tr>
\ No newline at end of file
+</tr>
diff --git a/templates/database/structure/table_header.phtml b/templates/database/structure/table_header.phtml
index 15aa81a979..d159b67f32 100644
--- a/templates/database/structure/table_header.phtml
+++ b/templates/database/structure/table_header.phtml
@@ -11,7 +11,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
 }
 ?>
 <form method="post" action="db_structure.php" name="tablesForm" id="tablesForm">
-<?= PMA_URL_getHiddenInputs($db); ?>
+<?= PMA\libraries\URL::getHiddenInputs($db); ?>
 <table class="data">
     <thead>
         <tr>
@@ -123,4 +123,4 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
         </tr>
     </thead>
     <tbody>
-        <?php $GLOBALS['colspan_for_structure'] = $cnt + $action_colspan + 3; ?>
\ No newline at end of file
+        <?php $GLOBALS['colspan_for_structure'] = $cnt + $action_colspan + 3; ?>
diff --git a/templates/privileges/edit_routine_privileges.phtml b/templates/privileges/edit_routine_privileges.phtml
index ee79fecdf1..dbb849a4ca 100644
--- a/templates/privileges/edit_routine_privileges.phtml
+++ b/templates/privileges/edit_routine_privileges.phtml
@@ -1,7 +1,7 @@
 <div id="edit_user_dialog">
     <?= $header; ?>
     <form class="submenu-item" name="usersForm" id="addUsersForm" action="server_privileges.php" method="post">
-        <?= PMA_URL_getHiddenInputs(); ?>
+        <?= PMA\libraries\URL::getHiddenInputs(); ?>
         <input type="hidden" name="username" value="<?= htmlspecialchars($username); ?>">
         <input type="hidden" name="hostname" value="<?= htmlspecialchars($hostname); ?>">
         <input type="hidden" name="dbname" value="<?= htmlspecialchars($database); ?>">
@@ -23,4 +23,4 @@
             <input type="submit" value="Go">
         </fieldset>
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/privileges/privileges_summary.phtml b/templates/privileges/privileges_summary.phtml
index cc764cd32c..0301563c9c 100644
--- a/templates/privileges/privileges_summary.phtml
+++ b/templates/privileges/privileges_summary.phtml
@@ -1,6 +1,6 @@
 <?php use PMA\libraries\Template; ?>
 <form class="submenu-item" action="server_privileges.php" id="<?= $formId; ?>" method="post">
-    <?= PMA_URL_getHiddenInputs(); ?>
+    <?= PMA\libraries\URL::getHiddenInputs(); ?>
     <input type="hidden" name="username" value="<?= htmlspecialchars($userName); ?>" />
     <input type="hidden" name="hostname" value="<?= htmlspecialchars($hostName); ?>" />
 
@@ -65,4 +65,4 @@
     <fieldset class="tblFooters">
         <input type="submit" value="<?= __('Go'); ?>" />
     </fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/templates/server/binlog/log_selector.phtml b/templates/server/binlog/log_selector.phtml
index 32012399e2..fe081e6ddf 100644
--- a/templates/server/binlog/log_selector.phtml
+++ b/templates/server/binlog/log_selector.phtml
@@ -1,5 +1,5 @@
 <form action="server_binlog.php" method="get">
-    <?= PMA_URL_getHiddenInputs($url_params); ?>
+    <?= PMA\libraries\URL::getHiddenInputs($url_params); ?>
     <fieldset>
         <legend>
             <?= __('Select binary log to view'); ?>
@@ -24,4 +24,4 @@
     <fieldset class="tblFooters">
         <input type="submit" value="<?= __('Go'); ?>" />
     </fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/templates/server/databases/create.phtml b/templates/server/databases/create.phtml
index 90355aefd7..f3d15b4998 100644
--- a/templates/server/databases/create.phtml
+++ b/templates/server/databases/create.phtml
@@ -9,7 +9,7 @@
                 </strong>
                 <br />
 
-                <?= PMA_URL_getHiddenInputs('', '', 5); ?>
+                <?= \PMA\libraries\URL::getHiddenInputs('', '', 5); ?>
                 <input type="hidden" name="reload" value="1" />
                 <?php if (! empty($dbstats)): ?>
                     <input type="hidden" name="dbstats" value="1" />
@@ -33,4 +33,4 @@
             </span>
         <?php endif; ?>
     </li>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/templates/server/databases/table_header.phtml b/templates/server/databases/table_header.phtml
index ed8fbf21bf..598e45827f 100644
--- a/templates/server/databases/table_header.phtml
+++ b/templates/server/databases/table_header.phtml
@@ -4,7 +4,7 @@
             <th></th>
         <?php endif; ?>
         <th>
-            <a href="server_databases.php<?= PMA_URL_getCommon($_url_params); ?>">
+            <a href="server_databases.php<?= \PMA\libraries\URL::getCommon($_url_params); ?>">
                 <?= __('Database'); ?>
                 <?= ($sort_by == 'SCHEMA_NAME' ?  \PMA\libraries\Util::getImage('s_' . $sort_order . '.png', $sort_order_text) : ''); ?>
             </a>
@@ -17,7 +17,7 @@
             $_url_params['sort_order'] = ($sort_by == $stat_name && $sort_order == 'desc') ? 'asc' : 'desc'; ?>
 
             <th <?php if ($stat['format'] === 'byte'): ?>colspan="2"<?php endif; ?>>
-                <a href="server_databases.php<?= PMA_URL_getCommon($_url_params); ?>">
+                <a href="server_databases.php<?= \PMA\libraries\URL::getCommon($_url_params); ?>">
                     <?= $stat['disp_name']; ?>
                     <?= ($sort_by == $stat_name ?  \PMA\libraries\Util::getImage('s_' . $sort_order . '.png', $sort_order_text) : ''); ?>
                 </a>
@@ -37,4 +37,4 @@
             <?= __('Action'); ?>
         </th>
     </tr>
-</thead>
\ No newline at end of file
+</thead>
diff --git a/templates/server/engines/engine.phtml b/templates/server/engines/engine.phtml
index 3c055295cf..c06be8af9c 100644
--- a/templates/server/engines/engine.phtml
+++ b/templates/server/engines/engine.phtml
@@ -14,7 +14,7 @@
             <?php if (empty($_REQUEST['page'])): ?>
                 <strong><?= __('Variables'); ?></strong>
             <?php else: ?>
-                <a href="server_engines.php<?= PMA_URL_getCommon(array('engine' => $_REQUEST['engine'])); ?>">
+                <a href="server_engines.php<?= \PMA\libraries\URL::getCommon(array('engine' => $_REQUEST['engine'])); ?>">
                     <?= __('Variables'); ?>
                 </a>
             <?php endif; ?>
@@ -23,7 +23,7 @@
                 <?php if (isset($_REQUEST['page']) && $_REQUEST['page'] == $current): ?>
                     <strong><?= htmlspecialchars($label); ?></strong>
                 <?php else: ?>
-                    <a href="server_engines.php<?= PMA_URL_getCommon(array('engine' => $_REQUEST['engine'], 'page' => $current)); ?>">
+                    <a href="server_engines.php<?= \PMA\libraries\URL::getCommon(array('engine' => $_REQUEST['engine'], 'page' => $current)); ?>">
                         <?= htmlspecialchars($label); ?>
                     </a>
                 <?php endif; ?>
@@ -39,4 +39,4 @@
         <?= $support; ?>
     </p>
     <?= $variables; ?>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/templates/server/engines/engines.phtml b/templates/server/engines/engines.phtml
index db92474b68..b0062f296e 100644
--- a/templates/server/engines/engines.phtml
+++ b/templates/server/engines/engines.phtml
@@ -13,7 +13,7 @@
                 <?= $details['Support'] == 'NO' || $details['Support'] == 'DISABLED' ? ' disabled' : ''; ?>
                 <?= $details['Support'] == 'DEFAULT' ? ' marked' : ''; ?>">
                 <td>
-                    <a rel="newpage" href="server_engines.php<?= PMA_URL_getCommon(array('engine' => $engine)); ?>">
+                    <a rel="newpage" href="server_engines.php<?= \PMA\libraries\URL::getCommon(array('engine' => $engine)); ?>">
                         <?= htmlspecialchars($details['Engine']); ?>
                     </a>
                 </td>
@@ -22,4 +22,4 @@
             <?php $odd_row = !$odd_row; ?>
         <?php endforeach; ?>
     </tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/templates/table/chart/tbl_chart.phtml b/templates/table/chart/tbl_chart.phtml
index 673f9a71d6..786e1a84a7 100644
--- a/templates/table/chart/tbl_chart.phtml
+++ b/templates/table/chart/tbl_chart.phtml
@@ -1,4 +1,3 @@
-<?php require_once 'libraries/url_generating.lib.php'; ?>
 <script type="text/javascript">
     pma_token = '<?= $_SESSION[' PMA_token ']; ?>';
     url_query = '<?= $url_query; ?>';
@@ -6,7 +5,7 @@
 <!-- Display Chart options -->
 <div id="div_view_options">
     <form method="post" id="tblchartform" action="tbl_chart.php" class="ajax">
-        <?= PMA_URL_getHiddenInputs($url_params); ?>
+        <?= \PMA\libraries\URL::getHiddenInputs($url_params); ?>
         <fieldset>
             <legend>
                 <?= __('Display chart'); ?>
@@ -159,4 +158,4 @@
             </div>
         </fieldset>
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/table/gis_visualization/gis_visualization.phtml b/templates/table/gis_visualization/gis_visualization.phtml
index d62c46b00c..1ffc16c0bf 100644
--- a/templates/table/gis_visualization/gis_visualization.phtml
+++ b/templates/table/gis_visualization/gis_visualization.phtml
@@ -3,7 +3,7 @@
         <legend><?= __('Display GIS Visualization'); ?></legend>
         <div id="gis_div" style="position:relative;">
             <form method="post" action="tbl_gis_visualization.php">
-                <?= PMA_URL_getHiddenInputs($url_params); ?>
+                <?= \PMA\libraries\URL::getHiddenInputs($url_params); ?>
                 <label for="labelColumn">
                     <?= __("Label column"); ?>
                 </label>
diff --git a/templates/table/index_form.phtml b/templates/table/index_form.phtml
index f0f28483a8..594973b0e5 100644
--- a/templates/table/index_form.phtml
+++ b/templates/table/index_form.phtml
@@ -5,7 +5,7 @@
       class="ajax"
       onsubmit="if (typeof(this.elements['index[Key_name]'].disabled) != 'undefined') this.elements['index[Key_name]'].disabled = false;">
 
-    <?= PMA_URL_getHiddenInputs($form_params); ?>
+    <?= PMA\libraries\URL::getHiddenInputs($form_params); ?>
 
     <fieldset id="index_edit_fields">
         <div class="index_info">
@@ -242,4 +242,4 @@
         <button type="submit" id="preview_index_frm"><?= __('Preview SQL'); ?></button>
         <input type="submit" id="save_index_frm" value="<?= __('Go'); ?>" />
     </fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/templates/table/relation/common_form.phtml b/templates/table/relation/common_form.phtml
index b09e97350c..7bf611b1be 100644
--- a/templates/table/relation/common_form.phtml
+++ b/templates/table/relation/common_form.phtml
@@ -1,5 +1,5 @@
 <form method="post" action="tbl_relation.php">
-    <?= PMA_URL_getHiddenInputs($db, $table); ?>
+    <?= PMA\libraries\URL::getHiddenInputs($db, $table); ?>
     <!-- InnoDB  -->
     <?php if (PMA\libraries\Util::isForeignKeySupported($tbl_storage_engine)): ?>
         <fieldset>
@@ -126,4 +126,4 @@
         <input type="button" class="preview_sql" value="<?= __('Preview SQL'); ?>" />
         <input type="submit" value="<?= __('Save'); ?>" />
     </fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/templates/table/relation/foreign_key_row.phtml b/templates/table/relation/foreign_key_row.phtml
index 5f02bb0fd4..d0f3c59b9a 100644
--- a/templates/table/relation/foreign_key_row.phtml
+++ b/templates/table/relation/foreign_key_row.phtml
@@ -2,6 +2,7 @@
 use PMA\libraries\DatabaseInterface;
 use PMA\libraries\Table;
 use PMA\libraries\Util;
+use PMA\libraries\URL;
 
 $js_msg = '';
 $this_params = null;
@@ -71,7 +72,7 @@ if ($foreign_db) {
                    class="drop_foreign_key_msg"
                    value="<?= $js_msg; ?>" />
             <a class="drop_foreign_key_anchor ajax"
-               href="sql.php<?= PMA_URL_getCommon($this_params); ?>" >
+               href="sql.php<?= URL::getCommon($this_params); ?>" >
                 <?= PMA\libraries\Util::getIcon('b_drop.png', __('Drop')); ?>
             </a>
         <?php endif; ?>
@@ -195,4 +196,4 @@ if ($foreign_db) {
             </span>
         <?php endif; ?>
     </td>
-</tr>
\ No newline at end of file
+</tr>
diff --git a/templates/table/search/form_tag.phtml b/templates/table/search/form_tag.phtml
index dfe730e791..2de0ab3461 100644
--- a/templates/table/search/form_tag.phtml
+++ b/templates/table/search/form_tag.phtml
@@ -17,6 +17,6 @@ switch ($searchType) {
 }
 ?>
 <form method="post" action="<?= $scriptName; ?>" name="insertForm" id="<?= $formId; ?>" class="ajax lock-page">
-    <?= PMA_URL_getHiddenInputs($db, $table); ?>
+    <?= \PMA\libraries\URL::getHiddenInputs($db, $table); ?>
     <input type="hidden" name="goto" value="<?= $goto; ?>" />
-    <input type="hidden" name="back" value="<?= $scriptName; ?>" />
\ No newline at end of file
+    <input type="hidden" name="back" value="<?= $scriptName; ?>" />
diff --git a/templates/table/search/input_box.phtml b/templates/table/search/input_box.phtml
index a9bda7639d..6f4080c9f4 100644
--- a/templates/table/search/input_box.phtml
+++ b/templates/table/search/input_box.phtml
@@ -23,7 +23,7 @@ if ($_foreigners
                    value="<?= $criteriaValues[$column_index]; ?>"
                <?php endif; ?> />
         <a class="ajax browse_foreign"
-           href="<?= ('browse_foreigners.php') , PMA_URL_getCommon(array('db' => $db, 'table' => $table))
+           href="<?= ('browse_foreigners.php') , PMA\libraries\URL::getCommon(array('db' => $db, 'table' => $table))
                     , ('&amp;field=') , urlencode($column_name)
                     , ('&amp;fieldkey=') , $column_index
                     , ('&amp;fromsearch=1')
@@ -42,7 +42,7 @@ if ($_foreigners
     <?php if ($in_fbs): ?>
 
         <?php
-        $edit_url = 'gis_data_editor.php' . PMA_URL_getCommon();
+        $edit_url = 'gis_data_editor.php' . PMA\libraries\URL::getCommon();
         $edit_str = PMA\libraries\Util::getIcon('b_edit.png', __('Edit/Insert'));
         ?>
 
@@ -129,4 +129,4 @@ if ($_foreigners
                value="<?= $criteriaValues[$column_index]; ?>"
            <?php endif; ?>/>
 
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/templates/table/search/replace_preview.phtml b/templates/table/search/replace_preview.phtml
index 785ee2012b..48449143f0 100644
--- a/templates/table/search/replace_preview.phtml
+++ b/templates/table/search/replace_preview.phtml
@@ -2,7 +2,7 @@
       action="tbl_find_replace.php"
       name="previewForm"
       id="previewForm">
-    <?= PMA_URL_getHiddenInputs($db, $table); ?>
+    <?= \PMA\libraries\URL::getHiddenInputs($db, $table); ?>
     <input type="hidden" name="replace" value="true" />
     <input type="hidden" name="columnIndex" value="<?= $columnIndex; ?>" />
     <input type="hidden" name="findString" value="<?= htmlspecialchars($find); ?>" />
@@ -39,4 +39,4 @@
     <fieldset class="tblFooters">
         <input type="submit" name="replace" value="<?= __('Replace'); ?>" />
     </fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/templates/table/search/zoom_result_form.phtml b/templates/table/search/zoom_result_form.phtml
index eb52de0057..5e17501150 100644
--- a/templates/table/search/zoom_result_form.phtml
+++ b/templates/table/search/zoom_result_form.phtml
@@ -1,5 +1,5 @@
 <form method="post" action="tbl_zoom_select.php" name="displayResultForm" id="zoom_display_form" class="ajax">
-    <?= PMA_URL_getHiddenInputs($_db, $_table); ?>
+    <?= \PMA\libraries\URL::getHiddenInputs($_db, $_table); ?>
     <input type="hidden" name="goto" value="<?= $goto; ?>" />
     <input type="hidden" name="back" value="tbl_zoom_select.php" />
 
@@ -96,4 +96,4 @@
             </table>
         </div>
         <input type="hidden" id="queryID" name="sql_query" />
-</form>
\ No newline at end of file
+</form>
diff --git a/templates/table/structure/add_column.phtml b/templates/table/structure/add_column.phtml
index 18348868e2..8ac7ed1cc0 100644
--- a/templates/table/structure/add_column.phtml
+++ b/templates/table/structure/add_column.phtml
@@ -1,5 +1,5 @@
 <form method="post" action="tbl_addfield.php" id="addColumns" name="addColumns" onsubmit="return checkFormElementInRange(this, 'num_fields', '<?= str_replace('\'', '\\\'', __('You have to add at least one column.')); ?>', 1)">
-    <?= PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']); ?>
+    <?= PMA\libraries\URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']); ?>
     <?php if (PMA\libraries\Util::showIcons('ActionLinksMode')): ?>
         <?= PMA\libraries\Util::getImage('b_insrow.png', __('Add column')); ?>&nbsp;
     <?php endif; ?>
@@ -23,4 +23,4 @@
         <?php endforeach; ?>
     </select>
     <input type="submit" value="<?= __('Go'); ?>" />
-</form>
\ No newline at end of file
+</form>
diff --git a/templates/table/structure/display_partitions.phtml b/templates/table/structure/display_partitions.phtml
index fd5b82d273..116c98dced 100644
--- a/templates/table/structure/display_partitions.phtml
+++ b/templates/table/structure/display_partitions.phtml
@@ -1,5 +1,6 @@
 <?php use PMA\libraries\Message;
-use PMA\libraries\Util; ?>
+use PMA\libraries\Util;
+use PMA\libraries\URL; ?>
 <div id="partitions">
     <fieldset>
         <legend><?= __('Partitions')
@@ -129,7 +130,7 @@ use PMA\libraries\Util; ?>
     </fieldset>
     <fieldset class="tblFooters print_ignore">
         <form action="tbl_structure.php" method="post">
-            <?= PMA_URL_getHiddenInputs($db, $table); ?>
+            <?= URL::getHiddenInputs($db, $table); ?>
             <input type="hidden" name="edit_partitioning" value="true" />
             <?php if (empty($partitions)): ?>
                 <input type="submit" name="edit_partitioning" value="<?= __('Partition table'); ?>" />
@@ -139,4 +140,4 @@ use PMA\libraries\Util; ?>
             <?php endif; ?>
         </form>
     </fieldset>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/table/structure/display_structure.phtml b/templates/table/structure/display_structure.phtml
index ceece39f02..07ee204c22 100644
--- a/templates/table/structure/display_structure.phtml
+++ b/templates/table/structure/display_structure.phtml
@@ -2,10 +2,11 @@
 use PMA\libraries\Partition;
 use PMA\libraries\Template;
 use PMA\libraries\Util;
+use PMA\libraries\URL;
 
 $rownum = 0; $odd_row = true; ?>
 <form method="post" action="tbl_structure.php" name="fieldsForm" id="fieldsForm" class="ajax<?= $HideStructureActions; ?>">
-    <?= PMA_URL_getHiddenInputs($db, $table); ?>
+    <?= URL::getHiddenInputs($db, $table); ?>
     <input type="hidden" name="table_type" value=
     <?php if ($db_is_system_schema): ?>
         "information_schema" />
@@ -222,4 +223,4 @@ $rownum = 0; $odd_row = true; ?>
 <?php if ($GLOBALS['cfg']['ShowStats']): ?>
     <?= $tablestats;  ?>
 <?php endif; ?>
-<div class="clearfloat"></div>
\ No newline at end of file
+<div class="clearfloat"></div>
diff --git a/templates/table/structure/move_columns_dialog.phtml b/templates/table/structure/move_columns_dialog.phtml
index 8e6d5c652b..fe3f072a4b 100644
--- a/templates/table/structure/move_columns_dialog.phtml
+++ b/templates/table/structure/move_columns_dialog.phtml
@@ -1,8 +1,8 @@
 <div id="move_columns_dialog" title="<?= __('Move columns'); ?>" style="display: none">
     <p><?= __('Move the columns by dragging them up and down.'); ?></p>
     <form action="tbl_structure.php">
-        <div><?= PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']); ?>
+        <div><?= PMA\libraries\URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']); ?>
             <ul></ul>
         </div>
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/table/structure/partition_definition_form.phtml b/templates/table/structure/partition_definition_form.phtml
index 22a44b7768..6997d2991e 100644
--- a/templates/table/structure/partition_definition_form.phtml
+++ b/templates/table/structure/partition_definition_form.phtml
@@ -1,6 +1,6 @@
 <form action="tbl_structure.php" method="post">
 
-    <?= PMA_URL_getHiddenInputs($db, $table); ?>
+    <?= PMA\libraries\URL::getHiddenInputs($db, $table); ?>
     <input type="hidden" name="edit_partitioning" value="true" />
 
     <fieldset>
@@ -10,4 +10,4 @@
     <fieldset class="tblFooters">
         <input type="submit" name="save_partitioning" value="<?= __('Save'); ?>">
     </fieldset>
-</form>
\ No newline at end of file
+</form>
diff --git a/test/classes/AdvisorTest.php b/test/classes/AdvisorTest.php
index 3d54ec209f..728e006ba4 100644
--- a/test/classes/AdvisorTest.php
+++ b/test/classes/AdvisorTest.php
@@ -9,7 +9,6 @@
 /*
  * Include to test.
  */
-require_once 'libraries/url_generating.lib.php';
 require_once 'test/PMATestCase.php';
 
 use PMA\libraries\Advisor;
diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php
index c161e19b72..944315f0da 100644
--- a/test/classes/ConfigTest.php
+++ b/test/classes/ConfigTest.php
@@ -13,7 +13,6 @@
 use PMA\libraries\Theme;
 
 require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
diff --git a/test/classes/DbSearchTest.php b/test/classes/DbSearchTest.php
index 99b9d84c8a..caa0f13901 100644
--- a/test/classes/DbSearchTest.php
+++ b/test/classes/DbSearchTest.php
@@ -9,7 +9,6 @@
  * Include to test.
  */
 
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/DisplayResultsTest.php b/test/classes/DisplayResultsTest.php
index ae0a85063d..f7b16d7ac1 100644
--- a/test/classes/DisplayResultsTest.php
+++ b/test/classes/DisplayResultsTest.php
@@ -10,7 +10,6 @@
  */
 use PMA\libraries\plugins\transformations\Text_Plain_Link;
 
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/string.lib.php';
diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php
index 3c5a3c6e94..a878f5582f 100644
--- a/test/classes/FooterTest.php
+++ b/test/classes/FooterTest.php
@@ -12,7 +12,6 @@
 use PMA\libraries\Theme;
 
 require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/relation.lib.php';
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/HeaderTest.php b/test/classes/HeaderTest.php
index b574a96881..455f10945c 100644
--- a/test/classes/HeaderTest.php
+++ b/test/classes/HeaderTest.php
@@ -13,7 +13,6 @@ use PMA\libraries\Theme;
 
 require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/js_escape.lib.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/MenuTest.php b/test/classes/MenuTest.php
index 75480cd898..3e4e3c1144 100644
--- a/test/classes/MenuTest.php
+++ b/test/classes/MenuTest.php
@@ -14,7 +14,6 @@ use PMA\libraries\Theme;
 
 require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/relation.lib.php';
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/ScriptsTest.php b/test/classes/ScriptsTest.php
index 16da6b7b28..fdd24d797c 100644
--- a/test/classes/ScriptsTest.php
+++ b/test/classes/ScriptsTest.php
@@ -13,7 +13,6 @@
 use PMA\libraries\Scripts;
 
 require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
diff --git a/test/classes/ServerStatusDataTest.php b/test/classes/ServerStatusDataTest.php
index a2db8b580f..c39ba07a56 100644
--- a/test/classes/ServerStatusDataTest.php
+++ b/test/classes/ServerStatusDataTest.php
@@ -11,7 +11,6 @@
  */
 use PMA\libraries\ServerStatusData;
 
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/TableTest.php b/test/classes/TableTest.php
index 6d898755e6..ae83e02109 100644
--- a/test/classes/TableTest.php
+++ b/test/classes/TableTest.php
@@ -15,7 +15,6 @@ use PMA\libraries\Util;
 
 require_once 'libraries/mysql_charsets.lib.php';
 require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/relation.lib.php';
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/ThemeManagerTest.php b/test/classes/ThemeManagerTest.php
index 8bfd14505f..cf1308116e 100644
--- a/test/classes/ThemeManagerTest.php
+++ b/test/classes/ThemeManagerTest.php
@@ -11,7 +11,6 @@
  */
 use PMA\libraries\ThemeManager;
 
-require_once 'libraries/url_generating.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
diff --git a/test/classes/ThemeTest.php b/test/classes/ThemeTest.php
index f84174d276..2ea59298ac 100644
--- a/test/classes/ThemeTest.php
+++ b/test/classes/ThemeTest.php
@@ -7,7 +7,6 @@
  */
 use PMA\libraries\Theme;
 
-require_once 'libraries/url_generating.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
diff --git a/test/libraries/PMA_generateCommonUrl_test.php b/test/classes/URL.php
similarity index 78%
rename from test/libraries/PMA_generateCommonUrl_test.php
rename to test/classes/URL.php
index a602d9f25c..67126ad876 100644
--- a/test/libraries/PMA_generateCommonUrl_test.php
+++ b/test/classes/URL.php
@@ -1,18 +1,17 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA_URL_getCommon()
+ * tests for URL::getCommon()
  *
  * @package PhpMyAdmin-test
  */
-
 /*
- * Include to test.
+ * Include to text.
  */
-require_once 'libraries/url_generating.lib.php';
+use PMA\libraries\URL;
 
 /**
- * tests for PMA_URL_getCommon()
+ * tests for URL::getCommon()
  *
  * @package PhpMyAdmin-test
  */
@@ -32,7 +31,7 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test for PMA_URL_getCommon for DB only
+     * Test for URL::getCommon for DB only
      *
      * @return void
      */
@@ -42,7 +41,7 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['collation_connection'] = 'x';
         $GLOBALS['cfg']['ServerDefault'] = 'y';
 
-        $separator = PMA_URL_getArgSeparator();
+        $separator = URL::getArgSeparator();
         $expected = 'server=x' . htmlentities($separator)
             . 'lang=en' . htmlentities($separator)
             . 'collation_connection=x' . htmlentities($separator)
@@ -52,11 +51,11 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
         $expected = '?db=db'
             . htmlentities($separator) . $expected;
 
-        $this->assertEquals($expected, PMA_URL_getCommon(array('db' => 'db')));
+        $this->assertEquals($expected, URL::getCommon(array('db' => 'db')));
     }
 
     /**
-     * Test for PMA_URL_getCommon with new style
+     * Test for URL::getCommon with new style
      *
      * @return void
      */
@@ -66,7 +65,7 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['collation_connection'] = 'x';
         $GLOBALS['cfg']['ServerDefault'] = 'y';
 
-        $separator = PMA_URL_getArgSeparator();
+        $separator = URL::getArgSeparator();
         $expected = 'server=x' . htmlentities($separator)
             . 'lang=en' . htmlentities($separator)
             . 'collation_connection=x' . htmlentities($separator)
@@ -77,11 +76,11 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
             . htmlentities($separator) . 'table=table'
             . htmlentities($separator) . $expected;
         $params = array('db' => 'db', 'table' => 'table');
-        $this->assertEquals($expected, PMA_URL_getCommon($params));
+        $this->assertEquals($expected, URL::getCommon($params));
     }
 
     /**
-     * Test for PMA_URL_getCommon with alternate divider
+     * Test for URL::getCommon with alternate divider
      *
      * @return void
      */
@@ -91,7 +90,7 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['collation_connection'] = 'x';
         $GLOBALS['cfg']['ServerDefault'] = 'y';
 
-        $separator = PMA_URL_getArgSeparator();
+        $separator = URL::getArgSeparator();
         $expected = 'server=x' . $separator
             . 'lang=en' . $separator
             . 'collation_connection=x' . $separator
@@ -102,14 +101,14 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
             . $expected;
         $this->assertEquals(
             $expected,
-            PMA_URL_getCommon(
+            URL::getCommon(
                 array('db' => 'db', 'table' => 'table'), 'text', '#ABC#'
             )
         );
     }
 
     /**
-     * Test for PMA_URL_getCommon
+     * Test for URL::getCommon
      *
      * @return void
      */
@@ -119,12 +118,12 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['collation_connection'] = 'x';
         $GLOBALS['cfg']['ServerDefault'] = 'y';
 
-        $separator = PMA_URL_getArgSeparator();
+        $separator = URL::getArgSeparator();
         $expected = '?server=x' . htmlentities($separator)
             . 'lang=en' . htmlentities($separator)
             . 'collation_connection=x' . htmlentities($separator)
             . 'token=token'
             ;
-        $this->assertEquals($expected, PMA_URL_getCommon());
+        $this->assertEquals($expected, URL::getCommon());
     }
 }
diff --git a/test/classes/controllers/ServerBinlogControllerTest.php b/test/classes/controllers/ServerBinlogControllerTest.php
index 1c8d50e5f8..d1a1d76f77 100644
--- a/test/classes/controllers/ServerBinlogControllerTest.php
+++ b/test/classes/controllers/ServerBinlogControllerTest.php
@@ -12,7 +12,6 @@ use PMA\libraries\di\Container;
 use PMA\libraries\Util;
 
 require_once 'test/PMATestCase.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/js_escape.lib.php';
diff --git a/test/classes/controllers/ServerCollationsControllerTest.php b/test/classes/controllers/ServerCollationsControllerTest.php
index 9659a72b9a..7e8a28d7c3 100644
--- a/test/classes/controllers/ServerCollationsControllerTest.php
+++ b/test/classes/controllers/ServerCollationsControllerTest.php
@@ -27,9 +27,6 @@ $GLOBALS['cfg']['Server'] = array(
 
 
 
-require_once 'libraries/url_generating.lib.php';
-
-
 require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/classes/controllers/ServerDatabasesControllerTest.php b/test/classes/controllers/ServerDatabasesControllerTest.php
index fd9375235d..f1959b3430 100644
--- a/test/classes/controllers/ServerDatabasesControllerTest.php
+++ b/test/classes/controllers/ServerDatabasesControllerTest.php
@@ -9,7 +9,6 @@
 use PMA\libraries\di\Container;
 use PMA\libraries\Theme;
 
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/mysql_charsets.lib.php';
 
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/classes/controllers/ServerEnginesControllerTest.php b/test/classes/controllers/ServerEnginesControllerTest.php
index 797c1e4f29..703c77bea5 100644
--- a/test/classes/controllers/ServerEnginesControllerTest.php
+++ b/test/classes/controllers/ServerEnginesControllerTest.php
@@ -9,8 +9,7 @@
 use PMA\libraries\StorageEngine;
 use PMA\libraries\Theme;
 use PMA\libraries\controllers\server\ServerEnginesController;
-
-require_once 'libraries/url_generating.lib.php';
+use PMA\libraries\URL;
 
 require_once 'libraries/database_interface.inc.php';
 
@@ -143,7 +142,7 @@ class ServerEnginesControllerTest extends PMATestCase
             $html
         );
         $this->assertContains(
-            PMA_URL_getCommon(
+            URL::getCommon(
                 array('engine' => $_REQUEST['engine'], 'page' => "Documentation")
             ),
             $html
@@ -151,7 +150,7 @@ class ServerEnginesControllerTest extends PMATestCase
 
         //validate 5: other items
         $this->assertContains(
-            PMA_URL_getCommon(array('engine' => $_REQUEST['engine'])),
+            URL::getCommon(array('engine' => $_REQUEST['engine'])),
             $html
         );
         $this->assertContains(
diff --git a/test/classes/controllers/ServerVariablesControllerTest.php b/test/classes/controllers/ServerVariablesControllerTest.php
index f021246b9a..b747e73d06 100644
--- a/test/classes/controllers/ServerVariablesControllerTest.php
+++ b/test/classes/controllers/ServerVariablesControllerTest.php
@@ -8,8 +8,8 @@
 
 use PMA\libraries\di\Container;
 use PMA\libraries\Theme;
+use PMA\libraries\URL;
 
-require_once 'libraries/url_generating.lib.php';
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/libraries/stubs/ResponseStub.php';
@@ -170,7 +170,7 @@ class ServerVariablesControllerTest extends PMATestCase
 
         //Call the test function
         $html = $method->invoke($ctrl);
-        $url = 'server_variables.php' . PMA_URL_getCommon(array());
+        $url = 'server_variables.php' . URL::getCommon(array());
 
         //validate 1: URL
         $this->assertContains(
diff --git a/test/classes/controllers/TableIndexesControllerTest.php b/test/classes/controllers/TableIndexesControllerTest.php
index 2bb3dac7d1..217b69376f 100644
--- a/test/classes/controllers/TableIndexesControllerTest.php
+++ b/test/classes/controllers/TableIndexesControllerTest.php
@@ -9,6 +9,7 @@
 use PMA\libraries\controllers\table\TableIndexesController;
 use PMA\libraries\di\Container;
 use PMA\libraries\Theme;
+use PMA\libraries\URL;
 
 /*
  * Include to test.
@@ -20,7 +21,6 @@ use PMA\libraries\Theme;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
 
 require_once 'libraries/sanitizing.lib.php';
 require_once 'test/libraries/stubs/ResponseStub.php';
@@ -167,9 +167,9 @@ class TableIndexesControllerTest extends PMATestCase
         $ctrl->displayFormAction();
         $html = $response->getHTMLResult();
 
-        //PMA_URL_getHiddenInputs
+        //URL::getHiddenInputs
         $this->assertContains(
-            PMA_URL_getHiddenInputs(
+            URL::getHiddenInputs(
                 array(
                     'db' => 'db',
                     'table' => 'table',
diff --git a/test/classes/controllers/TableRelationControllerTest.php b/test/classes/controllers/TableRelationControllerTest.php
index b32fdefe16..d380b870ee 100644
--- a/test/classes/controllers/TableRelationControllerTest.php
+++ b/test/classes/controllers/TableRelationControllerTest.php
@@ -12,7 +12,6 @@
 use PMA\libraries\di\Container;
 use PMA\libraries\Theme;
 
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/relation.lib.php';
 require_once 'test/libraries/stubs/ResponseStub.php';
diff --git a/test/classes/dbi/DBIMysqlTest.php b/test/classes/dbi/DBIMysqlTest.php
index 8c49303611..2a296e5b70 100644
--- a/test/classes/dbi/DBIMysqlTest.php
+++ b/test/classes/dbi/DBIMysqlTest.php
@@ -12,7 +12,6 @@
 use PMA\libraries\dbi\DBIMysql;
 
 require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'test/PMATestCase.php';
 
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/classes/dbi/DBIMysqliTest.php b/test/classes/dbi/DBIMysqliTest.php
index c290248d69..45f0152515 100644
--- a/test/classes/dbi/DBIMysqliTest.php
+++ b/test/classes/dbi/DBIMysqliTest.php
@@ -12,7 +12,6 @@ use PMA\libraries\dbi\DBIMysqli;
 use PMA\libraries\Theme;
 
 require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/navigation/NavigationTest.php b/test/classes/navigation/NavigationTest.php
index 3b5a468663..ee621a98c9 100644
--- a/test/classes/navigation/NavigationTest.php
+++ b/test/classes/navigation/NavigationTest.php
@@ -7,10 +7,10 @@
  */
 
 use PMA\libraries\Theme;
+use PMA\libraries\URL;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
@@ -145,7 +145,7 @@ class NavigationTest extends PMATestCase
             $html
         );
         $this->assertContains(
-            '<a href="navigation.php' . PMA_URL_getCommon()
+            '<a href="navigation.php' . URL::getCommon()
             . '&unhideNavItem=true&itemType=table&itemName=tableName&dbName=db"'
             . ' class="unhideNavItem ajax">',
             $html
diff --git a/test/classes/navigation/NavigationTreeTest.php b/test/classes/navigation/NavigationTreeTest.php
index 72677a2fb5..d8a17278d0 100644
--- a/test/classes/navigation/NavigationTreeTest.php
+++ b/test/classes/navigation/NavigationTreeTest.php
@@ -18,7 +18,6 @@ $GLOBALS['cfg']['Server']['DisableIS'] = false;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/check_user_privileges.lib.php';
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/navigation/NodeDatabaseChildTest.php b/test/classes/navigation/NodeDatabaseChildTest.php
index 670662d201..f7963a03df 100644
--- a/test/classes/navigation/NodeDatabaseChildTest.php
+++ b/test/classes/navigation/NodeDatabaseChildTest.php
@@ -9,8 +9,8 @@
 use PMA\libraries\navigation\NodeFactory;
 use PMA\libraries\navigation\nodes\NodeDatabaseChild;
 use PMA\libraries\Theme;
+use PMA\libraries\URL;
 
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/relation.lib.php';
 require_once 'test/PMATestCase.php';
 
@@ -80,7 +80,7 @@ class NodeDatabaseChildTest extends PMATestCase
             $html
         );
         $this->assertContains(
-            '<a href="navigation.php' . PMA_URL_getCommon()
+            '<a href="navigation.php' . URL::getCommon()
             . '&hideNavItem=true&itemType=itemType&itemName=child'
             . '&dbName=parent" class="hideNavItem ajax">',
             $html
diff --git a/test/classes/plugin/import/ImportCsvTest.php b/test/classes/plugin/import/ImportCsvTest.php
index ebcd90dce3..0026ae0b98 100644
--- a/test/classes/plugin/import/ImportCsvTest.php
+++ b/test/classes/plugin/import/ImportCsvTest.php
@@ -17,7 +17,6 @@ $GLOBALS['server'] = 0;
 /*
  * Include to test.
  */
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/import.lib.php';
 require_once 'libraries/sanitizing.lib.php';
diff --git a/test/classes/plugin/import/ImportLdiTest.php b/test/classes/plugin/import/ImportLdiTest.php
index e3ac23bf4b..be8f085e46 100644
--- a/test/classes/plugin/import/ImportLdiTest.php
+++ b/test/classes/plugin/import/ImportLdiTest.php
@@ -18,7 +18,6 @@ $GLOBALS['plugin_param'] = "table";
  * Include to test.
  */
 require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/import.lib.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/plugin/import/ImportMediawikiTest.php b/test/classes/plugin/import/ImportMediawikiTest.php
index 066cd5202d..3671b4684a 100644
--- a/test/classes/plugin/import/ImportMediawikiTest.php
+++ b/test/classes/plugin/import/ImportMediawikiTest.php
@@ -15,7 +15,6 @@ $GLOBALS['server'] = 0;
 /*
  * Include to test.
  */
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/import.lib.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/plugin/import/ImportOdsTest.php b/test/classes/plugin/import/ImportOdsTest.php
index 14e28aa169..f92cb7e4ce 100644
--- a/test/classes/plugin/import/ImportOdsTest.php
+++ b/test/classes/plugin/import/ImportOdsTest.php
@@ -16,7 +16,6 @@ $GLOBALS['server'] = 0;
 /*
  * Include to test.
  */
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/import.lib.php';
 require_once 'libraries/sanitizing.lib.php';
diff --git a/test/classes/plugin/import/ImportShpTest.php b/test/classes/plugin/import/ImportShpTest.php
index 26cfcebff6..061ffa73b9 100644
--- a/test/classes/plugin/import/ImportShpTest.php
+++ b/test/classes/plugin/import/ImportShpTest.php
@@ -13,7 +13,6 @@ use PMA\libraries\plugins\import\ImportShp;
 
 $GLOBALS['server'] = 0;
 
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/import.lib.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/plugin/import/ImportSqlTest.php b/test/classes/plugin/import/ImportSqlTest.php
index 2fa0238877..e231e55caa 100644
--- a/test/classes/plugin/import/ImportSqlTest.php
+++ b/test/classes/plugin/import/ImportSqlTest.php
@@ -16,7 +16,6 @@ $GLOBALS['server'] = 0;
 /*
  * Include to test.
  */
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/import.lib.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/plugin/import/ImportXmlTest.php b/test/classes/plugin/import/ImportXmlTest.php
index 70411cdc6c..adabc2846f 100644
--- a/test/classes/plugin/import/ImportXmlTest.php
+++ b/test/classes/plugin/import/ImportXmlTest.php
@@ -16,7 +16,6 @@ $GLOBALS['server'] = 0;
 /*
  * Include to test.
  */
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/import.lib.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/schema/DiaRelationSchemaTest.php b/test/classes/schema/DiaRelationSchemaTest.php
index 7fc96a3809..a7904a6d5e 100644
--- a/test/classes/schema/DiaRelationSchemaTest.php
+++ b/test/classes/schema/DiaRelationSchemaTest.php
@@ -11,7 +11,6 @@
 use PMA\libraries\plugins\schema\dia\DiaRelationSchema;
 
 require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/schema/EpsRelationSchemaTest.php b/test/classes/schema/EpsRelationSchemaTest.php
index eb269efbab..428d8d4e54 100644
--- a/test/classes/schema/EpsRelationSchemaTest.php
+++ b/test/classes/schema/EpsRelationSchemaTest.php
@@ -11,7 +11,6 @@
 use PMA\libraries\plugins\schema\eps\EpsRelationSchema;
 
 require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/schema/ExportRelationSchemaTest.php b/test/classes/schema/ExportRelationSchemaTest.php
index f20c0e94d6..c8526b6f38 100644
--- a/test/classes/schema/ExportRelationSchemaTest.php
+++ b/test/classes/schema/ExportRelationSchemaTest.php
@@ -12,7 +12,6 @@
 use PMA\libraries\plugins\schema\ExportRelationSchema;
 
 require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/schema/PdfRelationSchemaTest.php b/test/classes/schema/PdfRelationSchemaTest.php
index 8ce0df9a9d..1c3d0f612e 100644
--- a/test/classes/schema/PdfRelationSchemaTest.php
+++ b/test/classes/schema/PdfRelationSchemaTest.php
@@ -11,7 +11,6 @@
 use PMA\libraries\plugins\schema\pdf\PdfRelationSchema;
 
 require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/transformations.lib.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/schema/SvgRelationSchemaTest.php b/test/classes/schema/SvgRelationSchemaTest.php
index ebcabb755b..ce5f94ecb3 100644
--- a/test/classes/schema/SvgRelationSchemaTest.php
+++ b/test/classes/schema/SvgRelationSchemaTest.php
@@ -11,7 +11,6 @@
 use PMA\libraries\plugins\schema\svg\SvgRelationSchema;
 
 require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'test/PMATestCase.php';
 
diff --git a/test/libraries/PMA_FormDisplay_tpl_test.php b/test/libraries/PMA_FormDisplay_tpl_test.php
index 74d74b741c..a84f243948 100644
--- a/test/libraries/PMA_FormDisplay_tpl_test.php
+++ b/test/libraries/PMA_FormDisplay_tpl_test.php
@@ -10,7 +10,6 @@ use PMA\libraries\Theme;
 
 require_once 'libraries/config/FormDisplay.tpl.php';
 require_once 'libraries/user_preferences.lib.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/js_escape.lib.php';
 
 /**
diff --git a/test/libraries/PMA_browse_foreigners_test.php b/test/libraries/PMA_browse_foreigners_test.php
index a2eaa8353e..3d1917b331 100644
--- a/test/libraries/PMA_browse_foreigners_test.php
+++ b/test/libraries/PMA_browse_foreigners_test.php
@@ -11,8 +11,6 @@
  */
 require_once 'libraries/browse_foreigners.lib.php';
 
-require_once 'libraries/url_generating.lib.php';
-
 /**
  * Tests for libraries/browse_foreigners.lib.php
  *
diff --git a/test/libraries/PMA_central_columns_test.php b/test/libraries/PMA_central_columns_test.php
index 79017a5d78..81bc3c63e8 100644
--- a/test/libraries/PMA_central_columns_test.php
+++ b/test/libraries/PMA_central_columns_test.php
@@ -11,6 +11,7 @@
  */
 use PMA\libraries\Theme;
 use PMA\libraries\TypesMySQL;
+use PMA\libraries\URL;
 
 $GLOBALS['server'] = 1;
 
@@ -18,9 +19,6 @@ require_once 'libraries/database_interface.inc.php';
 
 require_once 'libraries/relation.lib.php';
 
-require_once 'libraries/url_generating.lib.php';
-
-
 require_once 'libraries/mysql_charsets.inc.php';
 require_once 'libraries/central_columns.lib.php';
 
@@ -455,7 +453,7 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
         $result_1 = PMA_getHTMLforTableNavigation(25, 10, 'phpmyadmin');
         $this->assertContains(
             '<form action="db_central_columns.php" method="post">'
-            . PMA_URL_getHiddenInputs(
+            . URL::getHiddenInputs(
                 'phpmyadmin'
             ),
             $result_1
@@ -564,7 +562,7 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
             $result
         );
         $this->assertContains(
-            PMA_URL_getHiddenInputs('phpmyadmin'),
+            URL::getHiddenInputs('phpmyadmin'),
             $result
         );
     }
@@ -658,7 +656,7 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase
             $result
         );
         $this->assertContains(
-            PMA_URL_getHiddenInputs('phpmyadmin')
+            URL::getHiddenInputs('phpmyadmin')
             . '<input type="hidden" name="add_column" value="add">'
             . '<input type="hidden" name="pos" value="0" />'
             . '<input type="hidden" name="total_rows" value="20"/>',
diff --git a/test/libraries/PMA_designer_test.php b/test/libraries/PMA_designer_test.php
index ffee48c1a1..847e832afe 100644
--- a/test/libraries/PMA_designer_test.php
+++ b/test/libraries/PMA_designer_test.php
@@ -9,7 +9,6 @@
  */
 require_once 'libraries/db_designer.lib.php';
 require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/plugin_interface.lib.php';
 
diff --git a/test/libraries/PMA_display_change_password_test.php b/test/libraries/PMA_display_change_password_test.php
index c7d9ea9197..8dbe61c9ad 100644
--- a/test/libraries/PMA_display_change_password_test.php
+++ b/test/libraries/PMA_display_change_password_test.php
@@ -10,9 +10,9 @@
  * Include to test.
  */
 use PMA\libraries\Theme;
+use PMA\libraries\URL;
 
 
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/display_change_password.lib.php';
 
 require_once 'libraries/database_interface.inc.php';
@@ -76,9 +76,9 @@ class PMA_DisplayChangePassword_Test extends PHPUnit_Framework_TestCase
             $html
         );
 
-        //PMA_URL_getHiddenInputs
+        //URL::getHiddenInputs
         $this->assertContains(
-            PMA_URL_getHiddenInputs(),
+            URL::getHiddenInputs(),
             $html
         );
 
diff --git a/test/libraries/PMA_display_create_table_test.php b/test/libraries/PMA_display_create_table_test.php
index 5d8c5e7722..966a5164df 100644
--- a/test/libraries/PMA_display_create_table_test.php
+++ b/test/libraries/PMA_display_create_table_test.php
@@ -7,6 +7,7 @@
  */
 
 use PMA\libraries\Theme;
+use PMA\libraries\URL;
 
 $GLOBALS['server'] = 0;
 $GLOBALS['cfg']['Server']['DisableIS'] = false;
@@ -15,8 +16,6 @@ $GLOBALS['cfg']['DBG']['sql'] = false;
  * Include to test.
  */
 
-require_once 'libraries/url_generating.lib.php';
-
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/display_create_table.lib.php';
 
@@ -80,9 +79,9 @@ class PMA_DisplayCreateTable_Test extends PHPUnit_Framework_TestCase
             $html
         );
 
-        //PMA_URL_getHiddenInputs
+        //URL::getHiddenInputs
         $this->assertContains(
-            PMA_URL_getHiddenInputs($db),
+            URL::getHiddenInputs($db),
             $html
         );
         //label
diff --git a/test/libraries/PMA_display_export_test.php b/test/libraries/PMA_display_export_test.php
index 9f193e3f81..eed2424a1a 100644
--- a/test/libraries/PMA_display_export_test.php
+++ b/test/libraries/PMA_display_export_test.php
@@ -10,10 +10,9 @@
  * Include to test.
  */
 use PMA\libraries\Theme;
+use PMA\libraries\URL;
 
 
-require_once 'libraries/url_generating.lib.php';
-
 require_once 'libraries/display_export.lib.php';
 
 require_once 'libraries/database_interface.inc.php';
@@ -99,7 +98,7 @@ class PMA_DisplayExport_Test extends PHPUnit_Framework_TestCase
             $sql_query_str
         );
 
-        //validate 1: PMA_URL_getHiddenInputs
+        //validate 1: URL::getHiddenInputs
         //$single_table
         $this->assertContains(
             '<input type="hidden" name="single_table" value="TRUE"',
diff --git a/test/libraries/PMA_import_test.php b/test/libraries/PMA_import_test.php
index 5f2556307e..7ad9fdfe7b 100644
--- a/test/libraries/PMA_import_test.php
+++ b/test/libraries/PMA_import_test.php
@@ -6,6 +6,7 @@
  *
  * @package PhpMyAdmin-test
  */
+use PMA\libraries\URL;
 
 /*
  * Include to test.
@@ -24,7 +25,6 @@ $GLOBALS['server'] = 0;
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/import.lib.php';
-require_once 'libraries/url_generating.lib.php';
 
 /**
  * Tests for import functions
@@ -399,7 +399,7 @@ class PMA_Import_Test extends PHPUnit_Framework_TestCase
             'db'        => 'PMA',
             'sql_query' => $simulated_query
         );
-        $matched_rows_url  = 'sql.php' . PMA_URL_getCommon($_url_params);
+        $matched_rows_url  = 'sql.php' . URL::getCommon($_url_params);
 
         $this->assertEquals(
             array(
diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php
index 61519612cc..d7babe1686 100644
--- a/test/libraries/PMA_insert_edit_test.php
+++ b/test/libraries/PMA_insert_edit_test.php
@@ -17,7 +17,6 @@ use PMA\libraries\TypesMySQL;
 
 require_once 'libraries/insert_edit.lib.php';
 require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/transformations.lib.php';
diff --git a/test/libraries/PMA_mult_submits_test.php b/test/libraries/PMA_mult_submits_test.php
index 5a9364444a..96dac1ac15 100644
--- a/test/libraries/PMA_mult_submits_test.php
+++ b/test/libraries/PMA_mult_submits_test.php
@@ -10,10 +10,9 @@
  * Include to test.
  */
 use PMA\libraries\Theme;
+use PMA\libraries\URL;
 
 
-require_once 'libraries/url_generating.lib.php';
-
 require_once 'libraries/mult_submits.lib.php';
 
 require_once 'libraries/database_interface.inc.php';
@@ -100,9 +99,9 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase
             '<form id="ajax_form" action="delete_row" method="post">',
             $html
         );
-        //$PMA_URL_getHiddenInputs
+        //$URL::getHiddenInputs
         $this->assertContains(
-            PMA_URL_getHiddenInputs($_url_params),
+            URL::getHiddenInputs($_url_params),
             $html
         );
         //from_prefix
@@ -132,7 +131,7 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase
         );
         //$_url_params
         $this->assertContains(
-            PMA_URL_getHiddenInputs($_url_params),
+            URL::getHiddenInputs($_url_params),
             $html
         );
         //from_prefix
@@ -166,7 +165,7 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase
         );
         //validate 2: $_url_params
         $this->assertContains(
-            PMA_URL_getHiddenInputs($_url_params),
+            URL::getHiddenInputs($_url_params),
             $html
         );
         //validate 3: conform
diff --git a/test/libraries/PMA_normalization_test.php b/test/libraries/PMA_normalization_test.php
index 3f9498b85a..7ca8dabe63 100644
--- a/test/libraries/PMA_normalization_test.php
+++ b/test/libraries/PMA_normalization_test.php
@@ -18,7 +18,6 @@ require_once 'libraries/database_interface.inc.php';
 
 require_once 'libraries/relation.lib.php';
 
-require_once 'libraries/url_generating.lib.php';
 
 
 require_once 'libraries/mysql_charsets.inc.php';
diff --git a/test/libraries/PMA_operations_test.php b/test/libraries/PMA_operations_test.php
index 29987415aa..832710608b 100644
--- a/test/libraries/PMA_operations_test.php
+++ b/test/libraries/PMA_operations_test.php
@@ -14,7 +14,6 @@ use PMA\libraries\Theme;
 
 $GLOBALS['server'] = 1;
 require_once 'libraries/operations.lib.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/relation.lib.php';
 
 
diff --git a/test/libraries/PMA_sanitize_test.php b/test/libraries/PMA_sanitize_test.php
index 8b63338a74..540665d13e 100644
--- a/test/libraries/PMA_sanitize_test.php
+++ b/test/libraries/PMA_sanitize_test.php
@@ -10,8 +10,6 @@
  * Include to test
  */
 require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/url_generating.lib.php';
-
 
 /**
  * tests for PMA_sanitize()
diff --git a/test/libraries/PMA_select_server_test.php b/test/libraries/PMA_select_server_test.php
index fc658bbd5a..83d039c56e 100644
--- a/test/libraries/PMA_select_server_test.php
+++ b/test/libraries/PMA_select_server_test.php
@@ -12,7 +12,6 @@
 use PMA\libraries\Theme;
 
 
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/select_server.lib.php';
 
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/libraries/PMA_server_common_test.php b/test/libraries/PMA_server_common_test.php
index b8b672c3b9..9c258acc1a 100644
--- a/test/libraries/PMA_server_common_test.php
+++ b/test/libraries/PMA_server_common_test.php
@@ -12,7 +12,6 @@
 use PMA\libraries\Theme;
 
 
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/server_common.lib.php';
 
 
diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php
index d647a61098..b4e7fb7d0e 100644
--- a/test/libraries/PMA_server_privileges_test.php
+++ b/test/libraries/PMA_server_privileges_test.php
@@ -10,10 +10,9 @@
  * Include to test.
  */
 use PMA\libraries\Theme;
+use PMA\libraries\URL;
 
 
-require_once 'libraries/url_generating.lib.php';
-
 require_once 'libraries/database_interface.inc.php';
 
 require_once 'libraries/sanitizing.lib.php';
@@ -391,9 +390,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             '<form class="ajax" id="changeUserGroupForm"',
             $html
         );
-        //PMA_URL_getHiddenInputs
+        //URL::getHiddenInputs
         $params = array('username' => $username);
-        $html_output = PMA_URL_getHiddenInputs($params);
+        $html_output = URL::getHiddenInputs($params);
         $this->assertContains(
             $html_output,
             $html
@@ -420,9 +419,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             '<form class="ajax" id="changeUserGroupForm"',
             $html
         );
-        //PMA_URL_getHiddenInputs
+        //URL::getHiddenInputs
         $params = array('username' => $username);
-        $html_output = PMA_URL_getHiddenInputs($params);
+        $html_output = URL::getHiddenInputs($params);
         $this->assertContains(
             $html_output,
             $html
@@ -1193,9 +1192,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
 
         $html = PMA_getHtmlForAddUser($dbname);
 
-        //validate 1: PMA_URL_getHiddenInputs
+        //validate 1: URL::getHiddenInputs
         $this->assertContains(
-            PMA_URL_getHiddenInputs('', ''),
+            URL::getHiddenInputs('', ''),
             $html
         );
 
@@ -1260,9 +1259,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
 
         $html = PMA_getHtmlForSpecificDbPrivileges($db);
 
-        //validate 1: PMA_URL_getCommon
+        //validate 1: URL::getCommon
         $this->assertContains(
-            PMA_URL_getCommon(array('db' => $db)),
+            URL::getCommon(array('db' => $db)),
             $html
         );
 
@@ -1304,7 +1303,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             $html
         );
         $this->assertContains(
-            PMA_URL_getCommon(array('checkprivsdb' => $db)),
+            URL::getCommon(array('checkprivsdb' => $db)),
             $html
         );
 
@@ -1342,8 +1341,8 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             $html
         );
 
-        //validate 2: PMA_URL_getCommon
-        $item = PMA_URL_getCommon(
+        //validate 2: URL::getCommon
+        $item = URL::getCommon(
             array(
                 'db' => $db,
                 'table' => $table,
@@ -1386,7 +1385,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             $html
         );
         $this->assertContains(
-            PMA_URL_getCommon(
+            URL::getCommon(
                 array('checkprivsdb' => $db, 'checkprivstable' => $table)
             ),
             $html
@@ -1482,7 +1481,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             'edit', $username, $hostname, $dbname, $tablename, ''
         );
 
-        $url_html = PMA_URL_getCommon(
+        $url_html = URL::getCommon(
             array(
                 'username' => $username,
                 'hostname' => $hostname,
@@ -1504,7 +1503,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             'revoke', $username, $hostname, $dbname, $tablename, ''
         );
 
-        $url_html = PMA_URL_getCommon(
+        $url_html = URL::getCommon(
             array(
                 'username' => $username,
                 'hostname' => $hostname,
@@ -1525,7 +1524,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
 
         $html = PMA_getUserLink('export', $username, $hostname);
 
-        $url_html = PMA_URL_getCommon(
+        $url_html = URL::getCommon(
             array(
                 'username' => $username,
                 'hostname' => $hostname,
@@ -1639,9 +1638,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
         //PMA_getChangeLoginInformationHtmlForm
         $html = PMA_getChangeLoginInformationHtmlForm($username, $hostname);
 
-        //PMA_URL_getHiddenInputs
+        //URL::getHiddenInputs
         $this->assertContains(
-            PMA_URL_getHiddenInputs('', ''),
+            URL::getHiddenInputs('', ''),
             $html
         );
 
@@ -1694,7 +1693,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             ),
             $html
         );
-        $item = PMA_URL_getCommon(
+        $item = URL::getCommon(
             array(
                 'db' => $url_dbname,
                 'reload' => 1
@@ -1720,7 +1719,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             ),
             $html
         );
-        $item = PMA_URL_getCommon(
+        $item = URL::getCommon(
             array(
                 'db' => $url_dbname,
                 'table' => $tablename,
@@ -1761,9 +1760,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             $result, $db_rights, $pmaThemeImage, $text_dir
         );
 
-        //PMA_URL_getHiddenInputs
+        //URL::getHiddenInputs
         $this->assertContains(
-            PMA_URL_getHiddenInputs('', ''),
+            URL::getHiddenInputs('', ''),
             $html
         );
 
@@ -1843,9 +1842,9 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             $result, $db_rights, $pmaThemeImage, $text_dir
         );
 
-        //PMA_URL_getCommon
+        //URL::getCommon
         $this->assertContains(
-            PMA_URL_getCommon(array('adduser' => 1)),
+            URL::getCommon(array('adduser' => 1)),
             $html
         );
 
@@ -1916,7 +1915,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
         $html = PMA_getAddUserHtmlFieldset();
 
         $this->assertContains(
-            PMA_URL_getCommon(array('adduser' => 1)),
+            URL::getCommon(array('adduser' => 1)),
             $html
         );
         $this->assertContains(
@@ -1959,8 +1958,8 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             $html
         );
 
-        //PMA_URL_getCommon
-        $item = PMA_URL_getCommon(
+        //URL::getCommon
+        $item = URL::getCommon(
             array(
                 'username' => $username,
                 'hostname' => $hostname,
@@ -1995,8 +1994,8 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
             $html
         );
 
-        //PMA_URL_getCommon
-        $item = PMA_URL_getCommon(
+        //URL::getCommon
+        $item = URL::getCommon(
             array(
                 'username' => $username,
                 'hostname' => $hostname,
diff --git a/test/libraries/PMA_server_replication_test.php b/test/libraries/PMA_server_replication_test.php
index 92a76a1c03..acec00ece1 100644
--- a/test/libraries/PMA_server_replication_test.php
+++ b/test/libraries/PMA_server_replication_test.php
@@ -12,8 +12,6 @@
 use PMA\libraries\Theme;
 
 
-require_once 'libraries/url_generating.lib.php';
-
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/replication.inc.php';
 require_once 'libraries/replication_gui.lib.php';
diff --git a/test/libraries/PMA_server_status_advisor_test.php b/test/libraries/PMA_server_status_advisor_test.php
index 1a6b4026ea..9bb6793dc9 100644
--- a/test/libraries/PMA_server_status_advisor_test.php
+++ b/test/libraries/PMA_server_status_advisor_test.php
@@ -14,7 +14,6 @@ use PMA\libraries\Theme;
 
 
 
-require_once 'libraries/url_generating.lib.php';
 
 require_once 'libraries/server_status_advisor.lib.php';
 
diff --git a/test/libraries/PMA_server_status_monitor_test.php b/test/libraries/PMA_server_status_monitor_test.php
index 25b73c00d2..36923d0502 100644
--- a/test/libraries/PMA_server_status_monitor_test.php
+++ b/test/libraries/PMA_server_status_monitor_test.php
@@ -13,8 +13,6 @@ use PMA\libraries\ServerStatusData;
 use PMA\libraries\Theme;
 
 
-require_once 'libraries/url_generating.lib.php';
-
 require_once 'libraries/server_status_monitor.lib.php';
 
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/libraries/PMA_server_status_processes_test.php b/test/libraries/PMA_server_status_processes_test.php
index d510270bce..2ca83a96f5 100644
--- a/test/libraries/PMA_server_status_processes_test.php
+++ b/test/libraries/PMA_server_status_processes_test.php
@@ -10,9 +10,9 @@
  * Include to test.
  */
 use PMA\libraries\Theme;
+use PMA\libraries\URL;
 
 
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/server_status_processes.lib.php';
 require_once 'libraries/database_interface.inc.php';
 
@@ -208,7 +208,7 @@ class PMA_ServerStatusProcesses_Test extends PHPUnit_Framework_TestCase
             'ajax_request' => true
         );
         $kill_process = 'server_status_processes.php'
-            . PMA_URL_getCommon($url_params);
+            . URL::getCommon($url_params);
         $this->assertContains(
             $kill_process,
             $html
diff --git a/test/libraries/PMA_server_status_queries_test.php b/test/libraries/PMA_server_status_queries_test.php
index 84c3286ff7..96295b5388 100644
--- a/test/libraries/PMA_server_status_queries_test.php
+++ b/test/libraries/PMA_server_status_queries_test.php
@@ -14,8 +14,6 @@ use PMA\libraries\ServerStatusData;
 use PMA\libraries\Theme;
 
 
-require_once 'libraries/url_generating.lib.php';
-
 require_once 'libraries/server_status_queries.lib.php';
 
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/libraries/PMA_server_status_test.php b/test/libraries/PMA_server_status_test.php
index b9db082045..9d9c4f0575 100644
--- a/test/libraries/PMA_server_status_test.php
+++ b/test/libraries/PMA_server_status_test.php
@@ -13,8 +13,6 @@ use PMA\libraries\ServerStatusData;
 use PMA\libraries\Theme;
 
 
-require_once 'libraries/url_generating.lib.php';
-
 require_once 'libraries/server_status.lib.php';
 
 require_once 'libraries/database_interface.inc.php';
diff --git a/test/libraries/PMA_server_status_variables_test.php b/test/libraries/PMA_server_status_variables_test.php
index 2122d968be..7597d657a8 100644
--- a/test/libraries/PMA_server_status_variables_test.php
+++ b/test/libraries/PMA_server_status_variables_test.php
@@ -13,7 +13,6 @@ use PMA\libraries\ServerStatusData;
 use PMA\libraries\Theme;
 
 
-require_once 'libraries/url_generating.lib.php';
 
 require_once 'libraries/server_status_variables.lib.php';
 
diff --git a/test/libraries/PMA_server_user_groups_test.php b/test/libraries/PMA_server_user_groups_test.php
index 428a0e9362..c5f8e9cc47 100644
--- a/test/libraries/PMA_server_user_groups_test.php
+++ b/test/libraries/PMA_server_user_groups_test.php
@@ -7,12 +7,12 @@
  */
 
 use PMA\libraries\Theme;
+use PMA\libraries\URL;
 
 
 
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/url_generating.lib.php';
 /*
  * Include to test.
  */
@@ -77,7 +77,7 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
             $html
         );
         $url_tag = '<a href="server_user_groups.php'
-            . PMA_URL_getCommon(array('addUserGroup' => 1));
+            . URL::getCommon(array('addUserGroup' => 1));
         $this->assertContains(
             $url_tag,
             $html
@@ -131,7 +131,7 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
             $html
         );
         $url_tag = '<a class="" href="server_user_groups.php'
-            . PMA_URL_getCommon(
+            . URL::getCommon(
                 array(
                     'viewUsers'=>1, 'userGroup'=>htmlspecialchars('usergroup')
                 )
@@ -141,7 +141,7 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
             $html
         );
         $url_tag = '<a class="" href="server_user_groups.php'
-            . PMA_URL_getCommon(
+            . URL::getCommon(
                 array(
                     'editUserGroup'=>1,
                     'userGroup'=>htmlspecialchars('usergroup')
@@ -152,7 +152,7 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
             $html
         );
         $url_tag = '<a class="deleteUserGroup ajax" href="server_user_groups.php'
-            . PMA_URL_getCommon(
+            . URL::getCommon(
                 array(
                     'deleteUserGroup'=> 1,
                     'userGroup'=>htmlspecialchars('usergroup')
diff --git a/test/libraries/PMA_server_users_test.php b/test/libraries/PMA_server_users_test.php
index b2c1aec8a6..d5d7f21faf 100644
--- a/test/libraries/PMA_server_users_test.php
+++ b/test/libraries/PMA_server_users_test.php
@@ -6,8 +6,6 @@
  * @package PhpMyAdmin-test
  */
 
-require_once 'libraries/url_generating.lib.php';
-
 /*
  * Include to test.
  */
diff --git a/test/libraries/PMA_sql_query_form_test.php b/test/libraries/PMA_sql_query_form_test.php
index 3e7ceb504e..58c8df8840 100644
--- a/test/libraries/PMA_sql_query_form_test.php
+++ b/test/libraries/PMA_sql_query_form_test.php
@@ -8,6 +8,7 @@
 
 //the following definition should be used globally
 use PMA\libraries\Theme;
+use PMA\libraries\URL;
 
 $GLOBALS['server'] = 0;
 
@@ -15,7 +16,6 @@ $GLOBALS['server'] = 0;
  * Include to test.
 */
 
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/relation.lib.php';
 
 
@@ -202,7 +202,7 @@ class PMA_SqlQueryForm_Test extends PHPUnit_Framework_TestCase
         $table  = $GLOBALS['table'];
         $db     = $GLOBALS['db'];
         $this->assertContains(
-            PMA_URL_getHiddenInputs($db, $table),
+            URL::getHiddenInputs($db, $table),
             $html
         );
 
diff --git a/test/libraries/PMA_tbl_tracking_test.php b/test/libraries/PMA_tbl_tracking_test.php
index 21dcae2c0c..102524a55b 100644
--- a/test/libraries/PMA_tbl_tracking_test.php
+++ b/test/libraries/PMA_tbl_tracking_test.php
@@ -10,12 +10,12 @@
  * Include to test.
  */
 use PMA\libraries\Theme;
+use PMA\libraries\URL;
 
 require_once 'libraries/tracking.lib.php';
 
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
 
 
 require_once 'libraries/js_escape.lib.php';
@@ -139,7 +139,7 @@ class PMA_TblTrackingTest extends PHPUnit_Framework_TestCase
         );
 
         $this->assertContains(
-            PMA_URL_getHiddenInputs($GLOBALS['db']),
+            URL::getHiddenInputs($GLOBALS['db']),
             $html
         );
 
@@ -591,7 +591,7 @@ class PMA_TblTrackingTest extends PHPUnit_Framework_TestCase
         );
 
         $version = '<form method="post" action="tbl_tracking.php'
-            . PMA_URL_getCommon(
+            . URL::getCommon(
                 $url_params + array(
                     'report' => 'true', 'version' => $_REQUEST['version']
                 )
diff --git a/test/libraries/PMA_user_preferences_test.php b/test/libraries/PMA_user_preferences_test.php
index dc534fced1..e1de8b7ea9 100644
--- a/test/libraries/PMA_user_preferences_test.php
+++ b/test/libraries/PMA_user_preferences_test.php
@@ -13,7 +13,6 @@ use PMA\libraries\config\ConfigFile;
 
 require_once 'libraries/user_preferences.lib.php';
 require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/sanitizing.lib.php';
 
 
diff --git a/test/libraries/common/PMA_getDbLink_test.php b/test/libraries/common/PMA_getDbLink_test.php
index c7f441418d..9c56febd81 100644
--- a/test/libraries/common/PMA_getDbLink_test.php
+++ b/test/libraries/common/PMA_getDbLink_test.php
@@ -7,12 +7,6 @@
  * @group common.lib-tests
  */
 
-/*
- * Include to test.
- */
-
-require_once 'libraries/url_generating.lib.php';
-
 /**
  * Test for PMA_getDbLink_test from Util.php
  *
diff --git a/test/libraries/core/PMA_fatalError_test.php b/test/libraries/core/PMA_fatalError_test.php
index be3ac6cb80..ef1d6db6a1 100644
--- a/test/libraries/core/PMA_fatalError_test.php
+++ b/test/libraries/core/PMA_fatalError_test.php
@@ -18,8 +18,6 @@ use PMA\libraries\Theme;
 require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/sanitizing.lib.php';
 
-require_once 'libraries/url_generating.lib.php';
-
 
 
 /**
diff --git a/test/libraries/core/PMA_getLinks_test.php b/test/libraries/core/PMA_getLinks_test.php
index 2cc3390d2d..5bf77308b9 100644
--- a/test/libraries/core/PMA_getLinks_test.php
+++ b/test/libraries/core/PMA_getLinks_test.php
@@ -5,10 +5,6 @@
  * @package PhpMyAdmin-test
  */
 
-/*
- * Include to test.
- */
-require_once 'libraries/url_generating.lib.php';
 
 /**
  *
diff --git a/test/libraries/core/PMA_getTableCount_test_dis.php b/test/libraries/core/PMA_getTableCount_test_dis.php
index 87b5011f5d..3dca47f579 100644
--- a/test/libraries/core/PMA_getTableCount_test_dis.php
+++ b/test/libraries/core/PMA_getTableCount_test_dis.php
@@ -18,8 +18,6 @@ require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/config.default.php';
 
 
-require_once 'libraries/url_generating.lib.php';
-
 
 require_once 'libraries/database_interface.inc.php';
 
diff --git a/test/libraries/core/PMA_headerLocation_test.php b/test/libraries/core/PMA_headerLocation_test.php
index f1de284531..f04aff2473 100644
--- a/test/libraries/core/PMA_headerLocation_test.php
+++ b/test/libraries/core/PMA_headerLocation_test.php
@@ -10,14 +10,12 @@
  * Include to test.
  */
 use PMA\libraries\Theme;
+use PMA\libraries\URL;
 
 
 require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/sanitizing.lib.php';
 
-require_once 'libraries/url_generating.lib.php';
-
-
 
 
 /**
@@ -113,7 +111,7 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
             runkit_constant_redefine('SID', md5('test_hash'));
 
             $testUri = 'http://testurl.com/test.php?test=test';
-            $separator = PMA_URL_getArgSeparator();
+            $separator = URL::getArgSeparator();
 
             $header = array('Location: ' . $testUri . $separator . SID);
 
diff --git a/test/libraries/rte/PMA_EVN_getEditorForm_test.php b/test/libraries/rte/PMA_EVN_getEditorForm_test.php
index ef0ea3e3dc..5f950e7412 100644
--- a/test/libraries/rte/PMA_EVN_getEditorForm_test.php
+++ b/test/libraries/rte/PMA_EVN_getEditorForm_test.php
@@ -6,8 +6,6 @@
  * @package PhpMyAdmin-test
  */
 
-require_once 'libraries/url_generating.lib.php';
-
 /*
  * Include to test.
  */
diff --git a/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/test/libraries/rte/PMA_RTN_getEditorForm_test.php
index 52985c7995..2dbfc2955f 100644
--- a/test/libraries/rte/PMA_RTN_getEditorForm_test.php
+++ b/test/libraries/rte/PMA_RTN_getEditorForm_test.php
@@ -11,8 +11,6 @@ use PMA\libraries\TypesMySQL;
 
 $GLOBALS['server'] = 0;
 
-require_once 'libraries/url_generating.lib.php';
-
 
 require_once 'libraries/database_interface.inc.php';
 
diff --git a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
index 9817baa33e..2ba5950a64 100644
--- a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
+++ b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
@@ -10,8 +10,6 @@ use PMA\libraries\TypesMySQL;
 
 $GLOBALS['server'] = 0;
 
-require_once 'libraries/url_generating.lib.php';
-
 require_once 'libraries/database_interface.inc.php';
 
 /*
diff --git a/test/libraries/rte/PMA_TRI_getEditorForm_test.php b/test/libraries/rte/PMA_TRI_getEditorForm_test.php
index 6a068edac4..38efd9955d 100644
--- a/test/libraries/rte/PMA_TRI_getEditorForm_test.php
+++ b/test/libraries/rte/PMA_TRI_getEditorForm_test.php
@@ -6,8 +6,6 @@
  * @package PhpMyAdmin-test
  */
 
-require_once 'libraries/url_generating.lib.php';
-
 require_once 'libraries/database_interface.inc.php';
 
 /*
diff --git a/user_password.php b/user_password.php
index 78e86617fa..b6d9445459 100644
--- a/user_password.php
+++ b/user_password.php
@@ -6,6 +6,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\URL;
 
 /**
  * Gets some core libraries
@@ -224,7 +225,7 @@ function PMA_changePassHashingFunction()
 function PMA_changePassUrlParamsAndSubmitQuery(
     $username, $hostname, $password, $sql_query, $hashing_function, $orig_auth_plugin
 ) {
-    $err_url = 'user_password.php' . PMA_URL_getCommon();
+    $err_url = 'user_password.php' . URL::getCommon();
 
     $serverType = PMA\libraries\Util::getServerType();
 
@@ -288,7 +289,7 @@ function PMA_changePassDisplayPage($message, $sql_query)
     echo PMA\libraries\Util::getMessage(
         $message, $sql_query, 'success'
     );
-    echo '<a href="index.php' , PMA_URL_getCommon()
+    echo '<a href="index.php' , URL::getCommon()
         , ' target="_parent">' , "\n"
         , '<strong>' , __('Back') , '</strong></a>';
     exit;
diff --git a/view_create.php b/view_create.php
index b28bfc7099..6d478e768c 100644
--- a/view_create.php
+++ b/view_create.php
@@ -7,6 +7,7 @@
  * @todo (also validate if js is disabled, after form submission?)
  * @package PhpMyAdmin
  */
+use PMA\libraries\URL;
 
 require_once './libraries/common.inc.php';
 
@@ -178,7 +179,7 @@ $url_params['reload'] = 1;
 $htmlString = '<!-- CREATE VIEW options -->'
     . '<div id="div_view_options">'
     . '<form method="post" action="view_create.php">'
-    . PMA_URL_getHiddenInputs($url_params)
+    . URL::getHiddenInputs($url_params)
     . '<fieldset>'
     . '<legend>'
     . (isset($_REQUEST['ajax_dialog']) ?
diff --git a/view_operations.php b/view_operations.php
index 1a891df01e..68575541eb 100644
--- a/view_operations.php
+++ b/view_operations.php
@@ -7,6 +7,7 @@
  */
 use PMA\libraries\Table;
 use PMA\libraries\Response;
+use PMA\libraries\URL;
 
 /**
  *
@@ -96,7 +97,7 @@ $url_params['back'] = 'view_operations.php';
 <!-- Table operations -->
 <div class="operations_half_width">
 <form method="post" action="view_operations.php">
-<?php echo PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']); ?>
+<?php echo URL::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']); ?>
 <input type="hidden" name="reload" value="1" />
 <fieldset>
     <legend><?php echo __('Operations'); ?></legend>

From 6650f7b07d51e4bd3505c970a68d29f17c94c1fd Mon Sep 17 00:00:00 2001
From: Durgesh <007durgesh219@gmail.com>
Date: Sat, 20 Feb 2016 01:21:02 +0530
Subject: [PATCH 2/2] Refactor text sanitization and javascript escaping, Issue
 #11989, #11988

Signed-off-by: Durgesh <007durgesh219@gmail.com>
---
 export.php                                    |   3 +-
 index.php                                     |   3 +-
 js/messages.php                               |  77 ++--
 libraries/DbSearch.php                        |   3 +-
 libraries/DisplayResults.php                  |   7 +-
 libraries/Footer.php                          |   5 +-
 libraries/Header.php                          |   4 +-
 libraries/Index.php                           |   5 +-
 libraries/Message.php                         |   4 +-
 libraries/Sanitize.php                        | 365 ++++++++++++++++++
 libraries/Scripts.php                         |   5 +-
 libraries/Util.php                            |   7 +-
 libraries/common.inc.php                      |  11 -
 libraries/config/FormDisplay.php              |  11 +-
 libraries/config/FormDisplay.tpl.php          |   3 +-
 libraries/config/config_functions.lib.php     |   5 +-
 .../database/DatabaseStructureController.php  |   3 +-
 libraries/core.lib.php                        |   4 +-
 libraries/display_import.lib.php              |  17 +-
 libraries/error.inc.php                       |   3 +-
 libraries/export.lib.php                      |   3 +-
 libraries/gis/GISVisualization.php            |   5 +-
 libraries/insert_edit.lib.php                 |   7 +-
 libraries/js_escape.lib.php                   | 175 ---------
 libraries/plugins/AuthenticationPlugin.php    |   4 +-
 libraries/sanitizing.lib.php                  | 189 ---------
 libraries/tracking.lib.php                    |   3 +-
 libraries/user_preferences.inc.php            |   3 +-
 prefs_manage.php                              |   3 +-
 setup/frames/index.inc.php                    |   7 +-
 setup/lib/index.lib.php                       |   3 +-
 .../database/structure/table_header.phtml     |   2 +-
 templates/header_location.phtml               |   4 +-
 templates/server/databases/table_row.phtml    |   4 +-
 .../table/relation/foreign_key_row.phtml      |   3 +-
 test/classes/DisplayResultsTest.php           |   1 -
 test/classes/ErrorHandlerTest.php             |   1 -
 test/classes/ErrorTest.php                    |   1 -
 test/classes/FooterTest.php                   |   1 -
 test/classes/HeaderTest.php                   |   2 -
 test/classes/MenuTest.php                     |   1 -
 test/classes/MessageTest.php                  |   1 -
 .../Sanitize.php}                             |  83 +++-
 test/classes/ScriptsTest.php                  |   1 -
 .../ServerBinlogControllerTest.php            |   2 -
 .../ServerCollationsControllerTest.php        |   2 -
 .../ServerDatabasesControllerTest.php         |   3 -
 .../ServerEnginesControllerTest.php           |   2 -
 .../ServerPluginsControllerTest.php           |   2 -
 .../ServerVariablesControllerTest.php         |   3 -
 .../TableIndexesControllerTest.php            |   1 -
 .../plugin/auth/AuthenticationConfigTest.php  |   1 -
 .../plugin/auth/AuthenticationCookieTest.php  |   2 -
 .../plugin/auth/AuthenticationHttpTest.php    |   1 -
 .../plugin/auth/AuthenticationSignonTest.php  |   1 -
 test/classes/plugin/import/ImportCsvTest.php  |   1 -
 test/classes/plugin/import/ImportLdiTest.php  |   1 -
 test/classes/plugin/import/ImportOdsTest.php  |   1 -
 test/libraries/PMA_FormDisplay_tpl_test.php   |   1 -
 test/libraries/PMA_SetupIndex_test.php        |   2 -
 test/libraries/PMA_config_functions_test.php  |   1 -
 .../PMA_display_change_password_test.php      |   2 -
 .../PMA_display_create_table_test.php         |   3 -
 test/libraries/PMA_display_export_test.php    |   2 -
 test/libraries/PMA_escapeJsString_test.php    |   7 +-
 test/libraries/PMA_insert_edit_test.php       |   2 -
 test/libraries/PMA_js_escape_test.php         |  75 ----
 test/libraries/PMA_mult_submits_test.php      |   2 -
 test/libraries/PMA_select_server_test.php     |   3 -
 test/libraries/PMA_server_privileges_test.php |   4 -
 .../libraries/PMA_server_replication_test.php |   4 -
 .../PMA_server_status_advisor_test.php        |   3 -
 .../PMA_server_status_monitor_test.php        |   3 -
 .../PMA_server_status_processes_test.php      |   4 -
 .../PMA_server_status_queries_test.php        |   3 -
 .../PMA_server_status_variables_test.php      |   3 -
 test/libraries/PMA_sql_query_form_test.php    |   2 -
 test/libraries/PMA_tbl_tracking_test.php      |   1 -
 test/libraries/PMA_user_preferences_test.php  |   1 -
 .../common/PMA_checkParameters_test.php       |   3 -
 .../common/PMA_showMessage_test_disabled.php  |   6 -
 test/libraries/core/PMA_fatalError_test.php   |   6 -
 .../core/PMA_getTableCount_test_dis.php       |   2 -
 .../core/PMA_headerLocation_test.php          |   9 +-
 .../core/PMA_warnMissingExtension_test.php    |   4 -
 url.php                                       |   7 +-
 86 files changed, 565 insertions(+), 675 deletions(-)
 create mode 100644 libraries/Sanitize.php
 delete mode 100644 libraries/js_escape.lib.php
 delete mode 100644 libraries/sanitizing.lib.php
 rename test/{libraries/PMA_sanitize_test.php => classes/Sanitize.php} (54%)
 delete mode 100644 test/libraries/PMA_js_escape_test.php

diff --git a/export.php b/export.php
index c3d38ce57a..912b2f9b4d 100644
--- a/export.php
+++ b/export.php
@@ -7,6 +7,7 @@
  */
 use PMA\libraries\plugins\ExportPlugin;
 use PMA\libraries\URL;
+use PMA\libraries\Sanitize;
 
 /**
  * Get the variables sent or posted to this script and a core script
@@ -372,7 +373,7 @@ if (!defined('TESTSUITE')) {
             // (avoid rewriting data containing HTML with anchors and forms;
             // this was reported to happen under Plesk)
             @ini_set('url_rewriter.tags', '');
-            $filename = PMA_sanitizeFilename($filename);
+            $filename = Sanitize::sanitizeFilename($filename);
 
             PMA_downloadHeader($filename, $mime_type);
         } else {
diff --git a/index.php b/index.php
index c0c90087d8..2aaefad400 100644
--- a/index.php
+++ b/index.php
@@ -7,6 +7,7 @@
  */
 use PMA\libraries\RecentFavoriteTable;
 use PMA\libraries\URL;
+use PMA\libraries\Sanitize;
 
 /**
  * Gets some core libraries and displays a top message if required
@@ -608,7 +609,7 @@ if (isset($GLOBALS['dbi'])
         )
     ) {
         trigger_error(
-            PMA_sanitize(
+            Sanitize::sanitize(
                 sprintf(
                     __(
                         'Your PHP MySQL library version %s differs from your ' .
diff --git a/js/messages.php b/js/messages.php
index 34b3bc6363..c3bad50849 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -25,8 +25,9 @@ if (!defined('TESTSUITE')) {
     session_write_close();
 }
 
-// But this one is needed for PMA_escapeJsString()
-require_once './libraries/js_escape.lib.php';
+// But this one is needed for Sanitize::escapeJsString()
+use PMA\libraries\Sanitize;
+
 
 $buffer = PMA\libraries\OutputBuffering::getInstance();
 $buffer->start();
@@ -717,7 +718,7 @@ $js_messages['strCopyPrefix'] = __('Copy table with prefix');
 
 echo "var PMA_messages = new Array();\n";
 foreach ($js_messages as $name => $js_message) {
-    PMA_printJsValue("PMA_messages['" . $name . "']", $js_message);
+    Sanitize::printJsValue("PMA_messages['" . $name . "']", $js_message);
 }
 
 /* Calendar */
@@ -738,20 +739,20 @@ echo 'var maxInputVars = '
 
 echo "if ($.datepicker) {\n";
 /* l10n: Display text for calendar close link */
-PMA_printJsValue("$.datepicker.regional['']['closeText']", __('Done'));
+Sanitize::printJsValue("$.datepicker.regional['']['closeText']", __('Done'));
 /* l10n: Display text for previous month link in calendar */
-PMA_printJsValue(
+Sanitize::printJsValue(
     "$.datepicker.regional['']['prevText']",
     _pgettext('Previous month', 'Prev')
 );
 /* l10n: Display text for next month link in calendar */
-PMA_printJsValue(
+Sanitize::printJsValue(
     "$.datepicker.regional['']['nextText']",
     _pgettext('Next month', 'Next')
 );
 /* l10n: Display text for current month link in calendar */
-PMA_printJsValue("$.datepicker.regional['']['currentText']", __('Today'));
-PMA_printJsValue(
+Sanitize::printJsValue("$.datepicker.regional['']['currentText']", __('Today'));
+Sanitize::printJsValue(
     "$.datepicker.regional['']['monthNames']",
     array(
         __('January'),
@@ -768,7 +769,7 @@ PMA_printJsValue(
         __('December')
     )
 );
-PMA_printJsValue(
+Sanitize::printJsValue(
     "$.datepicker.regional['']['monthNamesShort']",
     array(
         /* l10n: Short month name */
@@ -797,7 +798,7 @@ PMA_printJsValue(
         __('Dec')
     )
 );
-PMA_printJsValue(
+Sanitize::printJsValue(
     "$.datepicker.regional['']['dayNames']",
     array(
         __('Sunday'),
@@ -809,7 +810,7 @@ PMA_printJsValue(
         __('Saturday')
     )
 );
-PMA_printJsValue(
+Sanitize::printJsValue(
     "$.datepicker.regional['']['dayNamesShort']",
     array(
         /* l10n: Short week day name */
@@ -828,7 +829,7 @@ PMA_printJsValue(
         __('Sat')
     )
 );
-PMA_printJsValue(
+Sanitize::printJsValue(
     "$.datepicker.regional['']['dayNamesMin']",
     array(
         /* l10n: Minimal week day name */
@@ -848,9 +849,9 @@ PMA_printJsValue(
     )
 );
 /* l10n: Column header for week of the year in calendar */
-PMA_printJsValue("$.datepicker.regional['']['weekHeader']", __('Wk'));
+Sanitize::printJsValue("$.datepicker.regional['']['weekHeader']", __('Wk'));
 
-PMA_printJsValue(
+Sanitize::printJsValue(
     "$.datepicker.regional['']['showMonthAfterYear']",
     /* l10n: Month-year order for calendar, use either "calendar-month-year"
     * or "calendar-year-month".
@@ -859,7 +860,7 @@ PMA_printJsValue(
 );
 /* l10n: Year suffix for calendar, "none" is empty. */
 $year_suffix = _pgettext('Year suffix', 'none');
-PMA_printJsValue(
+Sanitize::printJsValue(
     "$.datepicker.regional['']['yearSuffix']",
     ($year_suffix == 'none' ? '' : $year_suffix)
 );
@@ -869,10 +870,10 @@ $.extend($.datepicker._defaults, $.datepicker.regional['']);
 
 <?php
 echo "if ($.timepicker) {\n";
-PMA_printJsValue("$.timepicker.regional['']['timeText']", __('Time'));
-PMA_printJsValue("$.timepicker.regional['']['hourText']", __('Hour'));
-PMA_printJsValue("$.timepicker.regional['']['minuteText']", __('Minute'));
-PMA_printJsValue("$.timepicker.regional['']['secondText']", __('Second'));
+Sanitize::printJsValue("$.timepicker.regional['']['timeText']", __('Time'));
+Sanitize::printJsValue("$.timepicker.regional['']['hourText']", __('Hour'));
+Sanitize::printJsValue("$.timepicker.regional['']['minuteText']", __('Minute'));
+Sanitize::printJsValue("$.timepicker.regional['']['secondText']", __('Second'));
 ?>
 $.extend($.timepicker._defaults, $.timepicker.regional['']);
 } /* if ($.timepicker) */
@@ -883,67 +884,67 @@ $.extend($.timepicker._defaults, $.timepicker.regional['']);
 echo "function extendingValidatorMessages() {\n";
 echo "$.extend($.validator.messages, {\n";
 /* Default validation functions */
-PMA_printJsValueForFormValidation('required', __('This field is required'));
-PMA_printJsValueForFormValidation('remote', __('Please fix this field'));
-PMA_printJsValueForFormValidation('email', __('Please enter a valid email address'));
-PMA_printJsValueForFormValidation('url', __('Please enter a valid URL'));
-PMA_printJsValueForFormValidation('date', __('Please enter a valid date'));
-PMA_printJsValueForFormValidation(
+Sanitize::printJsValueForFormValidation('required', __('This field is required'));
+Sanitize::printJsValueForFormValidation('remote', __('Please fix this field'));
+Sanitize::printJsValueForFormValidation('email', __('Please enter a valid email address'));
+Sanitize::printJsValueForFormValidation('url', __('Please enter a valid URL'));
+Sanitize::printJsValueForFormValidation('date', __('Please enter a valid date'));
+Sanitize::printJsValueForFormValidation(
     'dateISO',
     __('Please enter a valid date ( ISO )')
 );
-PMA_printJsValueForFormValidation('number', __('Please enter a valid number'));
-PMA_printJsValueForFormValidation(
+Sanitize::printJsValueForFormValidation('number', __('Please enter a valid number'));
+Sanitize::printJsValueForFormValidation(
     'creditcard',
     __('Please enter a valid credit card number')
 );
-PMA_printJsValueForFormValidation('digits', __('Please enter only digits'));
-PMA_printJsValueForFormValidation(
+Sanitize::printJsValueForFormValidation('digits', __('Please enter only digits'));
+Sanitize::printJsValueForFormValidation(
     'equalTo',
     __('Please enter the same value again')
 );
-PMA_printJsValueForFormValidation(
+Sanitize::printJsValueForFormValidation(
     'maxlength',
     __('Please enter no more than {0} characters'),
     true
 );
-PMA_printJsValueForFormValidation(
+Sanitize::printJsValueForFormValidation(
     'minlength',
     __('Please enter at least {0} characters'),
     true
 );
-PMA_printJsValueForFormValidation(
+Sanitize::printJsValueForFormValidation(
     'rangelength',
     __('Please enter a value between {0} and {1} characters long'),
     true
 );
-PMA_printJsValueForFormValidation(
+Sanitize::printJsValueForFormValidation(
     'range',
     __('Please enter a value between {0} and {1}'),
     true
 );
-PMA_printJsValueForFormValidation(
+Sanitize::printJsValueForFormValidation(
     'max',
     __('Please enter a value less than or equal to {0}'),
     true
 );
-PMA_printJsValueForFormValidation(
+Sanitize::printJsValueForFormValidation(
     'min',
     __('Please enter a value greater than or equal to {0}'),
     true
 );
 /* customed functions */
-PMA_printJsValueForFormValidation(
+Sanitize::printJsValueForFormValidation(
     'validationFunctionForDateTime',
     __('Please enter a valid date or time'),
     true
 );
-PMA_printJsValueForFormValidation(
+Sanitize::printJsValueForFormValidation(
     'validationFunctionForHex',
     __('Please enter a valid HEX input'),
     true
 );
-PMA_printJsValueForFormValidation(
+Sanitize::printJsValueForFormValidation(
     'validationFunctionForFuns',
     __('Error'),
     true,
diff --git a/libraries/DbSearch.php b/libraries/DbSearch.php
index 54a8e41caa..2bb24704df 100644
--- a/libraries/DbSearch.php
+++ b/libraries/DbSearch.php
@@ -8,6 +8,7 @@
 namespace PMA\libraries;
 
 use PMA\libraries\URL;
+use PMA\libraries\Sanitize;
 
 /**
  * Class to handle database search
@@ -342,7 +343,7 @@ class DbSearch
             $html_output .= '<td><a name="browse_search" class="ajax" href="'
                 . $browse_result_path . '" onclick="loadResult(\''
                 . $browse_result_path . '\',\''
-                . PMA_escapeJsString(htmlspecialchars($each_table)) . '\',\''
+                . Sanitize::escapeJsString(htmlspecialchars($each_table)) . '\',\''
                 . URL::getCommon(
                     array(
                         'db' => $GLOBALS['db'], 'table' => $each_table
diff --git a/libraries/DisplayResults.php b/libraries/DisplayResults.php
index 29decfb385..99d1c6533a 100644
--- a/libraries/DisplayResults.php
+++ b/libraries/DisplayResults.php
@@ -10,6 +10,7 @@ namespace PMA\libraries;
 use SqlParser\Utils\Query;
 use PMA\libraries\plugins\transformations\Text_Plain_Link;
 use PMA\libraries\URL;
+use PMA\libraries\Sanitize;
 
 require_once './libraries/transformations.lib.php';
 
@@ -3535,8 +3536,8 @@ class DisplayResults
                 );
             $del_url  = 'sql.php' . URL::getCommon($_url_params);
 
-            $js_conf  = 'DELETE FROM ' . PMA_jsFormat($this->__get('table'))
-                . ' WHERE ' . PMA_jsFormat($where_clause, false)
+            $js_conf  = 'DELETE FROM ' . Sanitize::jsFormat($this->__get('table'))
+                . ' WHERE ' . Sanitize::jsFormat($where_clause, false)
                 . ($clause_is_unique ? '' : ' LIMIT 1');
 
             $del_str = $this->_getActionLinkContent('b_drop.png', __('Delete'));
@@ -4257,7 +4258,7 @@ class DisplayResults
             // "j u s t   b r o w s i n g"
             $pre_count = '~';
             $after_count = Util::showHint(
-                PMA_sanitize(
+                Sanitize::sanitize(
                     __('May be approximate. See [doc@faq3-11]FAQ 3.11[/doc].')
                 )
             );
diff --git a/libraries/Footer.php b/libraries/Footer.php
index b051d89a9a..072d60a737 100644
--- a/libraries/Footer.php
+++ b/libraries/Footer.php
@@ -9,6 +9,7 @@ namespace PMA\libraries;
 
 use Traversable;
 use PMA\libraries\URL;
+use PMA\libraries\Sanitize;
 
 /**
  * Class used to output the footer
@@ -327,9 +328,9 @@ class Footer
                             . ' scripts: %s,'
                             . ' menuHash: "%s"'
                             . '};',
-                            PMA_escapeJsString($url),
+                            Sanitize::escapeJsString($url),
                             json_encode($scripts),
-                            PMA_escapeJsString($menuHash)
+                            Sanitize::escapeJsString($menuHash)
                         )
                     );
                 }
diff --git a/libraries/Header.php b/libraries/Header.php
index 99783896a1..f48fe91dc9 100644
--- a/libraries/Header.php
+++ b/libraries/Header.php
@@ -9,8 +9,8 @@ namespace PMA\libraries;
 
 use PMA\libraries\navigation\Navigation;
 use PMA\libraries\URL;
+use PMA\libraries\Sanitize;
 
-require_once 'libraries/js_escape.lib.php';
 
 /**
  * Class used to output the HTTP and HTML headers
@@ -272,7 +272,7 @@ class Header
     {
         $params = $this->getJsParams();
         foreach ($params as $key => $value) {
-            $params[$key] = $key . ':"' . PMA_escapeJsString($value) . '"';
+            $params[$key] = $key . ':"' . Sanitize::escapeJsString($value) . '"';
         }
         return 'PMA_commonParams.setAll({' . implode(',', $params) . '});';
     }
diff --git a/libraries/Index.php b/libraries/Index.php
index d9938d2c71..79e70a74eb 100644
--- a/libraries/Index.php
+++ b/libraries/Index.php
@@ -8,6 +8,7 @@
 namespace PMA\libraries;
 
 use PMA\libraries\URL;
+use PMA\libraries\Sanitize;
 
 /**
  * Index manipulation class
@@ -729,7 +730,7 @@ class Index
                         . ' DROP PRIMARY KEY;';
                     $this_params['message_to_show']
                         = __('The primary key has been dropped.');
-                    $js_msg = PMA_jsFormat(
+                    $js_msg = Sanitize::jsFormat(
                         'ALTER TABLE ' . $table . ' DROP PRIMARY KEY'
                     );
                 } else {
@@ -740,7 +741,7 @@ class Index
                         __('Index %s has been dropped.'), $index->getName()
                     );
 
-                    $js_msg = PMA_jsFormat(
+                    $js_msg = Sanitize::jsFormat(
                         'ALTER TABLE ' . $table . ' DROP INDEX '
                         . $index->getName() . ';'
                     );
diff --git a/libraries/Message.php b/libraries/Message.php
index 1b500aff39..3a87cf8778 100644
--- a/libraries/Message.php
+++ b/libraries/Message.php
@@ -7,6 +7,8 @@
  */
 namespace PMA\libraries;
 
+use PMA\libraries\Sanitize;
+
 /**
  * a single message
  *
@@ -583,7 +585,7 @@ class Message
      */
     static public function decodeBB($message)
     {
-        return PMA_sanitize($message, false, true);
+        return Sanitize::sanitize($message, false, true);
     }
 
     /**
diff --git a/libraries/Sanitize.php b/libraries/Sanitize.php
new file mode 100644
index 0000000000..1528b53e72
--- /dev/null
+++ b/libraries/Sanitize.php
@@ -0,0 +1,365 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * This is in a separate script because it's called from a number of scripts
+ *
+ * @package PhpMyAdmin
+ */
+namespace PMA\libraries;
+
+use PMA\libraries\Util;
+
+class Sanitize {
+
+    /**
+     * Checks whether given link is valid
+     *
+     * @param string $url URL to check
+     *
+     * @return boolean True if string can be used as link
+     */
+    public static function checkLink($url)
+    {
+        $valid_starts = array(
+            'http://',
+            'https://',
+            './url.php?url=http%3A%2F%2F',
+            './url.php?url=https%3A%2F%2F',
+            './doc/html/',
+        );
+        if (defined('PMA_SETUP')) {
+            $valid_starts[] = '?page=form&';
+            $valid_starts[] = '?page=servers&';
+        }
+        foreach ($valid_starts as $val) {
+            if (mb_substr($url, 0, mb_strlen($val)) == $val) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Callback function for replacing [a@link@target] links in bb code.
+     *
+     * @param array $found Array of preg matches
+     *
+     * @return string Replaced string
+     */
+    public static function replaceBBLink($found)
+    {
+        /* Check for valid link */
+        if (! Sanitize::checkLink($found[1])) {
+            return $found[0];
+        }
+        /* a-z and _ allowed in target */
+        if (! empty($found[3]) && preg_match('/[^a-z_]+/i', $found[3])) {
+            return $found[0];
+        }
+
+        /* Construct target */
+        $target = '';
+        if (! empty($found[3])) {
+            $target = ' target="' . $found[3] . '"';
+        }
+
+        /* Construct url */
+        if (substr($found[1], 0, 4) == 'http') {
+            $url = PMA_linkURL($found[1]);
+        } else {
+            $url = $found[1];
+        }
+
+        return '<a href="' . $url . '"' . $target . '>';
+    }
+
+    /**
+     * Callback function for replacing [doc@anchor] links in bb code.
+     *
+     * @param array $found Array of preg matches
+     *
+     * @return string Replaced string
+     */
+    public static function replaceDocLink($found)
+    {
+        $anchor = $found[1];
+        if (strncmp('faq', $anchor, 3) == 0) {
+            $page = 'faq';
+        } else if (strncmp('cfg', $anchor, 3) == 0) {
+            $page = 'cfg';
+        } else {
+            /* Guess */
+            $page = 'setup';
+        }
+        $link = Util::getDocuLink($page, $anchor);
+        return '<a href="' . $link . '" target="documentation">';
+    }
+
+    /**
+     * Sanitizes $message, taking into account our special codes
+     * for formatting.
+     *
+     * If you want to include result in element attribute, you should escape it.
+     *
+     * Examples:
+     *
+     * <p><?php echo Sanitize::sanitize($foo); ?></p>
+     *
+     * <a title="<?php echo Sanitize::sanitize($foo, true); ?>">bar</a>
+     *
+     * @param string  $message the message
+     * @param boolean $escape  whether to escape html in result
+     * @param boolean $safe    whether string is safe (can keep < and > chars)
+     *
+     * @return string   the sanitized message
+     */
+    public static function sanitize($message, $escape = false, $safe = false)
+    {
+        if (!$safe) {
+            $message = strtr($message, array('<' => '&lt;', '>' => '&gt;'));
+        }
+
+        /* Interpret bb code */
+        $replace_pairs = array(
+            '[em]'      => '<em>',
+            '[/em]'     => '</em>',
+            '[strong]'  => '<strong>',
+            '[/strong]' => '</strong>',
+            '[code]'    => '<code>',
+            '[/code]'   => '</code>',
+            '[kbd]'     => '<kbd>',
+            '[/kbd]'    => '</kbd>',
+            '[br]'      => '<br />',
+            '[/a]'      => '</a>',
+            '[/doc]'      => '</a>',
+            '[sup]'     => '<sup>',
+            '[/sup]'    => '</sup>',
+            // used in common.inc.php:
+            '[conferr]' => '<iframe src="show_config_errors.php" />',
+            // used in libraries/Util.php
+            '[dochelpicon]' => Util::getImage('b_help.png', __('Documentation')),
+        );
+
+        $message = strtr($message, $replace_pairs);
+
+        /* Match links in bb code ([a@url@target], where @target is options) */
+        $pattern = '/\[a@([^]"@]*)(@([^]"]*))?\]/';
+
+        /* Find and replace all links */
+        $message = preg_replace_callback($pattern, function($match){
+            return Sanitize::replaceBBLink($match);
+        }, $message);
+
+        /* Replace documentation links */
+        $message = preg_replace_callback(
+            '/\[doc@([a-zA-Z0-9_-]+)\]/',
+            function($match){
+                return Sanitize::replaceDocLink($match);
+            },
+                $message
+            );
+
+        /* Possibly escape result */
+        if ($escape) {
+            $message = htmlspecialchars($message);
+        }
+
+        return $message;
+    }
+
+
+    /**
+     * Sanitize a filename by removing anything besides legit characters
+     *
+     * Intended usecase:
+     *    When using a filename in a Content-Disposition header
+     *    the value should not contain ; or "
+     *
+     *    When exporting, avoiding generation of an unexpected double-extension file
+     *
+     * @param string  $filename    The filename
+     * @param boolean $replaceDots Whether to also replace dots
+     *
+     * @return string  the sanitized filename
+     *
+     */
+    public static function sanitizeFilename($filename, $replaceDots = false)
+    {
+        $pattern = '/[^A-Za-z0-9_';
+        // if we don't have to replace dots
+        if (! $replaceDots) {
+            // then add the dot to the list of legit characters
+            $pattern .= '.';
+        }
+        $pattern .= '-]/';
+        $filename = preg_replace($pattern, '_', $filename);
+        return $filename;
+    }
+
+    /**
+     * Format a string so it can be a string inside JavaScript code inside an
+     * eventhandler (onclick, onchange, on..., ).
+     * This function is used to displays a javascript confirmation box for
+     * "DROP/DELETE/ALTER" queries.
+     *
+     * @param string  $a_string       the string to format
+     * @param boolean $add_backquotes whether to add backquotes to the string or not
+     *
+     * @return string   the formatted string
+     *
+     * @access  public
+     */
+    public static function jsFormat($a_string = '', $add_backquotes = true)
+    {
+        if (is_string($a_string)) {
+            $a_string = htmlspecialchars($a_string);
+            $a_string = Sanitize::escapeJsString($a_string);
+            // Needed for inline javascript to prevent some browsers
+            // treating it as a anchor
+            $a_string = str_replace('#', '\\#', $a_string);
+        }
+
+        return $add_backquotes
+            ? Util::backquote($a_string)
+            : $a_string;
+    } // end of the 'Sanitize::jsFormat()' function
+
+    /**
+     * escapes a string to be inserted as string a JavaScript block
+     * enclosed by <![CDATA[ ... ]]>
+     * this requires only to escape ' with \' and end of script block
+     *
+     * We also remove NUL byte as some browsers (namely MSIE) ignore it and
+     * inserting it anywhere inside </script would allow to bypass this check.
+     *
+     * @param string $string the string to be escaped
+     *
+     * @return string  the escaped string
+     */
+    public static function escapeJsString($string)
+    {
+        return preg_replace(
+            '@</script@i', '</\' + \'script',
+            strtr(
+                $string,
+                array(
+                    "\000" => '',
+                    '\\' => '\\\\',
+                    '\'' => '\\\'',
+                    '"' => '\"',
+                    "\n" => '\n',
+                    "\r" => '\r'
+                )
+            )
+        );
+    }
+
+    /**
+     * Formats a value for javascript code.
+     *
+     * @param string $value String to be formatted.
+     *
+     * @return string formatted value.
+     */
+    public static function formatJsVal($value)
+    {
+        if (is_bool($value)) {
+            if ($value) {
+                return 'true';
+            }
+
+            return 'false';
+        }
+
+        if (is_int($value)) {
+            return (int)$value;
+        }
+
+        return '"' . Sanitize::escapeJsString($value) . '"';
+    }
+
+    /**
+     * Formats an javascript assignment with proper escaping of a value
+     * and support for assigning array of strings.
+     *
+     * @param string $key    Name of value to set
+     * @param mixed  $value  Value to set, can be either string or array of strings
+     * @param bool   $escape Whether to escape value or keep it as it is
+     *                       (for inclusion of js code)
+     *
+     * @return string Javascript code.
+     */
+    public static function getJsValue($key, $value, $escape = true)
+    {
+        $result = $key . ' = ';
+        if (!$escape) {
+            $result .= $value;
+        } elseif (is_array($value)) {
+            $result .= '[';
+            foreach ($value as $val) {
+                $result .= Sanitize::formatJsVal($val) . ",";
+            }
+            $result .= "];\n";
+        } else {
+            $result .= Sanitize::formatJsVal($value) . ";\n";
+        }
+        return $result;
+    }
+
+    /**
+     * Prints an javascript assignment with proper escaping of a value
+     * and support for assigning array of strings.
+     *
+     * @param string $key   Name of value to set
+     * @param mixed  $value Value to set, can be either string or array of strings
+     *
+     * @return void
+     */
+    public static function printJsValue($key, $value)
+    {
+        echo Sanitize::getJsValue($key, $value);
+    }
+
+    /**
+     * Formats javascript assignment for form validation api
+     * with proper escaping of a value.
+     *
+     * @param string  $key   Name of value to set
+     * @param string  $value Value to set
+     * @param boolean $addOn Check if $.validator.format is required or not
+     * @param boolean $comma Check if comma is required
+     *
+     * @return string Javascript code.
+     */
+    public static function getJsValueForFormValidation($key, $value, $addOn, $comma)
+    {
+        $result = $key . ': ';
+        if ($addOn) {
+            $result .= '$.validator.format(';
+        }
+        $result .= Sanitize::formatJsVal($value);
+        if ($addOn) {
+            $result .= ')';
+        }
+        if ($comma) {
+            $result .= ', ';
+        }
+        return $result;
+    }
+
+    /**
+     * Prints javascript assignment for form validation api
+     * with proper escaping of a value.
+     *
+     * @param string  $key   Name of value to set
+     * @param string  $value Value to set
+     * @param boolean $addOn Check if $.validator.format is required or not
+     * @param boolean $comma Check if comma is required
+     *
+     * @return void
+     */
+    public static function printJsValueForFormValidation($key, $value, $addOn=false, $comma=true)
+    {
+        echo Sanitize::getJsValueForFormValidation($key, $value, $addOn, $comma);
+    }
+}
diff --git a/libraries/Scripts.php b/libraries/Scripts.php
index a9d26c00dd..3d00c971ab 100644
--- a/libraries/Scripts.php
+++ b/libraries/Scripts.php
@@ -8,6 +8,7 @@
 namespace PMA\libraries;
 
 use PMA\libraries\URL;
+use PMA\libraries\Sanitize;
 
 /**
  * Collects information about which JavaScript
@@ -239,7 +240,7 @@ class Scripts
         foreach ($this->_files as $file) {
             $code .= sprintf(
                 '.add("%s",%d)',
-                PMA_escapeJsString($file['filename']),
+                Sanitize::escapeJsString($file['filename']),
                 $file['has_onload'] ? 1 : 0
             );
         }
@@ -250,7 +251,7 @@ class Scripts
         foreach ($this->_files as $file) {
             if ($file['has_onload']) {
                 $code .= 'AJAX.fireOnload("';
-                $code .= PMA_escapeJsString($file['filename']);
+                $code .= Sanitize::escapeJsString($file['filename']);
                 $code .= '");';
             }
         }
diff --git a/libraries/Util.php b/libraries/Util.php
index db336edab4..8feb574434 100644
--- a/libraries/Util.php
+++ b/libraries/Util.php
@@ -15,6 +15,7 @@ use SqlParser\Token;
 use stdClass;
 use SqlParser\Utils\Error as ParserError;
 use PMA\libraries\URL;
+use PMA\libraries\Sanitize;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -1114,9 +1115,9 @@ class Util
             $retval .= $message->getDisplay();
         } else {
             $retval .= '<div class="' . $type . '">';
-            $retval .= PMA_sanitize($message);
+            $retval .= Sanitize::sanitize($message);
             if (isset($GLOBALS['special_message'])) {
-                $retval .= PMA_sanitize($GLOBALS['special_message']);
+                $retval .= Sanitize::sanitize($GLOBALS['special_message']);
                 unset($GLOBALS['special_message']);
             }
             $retval .= '</div>';
@@ -1902,7 +1903,7 @@ class Util
             $tag_params = array();
             if (! empty($tmp)) {
                 $tag_params['onclick'] = 'return confirmLink(this, \''
-                    . PMA_escapeJsString($tmp) . '\')';
+                    . Sanitize::escapeJsString($tmp) . '\')';
             }
             unset($tmp);
         }
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 9140236b3d..d0009e9f40 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -91,11 +91,6 @@ $GLOBALS['error_handler'] = new ErrorHandler();
  */
 require './libraries/core.lib.php';
 
-/**
- * Input sanitizing
- */
-require './libraries/sanitizing.lib.php';
-
 /**
  * Warning about missing PHP extensions.
  */
@@ -112,12 +107,6 @@ mb_internal_encoding('utf-8');
  */
 require './libraries/relation.lib.php';
 
-if (! defined('PMA_MINIMUM_COMMON') || defined('PMA_SETUP')) {
-    /**
-     * JavaScript escaping.
-     */
-    include_once './libraries/js_escape.lib.php';
-}
 
 /******************************************************************************/
 /* start procedural code                       label_start_procedural         */
diff --git a/libraries/config/FormDisplay.php b/libraries/config/FormDisplay.php
index 80974e93ef..b5a2c9e434 100644
--- a/libraries/config/FormDisplay.php
+++ b/libraries/config/FormDisplay.php
@@ -14,12 +14,13 @@
  */
 namespace PMA\libraries\config;
 
+use PMA\libraries\Sanitize;
+
 /**
  * Core libraries.
  */
 use PMA\libraries\Util;
 
-require_once './libraries/js_escape.lib.php';
 require_once './libraries/config/FormDisplay.tpl.php';
 
 /**
@@ -335,7 +336,7 @@ class FormDisplay
             $js_lang_sent = true;
             $js_lang = array();
             foreach ($this->_jsLangStrings as $strName => $strValue) {
-                $js_lang[] = "'$strName': '" . PMA_jsFormat($strValue, false) . '\'';
+                $js_lang[] = "'$strName': '" . Sanitize::jsFormat($strValue, false) . '\'';
             }
             $js[] = "$.extend(PMA_messages, {\n\t"
                 . implode(",\n\t", $js_lang) . '})';
@@ -459,7 +460,7 @@ class FormDisplay
         case 'short_text':
         case 'number_text':
         case 'password':
-            $js_line .= '\'' . PMA_escapeJsString($value_default) . '\'';
+            $js_line .= '\'' . Sanitize::escapeJsString($value_default) . '\'';
             break;
         case 'checkbox':
             $js_line .= $value_default ? 'true' : 'false';
@@ -468,10 +469,10 @@ class FormDisplay
             $value_default_js = is_bool($value_default)
                 ? (int) $value_default
                 : $value_default;
-            $js_line .= '[\'' . PMA_escapeJsString($value_default_js) . '\']';
+            $js_line .= '[\'' . Sanitize::escapeJsString($value_default_js) . '\']';
             break;
         case 'list':
-            $js_line .= '\'' . PMA_escapeJsString(implode("\n", $value_default))
+            $js_line .= '\'' . Sanitize::escapeJsString(implode("\n", $value_default))
                 . '\'';
             break;
         }
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index fd041719fd..676971236f 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -8,6 +8,7 @@
 use PMA\libraries\Template;
 use PMA\libraries\Util;
 use PMA\libraries\URL;
+use PMA\libraries\Sanitize;
 
 /**
  * Displays top part of the form
@@ -482,7 +483,7 @@ function PMA_addJsValidate($field_id, $validators, &$js_array)
         $v_name = "PMA_" . $v_name;
         $v_args = array();
         foreach ($validator as $arg) {
-            $v_args[] = PMA_escapeJsString($arg);
+            $v_args[] = Sanitize::escapeJsString($arg);
         }
         $v_args = $v_args ? ", ['" . implode("', '", $v_args) . "']" : '';
         $js_array[] = "validateField('$field_id', '$v_name', true$v_args)";
diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php
index 74c8cacf69..5afeabd9fc 100644
--- a/libraries/config/config_functions.lib.php
+++ b/libraries/config/config_functions.lib.php
@@ -5,11 +5,12 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Sanitize;
 
 /**
  * Returns sanitized language string, taking into account our special codes
  * for formatting. Takes variable number of arguments.
- * Based on PMA_sanitize from sanitize.lib.php.
+ * Based on Sanitize::sanitize from sanitize.lib.php.
  *
  * @param string $lang_key key in $GLOBALS WITHOUT 'strSetup' prefix
  *
@@ -20,7 +21,7 @@ function PMA_lang($lang_key)
     $message = isset($GLOBALS["strConfig$lang_key"])
         ? $GLOBALS["strConfig$lang_key"] : $lang_key;
 
-    $message = PMA_sanitize($message);
+    $message = Sanitize::sanitize($message);
 
     if (func_num_args() == 1) {
         return $message;
diff --git a/libraries/controllers/database/DatabaseStructureController.php b/libraries/controllers/database/DatabaseStructureController.php
index 19aecf409e..aea38d7677 100644
--- a/libraries/controllers/database/DatabaseStructureController.php
+++ b/libraries/controllers/database/DatabaseStructureController.php
@@ -17,6 +17,7 @@ use PMA\libraries\Template;
 use PMA\libraries\Tracker;
 use PMA\libraries\Util;
 use PMA\libraries\URL;
+use PMA\libraries\Sanitize;
 
 require_once 'libraries/mysql_charsets.inc.php';
 require_once 'libraries/display_create_table.lib.php';
@@ -755,7 +756,7 @@ class DatabaseStructureController extends DatabaseController
             ) {
                 $approx_rows = true;
                 $show_superscript = Util::showHint(
-                    PMA_sanitize(
+                    Sanitize::sanitize(
                         sprintf(
                             __(
                                 'This view has at least this number of '
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index 60fcad6496..0a2c9de6c0 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -9,6 +9,7 @@
  */
 use PMA\libraries\Message;
 use PMA\libraries\URL;
+use PMA\libraries\Sanitize;
 
 
 if (! defined('PHPMYADMIN')) {
@@ -480,7 +481,6 @@ function PMA_getenv($var_name)
 function PMA_sendHeaderLocation($uri, $use_refresh = false)
 {
     if ($GLOBALS['PMA_Config']->get('PMA_IS_IIS') && mb_strlen($uri) > 600) {
-        include_once './libraries/js_escape.lib.php';
         PMA\libraries\Response::getInstance()->disable();
 
         echo PMA\libraries\Template::get('header_location')
@@ -792,7 +792,7 @@ function PMA_addJSCode($str)
  */
 function PMA_addJSVar($key, $value, $escape = true)
 {
-    PMA_addJSCode(PMA_getJsValue($key, $value, $escape));
+    PMA_addJSCode(Sanitize::getJsValue($key, $value, $escape));
 }
 
 /**
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index a27f609bf0..4eb5843c47 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -11,6 +11,7 @@
 use PMA\libraries\Message;
 use PMA\libraries\plugins\ImportPlugin;
 use PMA\libraries\URL;
+use PMA\libraries\Sanitize;
 
 /**
  * Prints Html For Display Import Hidden Input
@@ -65,7 +66,7 @@ function PMA_getHtmlForImportJS($upload_id)
     } else { // no plugin available
         $image_tag = '<img src="' . $GLOBALS['pmaThemeImage']
             . 'ajax_clock_small.gif" width="16" height="16" alt="ajax clock" /> '
-            . PMA_jsFormat(
+            . Sanitize::jsFormat(
                 __(
                     'Please be patient, the file is being uploaded. '
                     . 'Details about the upload are not available.'
@@ -476,7 +477,7 @@ function PMA_getHtmlForImportWithPlugin($upload_id)
     //some variable for javascript
     $ajax_url = "import_status.php?id=" . $upload_id . "&"
         . URL::getCommon(array('import_status'=>1), 'text');
-    $promot_str = PMA_jsFormat(
+    $promot_str = Sanitize::jsFormat(
         __(
             'The file being uploaded is probably larger than '
             . 'the maximum allowed size or this is a known bug in webkit '
@@ -484,12 +485,12 @@ function PMA_getHtmlForImportWithPlugin($upload_id)
         ),
         false
     );
-    $statustext_str = PMA_escapeJsString(__('%s of %s'));
-    $upload_str = PMA_jsFormat(__('Uploading your import file…'), false);
-    $second_str = PMA_jsFormat(__('%s/sec.'), false);
-    $remaining_min = PMA_jsFormat(__('About %MIN min. %SEC sec. remaining.'), false);
-    $remaining_second = PMA_jsFormat(__('About %SEC sec. remaining.'), false);
-    $processed_str = PMA_jsFormat(
+    $statustext_str = Sanitize::escapeJsString(__('%s of %s'));
+    $upload_str = Sanitize::jsFormat(__('Uploading your import file…'), false);
+    $second_str = Sanitize::jsFormat(__('%s/sec.'), false);
+    $remaining_min = Sanitize::jsFormat(__('About %MIN min. %SEC sec. remaining.'), false);
+    $remaining_second = Sanitize::jsFormat(__('About %SEC sec. remaining.'), false);
+    $processed_str = Sanitize::jsFormat(
         __('The file is being processed, please be patient.'),
         false
     );
diff --git a/libraries/error.inc.php b/libraries/error.inc.php
index 1d44975a03..da185a66b9 100644
--- a/libraries/error.inc.php
+++ b/libraries/error.inc.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Sanitize;
 
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -53,6 +54,6 @@ if (! defined('TESTSUITE')) {
 </head>
 <body>
 <h1>phpMyAdmin - <?php echo $error_header; ?></h1>
-<p><?php echo PMA_sanitize($error_message); ?></p>
+<p><?php echo Sanitize::sanitize($error_message); ?></p>
 </body>
 </html>
diff --git a/libraries/export.lib.php b/libraries/export.lib.php
index 1e6c112056..83801be74e 100644
--- a/libraries/export.lib.php
+++ b/libraries/export.lib.php
@@ -11,6 +11,7 @@ use PMA\libraries\plugins\ExportPlugin;
 use PMA\libraries\Table;
 use PMA\libraries\ZipFile;
 use PMA\libraries\URL;
+use PMA\libraries\Sanitize;
 
 
 /**
@@ -282,7 +283,7 @@ function PMA_getExportFilenameAndMimetype(
     $filename = PMA\libraries\Util::expandUserString($filename_template);
     // remove dots in filename (coming from either the template or already
     // part of the filename) to avoid a remote code execution vulnerability
-    $filename = PMA_sanitizeFilename($filename, $replaceDots = true);
+    $filename = Sanitize::sanitizeFilename($filename, $replaceDots = true);
 
     // Grab basic dump extension and mime type
     // Check if the user already added extension;
diff --git a/libraries/gis/GISVisualization.php b/libraries/gis/GISVisualization.php
index 800a06ef03..511236e117 100644
--- a/libraries/gis/GISVisualization.php
+++ b/libraries/gis/GISVisualization.php
@@ -9,7 +9,8 @@
 namespace PMA\libraries\gis;
 
 use PMA\libraries\Util;
-use TCPDF;
+use \TCPDF;
+use PMA\libraries\Sanitize;
 
 require_once 'libraries/sql.lib.php';
 
@@ -245,7 +246,7 @@ class GISVisualization
      */
     private function _sanitizeName($file_name, $ext)
     {
-        $file_name = PMA_sanitizeFilename($file_name);
+        $file_name = Sanitize::sanitizeFilename($file_name);
 
         // Check if the user already added extension;
         // get the substring where the extension would be if it was included
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index f4bd208de2..e9627b23ea 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -8,6 +8,7 @@
 use PMA\libraries\Message;
 use PMA\libraries\plugins\TransformationsPlugin;
 use PMA\libraries\URL;
+use PMA\libraries\Sanitize;
 
 /**
  * Retrieve form parameters for insert/edit form
@@ -467,7 +468,7 @@ function PMA_getNullColumn($column, $column_name_appendix, $real_null_value,
     $html_output .= '<input type="hidden" class="hashed_field" name="hashed_field'
         . $column_name_appendix . '" value="' .  $column['Field_md5'] . '" />';
     $html_output .= '<input type="hidden" class="multi_edit" name="multi_edit'
-        . $column_name_appendix . '" value="' . PMA_escapeJsString($vkey) . '" />';
+        . $column_name_appendix . '" value="' . Sanitize::escapeJsString($vkey) . '" />';
     $html_output .= '</td>' . "\n";
 
     return $html_output;
@@ -2727,8 +2728,8 @@ function PMA_getHtmlForInsertEditFormColumn($table_columns, $column_number,
     //Call validation when the form submitted...
     $onChangeClause = $chg_evt_handler
         . "=\"return verificationsAfterFieldChange('"
-        . PMA_escapeJsString($column['Field_md5']) . "', '"
-        . PMA_escapeJsString($jsvkey) . "','" . $column['pma_type'] . "')\"";
+        . Sanitize::escapeJsString($column['Field_md5']) . "', '"
+        . Sanitize::escapeJsString($jsvkey) . "','" . $column['pma_type'] . "')\"";
 
     // Use an MD5 as an array index to avoid having special characters
     // in the name attribute (see bug #1746964 )
diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php
deleted file mode 100644
index 7edcb004f6..0000000000
--- a/libraries/js_escape.lib.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Javascript escaping functions.
- *
- * @package PhpMyAdmin
- *
- */
-
-/**
- * Format a string so it can be a string inside JavaScript code inside an
- * eventhandler (onclick, onchange, on..., ).
- * This function is used to displays a javascript confirmation box for
- * "DROP/DELETE/ALTER" queries.
- *
- * @param string  $a_string       the string to format
- * @param boolean $add_backquotes whether to add backquotes to the string or not
- *
- * @return string   the formatted string
- *
- * @access  public
- */
-function PMA_jsFormat($a_string = '', $add_backquotes = true)
-{
-    if (is_string($a_string)) {
-        $a_string = htmlspecialchars($a_string);
-        $a_string = PMA_escapeJsString($a_string);
-        // Needed for inline javascript to prevent some browsers
-        // treating it as a anchor
-        $a_string = str_replace('#', '\\#', $a_string);
-    }
-
-    return $add_backquotes
-        ? PMA\libraries\Util::backquote($a_string)
-        : $a_string;
-} // end of the 'PMA_jsFormat()' function
-
-/**
- * escapes a string to be inserted as string a JavaScript block
- * enclosed by <![CDATA[ ... ]]>
- * this requires only to escape ' with \' and end of script block
- *
- * We also remove NUL byte as some browsers (namely MSIE) ignore it and
- * inserting it anywhere inside </script would allow to bypass this check.
- *
- * @param string $string the string to be escaped
- *
- * @return string  the escaped string
- */
-function PMA_escapeJsString($string)
-{
-    return preg_replace(
-        '@</script@i', '</\' + \'script',
-        strtr(
-            $string,
-            array(
-                "\000" => '',
-                '\\' => '\\\\',
-                '\'' => '\\\'',
-                '"' => '\"',
-                "\n" => '\n',
-                "\r" => '\r'
-            )
-        )
-    );
-}
-
-/**
- * Formats a value for javascript code.
- *
- * @param string $value String to be formatted.
- *
- * @return string formatted value.
- */
-function PMA_formatJsVal($value)
-{
-    if (is_bool($value)) {
-        if ($value) {
-            return 'true';
-        }
-
-        return 'false';
-    }
-
-    if (is_int($value)) {
-        return (int)$value;
-    }
-
-    return '"' . PMA_escapeJsString($value) . '"';
-}
-
-/**
- * Formats an javascript assignment with proper escaping of a value
- * and support for assigning array of strings.
- *
- * @param string $key    Name of value to set
- * @param mixed  $value  Value to set, can be either string or array of strings
- * @param bool   $escape Whether to escape value or keep it as it is
- *                       (for inclusion of js code)
- *
- * @return string Javascript code.
- */
-function PMA_getJsValue($key, $value, $escape = true)
-{
-    $result = $key . ' = ';
-    if (!$escape) {
-        $result .= $value;
-    } elseif (is_array($value)) {
-        $result .= '[';
-        foreach ($value as $val) {
-            $result .= PMA_formatJsVal($val) . ",";
-        }
-        $result .= "];\n";
-    } else {
-        $result .= PMA_formatJsVal($value) . ";\n";
-    }
-    return $result;
-}
-
-/**
- * Prints an javascript assignment with proper escaping of a value
- * and support for assigning array of strings.
- *
- * @param string $key   Name of value to set
- * @param mixed  $value Value to set, can be either string or array of strings
- *
- * @return void
- */
-function PMA_printJsValue($key, $value)
-{
-    echo PMA_getJsValue($key, $value);
-}
-
-/**
- * Formats javascript assignment for form validation api
- * with proper escaping of a value.
- *
- * @param string  $key   Name of value to set
- * @param string  $value Value to set
- * @param boolean $addOn Check if $.validator.format is required or not
- * @param boolean $comma Check if comma is required
- *
- * @return string Javascript code.
- */
-function PMA_getJsValueForFormValidation($key, $value, $addOn, $comma)
-{
-    $result = $key . ': ';
-    if ($addOn) {
-        $result .= '$.validator.format(';
-    }
-    $result .= PMA_formatJsVal($value);
-    if ($addOn) {
-        $result .= ')';
-    }
-    if ($comma) {
-        $result .= ', ';
-    }
-    return $result;
-}
-
-/**
- * Prints javascript assignment for form validation api
- * with proper escaping of a value.
- *
- * @param string  $key   Name of value to set
- * @param string  $value Value to set
- * @param boolean $addOn Check if $.validator.format is required or not
- * @param boolean $comma Check if comma is required
- *
- * @return void
- */
-function PMA_printJsValueForFormValidation($key, $value, $addOn=false, $comma=true)
-{
-    echo PMA_getJsValueForFormValidation($key, $value, $addOn, $comma);
-}
diff --git a/libraries/plugins/AuthenticationPlugin.php b/libraries/plugins/AuthenticationPlugin.php
index 7d5a794015..bca12f722d 100644
--- a/libraries/plugins/AuthenticationPlugin.php
+++ b/libraries/plugins/AuthenticationPlugin.php
@@ -7,6 +7,8 @@
  */
 namespace PMA\libraries\plugins;
 
+use PMA\libraries\Sanitize;
+
 /**
  * Provides a common interface that will have to be implemented by all of the
  * authentication plugins.
@@ -74,7 +76,7 @@ abstract class AuthenticationPlugin
         } else {
             $dbi_error = $GLOBALS['dbi']->getError();
             if (!empty($dbi_error)) {
-                return PMA_sanitize($dbi_error);
+                return Sanitize::sanitize($dbi_error);
             } elseif (isset($GLOBALS['errno'])) {
                 return '#' . $GLOBALS['errno'] . ' '
                 . __('Cannot log in to the MySQL server');
diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php
deleted file mode 100644
index 485e092329..0000000000
--- a/libraries/sanitizing.lib.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * This is in a separate script because it's called from a number of scripts
- *
- * @package PhpMyAdmin
- */
-
-/**
- * Checks whether given link is valid
- *
- * @param string $url URL to check
- *
- * @return boolean True if string can be used as link
- */
-function PMA_checkLink($url)
-{
-    $valid_starts = array(
-        'http://',
-        'https://',
-        './url.php?url=http%3A%2F%2F',
-        './url.php?url=https%3A%2F%2F',
-        './doc/html/',
-    );
-    if (defined('PMA_SETUP')) {
-        $valid_starts[] = '?page=form&';
-        $valid_starts[] = '?page=servers&';
-    }
-    foreach ($valid_starts as $val) {
-        if (mb_substr($url, 0, mb_strlen($val)) == $val) {
-            return true;
-        }
-    }
-    return false;
-}
-
-/**
- * Callback function for replacing [a@link@target] links in bb code.
- *
- * @param array $found Array of preg matches
- *
- * @return string Replaced string
- */
-function PMA_replaceBBLink($found)
-{
-    /* Check for valid link */
-    if (! PMA_checkLink($found[1])) {
-        return $found[0];
-    }
-    /* a-z and _ allowed in target */
-    if (! empty($found[3]) && preg_match('/[^a-z_]+/i', $found[3])) {
-        return $found[0];
-    }
-
-    /* Construct target */
-    $target = '';
-    if (! empty($found[3])) {
-        $target = ' target="' . $found[3] . '"';
-    }
-
-    /* Construct url */
-    if (substr($found[1], 0, 4) == 'http') {
-        $url = PMA_linkURL($found[1]);
-    } else {
-        $url = $found[1];
-    }
-
-    return '<a href="' . $url . '"' . $target . '>';
-}
-
-/**
- * Callback function for replacing [doc@anchor] links in bb code.
- *
- * @param array $found Array of preg matches
- *
- * @return string Replaced string
- */
-function PMA_replaceDocLink($found)
-{
-    $anchor = $found[1];
-    if (strncmp('faq', $anchor, 3) == 0) {
-        $page = 'faq';
-    } else if (strncmp('cfg', $anchor, 3) == 0) {
-        $page = 'cfg';
-    } else {
-        /* Guess */
-        $page = 'setup';
-    }
-    $link = PMA\libraries\Util::getDocuLink($page, $anchor);
-    return '<a href="' . $link . '" target="documentation">';
-}
-
-/**
- * Sanitizes $message, taking into account our special codes
- * for formatting.
- *
- * If you want to include result in element attribute, you should escape it.
- *
- * Examples:
- *
- * <p><?php echo PMA_sanitize($foo); ?></p>
- *
- * <a title="<?php echo PMA_sanitize($foo, true); ?>">bar</a>
- *
- * @param string  $message the message
- * @param boolean $escape  whether to escape html in result
- * @param boolean $safe    whether string is safe (can keep < and > chars)
- *
- * @return string   the sanitized message
- */
-function PMA_sanitize($message, $escape = false, $safe = false)
-{
-    if (!$safe) {
-        $message = strtr($message, array('<' => '&lt;', '>' => '&gt;'));
-    }
-
-    /* Interpret bb code */
-    $replace_pairs = array(
-        '[em]'      => '<em>',
-        '[/em]'     => '</em>',
-        '[strong]'  => '<strong>',
-        '[/strong]' => '</strong>',
-        '[code]'    => '<code>',
-        '[/code]'   => '</code>',
-        '[kbd]'     => '<kbd>',
-        '[/kbd]'    => '</kbd>',
-        '[br]'      => '<br />',
-        '[/a]'      => '</a>',
-        '[/doc]'      => '</a>',
-        '[sup]'     => '<sup>',
-        '[/sup]'    => '</sup>',
-         // used in common.inc.php:
-        '[conferr]' => '<iframe src="show_config_errors.php" />',
-         // used in libraries/Util.php
-        '[dochelpicon]' => PMA\libraries\Util::getImage('b_help.png', __('Documentation')),
-    );
-
-    $message = strtr($message, $replace_pairs);
-
-    /* Match links in bb code ([a@url@target], where @target is options) */
-    $pattern = '/\[a@([^]"@]*)(@([^]"]*))?\]/';
-
-    /* Find and replace all links */
-    $message = preg_replace_callback($pattern, 'PMA_replaceBBLink', $message);
-
-    /* Replace documentation links */
-    $message = preg_replace_callback(
-        '/\[doc@([a-zA-Z0-9_-]+)\]/',
-        'PMA_replaceDocLink',
-        $message
-    );
-
-    /* Possibly escape result */
-    if ($escape) {
-        $message = htmlspecialchars($message);
-    }
-
-    return $message;
-}
-
-
-/**
- * Sanitize a filename by removing anything besides legit characters
- *
- * Intended usecase:
- *    When using a filename in a Content-Disposition header
- *    the value should not contain ; or "
- *
- *    When exporting, avoiding generation of an unexpected double-extension file
- *
- * @param string  $filename    The filename
- * @param boolean $replaceDots Whether to also replace dots
- *
- * @return string  the sanitized filename
- *
- */
-function PMA_sanitizeFilename($filename, $replaceDots = false)
-{
-    $pattern = '/[^A-Za-z0-9_';
-    // if we don't have to replace dots
-    if (! $replaceDots) {
-        // then add the dot to the list of legit characters
-        $pattern .= '.';
-    }
-    $pattern .= '-]/';
-    $filename = preg_replace($pattern, '_', $filename);
-    return $filename;
-}
-
diff --git a/libraries/tracking.lib.php b/libraries/tracking.lib.php
index 4361eeb93b..537a464eea 100644
--- a/libraries/tracking.lib.php
+++ b/libraries/tracking.lib.php
@@ -9,6 +9,7 @@ use PMA\libraries\Message;
 use PMA\libraries\Response;
 use PMA\libraries\Tracker;
 use PMA\libraries\URL;
+use PMA\libraries\Sanitize;
 
 /**
  * Filters tracking entries
@@ -658,7 +659,7 @@ function PMA_getHtmlForTrackingReportExportForm2(
         . '</option>'
         . '<option value="sqldump">' . __('SQL dump') . '</option>'
         . '<option value="execution" onclick="alert(\''
-        . PMA_escapeJsString(
+        . Sanitize::escapeJsString(
             __('This option will replace your table and contained data.')
         )
         . '\')">' . __('SQL execution') . '</option>' . '</select>';
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index 4ab7ff9b6e..ef4687db41 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -6,6 +6,7 @@
  * @package PhpMyAdmin
  */
 use PMA\libraries\Message;
+use PMA\libraries\Sanitize;
 
 if (!defined('PHPMYADMIN')) {
     exit;
@@ -77,7 +78,7 @@ if (! $cfgRelation['userconfigwork']) {
         'Your preferences will be saved for current session only. Storing them '
         . 'permanently requires %sphpMyAdmin configuration storage%s.'
     );
-    $msg = PMA_sanitize(
+    $msg = Sanitize::sanitize(
         sprintf($msg, '[doc@linked-tables]', '[/doc]')
     );
     Message::notice($msg)->display();
diff --git a/prefs_manage.php b/prefs_manage.php
index 62aa3d3d22..bb03a628ee 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -11,6 +11,7 @@ use PMA\libraries\Message;
 use PMA\libraries\Response;
 use PMA\libraries\Util;
 use PMA\libraries\URL;
+use PMA\libraries\Sanitize;
 
 /**
  * Gets some core libraries and displays a top message if required
@@ -228,7 +229,7 @@ if ($error) {
 ?>
 <script type="text/javascript">
 <?php
-PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: @DATE@'));
+Sanitize::printJsValue("PMA_messages['strSavedOn']", __('Saved on: @DATE@'));
 ?>
 </script>
 <div id="maincontainer">
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 9ec51c5e27..e0dc5f6f48 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -11,6 +11,7 @@ use PMA\libraries\config\FormDisplay;
 use PMA\libraries\config\ServerConfigChecks;
 use PMA\libraries\LanguageManager;
 use PMA\libraries\URL;
+use PMA\libraries\Sanitize;
 
 if (!defined('PHPMYADMIN')) {
     exit;
@@ -56,7 +57,7 @@ PMA_checkConfigRw($config_readable, $config_writable, $config_exists);
 if (!$config_writable || !$config_readable) {
     PMA_messagesSet(
         'error', 'config_rw', __('Cannot load or save configuration'),
-        PMA_sanitize(
+        Sanitize::sanitize(
             __(
                 'Please create web server writable folder [em]config[/em] in '
                 . 'phpMyAdmin top level directory as described in '
@@ -82,7 +83,7 @@ if (!$is_https) {
             'https://' .  $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']
         );
         $text .= ' ';
-        $text .= PMA_sanitize(
+        $text .= Sanitize::sanitize(
             sprintf(
                 __(
                     'If your server is also configured to accept HTTPS requests '
@@ -121,7 +122,7 @@ case 'config_saved':
     /* Use uniqid to display this message every time configuration is saved */
     PMA_messagesSet(
         'notice', uniqid('config_saved'), __('Configuration saved.'),
-        PMA_sanitize(
+        Sanitize::sanitize(
             __(
                 'Configuration saved to file config/config.inc.php in phpMyAdmin '
                 . 'top level directory, copy it to top level one and delete '
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
index c4de5964a4..0c24504a67 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -7,6 +7,7 @@
  */
 
 use PMA\libraries\VersionInformation;
+use PMA\libraries\Sanitize;
 
 if (!defined('PHPMYADMIN')) {
     exit;
@@ -174,7 +175,7 @@ function PMA_versionCheck()
                 'notice',
                 $message_id,
                 __('Version check'),
-                PMA_sanitize(sprintf(__('You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable version is %s, released on %s.'), $version, $date))
+                Sanitize::sanitize(sprintf(__('You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable version is %s, released on %s.'), $version, $date))
             );
         } else {
             PMA_messagesSet(
diff --git a/templates/database/structure/table_header.phtml b/templates/database/structure/table_header.phtml
index d159b67f32..20c5d241bc 100644
--- a/templates/database/structure/table_header.phtml
+++ b/templates/database/structure/table_header.phtml
@@ -38,7 +38,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
                         'initial_sort_order' => 'DESC'
                     )
                 ); ?>
-                <?= PMA\libraries\Util::showHint(PMA_sanitize(
+                <?= PMA\libraries\Util::showHint(PMA\libraries\Sanitize::sanitize(
                     __('May be approximate. Click on the number to get the exact'
                         . ' count. See [doc@faq3-11]FAQ 3.11[/doc].'))); ?>
             </th>
diff --git a/templates/header_location.phtml b/templates/header_location.phtml
index 3362e015ee..a4e5fd8fee 100644
--- a/templates/header_location.phtml
+++ b/templates/header_location.phtml
@@ -18,14 +18,14 @@ $uri = isset($uri) ? $uri : null;
     <meta http-equiv="Refresh" content="0;url=<?= htmlspecialchars($uri) ?>">
     <script type="text/javascript">
         //<![CDATA[
-        setTimeout("window.location = decodeURI('<?= PMA_escapeJsString($uri) ?>')", 2000);
+        setTimeout("window.location = decodeURI('<?= PMA\libraries\Sanitize::escapeJsString($uri) ?>')", 2000);
         //]]>
     </script>
 </head>
 <body>
 <script type="text/javascript">
     //<![CDATA[
-    document.write('<p><a href="<?= PMA_escapeJsString(htmlspecialchars($uri)) ?>"><?php echo __('Go') ?></a></p>');
+    document.write('<p><a href="<?= PMA\libraries\Sanitize::escapeJsString(htmlspecialchars($uri)) ?>"><?php echo __('Go') ?></a></p>');
     //]]>
 </script>
 </body>
diff --git a/templates/server/databases/table_row.phtml b/templates/server/databases/table_row.phtml
index 20284f8f04..b83dd8137d 100644
--- a/templates/server/databases/table_row.phtml
+++ b/templates/server/databases/table_row.phtml
@@ -56,10 +56,10 @@
     <?php endif; ?>
 
     <td class="tool">
-        <a onclick="PMA_commonActions.setDb('<?= PMA_jsFormat($current['SCHEMA_NAME']) ?>');"
+        <a onclick="PMA_commonActions.setDb('<?= PMA\libraries\Sanitize::jsFormat($current['SCHEMA_NAME']) ?>');"
            href="server_privileges.php<?= $url_query; ?>&amp;db=<?= urlencode($current['SCHEMA_NAME']); ?>&amp;checkprivsdb=<?= urlencode($current['SCHEMA_NAME']); ?>"
            title="<?= sprintf(__('Check privileges for database "%s".'), htmlspecialchars($current['SCHEMA_NAME'])); ?>">
            <?= \PMA\libraries\Util::getIcon('s_rights.png', __('Check privileges')); ?>
         </a>
     </td>
-</tr>
\ No newline at end of file
+</tr>
diff --git a/templates/table/relation/foreign_key_row.phtml b/templates/table/relation/foreign_key_row.phtml
index d0f3c59b9a..6d534db18a 100644
--- a/templates/table/relation/foreign_key_row.phtml
+++ b/templates/table/relation/foreign_key_row.phtml
@@ -3,6 +3,7 @@ use PMA\libraries\DatabaseInterface;
 use PMA\libraries\Table;
 use PMA\libraries\Util;
 use PMA\libraries\URL;
+use PMA\libraries\Sanitize;
 
 $js_msg = '';
 $this_params = null;
@@ -18,7 +19,7 @@ if (isset($one_key['constraint'])) {
         __('Foreign key constraint %s has been dropped'),
         $one_key['constraint']
     );
-    $js_msg = PMA_jsFormat(
+    $js_msg = Sanitize::jsFormat(
         'ALTER TABLE ' . $GLOBALS['table']
         . ' DROP FOREIGN KEY '
         . $one_key['constraint'] . ';'
diff --git a/test/classes/DisplayResultsTest.php b/test/classes/DisplayResultsTest.php
index f7b16d7ac1..49628bb98b 100644
--- a/test/classes/DisplayResultsTest.php
+++ b/test/classes/DisplayResultsTest.php
@@ -10,7 +10,6 @@
  */
 use PMA\libraries\plugins\transformations\Text_Plain_Link;
 
-require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/string.lib.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/ErrorHandlerTest.php b/test/classes/ErrorHandlerTest.php
index 1e71713923..b50b4d9ab4 100644
--- a/test/classes/ErrorHandlerTest.php
+++ b/test/classes/ErrorHandlerTest.php
@@ -11,7 +11,6 @@
 
 use PMA\libraries\Theme;
 
-require_once 'libraries/sanitizing.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
diff --git a/test/classes/ErrorTest.php b/test/classes/ErrorTest.php
index f5d2382f8e..2fb863f0a6 100644
--- a/test/classes/ErrorTest.php
+++ b/test/classes/ErrorTest.php
@@ -12,7 +12,6 @@
 
 use PMA\libraries\Theme;
 
-require_once 'libraries/sanitizing.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php
index a878f5582f..ce3a7117d2 100644
--- a/test/classes/FooterTest.php
+++ b/test/classes/FooterTest.php
@@ -11,7 +11,6 @@
 
 use PMA\libraries\Theme;
 
-require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/relation.lib.php';
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/HeaderTest.php b/test/classes/HeaderTest.php
index 455f10945c..07fd5a5c1b 100644
--- a/test/classes/HeaderTest.php
+++ b/test/classes/HeaderTest.php
@@ -11,10 +11,8 @@
  */
 use PMA\libraries\Theme;
 
-require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/relation.lib.php';
-require_once 'libraries/js_escape.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
diff --git a/test/classes/MenuTest.php b/test/classes/MenuTest.php
index 3e4e3c1144..f7659b922c 100644
--- a/test/classes/MenuTest.php
+++ b/test/classes/MenuTest.php
@@ -12,7 +12,6 @@
 use PMA\libraries\Menu;
 use PMA\libraries\Theme;
 
-require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/relation.lib.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/MessageTest.php b/test/classes/MessageTest.php
index 8dac8f0029..fdf92cbdaa 100644
--- a/test/classes/MessageTest.php
+++ b/test/classes/MessageTest.php
@@ -11,7 +11,6 @@
  */
 use PMA\libraries\Theme;
 
-require_once 'libraries/sanitizing.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
diff --git a/test/libraries/PMA_sanitize_test.php b/test/classes/Sanitize.php
similarity index 54%
rename from test/libraries/PMA_sanitize_test.php
rename to test/classes/Sanitize.php
index 540665d13e..c3035d9120 100644
--- a/test/libraries/PMA_sanitize_test.php
+++ b/test/classes/Sanitize.php
@@ -1,18 +1,17 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * tests for PMA_sanitize()
+ * tests for Sanitize::sanitize()
  *
  * @package PhpMyAdmin-test
  */
-
 /*
  * Include to test
  */
-require_once 'libraries/sanitizing.lib.php';
+use PMA\libraries\Sanitize;
 
 /**
- * tests for PMA_sanitize()
+ * tests for Sanitize::sanitize()
  *
  * @package PhpMyAdmin-test
  */
@@ -36,7 +35,7 @@ class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase
     {
         $this->assertEquals(
             '[a@javascript:alert(\'XSS\');@target]link</a>',
-            PMA_sanitize('[a@javascript:alert(\'XSS\');@target]link[/a]')
+            Sanitize::sanitize('[a@javascript:alert(\'XSS\');@target]link[/a]')
         );
     }
 
@@ -52,7 +51,7 @@ class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase
         unset($GLOBALS['collation_connection']);
         $this->assertEquals(
             '<a href="./url.php?url=http%3A%2F%2Fwww.phpmyadmin.net%2F" target="target">link</a>',
-            PMA_sanitize('[a@http://www.phpmyadmin.net/@target]link[/a]')
+            Sanitize::sanitize('[a@http://www.phpmyadmin.net/@target]link[/a]')
         );
     }
 
@@ -65,7 +64,7 @@ class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase
     {
         $this->assertEquals(
             '<a href="./url.php?url=http%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fsetup.html%23foo" target="documentation">doclink</a>',
-            PMA_sanitize('[doc@foo]doclink[/doc]')
+            Sanitize::sanitize('[doc@foo]doclink[/doc]')
         );
     }
 
@@ -78,7 +77,7 @@ class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase
     {
         $this->assertEquals(
             '[a@./Documentation.html@INVALID9]doc</a>',
-            PMA_sanitize('[a@./Documentation.html@INVALID9]doc[/a]')
+            Sanitize::sanitize('[a@./Documentation.html@INVALID9]doc[/a]')
         );
     }
 
@@ -91,7 +90,7 @@ class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase
     {
         $this->assertEquals(
             '[a@./Documentation.html" onmouseover="alert(foo)"]doc</a>',
-            PMA_sanitize('[a@./Documentation.html" onmouseover="alert(foo)"]doc[/a]')
+            Sanitize::sanitize('[a@./Documentation.html" onmouseover="alert(foo)"]doc[/a]')
         );
     }
 
@@ -104,7 +103,7 @@ class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase
     {
         $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]')
+            Sanitize::sanitize('[a@http://docs.phpmyadmin.net/]doc[/a][a@javascript:alert(\'XSS\');@target]link[/a]')
         );
     }
 
@@ -117,7 +116,7 @@ class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase
     {
         $this->assertEquals(
             '&lt;div onclick=""&gt;',
-            PMA_sanitize('<div onclick="">')
+            Sanitize::sanitize('<div onclick="">')
         );
     }
 
@@ -130,7 +129,7 @@ class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase
     {
         $this->assertEquals(
             '<strong>strong</strong>',
-            PMA_sanitize('[strong]strong[/strong]')
+            Sanitize::sanitize('[strong]strong[/strong]')
         );
     }
 
@@ -143,12 +142,12 @@ class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase
     {
         $this->assertEquals(
             '&lt;strong&gt;strong&lt;/strong&gt;',
-            PMA_sanitize('[strong]strong[/strong]', true)
+            Sanitize::sanitize('[strong]strong[/strong]', true)
         );
     }
 
     /**
-     * Test for PMA_sanitizeFilename
+     * Test for Sanitize::sanitizeFilename
      *
      * @return void
      */
@@ -156,7 +155,61 @@ class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase
     {
         $this->assertEquals(
             'File_name_123',
-            PMA_sanitizeFilename('File_name 123')
+            Sanitize::sanitizeFilename('File_name 123')
+        );
+    }
+
+    /**
+     * Test for Sanitize::getJsValue
+     *
+     * @param string $key      Key
+     * @param string $value    Value
+     * @param string $expected Expected output
+     *
+     * @dataProvider variables
+     *
+     * @return void
+     */
+    public function testFormat($key, $value, $expected)
+    {
+        $this->assertEquals($expected, Sanitize::getJsValue($key, $value));
+        $this->assertEquals('foo = 100', Sanitize::getJsValue('foo', '100', false));
+        $array = array('1','2','3');
+        $this->assertEquals(
+            "foo = [\"1\",\"2\",\"3\",];\n",
+            Sanitize::getJsValue('foo', $array)
+        );
+        $this->assertEquals(
+            "foo = \"bar\\\"baz\";\n",
+            Sanitize::getJsValue('foo', 'bar"baz')
+        );
+    }
+
+    /**
+     * Test for Sanitize::jsFormat
+     *
+     * @return void
+     */
+    public function testJsFormat()
+    {
+        $this->assertEquals("`foo`", Sanitize::jsFormat('foo'));
+    }
+
+    /**
+     * Provider for testFormat
+     *
+     * @return array
+     */
+    public function variables()
+    {
+        return array(
+            array('foo', true, "foo = true;\n"),
+            array('foo', false, "foo = false;\n"),
+            array('foo', 100, "foo = 100;\n"),
+            array('foo', 0, "foo = 0;\n"),
+            array('foo', 'text', "foo = \"text\";\n"),
+            array('foo', 'quote"', "foo = \"quote\\\"\";\n"),
+            array('foo', 'apostroph\'', "foo = \"apostroph\\'\";\n"),
         );
     }
 }
diff --git a/test/classes/ScriptsTest.php b/test/classes/ScriptsTest.php
index fdd24d797c..8602455f20 100644
--- a/test/classes/ScriptsTest.php
+++ b/test/classes/ScriptsTest.php
@@ -12,7 +12,6 @@
 
 use PMA\libraries\Scripts;
 
-require_once 'libraries/js_escape.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
diff --git a/test/classes/controllers/ServerBinlogControllerTest.php b/test/classes/controllers/ServerBinlogControllerTest.php
index d1a1d76f77..a43df3a6a8 100644
--- a/test/classes/controllers/ServerBinlogControllerTest.php
+++ b/test/classes/controllers/ServerBinlogControllerTest.php
@@ -13,8 +13,6 @@ use PMA\libraries\Util;
 
 require_once 'test/PMATestCase.php';
 require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
 
 /**
  * Tests for ServerCollationsController class
diff --git a/test/classes/controllers/ServerCollationsControllerTest.php b/test/classes/controllers/ServerCollationsControllerTest.php
index 7e8a28d7c3..01667b9b32 100644
--- a/test/classes/controllers/ServerCollationsControllerTest.php
+++ b/test/classes/controllers/ServerCollationsControllerTest.php
@@ -27,8 +27,6 @@ $GLOBALS['cfg']['Server'] = array(
 
 
 
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/server_common.inc.php';
 require_once 'libraries/mysql_charsets.inc.php';
diff --git a/test/classes/controllers/ServerDatabasesControllerTest.php b/test/classes/controllers/ServerDatabasesControllerTest.php
index f1959b3430..5666bf1c4d 100644
--- a/test/classes/controllers/ServerDatabasesControllerTest.php
+++ b/test/classes/controllers/ServerDatabasesControllerTest.php
@@ -13,9 +13,6 @@ require_once 'libraries/mysql_charsets.lib.php';
 
 require_once 'libraries/database_interface.inc.php';
 
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
 require_once 'test/libraries/stubs/ResponseStub.php';
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/controllers/ServerEnginesControllerTest.php b/test/classes/controllers/ServerEnginesControllerTest.php
index 703c77bea5..3e74ac768d 100644
--- a/test/classes/controllers/ServerEnginesControllerTest.php
+++ b/test/classes/controllers/ServerEnginesControllerTest.php
@@ -13,8 +13,6 @@ use PMA\libraries\URL;
 
 require_once 'libraries/database_interface.inc.php';
 
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
diff --git a/test/classes/controllers/ServerPluginsControllerTest.php b/test/classes/controllers/ServerPluginsControllerTest.php
index ee693f4d5c..af62b8dca7 100644
--- a/test/classes/controllers/ServerPluginsControllerTest.php
+++ b/test/classes/controllers/ServerPluginsControllerTest.php
@@ -14,8 +14,6 @@ use PMA\libraries\controllers\server\ServerPluginsController;
 use PMA\libraries\di\Container;
 
 require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
diff --git a/test/classes/controllers/ServerVariablesControllerTest.php b/test/classes/controllers/ServerVariablesControllerTest.php
index b747e73d06..abd023f6fe 100644
--- a/test/classes/controllers/ServerVariablesControllerTest.php
+++ b/test/classes/controllers/ServerVariablesControllerTest.php
@@ -15,9 +15,6 @@ require_once 'libraries/database_interface.inc.php';
 require_once 'test/libraries/stubs/ResponseStub.php';
 require_once 'test/PMATestCase.php';
 
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
 /**
  * Tests for ServerVariablesController class
  *
diff --git a/test/classes/controllers/TableIndexesControllerTest.php b/test/classes/controllers/TableIndexesControllerTest.php
index 217b69376f..dff0c990ac 100644
--- a/test/classes/controllers/TableIndexesControllerTest.php
+++ b/test/classes/controllers/TableIndexesControllerTest.php
@@ -22,7 +22,6 @@ use PMA\libraries\URL;
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/relation.lib.php';
 
-require_once 'libraries/sanitizing.lib.php';
 require_once 'test/libraries/stubs/ResponseStub.php';
 require_once 'test/PMATestCase.php';
 
diff --git a/test/classes/plugin/auth/AuthenticationConfigTest.php b/test/classes/plugin/auth/AuthenticationConfigTest.php
index 18d3ac3267..63be771722 100644
--- a/test/classes/plugin/auth/AuthenticationConfigTest.php
+++ b/test/classes/plugin/auth/AuthenticationConfigTest.php
@@ -9,7 +9,6 @@
 use PMA\libraries\plugins\auth\AuthenticationConfig;
 
 require_once 'libraries/config.default.php';
-require_once 'libraries/js_escape.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
diff --git a/test/classes/plugin/auth/AuthenticationCookieTest.php b/test/classes/plugin/auth/AuthenticationCookieTest.php
index f742598fc5..7e67fdaccf 100644
--- a/test/classes/plugin/auth/AuthenticationCookieTest.php
+++ b/test/classes/plugin/auth/AuthenticationCookieTest.php
@@ -12,8 +12,6 @@ use PMA\libraries\Theme;
 $GLOBALS['PMA_Config'] = new PMA\libraries\Config();
 
 require_once 'libraries/config.default.php';
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/plugins/auth/AuthenticationCookie.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/plugin/auth/AuthenticationHttpTest.php b/test/classes/plugin/auth/AuthenticationHttpTest.php
index 3d0dcd2f74..3824b1d9ef 100644
--- a/test/classes/plugin/auth/AuthenticationHttpTest.php
+++ b/test/classes/plugin/auth/AuthenticationHttpTest.php
@@ -9,7 +9,6 @@
 use PMA\libraries\plugins\auth\AuthenticationHttp;
 
 require_once 'libraries/config.default.php';
-require_once 'libraries/sanitizing.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
diff --git a/test/classes/plugin/auth/AuthenticationSignonTest.php b/test/classes/plugin/auth/AuthenticationSignonTest.php
index d8b15bcdee..db56e69bbe 100644
--- a/test/classes/plugin/auth/AuthenticationSignonTest.php
+++ b/test/classes/plugin/auth/AuthenticationSignonTest.php
@@ -9,7 +9,6 @@
 use PMA\libraries\plugins\auth\AuthenticationSignon;
 
 require_once 'libraries/config.default.php';
-require_once 'libraries/sanitizing.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
diff --git a/test/classes/plugin/import/ImportCsvTest.php b/test/classes/plugin/import/ImportCsvTest.php
index 0026ae0b98..188e15eaa1 100644
--- a/test/classes/plugin/import/ImportCsvTest.php
+++ b/test/classes/plugin/import/ImportCsvTest.php
@@ -19,7 +19,6 @@ $GLOBALS['server'] = 0;
  */
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/import.lib.php';
-require_once 'libraries/sanitizing.lib.php';
 require_once 'test/PMATestCase.php';
 
 /**
diff --git a/test/classes/plugin/import/ImportLdiTest.php b/test/classes/plugin/import/ImportLdiTest.php
index be8f085e46..1ccc303b82 100644
--- a/test/classes/plugin/import/ImportLdiTest.php
+++ b/test/classes/plugin/import/ImportLdiTest.php
@@ -17,7 +17,6 @@ $GLOBALS['plugin_param'] = "table";
 /*
  * Include to test.
  */
-require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/import.lib.php';
 require_once 'test/PMATestCase.php';
diff --git a/test/classes/plugin/import/ImportOdsTest.php b/test/classes/plugin/import/ImportOdsTest.php
index f92cb7e4ce..1b8db9c083 100644
--- a/test/classes/plugin/import/ImportOdsTest.php
+++ b/test/classes/plugin/import/ImportOdsTest.php
@@ -18,7 +18,6 @@ $GLOBALS['server'] = 0;
  */
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/import.lib.php';
-require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/plugins/import/ImportOds.php';
 require_once 'test/PMATestCase.php';
 
diff --git a/test/libraries/PMA_FormDisplay_tpl_test.php b/test/libraries/PMA_FormDisplay_tpl_test.php
index a84f243948..36abbd703b 100644
--- a/test/libraries/PMA_FormDisplay_tpl_test.php
+++ b/test/libraries/PMA_FormDisplay_tpl_test.php
@@ -10,7 +10,6 @@ use PMA\libraries\Theme;
 
 require_once 'libraries/config/FormDisplay.tpl.php';
 require_once 'libraries/user_preferences.lib.php';
-require_once 'libraries/js_escape.lib.php';
 
 /**
  * Tests for FromDisplay.tpl.php
diff --git a/test/libraries/PMA_SetupIndex_test.php b/test/libraries/PMA_SetupIndex_test.php
index 3021bc12bb..72f971c72a 100644
--- a/test/libraries/PMA_SetupIndex_test.php
+++ b/test/libraries/PMA_SetupIndex_test.php
@@ -12,10 +12,8 @@
 use PMA\libraries\config\ConfigFile;
 use PMA\libraries\config\ServerConfigChecks;
 
-require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/config/config_functions.lib.php';
 require_once 'setup/lib/index.lib.php';
-require_once 'libraries/sanitizing.lib.php';
 
 /**
  * tests for methods under setup/lib/index.lib.php
diff --git a/test/libraries/PMA_config_functions_test.php b/test/libraries/PMA_config_functions_test.php
index 07d830879d..ca8ee07c7d 100644
--- a/test/libraries/PMA_config_functions_test.php
+++ b/test/libraries/PMA_config_functions_test.php
@@ -10,7 +10,6 @@
  * Include to test.
  */
 require_once 'libraries/config/config_functions.lib.php';
-require_once 'libraries/sanitizing.lib.php';
 
 /**
  * Tests for Config Functions
diff --git a/test/libraries/PMA_display_change_password_test.php b/test/libraries/PMA_display_change_password_test.php
index 8dbe61c9ad..ba71b75fb0 100644
--- a/test/libraries/PMA_display_change_password_test.php
+++ b/test/libraries/PMA_display_change_password_test.php
@@ -16,8 +16,6 @@ use PMA\libraries\URL;
 require_once 'libraries/display_change_password.lib.php';
 
 require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
 
 require_once 'libraries/config.default.php';
 
diff --git a/test/libraries/PMA_display_create_table_test.php b/test/libraries/PMA_display_create_table_test.php
index 966a5164df..6ee8cd4233 100644
--- a/test/libraries/PMA_display_create_table_test.php
+++ b/test/libraries/PMA_display_create_table_test.php
@@ -19,9 +19,6 @@ $GLOBALS['cfg']['DBG']['sql'] = false;
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/display_create_table.lib.php';
 
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
 /**
  * class PMA_DisplayCreateTable_Test
  *
diff --git a/test/libraries/PMA_display_export_test.php b/test/libraries/PMA_display_export_test.php
index eed2424a1a..17a7f52693 100644
--- a/test/libraries/PMA_display_export_test.php
+++ b/test/libraries/PMA_display_export_test.php
@@ -18,8 +18,6 @@ require_once 'libraries/display_export.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/charset_conversion.lib.php';
 require_once 'libraries/plugin_interface.lib.php';
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/relation.lib.php';
 
 /**
diff --git a/test/libraries/PMA_escapeJsString_test.php b/test/libraries/PMA_escapeJsString_test.php
index 45c1886842..28662b552b 100644
--- a/test/libraries/PMA_escapeJsString_test.php
+++ b/test/libraries/PMA_escapeJsString_test.php
@@ -9,7 +9,8 @@
 /*
  * Include to test.
  */
-require_once 'libraries/js_escape.lib.php';
+use PMA\libraries\Sanitize;
+
 
 /**
  * Test for javascript escaping.
@@ -19,7 +20,7 @@ require_once 'libraries/js_escape.lib.php';
 class PMA_EscapeJsString_Test extends PHPUnit_Framework_TestCase
 {
     /**
-     * PMA_escapeJsString tests
+     * Sanitize::escapeJsString tests
      *
      * @param string $target expected output
      * @param string $source string to be escaped
@@ -29,7 +30,7 @@ class PMA_EscapeJsString_Test extends PHPUnit_Framework_TestCase
      */
     public function testEscape($target, $source)
     {
-        $this->assertEquals($target, PMA_escapeJsString($source));
+        $this->assertEquals($target, Sanitize::escapeJsString($source));
     }
 
     /**
diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php
index d7babe1686..41289e362d 100644
--- a/test/libraries/PMA_insert_edit_test.php
+++ b/test/libraries/PMA_insert_edit_test.php
@@ -17,10 +17,8 @@ use PMA\libraries\TypesMySQL;
 
 require_once 'libraries/insert_edit.lib.php';
 require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/transformations.lib.php';
-require_once 'libraries/sanitizing.lib.php';
 
 /**
  * Tests for libraries/insert_edit.lib.php
diff --git a/test/libraries/PMA_js_escape_test.php b/test/libraries/PMA_js_escape_test.php
deleted file mode 100644
index 3e251330e6..0000000000
--- a/test/libraries/PMA_js_escape_test.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for JS variable formatting
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/js_escape.lib.php';
-
-
-/**
- * tests for JS variable formatting
- *
- * @package PhpMyAdmin-test
- */
-class PMA_JS_Escape_Test extends PHPUnit_Framework_TestCase
-{
-    /**
-     * Test for PMA_getJsValue
-     *
-     * @param string $key      Key
-     * @param string $value    Value
-     * @param string $expected Expected output
-     *
-     * @dataProvider variables
-     *
-     * @return void
-     */
-    public function testFormat($key, $value, $expected)
-    {
-        $this->assertEquals($expected, PMA_getJsValue($key, $value));
-        $this->assertEquals('foo = 100', PMA_getJsValue('foo', '100', false));
-        $array = array('1','2','3');
-        $this->assertEquals(
-            "foo = [\"1\",\"2\",\"3\",];\n",
-            PMA_getJsValue('foo', $array)
-        );
-        $this->assertEquals(
-            "foo = \"bar\\\"baz\";\n",
-            PMA_getJsValue('foo', 'bar"baz')
-        );
-    }
-
-    /**
-     * Test for PMA_jsFormat
-     *
-     * @return void
-     */
-    public function testJsFormat()
-    {
-        $this->assertEquals("`foo`", PMA_jsFormat('foo'));
-    }
-
-    /**
-     * Provider for testFormat
-     *
-     * @return array
-     */
-    public function variables()
-    {
-        return array(
-            array('foo', true, "foo = true;\n"),
-            array('foo', false, "foo = false;\n"),
-            array('foo', 100, "foo = 100;\n"),
-            array('foo', 0, "foo = 0;\n"),
-            array('foo', 'text', "foo = \"text\";\n"),
-            array('foo', 'quote"', "foo = \"quote\\\"\";\n"),
-            array('foo', 'apostroph\'', "foo = \"apostroph\\'\";\n"),
-        );
-    }
-}
diff --git a/test/libraries/PMA_mult_submits_test.php b/test/libraries/PMA_mult_submits_test.php
index 96dac1ac15..bbb2705514 100644
--- a/test/libraries/PMA_mult_submits_test.php
+++ b/test/libraries/PMA_mult_submits_test.php
@@ -17,8 +17,6 @@ require_once 'libraries/mult_submits.lib.php';
 
 require_once 'libraries/database_interface.inc.php';
 
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/relation_cleanup.lib.php';
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/sql.lib.php';
diff --git a/test/libraries/PMA_select_server_test.php b/test/libraries/PMA_select_server_test.php
index 83d039c56e..2fe494a97d 100644
--- a/test/libraries/PMA_select_server_test.php
+++ b/test/libraries/PMA_select_server_test.php
@@ -16,9 +16,6 @@ require_once 'libraries/select_server.lib.php';
 
 require_once 'libraries/database_interface.inc.php';
 
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
 /**
  * PMA_SelectServer_Test class
  *
diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php
index b4e7fb7d0e..4d4eba295e 100644
--- a/test/libraries/PMA_server_privileges_test.php
+++ b/test/libraries/PMA_server_privileges_test.php
@@ -15,10 +15,6 @@ use PMA\libraries\URL;
 
 require_once 'libraries/database_interface.inc.php';
 
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
-
 require_once 'libraries/relation.lib.php';
 require_once 'libraries/relation_cleanup.lib.php';
 require_once 'libraries/server_privileges.lib.php';
diff --git a/test/libraries/PMA_server_replication_test.php b/test/libraries/PMA_server_replication_test.php
index acec00ece1..a308ef0355 100644
--- a/test/libraries/PMA_server_replication_test.php
+++ b/test/libraries/PMA_server_replication_test.php
@@ -16,10 +16,6 @@ require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/replication.inc.php';
 require_once 'libraries/replication_gui.lib.php';
 
-
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
 /**
  * PMA_Serverreplication_Test class
  *
diff --git a/test/libraries/PMA_server_status_advisor_test.php b/test/libraries/PMA_server_status_advisor_test.php
index 9bb6793dc9..86f82a1835 100644
--- a/test/libraries/PMA_server_status_advisor_test.php
+++ b/test/libraries/PMA_server_status_advisor_test.php
@@ -19,9 +19,6 @@ require_once 'libraries/server_status_advisor.lib.php';
 
 require_once 'libraries/database_interface.inc.php';
 
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
 /**
  * class PMA_ServerStatusAdvisor_Test
  *
diff --git a/test/libraries/PMA_server_status_monitor_test.php b/test/libraries/PMA_server_status_monitor_test.php
index 36923d0502..837d2a7c16 100644
--- a/test/libraries/PMA_server_status_monitor_test.php
+++ b/test/libraries/PMA_server_status_monitor_test.php
@@ -17,9 +17,6 @@ require_once 'libraries/server_status_monitor.lib.php';
 
 require_once 'libraries/database_interface.inc.php';
 
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
 /**
  * class PMA_ServerStatusMonitor_Test
  *
diff --git a/test/libraries/PMA_server_status_processes_test.php b/test/libraries/PMA_server_status_processes_test.php
index 2ca83a96f5..ee7ac876bc 100644
--- a/test/libraries/PMA_server_status_processes_test.php
+++ b/test/libraries/PMA_server_status_processes_test.php
@@ -16,10 +16,6 @@ use PMA\libraries\URL;
 require_once 'libraries/server_status_processes.lib.php';
 require_once 'libraries/database_interface.inc.php';
 
-
-
-require_once 'libraries/sanitizing.lib.php';
-
 /**
  * class PMA_ServerStatusProcesses_Test
  *
diff --git a/test/libraries/PMA_server_status_queries_test.php b/test/libraries/PMA_server_status_queries_test.php
index 96295b5388..f6b42a6c79 100644
--- a/test/libraries/PMA_server_status_queries_test.php
+++ b/test/libraries/PMA_server_status_queries_test.php
@@ -18,9 +18,6 @@ require_once 'libraries/server_status_queries.lib.php';
 
 require_once 'libraries/database_interface.inc.php';
 
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
 /**
  * class PMA_ServerStatusVariables_Test
  *
diff --git a/test/libraries/PMA_server_status_variables_test.php b/test/libraries/PMA_server_status_variables_test.php
index 7597d657a8..fab148c865 100644
--- a/test/libraries/PMA_server_status_variables_test.php
+++ b/test/libraries/PMA_server_status_variables_test.php
@@ -18,9 +18,6 @@ require_once 'libraries/server_status_variables.lib.php';
 
 require_once 'libraries/database_interface.inc.php';
 
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
-
 /**
  * class PMA_ServerStatusVariables_Test
  *
diff --git a/test/libraries/PMA_sql_query_form_test.php b/test/libraries/PMA_sql_query_form_test.php
index 58c8df8840..ce188f2b5d 100644
--- a/test/libraries/PMA_sql_query_form_test.php
+++ b/test/libraries/PMA_sql_query_form_test.php
@@ -19,8 +19,6 @@ $GLOBALS['server'] = 0;
 require_once 'libraries/relation.lib.php';
 
 
-require_once 'libraries/sanitizing.lib.php';
-require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/sql_query_form.lib.php';
 require_once 'libraries/kanji-encoding.lib.php';
diff --git a/test/libraries/PMA_tbl_tracking_test.php b/test/libraries/PMA_tbl_tracking_test.php
index 102524a55b..a7a7ed208b 100644
--- a/test/libraries/PMA_tbl_tracking_test.php
+++ b/test/libraries/PMA_tbl_tracking_test.php
@@ -18,7 +18,6 @@ require_once 'libraries/database_interface.inc.php';
 require_once 'libraries/relation.lib.php';
 
 
-require_once 'libraries/js_escape.lib.php';
 
 /**
  * Tests for libraries/tracking.lib.php
diff --git a/test/libraries/PMA_user_preferences_test.php b/test/libraries/PMA_user_preferences_test.php
index e1de8b7ea9..53b164319f 100644
--- a/test/libraries/PMA_user_preferences_test.php
+++ b/test/libraries/PMA_user_preferences_test.php
@@ -13,7 +13,6 @@ use PMA\libraries\config\ConfigFile;
 
 require_once 'libraries/user_preferences.lib.php';
 require_once 'libraries/relation.lib.php';
-require_once 'libraries/sanitizing.lib.php';
 
 
 /**
diff --git a/test/libraries/common/PMA_checkParameters_test.php b/test/libraries/common/PMA_checkParameters_test.php
index 84ed337059..051686be91 100644
--- a/test/libraries/common/PMA_checkParameters_test.php
+++ b/test/libraries/common/PMA_checkParameters_test.php
@@ -12,9 +12,6 @@
  */
 use PMA\libraries\Theme;
 
-
-require_once 'libraries/sanitizing.lib.php';
-
 /**
  ** Test for PMA\libraries\Util::checkParameters from Util.php
  *
diff --git a/test/libraries/common/PMA_showMessage_test_disabled.php b/test/libraries/common/PMA_showMessage_test_disabled.php
index 11d1a16139..b9b8d08503 100644
--- a/test/libraries/common/PMA_showMessage_test_disabled.php
+++ b/test/libraries/common/PMA_showMessage_test_disabled.php
@@ -9,12 +9,6 @@
 
 const PMA_IS_WINDOWS = false;
 
-/*
- * Include to test.
- */
-
-
-require_once 'libraries/js_escape.lib.php';
 
 /**
  ** Test for PMA\libraries\Util::getMessage from common.lib
diff --git a/test/libraries/core/PMA_fatalError_test.php b/test/libraries/core/PMA_fatalError_test.php
index ef1d6db6a1..a952b7d91c 100644
--- a/test/libraries/core/PMA_fatalError_test.php
+++ b/test/libraries/core/PMA_fatalError_test.php
@@ -14,12 +14,6 @@
  */
 use PMA\libraries\Theme;
 
-
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/sanitizing.lib.php';
-
-
-
 /**
  *
  * PMA_fatalError() displays the given error message on phpMyAdmin error page in
diff --git a/test/libraries/core/PMA_getTableCount_test_dis.php b/test/libraries/core/PMA_getTableCount_test_dis.php
index 3dca47f579..e4bdf38977 100644
--- a/test/libraries/core/PMA_getTableCount_test_dis.php
+++ b/test/libraries/core/PMA_getTableCount_test_dis.php
@@ -12,9 +12,7 @@
 
 use PMA\libraries\Theme;
 
-require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/select_lang.inc.php';
-require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/config.default.php';
 
 
diff --git a/test/libraries/core/PMA_headerLocation_test.php b/test/libraries/core/PMA_headerLocation_test.php
index f04aff2473..932d84b4d4 100644
--- a/test/libraries/core/PMA_headerLocation_test.php
+++ b/test/libraries/core/PMA_headerLocation_test.php
@@ -11,12 +11,7 @@
  */
 use PMA\libraries\Theme;
 use PMA\libraries\URL;
-
-
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/sanitizing.lib.php';
-
-
+use PMA\libraries\Sanitize;
 
 /**
  * Test function sending headers.
@@ -231,7 +226,7 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
             . '&test=test&test=test&test=test&test=test&test=test&test=test'
             . '&test=test&test=test';
         $testUri_html = htmlspecialchars($testUri);
-        $testUri_js = PMA_escapeJsString($testUri);
+        $testUri_js = Sanitize::escapeJsString($testUri);
 
         $header = "<html><head><title>- - -</title>
     <meta http-equiv=\"expires\" content=\"0\">"
diff --git a/test/libraries/core/PMA_warnMissingExtension_test.php b/test/libraries/core/PMA_warnMissingExtension_test.php
index c38d69c23d..1e20738718 100644
--- a/test/libraries/core/PMA_warnMissingExtension_test.php
+++ b/test/libraries/core/PMA_warnMissingExtension_test.php
@@ -11,10 +11,6 @@
  */
 use PMA\libraries\Theme;
 
-
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/sanitizing.lib.php';
-
 /**
  * PMA_warnMissingExtension warns or fails on missing extension.
  *
diff --git a/url.php b/url.php
index c59bd25878..d0577bcd45 100644
--- a/url.php
+++ b/url.php
@@ -5,16 +5,13 @@
  *
  * @package PhpMyAdmin
  */
+use PMA\libraries\Sanitize;
 
 /**
  * Gets core libraries and defines some variables
  */
 define('PMA_MINIMUM_COMMON', true);
 require_once './libraries/common.inc.php';
-/**
- * JavaScript escaping.
- */
-require_once './libraries/js_escape.lib.php';
 
 if (! PMA_isValid($_REQUEST['url'])
     || ! preg_match('/^https?:\/\/[^\n\r]*$/', $_REQUEST['url'])
@@ -28,7 +25,7 @@ if (! PMA_isValid($_REQUEST['url'])
     //  external site.
     echo "<script type='text/javascript'>
             window.onload=function(){
-                window.location='" , PMA_escapeJsString($_REQUEST['url']) , "';
+                window.location='" , Sanitize::escapeJsString($_REQUEST['url']) , "';
             }
         </script>";
     // Display redirecting msg on screen.