diff options
| author | Michal Čihař <mcihar@suse.cz> | 2013-08-07 12:58:17 +0400 |
|---|---|---|
| committer | Michal Čihař <mcihar@suse.cz> | 2013-08-07 12:58:17 +0400 |
| commit | 0a3d1d5be80a93d24e40b3e90c5b6491da1141fd (patch) | |
| tree | 7d9eeaa3eac1d68decea74702b708df4d35372c3 | |
| parent | ffae07abda9cc3538c4ae137466595c633c1a21f (diff) | |
Better names for URL generating functions
105 files changed, 338 insertions, 338 deletions
diff --git a/browse_foreigners.php b/browse_foreigners.php index 6ef81be26a..8f40f211cb 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -164,7 +164,7 @@ $header->getScripts()->addCode($code); // HTML output $output = '<form action="browse_foreigners.php" method="post">' . '<fieldset>' - . PMA_generate_common_hidden_inputs($db, $table) + . PMA_URL_getHiddenInputs($db, $table) . '<input type="hidden" name="field" value="' . htmlspecialchars($field) . '" />' . '<input type="hidden" name="fieldkey" value="' . (isset($fieldkey) ? htmlspecialchars($fieldkey) : '') . '" />'; diff --git a/db_create.php b/db_create.php index d99a851090..a5cd007f25 100644 --- a/db_create.php +++ b/db_create.php @@ -20,7 +20,7 @@ require 'libraries/build_html_for_db.lib.php'; /** * Defines the url to return to in case of error in a sql statement */ -$err_url = 'index.php?' . PMA_generate_common_url(); +$err_url = 'index.php?' . PMA_URL_getCommon(); /** * Builds and executes the db creation sql query @@ -70,7 +70,7 @@ if (! $result) { // the list of databases on server_databases.php /** - * Build the array to be passed to {@link PMA_generate_common_url} + * Build the array to be passed to {@link PMA_URL_getCommon} * to generate the links * * @global array $GLOBALS['db_url_params'] @@ -80,7 +80,7 @@ if (! $result) { $is_superuser = $GLOBALS['dbi']->isSuperuser(); $column_order = PMA_getColumnOrder(); - $url_query = PMA_generate_common_url($_POST['new_db']); + $url_query = PMA_URL_getCommon($_POST['new_db']); /** * String that will contain the output HTML diff --git a/db_datadict.php b/db_datadict.php index 688d18ca50..6a17a57af8 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -37,9 +37,9 @@ PMA_Util::checkParameters(array('db')); * Defines the url to return to in case of error in a sql statement */ if (strlen($table)) { - $err_url = 'tbl_sql.php?' . PMA_generate_common_url($db, $table); + $err_url = 'tbl_sql.php?' . PMA_URL_getCommon($db, $table); } else { - $err_url = 'db_sql.php?' . PMA_generate_common_url($db); + $err_url = 'db_sql.php?' . PMA_URL_getCommon($db); } if ($cfgRelation['commwork']) { diff --git a/db_printview.php b/db_printview.php index 965ca1af76..92f70024b9 100644 --- a/db_printview.php +++ b/db_printview.php @@ -20,7 +20,7 @@ PMA_Util::checkParameters(array('db')); /** * Defines the url to return to in case of error in a sql statement */ -$err_url = 'db_sql.php?' . PMA_generate_common_url($db); +$err_url = 'db_sql.php?' . PMA_URL_getCommon($db); /** * Settings for relations stuff diff --git a/db_qbe.php b/db_qbe.php index 849d10eff0..7fad34d72d 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -58,7 +58,7 @@ $db_qbe = new PMA_DBQbe($GLOBALS['db']); * Displays the Query by example form */ if ($cfgRelation['designerwork']) { - $url = 'pmd_general.php' . PMA_generate_common_url( + $url = 'pmd_general.php' . PMA_URL_getCommon( array_merge( $url_params, array('query' => 1) diff --git a/db_structure.php b/db_structure.php index 3437122454..0eed9ad925 100644 --- a/db_structure.php +++ b/db_structure.php @@ -28,7 +28,7 @@ if ((!empty($_POST['submit_mult']) && isset($_POST['selected_tbl'])) || isset($_POST['mult_btn']) ) { $action = 'db_structure.php'; - $err_url = 'db_structure.php?'. PMA_generate_common_url($db); + $err_url = 'db_structure.php?'. PMA_URL_getCommon($db); // see bug #2794840; in this case, code path is: // db_structure.php -> libraries/mult_submits.inc.php -> sql.php @@ -111,7 +111,7 @@ $response->addHTML( . 'name="tablesForm" id="tablesForm">' ); -$response->addHTML(PMA_generate_common_hidden_inputs($db)); +$response->addHTML(PMA_URL_getHiddenInputs($db)); $response->addHTML( PMA_tableHeader($db_is_information_schema, $server_slave_status) diff --git a/export.php b/export.php index 9f3807713c..4abd931eac 100644 --- a/export.php +++ b/export.php @@ -219,9 +219,9 @@ if (!defined('TESTSUITE')) { // Generate error url and check for needed variables if ($export_type == 'server') { - $err_url = 'server_export.php?' . PMA_generate_common_url(); + $err_url = 'server_export.php?' . PMA_URL_getCommon(); } elseif ($export_type == 'database' && strlen($db)) { - $err_url = 'db_export.php?' . PMA_generate_common_url($db); + $err_url = 'db_export.php?' . PMA_URL_getCommon($db); // Check if we have something to export if (isset($table_select)) { $tables = $table_select; @@ -229,7 +229,7 @@ if (!defined('TESTSUITE')) { $tables = array(); } } elseif ($export_type == 'table' && strlen($db) && strlen($table)) { - $err_url = 'tbl_export.php?' . PMA_generate_common_url($db, $table); + $err_url = 'tbl_export.php?' . PMA_URL_getCommon($db, $table); } else { PMA_fatalError(__('Bad parameters!')); } @@ -576,11 +576,11 @@ if (!defined('TESTSUITE')) { */ $back_button = '<p>[ <a href="'; if ($export_type == 'server') { - $back_button .= 'server_export.php?' . PMA_generate_common_url(); + $back_button .= 'server_export.php?' . PMA_URL_getCommon(); } elseif ($export_type == 'database') { - $back_button .= 'db_export.php?' . PMA_generate_common_url($db); + $back_button .= 'db_export.php?' . PMA_URL_getCommon($db); } else { - $back_button .= 'tbl_export.php?' . PMA_generate_common_url($db, $table); + $back_button .= 'tbl_export.php?' . PMA_URL_getCommon($db, $table); } // Convert the multiple select elements from an array to a string diff --git a/gis_data_editor.php b/gis_data_editor.php index 89c46b90fc..ad92aa4a8b 100644 --- a/gis_data_editor.php +++ b/gis_data_editor.php @@ -122,7 +122,7 @@ if (isset($_REQUEST['input_name'])) { echo '<input type="hidden" name="input_name" value="' . htmlspecialchars($_REQUEST['input_name']) . '" />'; } -echo PMA_generate_common_hidden_inputs(); +echo PMA_URL_getHiddenInputs(); echo '<!-- Visualization section -->'; echo '<div id="placeholder" style="width:450px;height:300px;' diff --git a/import.php b/import.php index 5fdc7db990..f6f49323bf 100644 --- a/import.php +++ b/import.php @@ -165,15 +165,15 @@ require_once 'libraries/import.lib.php'; // Create error and goto url if ($import_type == 'table') { - $err_url = 'tbl_import.php?' . PMA_generate_common_url($db, $table); + $err_url = 'tbl_import.php?' . PMA_URL_getCommon($db, $table); $_SESSION['Import_message']['go_back_url'] = $err_url; $goto = 'tbl_import.php'; } elseif ($import_type == 'database') { - $err_url = 'db_import.php?' . PMA_generate_common_url($db); + $err_url = 'db_import.php?' . PMA_URL_getCommon($db); $_SESSION['Import_message']['go_back_url'] = $err_url; $goto = 'db_import.php'; } elseif ($import_type == 'server') { - $err_url = 'server_import.php?' . PMA_generate_common_url(); + $err_url = 'server_import.php?' . PMA_URL_getCommon(); $_SESSION['Import_message']['go_back_url'] = $err_url; $goto = 'server_import.php'; } else { @@ -187,11 +187,11 @@ if ($import_type == 'table') { } } if (strlen($table) && strlen($db)) { - $common = PMA_generate_common_url($db, $table); + $common = PMA_URL_getCommon($db, $table); } elseif (strlen($db)) { - $common = PMA_generate_common_url($db); + $common = PMA_URL_getCommon($db); } else { - $common = PMA_generate_common_url(); + $common = PMA_URL_getCommon(); } $err_url = $goto . '?' . $common . (preg_match('@^tbl_[a-z]*\.php$@', $goto) @@ -75,7 +75,7 @@ if (! empty($message)) { unset($message); } -$common_url_query = PMA_generate_common_url('', ''); +$common_url_query = PMA_URL_getCommon('', ''); // when $server > 0, a server has been chosen so we can display // all MySQL-related information @@ -169,7 +169,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_generate_common_hidden_inputs(null, null, 4, 'collation_connection') + . PMA_URL_getHiddenInputs(null, null, 4, 'collation_connection') . ' <label for="select_collation_connection">' . "\n" . ' '. PMA_Util::getImage('s_asci.png') . " " . __('Server connection collation') . "\n" diff --git a/libraries/Advisor.class.php b/libraries/Advisor.class.php index 38ff201455..a8b5d0b075 100644 --- a/libraries/Advisor.class.php +++ b/libraries/Advisor.class.php @@ -242,7 +242,7 @@ class Advisor // linking to server_variables.php $rule['recommendation'] = preg_replace( '/\{([a-z_0-9]+)\}/Ui', - '<a href="server_variables.php?' . PMA_generate_common_url() + '<a href="server_variables.php?' . PMA_URL_getCommon() . '&filter=\1">\1</a>', $this->translate($rule['recommendation']) ); diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 8a5b27f4ea..0b81062b9d 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -1738,7 +1738,7 @@ class PMA_Config { return '<form name="form_fontsize_selection" id="form_fontsize_selection"' . ' method="get" action="index.php" class="disableAjax">' . "\n" - . PMA_generate_common_hidden_inputs() . "\n" + . PMA_URL_getHiddenInputs() . "\n" . PMA_Config::getFontsizeSelection() . "\n" . '</form>'; } diff --git a/libraries/DBQbe.class.php b/libraries/DBQbe.class.php index cd55607f6a..8b93578989 100644 --- a/libraries/DBQbe.class.php +++ b/libraries/DBQbe.class.php @@ -1304,7 +1304,7 @@ class PMA_DbQbe $url_params['db'] = $this->_db; $url_params['criteriaColumnCount'] = $this->_new_column_count; $url_params['rows'] = $this->_new_row_count; - $html_output .= PMA_generate_common_hidden_inputs($url_params); + $html_output .= PMA_URL_getHiddenInputs($url_params); $html_output .= '</fieldset>'; // get footers $html_output .= $this->_getTableFooters(); @@ -1312,7 +1312,7 @@ class PMA_DbQbe $html_output .= $this->_getTablesList(); $html_output .= '</form>'; $html_output .= '<form action="db_qbe.php" method="post">'; - $html_output .= PMA_generate_common_hidden_inputs(array('db' => $this->_db)); + $html_output .= PMA_URL_getHiddenInputs(array('db' => $this->_db)); // get SQL query $html_output .= '<div class="floatleft">'; $html_output .= '<fieldset>'; diff --git a/libraries/DatabaseInterface.class.php b/libraries/DatabaseInterface.class.php index 29502e2751..0cc6cadbe8 100644 --- a/libraries/DatabaseInterface.class.php +++ b/libraries/DatabaseInterface.class.php @@ -2027,7 +2027,7 @@ class PMA_DatabaseInterface */ $error .= ' - ' . $error_message . ' (<a href="server_engines.php' . - PMA_generate_common_url( + PMA_URL_getCommon( array('engine' => 'InnoDB', 'page' => 'Status') ) . '">' . __('Details…') . '</a>)'; } diff --git a/libraries/DbSearch.class.php b/libraries/DbSearch.class.php index ec0f3d7df3..15f178afd6 100644 --- a/libraries/DbSearch.class.php +++ b/libraries/DbSearch.class.php @@ -337,15 +337,15 @@ class PMA_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_generate_common_url($this_url_params); + $browse_result_path = 'sql.php' . PMA_URL_getCommon($this_url_params); $html_output .= '<td><a name="browse_search" href="' . $browse_result_path . '" onclick="loadResult(\'' . $browse_result_path . '\',\'' . $each_table . '\',\'' - . PMA_generate_common_url($GLOBALS['db'], $each_table) . '\'' + . PMA_URL_getCommon($GLOBALS['db'], $each_table) . '\'' . ');return false;" >' . __('Browse') . '</a></td>'; $this_url_params['sql_query'] = $newsearchsqls['delete']; - $delete_result_path = 'sql.php' . PMA_generate_common_url($this_url_params); + $delete_result_path = 'sql.php' . PMA_URL_getCommon($this_url_params); $html_output .= '<td><a name="delete_search" href="' . $delete_result_path . '" onclick="deleteResult(\'' . $delete_result_path . '\' , \'' @@ -376,7 +376,7 @@ class PMA_DbSearch $html_output .= '<form id="db_search_form"' . ' class="ajax"' . ' method="post" action="db_search.php" name="db_search">'; - $html_output .= PMA_generate_common_hidden_inputs($GLOBALS['db']); + $html_output .= PMA_URL_getHiddenInputs($GLOBALS['db']); $html_output .= '<fieldset>'; // set legend caption $html_output .= '<legend>' . __('Search in database') . '</legend>'; diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 47dfd29350..bd69378184 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -546,7 +546,7 @@ class PMA_DisplayResults return '<td>' . '<form action="sql.php" method="post" ' . $onsubmit . '>' - . PMA_generate_common_hidden_inputs( + . PMA_URL_getHiddenInputs( $this->__get('db'), $this->__get('table') ) . '<input type="hidden" name="sql_query" value="' @@ -641,7 +641,7 @@ class PMA_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_generate_common_url($_url_params) + . PMA_URL_getCommon($_url_params) . '" method="post">'; $table_navigation_html .= PMA_Util::pageselector( @@ -733,7 +733,7 @@ class PMA_DisplayResults . ')' .'">'; - $table_navigation_html .= PMA_generate_common_hidden_inputs( + $table_navigation_html .= PMA_URL_getHiddenInputs( $this->__get('db'), $this->__get('table') ); @@ -793,7 +793,7 @@ class PMA_DisplayResults return "\n" . '<td>' . '<form action="sql.php" method="post">' - . PMA_generate_common_hidden_inputs( + . PMA_URL_getHiddenInputs( $this->__get('db'), $this->__get('table') ) . '<input type="hidden" name="sql_query" value="' @@ -998,7 +998,7 @@ class PMA_DisplayResults $table_headers_html .= '<input id="save_cells_at_once" type="hidden" value="' . $GLOBALS['cfg']['SaveCellsAtOnce'] . '" />' . '<div class="common_hidden_inputs">' - . PMA_generate_common_hidden_inputs( + . PMA_URL_getHiddenInputs( $this->__get('db'), $this->__get('table') ) . '</div>'; @@ -1219,7 +1219,7 @@ class PMA_DisplayResults $drop_down_html = ''; $drop_down_html .= '<form action="sql.php" method="post">' . "\n" - . PMA_generate_common_hidden_inputs( + . PMA_URL_getHiddenInputs( $this->__get('db'), $this->__get('table') ) . __('Sort by key') @@ -1560,7 +1560,7 @@ class PMA_DisplayResults 'display_options_form' => 1 ); - $options_html .= PMA_generate_common_hidden_inputs($url_params) + $options_html .= PMA_URL_getHiddenInputs($url_params) . '<br />' . PMA_Util::getDivForSliderEffect( 'displayoptions', __('Options') @@ -1685,7 +1685,7 @@ class PMA_DisplayResults $tmp_image = '<img class="fulltext" src="' . $tmp_image_file . '" alt="' . $tmp_txt . '" title="' . $tmp_txt . '" />'; - $tmp_url = 'sql.php' . PMA_generate_common_url($url_params_full_text); + $tmp_url = 'sql.php' . PMA_URL_getCommon($url_params_full_text); return PMA_Util::linkOrButton( $tmp_url, $tmp_image, array(), false @@ -1718,7 +1718,7 @@ class PMA_DisplayResults $form_html .= ' class="ajax" '; $form_html .= '>' - . PMA_generate_common_hidden_inputs( + . PMA_URL_getHiddenInputs( $this->__get('db'), $this->__get('table'), 1 ) . '<input type="hidden" name="goto" value="sql.php" />'; @@ -1872,7 +1872,7 @@ class PMA_DisplayResults 'sql_query' => $sorted_sql_query, 'session_max_rows' => $session_max_rows ); - $order_url = 'sql.php' . PMA_generate_common_url($_url_params); + $order_url = 'sql.php' . PMA_URL_getCommon($_url_params); // Displays the sorting URL // enable sort order swapping for image @@ -2779,7 +2779,7 @@ class PMA_DisplayResults } $transform_options['wrapper_link'] - = PMA_generate_common_url($_url_params); + = PMA_URL_getCommon($_url_params); $vertical_display = $this->__get('vertical_display'); @@ -3113,7 +3113,7 @@ class PMA_DisplayResults } return $link_relations['default_page'] - . PMA_generate_common_url($linking_url_params); + . PMA_URL_getCommon($linking_url_params); } @@ -3290,12 +3290,12 @@ class PMA_DisplayResults ); $edit_url = 'tbl_change.php' - . PMA_generate_common_url( + . PMA_URL_getCommon( $_url_params + array('default_action' => 'update') ); $copy_url = 'tbl_change.php' - . PMA_generate_common_url( + . PMA_URL_getCommon( $_url_params + array('default_action' => 'insert') ); @@ -3349,7 +3349,7 @@ class PMA_DisplayResults 'goto' => (empty($goto) ? 'tbl_sql.php' : $goto), ); - $lnk_goto = 'sql.php' . PMA_generate_common_url($_url_params, 'text'); + $lnk_goto = 'sql.php' . PMA_URL_getCommon($_url_params, 'text'); $del_query = 'DELETE FROM ' . PMA_Util::backquote($this->__get('db')) . '.' @@ -3364,7 +3364,7 @@ class PMA_DisplayResults 'message_to_show' => __('The row has been deleted'), 'goto' => $lnk_goto, ); - $del_url = 'sql.php' . PMA_generate_common_url($_url_params); + $del_url = 'sql.php' . PMA_URL_getCommon($_url_params); $js_conf = 'DELETE FROM ' . PMA_jsFormat($this->__get('db')) . '.' . PMA_jsFormat($this->__get('table')) @@ -3385,7 +3385,7 @@ class PMA_DisplayResults ); $lnk_goto = 'sql.php' - . PMA_generate_common_url( + . PMA_URL_getCommon( $_url_params, 'text' ); @@ -3395,7 +3395,7 @@ class PMA_DisplayResults 'goto' => $lnk_goto, ); - $del_url = 'sql.php' . PMA_generate_common_url($_url_params); + $del_url = 'sql.php' . PMA_URL_getCommon($_url_params); $del_query = 'KILL ' . $row[0]; $js_conf = 'KILL ' . $row[0]; $del_str = PMA_Util::getIcon( @@ -5160,7 +5160,7 @@ class PMA_DisplayResults 'printview' => '1', 'sql_query' => $this->__get('sql_query'), ); - $url_query = PMA_generate_common_url($_url_params); + $url_query = PMA_URL_getCommon($_url_params); if (!$header_shown) { $results_operations_html .= $header; @@ -5202,7 +5202,7 @@ class PMA_DisplayResults $results_operations_html .= PMA_Util::linkOrButton( - 'sql.php' . PMA_generate_common_url($_url_params), + 'sql.php' . PMA_URL_getCommon($_url_params), PMA_Util::getIcon( 'b_print.png', __('Print view (with full texts)'), true @@ -5261,7 +5261,7 @@ class PMA_DisplayResults } $results_operations_html .= PMA_Util::linkOrButton( - 'tbl_export.php' . PMA_generate_common_url($_url_params), + 'tbl_export.php' . PMA_URL_getCommon($_url_params), PMA_Util::getIcon( 'b_tblexport.png', __('Export'), true ), @@ -5274,7 +5274,7 @@ class PMA_DisplayResults // prepare chart $results_operations_html .= PMA_Util::linkOrButton( - 'tbl_chart.php' . PMA_generate_common_url($_url_params), + 'tbl_chart.php' . PMA_URL_getCommon($_url_params), PMA_Util::getIcon( 'b_chart.png', __('Display chart'), true ), @@ -5299,7 +5299,7 @@ class PMA_DisplayResults $results_operations_html .= PMA_Util::linkOrButton( 'tbl_gis_visualization.php' - . PMA_generate_common_url($_url_params), + . PMA_URL_getCommon($_url_params), PMA_Util::getIcon( 'b_globe.gif', __('Visualize GIS data'), true ), @@ -5414,7 +5414,7 @@ class PMA_DisplayResults /* Create link to download */ if (count($url_params) > 0) { $result = '<a href="tbl_get_field.php' - . PMA_generate_common_url($url_params) + . PMA_URL_getCommon($url_params) . '" class="disableAjax">' . $result . '</a>'; } @@ -5572,7 +5572,7 @@ class PMA_DisplayResults ); $result .= '<a class="ajax" href="sql.php' - . PMA_generate_common_url($_url_params) + . PMA_URL_getCommon($_url_params) . '"' . $title . '>'; if ($transformation_plugin != $default_function) { @@ -5627,7 +5627,7 @@ class PMA_DisplayResults ); $result .= '<input type="hidden" class="data_browse_link" value="' - . PMA_generate_common_url($_url_params_for_show_data_row). '" />'; + . PMA_URL_getCommon($_url_params_for_show_data_row). '" />'; } diff --git a/libraries/Footer.class.php b/libraries/Footer.class.php index 83a0e88c24..63755abfc2 100644 --- a/libraries/Footer.class.php +++ b/libraries/Footer.class.php @@ -128,7 +128,7 @@ class PMA_Footer /** * Returns the url of the current page * - * @param mixed $encoding See PMA_generate_common_url() + * @param mixed $encoding See PMA_URL_getCommon() * * @return string */ @@ -137,7 +137,7 @@ class PMA_Footer $db = ! empty($GLOBALS['db']) ? $GLOBALS['db'] : ''; $table = ! empty($GLOBALS['table']) ? $GLOBALS['table'] : ''; $target = ! empty($_REQUEST['target']) ? $_REQUEST['target'] : ''; - return basename(PMA_getenv('SCRIPT_NAME')) . PMA_generate_common_url( + return basename(PMA_getenv('SCRIPT_NAME')) . PMA_URL_getCommon( array( 'db' => $db, 'table' => $table, diff --git a/libraries/Header.class.php b/libraries/Header.class.php index 379bd18a01..cd811616d3 100644 --- a/libraries/Header.class.php +++ b/libraries/Header.class.php @@ -174,7 +174,7 @@ class PMA_Header if (isset($GLOBALS['db'])) { $params['db'] = $GLOBALS['db']; } - $this->_scripts->addFile('messages.php' . PMA_generate_common_url($params)); + $this->_scripts->addFile('messages.php' . PMA_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. @@ -205,7 +205,7 @@ class PMA_Header $db = ! empty($GLOBALS['db']) ? $GLOBALS['db'] : ''; $table = ! empty($GLOBALS['table']) ? $GLOBALS['table'] : ''; return array( - 'common_query' => PMA_generate_common_url('', '', '&'), + 'common_query' => PMA_URL_getCommon('', '', '&'), 'opendb_url' => $GLOBALS['cfg']['DefaultTabDatabase'], 'safari_browser' => PMA_USR_BROWSER_AGENT == 'SAFARI' ? 1 : 0, 'querywindow_height' => $GLOBALS['cfg']['QueryWindowHeight'], @@ -560,7 +560,7 @@ class PMA_Header . 'type="image/x-icon" />'; // stylesheets $basedir = defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; - $common_url = PMA_generate_common_url(array('server' => $GLOBALS['server'])); + $common_url = PMA_URL_getCommon(array('server' => $GLOBALS['server'])); $theme_id = $GLOBALS['PMA_Config']->getThemeUniqueValue(); $theme_path = $GLOBALS['pmaThemePath']; @@ -670,7 +670,7 @@ class PMA_Header $tmp_result = PMA_RecentTable::getInstance()->add($db, $table); if ($tmp_result === true) { $params = array('ajax_request' => true, 'recent_table' => true); - $url = 'index.php' . PMA_generate_common_url($params); + $url = 'index.php' . PMA_URL_getCommon($params); $retval = '<a class="hide" id="update_recent_tables"'; $retval .= ' href="' . $url . '"></a>'; } else { diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 5a193b95eb..6a3b7a26e3 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -585,7 +585,7 @@ class PMA_Index $r .= '" ' . $row_span . '>' . ' <a class="'; $r .= 'ajax'; - $r .= '" href="tbl_indexes.php' . PMA_generate_common_url($this_params) + $r .= '" href="tbl_indexes.php' . PMA_URL_getCommon($this_params) . '">' . PMA_Util::getIcon('b_edit.png', __('Edit')) . '</a>' . '</td>' . "\n"; $this_params = $GLOBALS['url_params']; @@ -618,7 +618,7 @@ class PMA_Index . ' value="' . $js_msg . '" />'; $r .= ' <a class="drop_primary_key_index_anchor'; $r .= ' ajax'; - $r .= '" href="sql.php' . PMA_generate_common_url($this_params) + $r .= '" href="sql.php' . PMA_URL_getCommon($this_params) . '" >' . PMA_Util::getIcon('b_drop.png', __('Drop')) . '</a>' . '</td>' . "\n"; diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php index ad5eb52e17..9a23e523ac 100644 --- a/libraries/Menu.class.php +++ b/libraries/Menu.class.php @@ -194,7 +194,7 @@ class PMA_Menu $retval .= sprintf( $item, $GLOBALS['cfg']['DefaultTabServer'], - PMA_generate_common_url(), + PMA_URL_getCommon(), htmlspecialchars($server_info), __('Server') ); @@ -211,7 +211,7 @@ class PMA_Menu $retval .= sprintf( $item, $GLOBALS['cfg']['DefaultTabDatabase'], - PMA_generate_common_url($this->_db), + PMA_URL_getCommon($this->_db), htmlspecialchars($this->_db), __('Database') ); @@ -234,7 +234,7 @@ class PMA_Menu $retval .= sprintf( $item, $GLOBALS['cfg']['DefaultTabTable'], - PMA_generate_common_url($this->_db, $this->_table), + PMA_URL_getCommon($this->_db, $this->_table), str_replace(' ', ' ', htmlspecialchars($this->_table)), $tbl_is_view ? __('View') : __('Table') ); diff --git a/libraries/ServerStatusData.class.php b/libraries/ServerStatusData.class.php index 324493a348..dc000dd33d 100644 --- a/libraries/ServerStatusData.class.php +++ b/libraries/ServerStatusData.class.php @@ -208,16 +208,16 @@ class PMA_ServerStatusData $links = array(); $links['table'][__('Flush (close) all tables')] - = $this->selfUrl . '?flush=TABLES&' . PMA_generate_common_url(); + = $this->selfUrl . '?flush=TABLES&' . PMA_URL_getCommon(); $links['table'][__('Show open tables')] = 'sql.php?sql_query=' . urlencode('SHOW OPEN TABLES') . - '&goto=' . $this->selfUrl . '&' . PMA_generate_common_url(); + '&goto=' . $this->selfUrl . '&' . PMA_URL_getCommon(); if ($GLOBALS['server_master_status']) { $links['repl'][__('Show slave hosts')] = 'sql.php?sql_query=' . urlencode('SHOW SLAVE HOSTS') . '&goto=' . $this->selfUrl . '&' - . PMA_generate_common_url(); + . PMA_URL_getCommon(); $links['repl'][__('Show master status')] = '#replication_master'; } if ($GLOBALS['server_slave_status']) { @@ -228,7 +228,7 @@ class PMA_ServerStatusData $links['qcache'][__('Flush query cache')] = $this->selfUrl . '?flush=' . urlencode('QUERY CACHE') . '&' . - PMA_generate_common_url(); + PMA_URL_getCommon(); $links['qcache']['doc'] = 'query_cache'; $links['threads']['doc'] = 'mysql_threads'; @@ -240,10 +240,10 @@ class PMA_ServerStatusData $links['Slow_queries']['doc'] = 'slow_query_log'; $links['innodb'][__('Variables')] - = 'server_engines.php?engine=InnoDB&' . PMA_generate_common_url(); + = 'server_engines.php?engine=InnoDB&' . PMA_URL_getCommon(); $links['innodb'][__('InnoDB Status')] = 'server_engines.php?engine=InnoDB&page=Status&' . - PMA_generate_common_url(); + PMA_URL_getCommon(); $links['innodb']['doc'] = 'innodb'; @@ -336,7 +336,7 @@ class PMA_ServerStatusData */ public function getMenuHtml() { - $url_params = PMA_generate_common_url(); + $url_params = PMA_URL_getCommon(); $items = array( array( 'name' => __('Server'), diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php index 212387f145..198f346084 100644 --- a/libraries/TableSearch.class.php +++ b/libraries/TableSearch.class.php @@ -235,7 +235,7 @@ class PMA_TableSearch . ' size="40" class="textfield" id="field_' . $column_index . '" />'; if ($in_fbs) { - $edit_url = 'gis_data_editor.php?' . PMA_generate_common_url(); + $edit_url = 'gis_data_editor.php?' . PMA_URL_getCommon(); $edit_str = PMA_Util::getIcon('b_edit.png', __('Edit/Insert')); $html_output .= '<span class="open_search_gis_editor">'; $html_output .= PMA_Util::linkOrButton( @@ -288,7 +288,7 @@ class PMA_TableSearch $html_output .= <<<EOT <a target="_blank" onclick="window.open(this.href, 'foreigners', 'width=640,height=240,scrollbars=yes'); return false" href="browse_foreigners.php? EOT; - $html_output .= '' . PMA_generate_common_url($this->_db, $this->_table) + $html_output .= '' . PMA_URL_getCommon($this->_db, $this->_table) . '&field=' . urlencode($column_name) . '&fieldkey=' . $column_index . '"'; if ($in_zoom_search_edit) { @@ -1102,7 +1102,7 @@ EOT; . 'name="insertForm" id="' . $formId . '" ' . 'class="ajax"' . '>'; - $html_output .= PMA_generate_common_hidden_inputs($this->_db, $this->_table); + $html_output .= PMA_URL_getHiddenInputs($this->_db, $this->_table); $html_output .= '<input type="hidden" name="goto" value="' . $goto . '" />'; $html_output .= '<input type="hidden" name="back" value="' . $scriptName . '" />'; @@ -1202,7 +1202,7 @@ EOT; $html_output .= '<form method="post" action="tbl_zoom_select.php"' . ' name="displayResultForm" id="zoom_display_form"' . ' class="ajax"' . '>'; - $html_output .= PMA_generate_common_hidden_inputs($this->_db, $this->_table); + $html_output .= PMA_URL_getHiddenInputs($this->_db, $this->_table); $html_output .= '<input type="hidden" name="goto" value="' . $goto . '" />'; $html_output .= '<input type="hidden" name="back" value="tbl_zoom_select.php" />'; @@ -1326,7 +1326,7 @@ EOT; $htmlOutput = '<form method="post" action="tbl_find_replace.php"' . ' name="previewForm" id="previewForm" class="ajax">'; - $htmlOutput .= PMA_generate_common_hidden_inputs($this->_db, $this->_table); + $htmlOutput .= PMA_URL_getHiddenInputs($this->_db, $this->_table); $htmlOutput .= '<input type="hidden" name="replace" value="true" />'; $htmlOutput .= '<input type="hidden" name="columnIndex" value="' . $columnIndex . '" />'; diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index 22a68602ff..9126a2e5ec 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -381,7 +381,7 @@ class PMA_Theme public function getPrintPreview() { $url_params = array('set_theme' => $this->getId()); - $url = 'index.php'. PMA_generate_common_url($url_params); + $url = 'index.php'. PMA_URL_getCommon($url_params); $retval = '<div class="theme_preview">'; $retval .= '<h2>'; diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index cb16164b6a..9a99e00e23 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -361,7 +361,7 @@ class PMA_Theme_Manager if ($form) { $select_box .= '<form name="setTheme" method="get"'; $select_box .= ' action="index.php" class="disableAjax">'; - $select_box .= PMA_generate_common_hidden_inputs(); + $select_box .= PMA_URL_getHiddenInputs(); } $theme_preview_path= './themes.php'; diff --git a/libraries/Util.class.php b/libraries/Util.class.php index b117dc6569..76ac79e247 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -651,14 +651,14 @@ class PMA_Util $_url_params['db'] = $db; $_url_params['table'] = $table; $doedit_goto = '<a href="tbl_sql.php' - . PMA_generate_common_url($_url_params) . '">'; + . PMA_URL_getCommon($_url_params) . '">'; } elseif (strlen($db)) { $_url_params['db'] = $db; $doedit_goto = '<a href="db_sql.php' - . PMA_generate_common_url($_url_params) . '">'; + . PMA_URL_getCommon($_url_params) . '">'; } else { $doedit_goto = '<a href="server_sql.php' - . PMA_generate_common_url($_url_params) . '">'; + . PMA_URL_getCommon($_url_params) . '">'; } $error_msg .= $doedit_goto @@ -1185,7 +1185,7 @@ class PMA_Util } if (isset($explain_params['sql_query'])) { $explain_link = 'import.php' - . PMA_generate_common_url($explain_params); + . PMA_URL_getCommon($explain_params); $explain_link = ' [' . self::linkOrButton($explain_link, $_message) . ']'; } @@ -1204,7 +1204,7 @@ class PMA_Util $onclick = ''; } - $edit_link .= PMA_generate_common_url($url_params) . '#querybox'; + $edit_link .= PMA_URL_getCommon($url_params) . '#querybox'; $edit_link = ' [' . self::linkOrButton( $edit_link, __('Edit'), @@ -1227,13 +1227,13 @@ class PMA_Util $_message = __('Create PHP Code'); } - $php_link = 'import.php' . PMA_generate_common_url($php_params); + $php_link = 'import.php' . PMA_URL_getCommon($php_params); $php_link = ' [' . self::linkOrButton($php_link, $_message) . ']'; if (isset($GLOBALS['show_as_php'])) { $runquery_link = 'import.php' - . PMA_generate_common_url($url_params); + . PMA_URL_getCommon($url_params); $php_link .= ' [' . self::linkOrButton($runquery_link, __('Submit Query')) @@ -1248,7 +1248,7 @@ class PMA_Util && ! isset($GLOBALS['show_as_php']) // 'Submit query' does the same && preg_match('@^(SELECT|SHOW)[[:space:]]+@i', $sql_query) ) { - $refresh_link = 'import.php' . PMA_generate_common_url($url_params); + $refresh_link = 'import.php' . PMA_URL_getCommon($url_params); $refresh_link = ' [' . self::linkOrButton($refresh_link, __('Refresh')) . ']'; } else { @@ -1267,7 +1267,7 @@ class PMA_Util } $validate_link = 'import.php' - . PMA_generate_common_url($validate_params); + . PMA_URL_getCommon($validate_params); $validate_link = ' [' . self::linkOrButton($validate_link, $validate_message) . ']'; } else { @@ -1297,7 +1297,7 @@ class PMA_Util $retval .= '<div class="tools">'; $retval .= '<form action="sql.php" method="post">'; - $retval .= PMA_generate_common_hidden_inputs( + $retval .= PMA_URL_getHiddenInputs( $GLOBALS['db'], $GLOBALS['table'] ); $retval .= '<input type="hidden" name="sql_query" value="' @@ -1712,10 +1712,10 @@ class PMA_Util // build the link if (! empty($tab['link'])) { $tab['link'] = htmlentities($tab['link']); - $tab['link'] = $tab['link'] . PMA_generate_common_url($url_params); + $tab['link'] = $tab['link'] . PMA_URL_getCommon($url_params); if (! empty($tab['args'])) { foreach ($tab['args'] as $param => $value) { - $tab['link'] .= PMA_get_arg_separator('html') . urlencode($param) + $tab['link'] .= PMA_URL_getArgSeparator('html') . urlencode($param) . '=' . urlencode($value); } } @@ -1945,7 +1945,7 @@ class PMA_Util public static function splitURLQuery($url) { // decode encoded url separators - $separator = PMA_get_arg_separator(); + $separator = PMA_URL_getArgSeparator(); // on most places separator is still hard coded ... if ($separator !== '&') { // ... so always replace & with $separator @@ -2496,19 +2496,19 @@ class PMA_Util $_url_params[$name] = 0; $list_navigator_html .= '<a' . $class . $title1 . ' href="' . $script - . PMA_generate_common_url($_url_params) . '">' . $caption1 + . PMA_URL_getCommon($_url_params) . '">' . $caption1 . '</a>'; $_url_params[$name] = $pos - $max_count; $list_navigator_html .= '<a' . $class . $title2 . ' href="' . $script - . PMA_generate_common_url($_url_params) . '">' . $caption2 + . PMA_URL_getCommon($_url_params) . '">' . $caption2 . '</a>'; } $list_navigator_html .= '<form action="' . basename($script). '" method="post">'; - $list_navigator_html .= PMA_generate_common_hidden_inputs($_url_params); + $list_navigator_html .= PMA_URL_getHiddenInputs($_url_params); $list_navigator_html .= self::pageselector( $name, $max_count, @@ -2532,7 +2532,7 @@ class PMA_Util $_url_params[$name] = $pos + $max_count; $list_navigator_html .= '<a' . $class . $title3 . ' href="' . $script - . PMA_generate_common_url($_url_params) . '" >' . $caption3 + . PMA_URL_getCommon($_url_params) . '" >' . $caption3 . '</a>'; $_url_params[$name] = floor($count / $max_count) * $max_count; @@ -2541,7 +2541,7 @@ class PMA_Util } $list_navigator_html .= '<a' . $class . $title4 . ' href="' . $script - . PMA_generate_common_url($_url_params) . '" >' . $caption4 + . PMA_URL_getCommon($_url_params) . '" >' . $caption4 . '</a>'; } $list_navigator_html .= '</div>' . "\n"; @@ -2592,7 +2592,7 @@ class PMA_Util } return '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' - . PMA_generate_common_url($database) . '" title="' + . PMA_URL_getCommon($database) . '" title="' . sprintf( __('Jump to database "%s".'), htmlspecialchars($database) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 3a555035ba..505c30be51 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -331,7 +331,7 @@ if ($GLOBALS['PMA_Config']->get('ForceSSL') // grab SSL URL $url = $GLOBALS['PMA_Config']->getSSLUri(); // Actually redirect - PMA_sendHeaderLocation($url . PMA_generate_common_url($_GET, 'text')); + PMA_sendHeaderLocation($url . PMA_URL_getCommon($_GET, 'text')); // delete the current session, otherwise we get problems (see bug #2397877) $GLOBALS['PMA_Config']->removeCookie($GLOBALS['session_name']); exit; diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php index b3a18e3b69..e47d953d77 100644 --- a/libraries/config/FormDisplay.tpl.php +++ b/libraries/config/FormDisplay.tpl.php @@ -35,7 +35,7 @@ function PMA_displayFormTop($action = null, $method = 'post', $hidden_fields = n echo '<input type="hidden" name="check_page_refresh" ' . ' id="check_page_refresh" value="" />' . "\n"; } - echo PMA_generate_common_hidden_inputs('', '', 0, 'server') . "\n"; + echo PMA_URL_getHiddenInputs('', '', 0, 'server') . "\n"; echo PMA_getHiddenFields((array)$hidden_fields); } diff --git a/libraries/core.lib.php b/libraries/core.lib.php index da2cce43a7..bc283b74f3 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -560,7 +560,7 @@ function PMA_sendHeaderLocation($uri, $use_refresh = false) if (strpos($uri, '?') === false) { header('Location: ' . $uri . '?' . SID); } else { - $separator = PMA_get_arg_separator(); + $separator = PMA_URL_getArgSeparator(); header('Location: ' . $uri . $separator . SID); } } else { @@ -756,12 +756,12 @@ function PMA_linkURL($url) if (!preg_match('#^https?://#', $url) || defined('PMA_SETUP')) { return $url; } else { - if (!function_exists('PMA_generate_common_url')) { + if (!function_exists('PMA_URL_getCommon')) { include_once './libraries/url_generating.lib.php'; } $params = array(); $params['url'] = $url; - return './url.php' . PMA_generate_common_url($params); + return './url.php' . PMA_URL_getCommon($params); } } diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index 3c23895224..a16a700890 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -26,8 +26,8 @@ if ($db_is_information_schema) { /** * Defines the urls to return to in case of error in a sql statement */ -$err_url_0 = 'index.php?' . PMA_generate_common_url(); -$err_url = $cfg['DefaultTabDatabase'] . '?' . PMA_generate_common_url($db); +$err_url_0 = 'index.php?' . PMA_URL_getCommon(); +$err_url = $cfg['DefaultTabDatabase'] . '?' . PMA_URL_getCommon($db); /** @@ -47,7 +47,7 @@ if (! isset($is_db) || ! $is_db) { } // Not a valid db name -> back to the welcome page $uri = $cfg['PmaAbsoluteUri'] . 'index.php?' - . PMA_generate_common_url('', '', '&') + . PMA_URL_getCommon('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1'; if (! strlen($db) || ! $is_db) { $response = PMA_Response::getInstance(); @@ -95,6 +95,6 @@ if (isset($_REQUEST['submitcollation']) /** * Set parameters for links */ -$url_query = PMA_generate_common_url($db); +$url_query = PMA_URL_getCommon($db); ?> diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php index f2eaf6727e..706629e488 100644 --- a/libraries/db_table_exists.lib.php +++ b/libraries/db_table_exists.lib.php @@ -40,7 +40,7 @@ if (empty($is_db)) { } PMA_sendHeaderLocation( $cfg['PmaAbsoluteUri'] . 'index.php' - . PMA_generate_common_url($url_params, '&') + . PMA_URL_getCommon($url_params, '&') ); } exit; diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php index 06b0b2eec7..3d068d4c2a 100644 --- a/libraries/display_change_password.lib.php +++ b/libraries/display_change_password.lib.php @@ -34,7 +34,7 @@ function PMA_getHtmlForChangePassword($username, $hostname) . 'name="chgPassword" ' . 'class="ajax" >'; - $html .= PMA_generate_common_hidden_inputs(); + $html .= PMA_URL_getHiddenInputs(); if (strpos($GLOBALS['PMA_PHP_SELF'], 'server_privileges') !== false) { $html .= '<input type="hidden" name="username" ' diff --git a/libraries/display_create_database.lib.php b/libraries/display_create_database.lib.php index ec97bbe63a..4bffb1e8d6 100644 --- a/libraries/display_create_database.lib.php +++ b/libraries/display_create_database.lib.php @@ -24,7 +24,7 @@ if ($is_create_db_priv) { . '</label> ' . PMA_Util::showMySQLDocu('CREATE_DATABASE'); $html .= '</strong><br />'; - $html .= PMA_generate_common_hidden_inputs('', '', 5); + $html .= PMA_URL_getHiddenInputs('', '', 5); $html .= '<input type="hidden" name="reload" value="1" />'; $html .= '<input type="text" name="new_db" value="' . $db_to_create . '" maxlength="64" class="textfield" id="text_create_db"/>'; diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php index dcdeca84b7..f358eb8615 100644 --- a/libraries/display_create_table.lib.php +++ b/libraries/display_create_table.lib.php @@ -46,7 +46,7 @@ if (PMA_Util::showIcons('ActionLinksMode')) { echo __('Create table'); ?> </legend> - <?php echo PMA_generate_common_hidden_inputs($db); ?> + <?php echo PMA_URL_getHiddenInputs($db); ?> <div class="formelement"> <?php echo __('Name'); ?>: <input type="text" name="table" maxlength="64" size="30" /> diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index f7730601c8..345bd6fe37 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -107,11 +107,11 @@ function PMA_getHtmlForHiddenInput( global $cfg; $html = ""; if ($export_type == 'server') { - $html .= PMA_generate_common_hidden_inputs('', '', 1); + $html .= PMA_URL_getHiddenInputs('', '', 1); } elseif ($export_type == 'database') { - $html .= PMA_generate_common_hidden_inputs($db, '', 1); + $html .= PMA_URL_getHiddenInputs($db, '', 1); } else { - $html .= PMA_generate_common_hidden_inputs($db, $table, 1); + $html .= PMA_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 4c9cf29a16..e1cea907f9 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -26,11 +26,11 @@ function PMA_getHtmlForHiddenInputs($import_type, $db, $table) { $html = ''; if ($import_type == 'server') { - $html .= PMA_generate_common_hidden_inputs('', '', 1); + $html .= PMA_URL_getHiddenInputs('', '', 1); } elseif ($import_type == 'database') { - $html .= PMA_generate_common_hidden_inputs($db, '', 1); + $html .= PMA_URL_getHiddenInputs($db, '', 1); } else { - $html .= PMA_generate_common_hidden_inputs($db, $table, 1); + $html .= PMA_URL_getHiddenInputs($db, $table, 1); } $html .= ' <input type="hidden" name="import_type" value="' . $import_type . '" />'."\n"; @@ -441,7 +441,7 @@ function PMA_getHtmlForImportWithPlugin($upload_id) { //some variable for javasript $ajax_url = "import_status.php?id=" . $upload_id . "&" - . PMA_generate_common_url(array('import_status'=>1), '&'); + . PMA_URL_getCommon(array('import_status'=>1), '&'); $promot_str = PMA_jsFormat( __( 'The file being uploaded is probably larger than ' @@ -459,7 +459,7 @@ function PMA_getHtmlForImportWithPlugin($upload_id) __('The file is being processed, please be patient.'), false ); - $import_url = PMA_generate_common_url(array('import_status'=>1), '&'); + $import_url = PMA_URL_getCommon(array('import_status'=>1), '&'); //start output $html = 'var finished = false; '; diff --git a/libraries/display_indexes.lib.php b/libraries/display_indexes.lib.php index e4ed7f2f03..31aa5da33c 100644 --- a/libraries/display_indexes.lib.php +++ b/libraries/display_indexes.lib.php @@ -40,7 +40,7 @@ if (isset($_REQUEST['create_index'])) { $form_params['old_index'] = $_REQUEST['index']; } -$html .= PMA_generate_common_hidden_inputs($form_params); +$html .= PMA_URL_getHiddenInputs($form_params); $html .= '<fieldset id="index_edit_fields">'; diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php index 4ea824f975..bab89e829a 100644 --- a/libraries/display_select_lang.lib.php +++ b/libraries/display_select_lang.lib.php @@ -48,7 +48,7 @@ function PMA_getLanguageSelectorHtml($use_fieldset = false, $show_doc = true) 'db' => $GLOBALS['db'], 'table' => $GLOBALS['table'], ); - $retval .= PMA_generate_common_hidden_inputs($_form_params); + $retval .= PMA_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/display_structure.lib.php b/libraries/display_structure.lib.php index 0a92e30f6e..60eeba3c00 100644 --- a/libraries/display_structure.lib.php +++ b/libraries/display_structure.lib.php @@ -31,7 +31,7 @@ $html_form = '<form method="post" action="tbl_structure.php" name="fieldsForm" ' . 'id="fieldsForm" class="ajax' . $HideStructureActions . '">'; $response->addHTML($html_form); -$response->addHTML(PMA_generate_common_hidden_inputs($db, $table)); +$response->addHTML(PMA_URL_getHiddenInputs($db, $table)); $tabletype = '<input type="hidden" name="table_type" value='; if ($db_is_information_schema) { diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 7d10590bac..9ef67591bb 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -1189,8 +1189,8 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, } $params = array('db' => (string)$db_name); - $db_url = 'db_structure.php' . PMA_generate_common_url($params); - $db_ops_url = 'db_operations.php' . PMA_generate_common_url($params); + $db_url = 'db_structure.php' . PMA_URL_getCommon($params); + $db_ops_url = 'db_operations.php' . PMA_URL_getCommon($params); $message = '<br /><br />'; $message .= '<strong>' . __('The following structures have either been created or altered. Here you can:') . '</strong><br />'; @@ -1216,9 +1216,9 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, 'db' => (string) $db_name, 'table' => (string) $tables[$i][TBL_NAME] ); - $tbl_url = 'sql.php' . PMA_generate_common_url($params); - $tbl_struct_url = 'tbl_structure.php' . PMA_generate_common_url($params); - $tbl_ops_url = 'tbl_operations.php' . PMA_generate_common_url($params); + $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); unset($params); diff --git a/libraries/index.lib.php b/libraries/index.lib.php index 02596a6c16..2824af1b2b 100644 --- a/libraries/index.lib.php +++ b/libraries/index.lib.php @@ -25,7 +25,7 @@ function PMA_getHtmlForDisplayIndexes() $html_output .= PMA_Index::getView($GLOBALS['table'], $GLOBALS['db']); $html_output .= '<fieldset class="tblFooters" style="text-align: left;">' . '<form action="tbl_indexes.php" method="post">'; - $html_output .= PMA_generate_common_hidden_inputs( + $html_output .= PMA_URL_getHiddenInputs( $GLOBALS['db'], $GLOBALS['table'] ); $html_output .= sprintf( diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index ddfa404cf6..083e78b9a0 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -207,12 +207,12 @@ function PMA_showFunctionFieldsInEditMode($url_params, $showFuncFields) $this_url_params = array_merge($url_params, $params); if (! $showFuncFields) { return ' : <a href="tbl_change.php' - . PMA_generate_common_url($this_url_params) . '">' + . PMA_URL_getCommon($this_url_params) . '">' . __('Function') . '</a>' . "\n"; } return '<th><a href="tbl_change.php' - . PMA_generate_common_url($this_url_params) + . PMA_URL_getCommon($this_url_params) . '" title="' . __('Hide') . '">' . __('Function') . '</a></th>' . "\n"; @@ -239,11 +239,11 @@ function PMA_showColumnTypesInDataEditView($url_params, $showColumnType) $this_other_url_params = array_merge($url_params, $params); if (! $showColumnType) { return ' : <a href="tbl_change.php' - . PMA_generate_common_url($this_other_url_params) . '">' + . PMA_URL_getCommon($this_other_url_params) . '">' . __('Type') . '</a>' . "\n"; } return '<th><a href="tbl_change.php' - . PMA_generate_common_url($this_other_url_params) + . PMA_URL_getCommon($this_other_url_params) . '" title="' . __('Hide') . '">' . __('Type') . '</a></th>' . "\n"; } @@ -734,7 +734,7 @@ function PMA_getForeignLink($column, $backup_field, $column_name_appendix, . 'onclick="window.open(this.href,\'foreigners\', \'width=640,height=240,' . 'scrollbars=yes,resizable=yes\'); return false;" ' . 'href="browse_foreigners.php?' - . PMA_generate_common_url($db, $table) . '&field=' + . PMA_URL_getCommon($db, $table) . '&field=' . PMA_escapeJsString(urlencode($column['Field']) . $rownumber_param) . '">' . str_replace("'", "\'", $titles['Browse']) . '</a>'; return $html_output; @@ -1371,7 +1371,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_generate_common_hidden_inputs($db, $table) + . PMA_URL_getHiddenInputs($db, $table) . '<input type="hidden" name="goto"' . ' value="' . htmlspecialchars($GLOBALS['goto']) . '" />' . '<input type="hidden" name="err_url"' @@ -1854,7 +1854,7 @@ function PMA_getErrorUrl($url_params) if (isset($_REQUEST['err_url'])) { return $_REQUEST['err_url']; } else { - return 'tbl_change.php' . PMA_generate_common_url($url_params); + return 'tbl_change.php' . PMA_URL_getCommon($url_params); } } @@ -2042,7 +2042,7 @@ function PMA_getLinkForRelationalDisplayField($map, $relation_field, . $where_comparison ); $output = '<a href="sql.php' - . PMA_generate_common_url($_url_params) . '"' . $title . '>'; + . PMA_URL_getCommon($_url_params) . '"' . $title . '>'; if ('D' == $_SESSION['tmp_user_values']['relational_display']) { // user chose "relational display field" in the @@ -2094,7 +2094,7 @@ function PMA_transformEditedValues($db, $table, : '' ); $transform_options['wrapper_link'] - = PMA_generate_common_url($_url_params); + = PMA_URL_getCommon($_url_params); $class_name = str_replace('.class.php', '', $file); $plugin_manager = null; $transformation_plugin = new $class_name( diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 493436ceec..a3fc79c8bb 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -286,7 +286,7 @@ if (!empty($submit_mult) && !empty($what)) { } if ($what == 'replace_prefix_tbl' || $what == 'copy_tbl_change_prefix') { echo '<form action="' . $action . '" method="post">'; - echo PMA_generate_common_hidden_inputs($_url_params); + echo PMA_URL_getHiddenInputs($_url_params); echo '<fieldset class = "input">'; echo '<legend>'; if ($what == 'replace_prefix_tbl') { @@ -317,7 +317,7 @@ if (!empty($submit_mult) && !empty($what)) { echo '</form>'; } elseif ($what == 'add_prefix_tbl') { echo '<form action="' . $action . '" method="post">'; - echo PMA_generate_common_hidden_inputs($_url_params); + echo PMA_URL_getHiddenInputs($_url_params); echo '<fieldset class = "input">'; echo '<legend>' . __('Add table prefix:') . '</legend>'; echo '<table>'; @@ -347,7 +347,7 @@ if (!empty($submit_mult) && !empty($what)) { echo '</fieldset>'; echo '<fieldset class="tblFooters">'; echo '<form action="' . $action . '" method="post">'; - echo PMA_generate_common_hidden_inputs($_url_params); + echo PMA_URL_getHiddenInputs($_url_params); // Display option to disable foreign key checks while dropping tables if ($what == 'drop_tbl') { echo '<div id="foreignkeychk">'; @@ -371,7 +371,7 @@ if (!empty($submit_mult) && !empty($what)) { echo '</form>'; echo '<form action="' . $action . '" method="post">'; - echo PMA_generate_common_hidden_inputs($_url_params); + echo PMA_URL_getHiddenInputs($_url_params); echo '<input type="hidden" name="mult_btn" value="' . __('No') . '" />'; echo '<input type="submit" value="' . __('No') . '" id="buttonNo" />'; echo '</form>'; diff --git a/libraries/navigation/Navigation.class.php b/libraries/navigation/Navigation.class.php index 98665ce07d..ec49c73013 100644 --- a/libraries/navigation/Navigation.class.php +++ b/libraries/navigation/Navigation.class.php @@ -144,7 +144,7 @@ class PMA_Navigation { $html = '<form method="post" action="navigation.php" class="ajax">'; $html .= '<fieldset>'; - $html .= PMA_generate_common_hidden_inputs($dbName, $tableName); + $html .= PMA_URL_getHiddenInputs($dbName, $tableName); $navTable = PMA_Util::backquote($GLOBALS['cfgRelation']['db']) . "." . PMA_Util::backquote($GLOBALS['cfgRelation']['navigationhiding']); @@ -189,7 +189,7 @@ class PMA_Navigation $html .= '<tr class="' . ($odd ? 'odd' : 'even') . '">'; $html .= '<td>' . htmlspecialchars($hiddenItem) . '</td>'; $html .= '<td style="width:80px"><a href="navigation.php?' - . PMA_generate_common_url() + . PMA_URL_getCommon() . '&unhideNavItem=true' . '&itemType=' . $t . '&itemName=' . urldecode($hiddenItem) diff --git a/libraries/navigation/NavigationHeader.class.php b/libraries/navigation/NavigationHeader.class.php index 87b3603bf2..d7294a9899 100644 --- a/libraries/navigation/NavigationHeader.class.php +++ b/libraries/navigation/NavigationHeader.class.php @@ -25,9 +25,9 @@ class PMA_NavigationHeader public function getDisplay() { if (empty($GLOBALS['url_query'])) { - $GLOBALS['url_query'] = PMA_generate_common_url(); + $GLOBALS['url_query'] = PMA_URL_getCommon(); } - $link_url = PMA_generate_common_url( + $link_url = PMA_URL_getCommon( array( 'ajax_request' => true ) @@ -178,7 +178,7 @@ class PMA_NavigationHeader $retval = '<!-- LINKS START -->'; $retval .= '<div id="leftframelinks">'; $retval .= $this->_getLink( - 'index.php?' . PMA_generate_common_url(), + 'index.php?' . PMA_URL_getCommon(), $showText, __('Home'), $showIcon, @@ -201,7 +201,7 @@ class PMA_NavigationHeader ); } $link = 'querywindow.php?'; - $link .= PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']); + $link .= PMA_URL_getCommon($GLOBALS['db'], $GLOBALS['table']); $link .= '&no_js=true'; $retval .= $this->_getLink( $link, @@ -285,7 +285,7 @@ class PMA_NavigationHeader $retval .= '<div id="recentTableList">'; $retval .= '<form method="post" '; $retval .= 'action="' . $GLOBALS['cfg']['DefaultTabTable'] . '">'; - $retval .= PMA_generate_common_hidden_inputs( + $retval .= PMA_URL_getHiddenInputs( array( 'db' => '', 'table' => '', diff --git a/libraries/navigation/Nodes/Node_Database.class.php b/libraries/navigation/Nodes/Node_Database.class.php index b5026b4153..03f6337eb9 100644 --- a/libraries/navigation/Nodes/Node_Database.class.php +++ b/libraries/navigation/Nodes/Node_Database.class.php @@ -504,7 +504,7 @@ class Node_Database extends Node if ($count > 0) { $ret = '<span class="dbItemControls">' . '<a href="navigation.php?' - . PMA_generate_common_url() + . PMA_URL_getCommon() . '&showUnhideDialog=true' . '&dbName=' . urldecode($db) . '"' . ' class="showUnhide ajax">' diff --git a/libraries/navigation/Nodes/Node_DatabaseChild.class.php b/libraries/navigation/Nodes/Node_DatabaseChild.class.php index e080e4ab37..5b686ac560 100644 --- a/libraries/navigation/Nodes/Node_DatabaseChild.class.php +++ b/libraries/navigation/Nodes/Node_DatabaseChild.class.php @@ -30,7 +30,7 @@ abstract class Node_DatabaseChild extends Node $item = $this->real_name; $ret = '<span class="navItemControls">' . '<a href="navigation.php?' - . PMA_generate_common_url() + . PMA_URL_getCommon() . '&hideNavItem=true' . '&itemType=' . urldecode($this->getItemType()) . '&itemName=' . urldecode($item) diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php index 75c6064862..9d5e57d740 100644 --- a/libraries/operations.lib.php +++ b/libraries/operations.lib.php @@ -22,7 +22,7 @@ function PMA_getHtmlForDatabaseComment($db) { $html_output = '<div class="operations_half_width">' . '<form method="post" action="db_operations.php">' - . PMA_generate_common_hidden_inputs($db) + . PMA_URL_getHiddenInputs($db) . '<fieldset>' . '<legend>'; if (PMA_Util::showIcons('ActionLinksMode')) { @@ -65,7 +65,7 @@ function PMA_getHtmlForRenameDatabase($db) } $html_output .= '<input type="hidden" name="what" value="data" />' . '<input type="hidden" name="db_rename" value="true" />' - . PMA_generate_common_hidden_inputs($db) + . PMA_URL_getHiddenInputs($db) . '<fieldset>' . '<legend>'; @@ -165,7 +165,7 @@ function PMA_getHtmlForCopyDatabase($db) . 'value="' . $_REQUEST['db_collation'] .'" />' . "\n"; } $html_output .= '<input type="hidden" name="db_copy" value="true" />' . "\n" - . PMA_generate_common_hidden_inputs($db); + . PMA_URL_getHiddenInputs($db); $html_output .= '<fieldset>' . '<legend>'; @@ -230,7 +230,7 @@ function PMA_getHtmlForChangeDatabaseCharset($db, $table) $html_output .= 'class="ajax" '; $html_output .= 'method="post" action="db_operations.php">'; - $html_output .= PMA_generate_common_hidden_inputs($db, $table); + $html_output .= PMA_URL_getHiddenInputs($db, $table); $html_output .= '<fieldset>' . "\n" . ' <legend>'; @@ -620,7 +620,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_generate_common_hidden_inputs( + $html_output .= PMA_URL_getHiddenInputs( $GLOBALS['db'], $GLOBALS['table'] ); $html_output .= '<fieldset id="fieldset_table_order">' @@ -662,7 +662,7 @@ function PMA_getHtmlForMoveTable() $html_output .= '<form method="post" action="tbl_operations.php"' . ' id="moveTableForm" class="ajax"' . ' onsubmit="return emptyFormElements(this, \'new_name\')">' - . PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); + . PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']); $html_output .= '<input type="hidden" name="reload" value="1" />' . '<input type="hidden" name="what" value="data" />' @@ -731,7 +731,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_generate_common_hidden_inputs( + $html_output .= PMA_URL_getHiddenInputs( $GLOBALS['db'], $GLOBALS['table'] ); $html_output .= '<input type="hidden" name="reload" value="1" />'; @@ -995,7 +995,7 @@ function PMA_getHtmlForCopytable() . 'id="copyTable" ' . ' class="ajax" ' . 'onsubmit="return emptyFormElements(this, \'new_name\')">' - . PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']) + . PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']) . '<input type="hidden" name="reload" value="1" />'; $html_output .= '<fieldset>'; @@ -1218,7 +1218,7 @@ function PMA_getMaintainActionlink($action, $params, $url_params, $link) return '<li>' . '<a class="maintain_action ajax" ' . 'href="sql.php' - . PMA_generate_common_url(array_merge($url_params, $params)) .'">' + . PMA_URL_getCommon(array_merge($url_params, $params)) .'">' . $action . '</a>' . PMA_Util::showMySQLDocu($link) @@ -1277,7 +1277,7 @@ function PMA_getHtmlForDeleteDataOrTable( function PMA_getDeleteDataOrTablelink($url_params, $syntax, $link, $id) { return '<li><a ' - . 'href="sql.php' . PMA_generate_common_url($url_params) . '"' + . 'href="sql.php' . PMA_URL_getCommon($url_params) . '"' . ' id="' . $id . '" class="ajax">' . $link . '</a>' . PMA_Util::showMySQLDocu($syntax) @@ -1304,7 +1304,7 @@ function PMA_getHtmlForPartitionMaintenance($partition_names, $url_params) $html_output = '<div class="operations_half_width">' . '<form method="post" action="tbl_operations.php">' - . PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']) + . PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']) . '<fieldset>' . '<legend>' . __('Partition maintenance') . '</legend>'; @@ -1330,7 +1330,7 @@ function PMA_getHtmlForPartitionMaintenance($partition_names, $url_params) ) ); $html_output .= '<br /><a href="sql.php' - . PMA_generate_common_url($this_url_params) . '">' + . PMA_URL_getCommon($this_url_params) . '">' . __('Remove partitioning') . '</a>'; $html_output .= '</fieldset>' @@ -1399,7 +1399,7 @@ function PMA_getHtmlForReferentialIntegrityCheck($foreign, $url_params) $html_output .= '<li>' . '<a href="sql.php' - . PMA_generate_common_url($this_url_params) + . PMA_URL_getCommon($this_url_params) . '">' . $master . ' -> ' . $arr['foreign_db'] . '.' . $arr['foreign_table'] . '.' . $arr['foreign_field'] diff --git a/libraries/plugins/auth/AuthenticationConfig.class.php b/libraries/plugins/auth/AuthenticationConfig.class.php index 5e33a07f1a..c0ea3892a3 100644 --- a/libraries/plugins/auth/AuthenticationConfig.class.php +++ b/libraries/plugins/auth/AuthenticationConfig.class.php @@ -138,7 +138,7 @@ class AuthenticationConfig extends AuthenticationPlugin <td>' . "\n"; echo '<a href="' . $GLOBALS['cfg']['DefaultTabServer'] - . PMA_generate_common_url(array()) . '" class="button disableAjax">' + . PMA_URL_getCommon(array()) . '" class="button disableAjax">' . __('Retry to connect') . '</a>' . "\n"; echo '</td> diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php index 2b68f358ab..12d4526fcb 100644 --- a/libraries/plugins/auth/AuthenticationCookie.class.php +++ b/libraries/plugins/auth/AuthenticationCookie.class.php @@ -292,7 +292,7 @@ class AuthenticationCookie extends AuthenticationPlugin } // do not generate a "server" hidden field as we want the "server" // drop-down to have priority - echo PMA_generate_common_hidden_inputs($_form_params, '', 0, 'server'); + echo PMA_URL_getHiddenInputs($_form_params, '', 0, 'server'); echo '</fieldset> </form>'; @@ -640,7 +640,7 @@ class AuthenticationCookie extends AuthenticationPlugin PMA_Response::getInstance()->disable(); PMA_sendHeaderLocation( - $redirect_url . PMA_generate_common_url($url_params, '&'), + $redirect_url . PMA_URL_getCommon($url_params, '&'), true ); if (! defined('TESTSUITE')) { diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index 19a6518035..b09526057f 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -60,7 +60,7 @@ function PMA_getHtmlForMasterReplication() $_url_params['repl_clear_scr'] = true; $html .= ' <li><a href="server_replication.php'; - $html .= PMA_generate_common_url($_url_params) + $html .= PMA_URL_getCommon($_url_params) . '" id="master_addslaveuser_href">'; $html .= __('Add slave replication user') . '</a></li>'; } @@ -117,7 +117,7 @@ function PMA_getHtmlForMasterConfiguration() $html .= '</fieldset>'; $html .= '<fieldset class="tblFooters">'; $html .= ' <form method="post" action="server_replication.php" >'; - $html .= PMA_generate_common_hidden_inputs('', ''); + $html .= PMA_URL_getHiddenInputs('', ''); $html .= ' <input type="submit" value="' . __('Go') . '" id="goButton" />'; $html .= ' </form>'; $html .= '</fieldset>'; @@ -152,7 +152,7 @@ function PMA_getHtmlForSlaveConfiguration($server_slave_status, $server_slave_re $_url_params['sr_slave_control_parm'] = 'IO_THREAD'; $slave_control_io_link = 'server_replication.php' - . PMA_generate_common_url($_url_params); + . PMA_URL_getCommon($_url_params); if ($server_slave_replication[0]['Slave_SQL_Running'] == 'No') { $_url_params['sr_slave_action'] = 'start'; @@ -162,7 +162,7 @@ function PMA_getHtmlForSlaveConfiguration($server_slave_status, $server_slave_re $_url_params['sr_slave_control_parm'] = 'SQL_THREAD'; $slave_control_sql_link = 'server_replication.php' - . PMA_generate_common_url($_url_params); + . PMA_URL_getCommon($_url_params); if ($server_slave_replication[0]['Slave_IO_Running'] == 'No' || $server_slave_replication[0]['Slave_SQL_Running'] == 'No' @@ -174,16 +174,16 @@ function PMA_getHtmlForSlaveConfiguration($server_slave_status, $server_slave_re $_url_params['sr_slave_control_parm'] = null; $slave_control_full_link = 'server_replication.php' - . PMA_generate_common_url($_url_params); + . PMA_URL_getCommon($_url_params); $_url_params['sr_slave_action'] = 'reset'; $slave_control_reset_link = 'server_replication.php' - . PMA_generate_common_url($_url_params); + . PMA_URL_getCommon($_url_params); $_url_params = $GLOBALS['url_params']; $_url_params['sr_slave_skip_error'] = true; $slave_skip_error_link = 'server_replication.php' - . PMA_generate_common_url($_url_params); + . PMA_URL_getCommon($_url_params); if ($server_slave_replication[0]['Slave_SQL_Running'] == 'No') { $html .= PMA_Message::error( @@ -201,7 +201,7 @@ function PMA_getHtmlForSlaveConfiguration($server_slave_status, $server_slave_re $_url_params['repl_clear_scr'] = true; $reconfiguremaster_link = 'server_replication.php' - . PMA_generate_common_url($_url_params); + . PMA_URL_getCommon($_url_params); $html .= __('Server is configured as slave in a replication process. Would you like to:'); $html .= '<br />'; @@ -257,7 +257,7 @@ function PMA_getHtmlForSlaveConfiguration($server_slave_status, $server_slave_re '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_generate_common_url($_url_params) + 'server_replication.php' . PMA_URL_getCommon($_url_params) ); } $html .= '</fieldset>'; @@ -285,7 +285,7 @@ function PMA_getHtmlForSlaveErrorManagement($slave_skip_error_link) $html .= __('Skip current error') . '</a></li>'; $html .= ' <li>' . __('Skip next'); $html .= ' <form method="post" action="server_replication.php">'; - $html .= PMA_generate_common_hidden_inputs('', ''); + $html .= PMA_URL_getHiddenInputs('', ''); $html .= ' <input type="text" name="sr_skip_errors_count" value="1" '; $html .= 'style="width: 30px" />' . __('errors.'); $html .= ' <input type="submit" name="sr_slave_skip_error" '; @@ -314,7 +314,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_generate_common_url($_url_params) + 'server_replication.php' . PMA_URL_getCommon($_url_params) ); $html .= '</fieldset>'; return $html; @@ -369,7 +369,7 @@ function PMA_getHtmlForReplicationChangeMaster($submitname) = PMA_replicationGetUsernameHostnameLength(); $html .= '<form method="post" action="server_replication.php">'; - $html .= PMA_generate_common_hidden_inputs('', ''); + $html .= PMA_URL_getHiddenInputs('', ''); $html .= ' <fieldset id="fieldset_add_user_login">'; $html .= ' <legend>' . __('Slave configuration'); $html .= ' - ' . __('Change or reconfigure master server') . '</legend>'; @@ -662,7 +662,7 @@ function PMA_getHtmlForReplicationMasterAddSlaveuser() $html .= '<form autocomplete="off" method="post" '; $html .= 'action="server_privileges.php"'; $html .= ' onsubmit="return checkAddUser(this);">'; - $html .= PMA_generate_common_hidden_inputs('', ''); + $html .= PMA_URL_getHiddenInputs('', ''); $html .= '<fieldset id="fieldset_add_user_login">' . '<legend>' . __('Add slave replication user') . '</legend>' . PMA_getHtmlForAddUserLoginForm($username_length) @@ -894,7 +894,7 @@ function PMA_handleControlRequest() if ($refresh) { Header( "Location: server_replication.php" - . PMA_generate_common_url($GLOBALS['url_params']) + . PMA_URL_getCommon($GLOBALS['url_params']) ); } unset($refresh); diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php index 74c6b7a0f5..f8f34f77b7 100644 --- a/libraries/rte/rte_events.lib.php +++ b/libraries/rte/rte_events.lib.php @@ -412,7 +412,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_generate_common_hidden_inputs($db, $table) . "\n"; + $retval .= PMA_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_main.inc.php b/libraries/rte/rte_main.inc.php index a36221c9c5..de48f31ad3 100644 --- a/libraries/rte/rte_main.inc.php +++ b/libraries/rte/rte_main.inc.php @@ -38,7 +38,7 @@ if ($GLOBALS['is_ajax_request'] != true) { if (strlen($db)) { $GLOBALS['dbi']->selectDb($db); if (! isset($url_query)) { - $url_query = PMA_generate_common_url($db, $table); + $url_query = PMA_URL_getCommon($db, $table); } } } diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index c44032bf04..a08f6914ab 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -926,7 +926,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_generate_common_hidden_inputs($db) . "\n"; + $retval .= PMA_URL_getHiddenInputs($db) . "\n"; $retval .= "<fieldset>\n"; $retval .= "<legend>" . __('Details') . "</legend>\n"; $retval .= "<table class='rte_table' style='width: 100%'>\n"; @@ -1563,7 +1563,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_generate_common_hidden_inputs($db) . "\n"; + $retval .= PMA_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 eb8a5ab8a4..3d93f76300 100644 --- a/libraries/rte/rte_triggers.lib.php +++ b/libraries/rte/rte_triggers.lib.php @@ -342,7 +342,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_generate_common_hidden_inputs($db, $table) . "\n"; + $retval .= PMA_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/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php index 66e19974d3..bb7f87ede4 100644 --- a/libraries/schema/Export_Relation_Schema.class.php +++ b/libraries/schema/Export_Relation_Schema.class.php @@ -240,7 +240,7 @@ class PMA_Export_Relation_Schema echo '<p>' . "\n"; echo ' ' . $error_message . "\n"; echo '</p>' . "\n"; - echo '<a href="schema_edit.php?' . PMA_generate_common_url($db) + echo '<a href="schema_edit.php?' . PMA_URL_getCommon($db) . '&do=selectpage&chpage=' . htmlspecialchars($pageNumber) . '&action_choose=0' . '">' . __('Back') . '</a>'; diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 0ff556ae41..b3ef37be04 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -131,7 +131,7 @@ class PMA_User_Schema <legend> <?php echo __('Create a page') . "\n"; ?> </legend> - <?php echo PMA_generate_common_hidden_inputs($db); ?> + <?php echo PMA_URL_getHiddenInputs($db); ?> <input type="hidden" name="do" value="createpage" /> <table> <tr> @@ -194,7 +194,7 @@ class PMA_User_Schema <legend> <?php echo __('Please choose a page to edit') . "\n"; ?> </legend> - <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> + <?php echo PMA_URL_getHiddenInputs($db, $table); ?> <input type="hidden" name="do" value="selectpage" /> <select name="chpage" id="chpage" class="autosubmit"> <option value="0"><?php echo __('Select page'); ?></option> @@ -291,7 +291,7 @@ class PMA_User_Schema echo '<form method="post" action="schema_edit.php" name="edcoord">'; - echo PMA_generate_common_hidden_inputs($db, $table); + echo PMA_URL_getHiddenInputs($db, $table); echo '<input type="hidden" name="chpage" ' . 'value="' . htmlspecialchars($this->chosenPage) . '" />'; echo '<input type="hidden" name="do" value="edcoord" />'; @@ -408,7 +408,7 @@ class PMA_User_Schema <fieldset> <legend> <?php - echo PMA_generate_common_hidden_inputs($db); + echo PMA_URL_getHiddenInputs($db); if (PMA_Util::showIcons('ActionLinksMode')) { echo PMA_Util::getImage('b_views.png'); } @@ -519,7 +519,7 @@ class PMA_User_Schema return; } echo '<br /><form action="schema_edit.php" method="post">' . "\n" - . PMA_generate_common_hidden_inputs($db) + . PMA_URL_getHiddenInputs($db) . '<input type="hidden" name="do" value="delete_old_references" />' . "\n" . '<input type="hidden" name="chpage" value="' diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php index b6fdff02a8..7f72c7d110 100644 --- a/libraries/select_server.lib.php +++ b/libraries/select_server.lib.php @@ -32,7 +32,7 @@ function PMA_selectServer($not_only_options, $ommit_fieldset) if ($not_only_options) { $retval .= '<form method="post" action="' . $GLOBALS['cfg']['DefaultTabServer'] . '" class="disableAjax">'; - $retval .= PMA_generate_common_hidden_inputs(); + $retval .= PMA_URL_getHiddenInputs(); if (! $ommit_fieldset) { $retval .= '<fieldset>'; @@ -85,7 +85,7 @@ function PMA_selectServer($not_only_options, $ommit_fieldset) $retval .= '<a class="disableAjax item" href="' . $GLOBALS['cfg']['DefaultTabServer'] - . PMA_generate_common_url(array('server' => $key)) + . PMA_URL_getCommon(array('server' => $key)) . '" >' . htmlspecialchars($label) . '</a>'; } $retval .= '</li>'; diff --git a/libraries/server_bin_log.lib.php b/libraries/server_bin_log.lib.php index ecefa4d812..5ab4f0f560 100644 --- a/libraries/server_bin_log.lib.php +++ b/libraries/server_bin_log.lib.php @@ -25,7 +25,7 @@ function PMA_getLogSelector($binary_log_file_names, $url_params) $html = ""; if (count($binary_log_file_names) > 1) { $html .= '<form action="server_binlog.php" method="get">'; - $html .= PMA_generate_common_hidden_inputs($url_params); + $html .= PMA_URL_getHiddenInputs($url_params); $html .= '<fieldset><legend>'; $html .= __('Select binary log to view'); $html .= '</legend><select name="log">'; @@ -166,7 +166,7 @@ function PMA_getNavigationRow($url_params, $pos, $num_rows, $dontlimitchars) } $html .= '<a href="server_binlog.php' - . PMA_generate_common_url($this_url_params) . '"'; + . PMA_URL_getCommon($this_url_params) . '"'; if (PMA_Util::showIcons('TableNavigationLinksMode')) { $html .= ' title="' . _pgettext('Previous page', 'Previous') . '">'; } else { @@ -188,7 +188,7 @@ function PMA_getNavigationRow($url_params, $pos, $num_rows, $dontlimitchars) $tempTitle = __('Show Full Queries'); $tempImgMode = 'full'; } - $html .= '<a href="server_binlog.php' . PMA_generate_common_url($this_url_params) + $html .= '<a href="server_binlog.php' . PMA_URL_getCommon($this_url_params) . '" title="' . $tempTitle . '">' . '<img src="' .$GLOBALS['pmaThemeImage'] . 's_' . $tempImgMode . 'text.png"' . 'alt="' . $tempTitle . '" /></a>'; @@ -199,7 +199,7 @@ function PMA_getNavigationRow($url_params, $pos, $num_rows, $dontlimitchars) $this_url_params = $url_params; $this_url_params['pos'] = $pos + $GLOBALS['cfg']['MaxRows']; $html .= ' - <a href="server_binlog.php' - . PMA_generate_common_url($this_url_params) + . PMA_URL_getCommon($this_url_params) . '"'; if (PMA_Util::showIcons('TableNavigationLinksMode')) { $html .= ' title="' . _pgettext('Next page', 'Next') . '">'; diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php index ad6caa203f..19f3845321 100644 --- a/libraries/server_common.inc.php +++ b/libraries/server_common.inc.php @@ -22,7 +22,7 @@ if (empty($viewing_mode)) { /** * Set parameters for links */ -$url_query = PMA_generate_common_url($db); +$url_query = PMA_URL_getCommon($db); /** * Defines the urls to return to in case of error in a sql statement diff --git a/libraries/server_databases.lib.php b/libraries/server_databases.lib.php index 39e4e41d4b..03d26ed776 100644 --- a/libraries/server_databases.lib.php +++ b/libraries/server_databases.lib.php @@ -57,7 +57,7 @@ function PMA_getHtmlForDatabase( $html .= '<form class="ajax" action="server_databases.php" '; $html .= 'method="post" name="dbStatsForm" id="dbStatsForm">' . "\n"; - $html .= PMA_generate_common_hidden_inputs($_url_params); + $html .= PMA_URL_getHiddenInputs($_url_params); $_url_params['sort_by'] = 'SCHEMA_NAME'; $_url_params['sort_order'] @@ -306,7 +306,7 @@ function PMA_getHtmlForColumnOrderWithSort( ? ' <th></th>' . "\n" : '') . ' <th><a href="server_databases.php' - . PMA_generate_common_url($_url_params) . '">' . "\n" + . PMA_URL_getCommon($_url_params) . '">' . "\n" . ' ' . __('Database') . "\n" . ($sort_by == 'SCHEMA_NAME' ? ' ' . PMA_Util::getImage( @@ -331,7 +331,7 @@ function PMA_getHtmlForColumnOrderWithSort( = ($sort_by == $stat_name && $sort_order == 'desc') ? 'asc' : 'desc'; $html .= ' <th' . $colspan . '>' . '<a href="server_databases.php' - . PMA_generate_common_url($_url_params) . '">' . "\n" + . PMA_URL_getCommon($_url_params) . '">' . "\n" . ' ' . $stat['disp_name'] . "\n" . ($sort_by == $stat_name ? ' ' . PMA_Util::getImage( diff --git a/libraries/server_engines.lib.php b/libraries/server_engines.lib.php index 35ebc13e05..f8c9710171 100644 --- a/libraries/server_engines.lib.php +++ b/libraries/server_engines.lib.php @@ -64,7 +64,7 @@ function PMA_getHtmlForAllServerEngines() ? ' disabled' : '') . '">' . "\n" . ' <td><a rel="newpage" href="server_engines.php' - . PMA_generate_common_url(array('engine' => $engine)) . '">' . "\n" + . PMA_URL_getCommon(array('engine' => $engine)) . '">' . "\n" . ' ' . htmlspecialchars($details['Engine']) . "\n" . ' </a></td>' . "\n" . ' <td>' . htmlspecialchars($details['Comment']) . '</td>' . "\n" @@ -109,7 +109,7 @@ function PMA_getHtmlForSpecifiedServerEngines() $html .= ' <strong>' . __('Variables') . '</strong>' . "\n"; } else { $html .= ' <a href="server_engines.php' - . PMA_generate_common_url(array('engine' => $_REQUEST['engine'])) + . PMA_URL_getCommon(array('engine' => $_REQUEST['engine'])) . '">' . __('Variables') . '</a>' . "\n"; } foreach ($infoPages as $current => $label) { @@ -118,7 +118,7 @@ function PMA_getHtmlForSpecifiedServerEngines() $html .= ' <strong>' . $label . '</strong>' . "\n"; } else { $html .= ' <a href="server_engines.php' - . PMA_generate_common_url( + . PMA_URL_getCommon( array('engine' => $_REQUEST['engine'], 'page' => $current) ) . '">' . htmlspecialchars($label) . '</a>' . "\n"; diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 9ca619d673..0c6ac22c02 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -404,7 +404,7 @@ function PMA_getHtmlToChoseUserGroup($username) $html_output = '<form class="ajax" id="changeUserGroupForm"' . ' action="server_privileges.php" method="post">'; $params = array('username' => $username); - $html_output .= PMA_generate_common_hidden_inputs($params); + $html_output .= PMA_URL_getHiddenInputs($params); $html_output .= '<fieldset id="fieldset_user_group_selection">'; $html_output .= '<legend>' . __('User group') . '</legend>'; @@ -1566,7 +1566,7 @@ function PMA_getHtmlForAddUser($dbname) . '</h2>' . "\n" . '<form name="usersForm" class="ajax" id="addUsersForm"' . ' action="server_privileges.php" method="post">' . "\n" - . PMA_generate_common_hidden_inputs('', '') + . PMA_URL_getHiddenInputs('', '') . PMA_getHtmlForDisplayLoginInformationFields('new'); $html_output .= '<fieldset id="fieldset_add_user_database">' . "\n" @@ -1685,7 +1685,7 @@ function PMA_getHtmlForSpecificDbPrivileges($link_edit, $conditional_class) . sprintf( __('Users having access to "%s"'), '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' - . PMA_generate_common_url($_REQUEST['checkprivs']) . '">' + . PMA_URL_getCommon($_REQUEST['checkprivs']) . '">' . htmlspecialchars($_REQUEST['checkprivs']) . '</a>' ) @@ -2072,7 +2072,7 @@ function PMA_getChangeLoginInformationHtmlForm($username, $hostname) $class = ' ajax'; $html_output = '<form action="server_privileges.php" ' . 'method="post" class="copyUserForm' . $class .'">' . "\n" - . PMA_generate_common_hidden_inputs('', '') + . PMA_URL_getHiddenInputs('', '') . '<input type="hidden" name="old_username" ' . 'value="' . htmlspecialchars($username) . '" />' . "\n" . '<input type="hidden" name="old_hostname" ' @@ -2339,7 +2339,7 @@ function PMA_getTableForDisplayAllTableSpecificRights($username, $hostname , $link_edit, $link_revoke, $dbname ) { // table header - $html_output = PMA_generate_common_hidden_inputs('', '') + $html_output = PMA_URL_getHiddenInputs('', '') . '<input type="hidden" name="username" ' . 'value="' . htmlspecialchars($username) . '" />' . "\n" . '<input type="hidden" name="hostname" ' @@ -2516,7 +2516,7 @@ function PMA_getUsersOverview($result, $db_rights, $link_edit, $pmaThemeImage, $html_output = '<form name="usersForm" id="usersForm" action="server_privileges.php" ' . 'method="post">' . "\n" - . PMA_generate_common_hidden_inputs('', '') + . PMA_URL_getHiddenInputs('', '') . '<table id="tableuserrights" class="data">' . "\n" . '<thead>' . "\n" . '<tr><th></th>' . "\n" @@ -3243,7 +3243,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_generate_common_hidden_inputs(); + $html_output .= PMA_URL_getHiddenInputs(); $html_output .= '<table id="userGroupsTable">'; $html_output .= '<thead><tr>'; $html_output .= '<th style="white-space: nowrap">' @@ -3265,18 +3265,18 @@ function PMA_getHtmlForUserGroupsTable() $html_output .= '<td>'; $html_output .= '<a class="" href="server_user_groups.php?' - . PMA_generate_common_url() . '&viewUsers=1&userGroup=' + . PMA_URL_getCommon() . '&viewUsers=1&userGroup=' . urlencode($row['usergroup']) . '">' . PMA_Util::getIcon('b_usrlist.png', __('View users')) . '</a>'; $html_output .= ' '; $html_output .= '<a class="" href="server_user_groups.php?' - . PMA_generate_common_url() . '&editUserGroup=1&userGroup=' + . PMA_URL_getCommon() . '&editUserGroup=1&userGroup=' . urlencode($row['usergroup']) . '">' . PMA_Util::getIcon('b_edit.png', __('Edit')) . '</a>'; $html_output .= ' '; $html_output .= '<a class="deleteUserGroup ajax"' . ' href="server_user_groups.php?' - . PMA_generate_common_url() . '&deleteUserGroup=1&userGroup=' + . PMA_URL_getCommon() . '&deleteUserGroup=1&userGroup=' . urlencode($row['usergroup']) . '">' . PMA_Util::getIcon('b_drop.png', __('Delete')) . '</a>'; $html_output .= '</td>'; @@ -3294,7 +3294,7 @@ function PMA_getHtmlForUserGroupsTable() $html_output .= '<fieldset id="fieldset_add_user_group">'; $html_output .= '<a href="server_user_groups.php?' - . PMA_generate_common_url() . '&addUserGroup=1">' + . PMA_URL_getCommon() . '&addUserGroup=1">' . PMA_Util::getIcon('b_usradd.png') . __('Add user group') . '</a>'; $html_output .= '</fieldset>'; @@ -3373,7 +3373,7 @@ function PMA_getHtmlToEditUserGroup($userGroup = null) } else { $urlParams['addUserGroupSubmit'] = '1'; } - $html_output .= PMA_generate_common_hidden_inputs($urlParams); + $html_output .= PMA_URL_getHiddenInputs($urlParams); $html_output .= '<fieldset id="fieldset_user_group_rights">'; $html_output .= '<legend>' . __('User group menu assignments') @@ -3554,7 +3554,7 @@ function PMA_getHtmlForDisplayUserProperties($dbname_is_wildcard,$url_dbname, $html_output .= '<form' . $class . ' name="usersForm" id="addUsersForm"' . ' action="server_privileges.php" method="post">' . "\n"; - $html_output .= PMA_generate_common_hidden_inputs($_params); + $html_output .= PMA_URL_getHiddenInputs($_params); $html_output .= PMA_getHtmlToDisplayPrivilegesTable( PMA_ifSetOr($dbname, '*', 'length'), PMA_ifSetOr($tablename, '*', 'length') @@ -3884,7 +3884,7 @@ function PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password) */ function PMA_getHtmlForSubMenusOnUsersPage($selfUrl) { - $url_params = PMA_generate_common_url(); + $url_params = PMA_URL_getCommon(); $items = array( array( 'name' => __('Users overview'), diff --git a/libraries/server_status.lib.php b/libraries/server_status.lib.php index cef78c9fef..41c7efea69 100644 --- a/libraries/server_status.lib.php +++ b/libraries/server_status.lib.php @@ -323,11 +323,11 @@ function PMA_getHtmlForServerProcesslist($ServerStatusData) $show_full_sql = ! empty($_REQUEST['full']); if ($show_full_sql) { $url_params['full'] = 1; - $full_text_link = 'server_status.php' . PMA_generate_common_url( + $full_text_link = 'server_status.php' . PMA_URL_getCommon( array(), 'html', '?' ); } else { - $full_text_link = 'server_status.php' . PMA_generate_common_url( + $full_text_link = 'server_status.php' . PMA_URL_getCommon( array('full' => 1) ); } @@ -434,7 +434,7 @@ function PMA_getHtmlForServerProcesslist($ServerStatusData) } $retval .= '<th>'; - $columnUrl = PMA_generate_common_url($column); + $columnUrl = PMA_URL_getCommon($column); $retval .= '<a href="server_status.php' . $columnUrl . '" '; if ($is_sorted) { $retval .= 'onmouseout="$(\'.soimg\').toggle()" ' @@ -514,7 +514,7 @@ function PMA_getHtmlForServerProcessItem($process, $odd_row, $show_full_sql) } $url_params['kill'] = $process['Id']; - $kill_process = 'server_status.php' . PMA_generate_common_url($url_params); + $kill_process = 'server_status.php' . PMA_URL_getCommon($url_params); $retval = '<tr class="' . ($odd_row ? 'odd' : 'even') . '">'; $retval .= '<td><a href="' . $kill_process . '">' . __('Kill') . '</a></td>'; diff --git a/libraries/server_status_variables.lib.php b/libraries/server_status_variables.lib.php index 435c8f089e..a8e62702bf 100644 --- a/libraries/server_status_variables.lib.php +++ b/libraries/server_status_variables.lib.php @@ -38,7 +38,7 @@ function PMA_getHtmlForFilter($ServerStatusData) $retval .= '<fieldset id="tableFilter">'; $retval .= '<legend>' . __('Filters') . '</legend>'; $retval .= '<form action="server_status_variables.php?' - . PMA_generate_common_url() . '">'; + . PMA_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_variables.lib.php b/libraries/server_variables.lib.php index 1808c07eee..756ca1b7d7 100644 --- a/libraries/server_variables.lib.php +++ b/libraries/server_variables.lib.php @@ -149,7 +149,7 @@ function PMA_formatVariable($name, $value, $variable_doc_links) */ function PMA_getHtmlForLinkTemplates() { - $url = htmlspecialchars('server_variables.php?' . PMA_generate_common_url()); + $url = htmlspecialchars('server_variables.php?' . PMA_URL_getCommon()); $output = '<a style="display: none;" href="#" class="editLink">'; $output .= PMA_Util::getIcon('b_edit.png', __('Edit')) . '</a>'; $output .= '<a style="display: none;" href="' diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index dcc6312837..cac8b0b2d6 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -130,7 +130,7 @@ function PMA_getTableHtmlForMultipleQueries( $unlim_num_rows = PMA_Table::countRecords($db, $table, true); $showtable = PMA_Table::sGetStatusInfo($db, $table, null, true); - $url_query = PMA_generate_common_url($db, $table); + $url_query = PMA_URL_getCommon($db, $table); // Handle remembered sorting order, only for single table query if ($GLOBALS['cfg']['RememberSorting'] @@ -366,7 +366,7 @@ function PMA_getHtmlForRelationalColumnDropdown($db, $table, $column, $curr_valu . htmlspecialchars($_REQUEST['curr_value']) . '</span>' . '<a href="browse_foreigners.php' - . PMA_generate_common_url($_url_params) . '"' + . PMA_URL_getCommon($_url_params) . '"' . ' target="_blank" class="browse_foreign" ' .'>' . __('Browse foreign values') . '</a>'; @@ -454,7 +454,7 @@ function PMA_getHtmlForProfilingChart($url_query, $db, $profiling_results) { if (isset($profiling_results)) { $pma_token = $_SESSION[' PMA_token ']; - $url_query = (isset($url_query) ? $url_query : PMA_generate_common_url($db)); + $url_query = (isset($url_query) ? $url_query : PMA_URL_getCommon($db)); $profiling_table = ''; $profiling_table .= '<fieldset><legend>' . __('Profiling') @@ -730,7 +730,7 @@ function PMA_getHtmlForBookmark($disp_mode, $cfgBookmark, $sql_query, $db, $tabl ) { $html = "\n"; $goto = 'sql.php?' - . PMA_generate_common_url($db, $table) + . PMA_URL_getCommon($db, $table) . '&sql_query=' . urlencode($sql_query) . '&id_bookmark=1'; $bkm_sql_query = urlencode( @@ -740,7 +740,7 @@ function PMA_getHtmlForBookmark($disp_mode, $cfgBookmark, $sql_query, $db, $tabl . ' onsubmit="return ! emptyFormElements(this,' . '\'bkm_fields[bkm_label]\');"' . ' id="bookmarkQueryForm">'; - $html .= PMA_generate_common_hidden_inputs(); + $html .= PMA_URL_getHiddenInputs(); $html .= '<input type="hidden" name="goto" value="' . $goto . '" />'; $html .= '<input type="hidden" name="bkm_fields[bkm_database]"' . ' value="' . htmlspecialchars($db) . '" />'; diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index fbac797daf..d884019d49 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -109,7 +109,7 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';') } } $html .= '<input type="hidden" name="is_js_confirmed" value="0" />' - . "\n" . PMA_generate_common_hidden_inputs($db, $table) . "\n" + . "\n" . PMA_URL_getHiddenInputs($db, $table) . "\n" .'<input type="hidden" name="pos" value="0" />' . "\n" .'<input type="hidden" name="goto" value="' .htmlspecialchars($goto) . '" />' . "\n" @@ -198,7 +198,7 @@ function PMA_sqlQueryFormInsert( $db = $GLOBALS['db']; // if you want navigation: $tmp_db_link = '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] - . '?' . PMA_generate_common_url($db) . '"'; + . '?' . PMA_URL_getCommon($db) . '"'; if ($is_querywindow) { $tmp_db_link .= ' target="_self"' . ' onclick="this.target=window.opener.frame_content.name"'; @@ -222,7 +222,7 @@ function PMA_sqlQueryFormInsert( $fields_list = $GLOBALS['dbi']->getColumns($db, $GLOBALS['table'], null, true); $tmp_db_link = '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] - . '?' . PMA_generate_common_url($db) . '"'; + . '?' . PMA_URL_getCommon($db) . '"'; if ($is_querywindow) { $tmp_db_link .= ' target="_self"' . ' onclick="this.target=window.opener.frame_content.name"'; diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index 94d88dee57..719fd390b0 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -893,7 +893,7 @@ function PMA_sortableTableHeader($title, $sort, $initial_sort_order = 'ASC') 'db' => $_REQUEST['db'], ); - $url = 'db_structure.php'.PMA_generate_common_url($_url_params); + $url = 'db_structure.php'.PMA_URL_getCommon($_url_params); // We set the position back to 0 every time they sort. $url .= "&pos=0&sort=$sort&sort_order=$future_sort_order"; @@ -1427,7 +1427,7 @@ function PMA_getHtmlDivForMoveColumnsDialog() $html_output .= '<form action="tbl_structure.php">' . '<div>' - . PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']) + . PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']) . '<ul></ul>' . '</div>' . '</form>' @@ -1460,7 +1460,7 @@ function PMA_getHtmlForEditView($url_params) 'as' => $item['VIEW_DEFINITION'], 'with' => $item['CHECK_OPTION'], ); - $url = 'view_create.php' . PMA_generate_common_url($url_params) . '&'; + $url = 'view_create.php' . PMA_URL_getCommon($url_params) . '&'; $url .= implode( '&', array_map( @@ -1556,7 +1556,7 @@ function PMA_getHtmlForAddColumn($columns_list) ) . '\', 1)' . '">'; - $html_output .= PMA_generate_common_hidden_inputs( + $html_output .= PMA_URL_getHiddenInputs( $GLOBALS['db'], $GLOBALS['table'] ); @@ -2301,7 +2301,7 @@ function PMA_displayHtmlForColumnChange($db, $table, $selected, $action) */ function PMA_updateColumns($db, $table) { - $err_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table); + $err_url = 'tbl_structure.php?' . PMA_URL_getCommon($db, $table); $regenerate = false; $field_cnt = count($_REQUEST['field_name']); $key_fields = array(); diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php index 0ca2670118..9c6deee76b 100644 --- a/libraries/tbl_columns_definition_form.lib.php +++ b/libraries/tbl_columns_definition_form.lib.php @@ -239,7 +239,7 @@ function PMA_getHtmlForTableCreateOrAddField($action, $form_params, $content_cel $html = '<form method="post" action="' . $action . '" class="' . ($action == 'tbl_create.php' ? 'create_table' : 'append_fields') . '_form ajax">'; - $html .= PMA_generate_common_hidden_inputs($form_params); + $html .= PMA_URL_getHiddenInputs($form_params); if ($action == 'tbl_create.php') { $html .= PMA_getHtmlForTableNameAndNoOfColumns(); @@ -319,7 +319,7 @@ function PMA_getHeaderCells($is_backup, $fields_meta, $mimework, $db, $table) . ' %stransformation descriptions%s' ), '<a href="transformation_overview.php?' - . PMA_generate_common_url($db, $table) + . PMA_URL_getCommon($db, $table) . '" target="_blank">', '</a>' ); diff --git a/libraries/tbl_common.inc.php b/libraries/tbl_common.inc.php index ae8c4e74b8..ea079474f8 100644 --- a/libraries/tbl_common.inc.php +++ b/libraries/tbl_common.inc.php @@ -23,7 +23,7 @@ $db_is_information_schema = $GLOBALS['dbi']->isSystemSchema($db); * Set parameters for links * @deprecated */ -$url_query = PMA_generate_common_url($db, $table); +$url_query = PMA_URL_getCommon($db, $table); /** * Set parameters for links @@ -36,8 +36,8 @@ $url_params['table'] = $table; * Defines the urls to return to in case of error in a sql statement */ $err_url_0 = $cfg['DefaultTabDatabase'] - . PMA_generate_common_url(array('db' => $db,)); -$err_url = $cfg['DefaultTabTable'] . PMA_generate_common_url($url_params); + . PMA_URL_getCommon(array('db' => $db,)); +$err_url = $cfg['DefaultTabTable'] . PMA_URL_getCommon($url_params); /** diff --git a/libraries/tbl_gis_visualization.lib.php b/libraries/tbl_gis_visualization.lib.php index b2d07318c2..6f184fc75b 100644 --- a/libraries/tbl_gis_visualization.lib.php +++ b/libraries/tbl_gis_visualization.lib.php @@ -289,7 +289,7 @@ function PMA_getHtmlForGisVisualization( $html .= '<div style="width: 400px; float: left;">'; $html .= '<form method="post" action="tbl_gis_visualization.php">'; - $html .= PMA_generate_common_hidden_inputs($url_params); + $html .= PMA_URL_getHiddenInputs($url_params); $html .= '<table class="gis_table">'; $html .= PMA_getHtmlForColumn( @@ -319,7 +319,7 @@ function PMA_getHtmlForGisVisualization( $html .= '<div style="float:left;">'; $html .= '<form method="post" class="disableAjax" action="tbl_gis_visualization.php">'; - $html .= PMA_generate_common_hidden_inputs($url_params); + $html .= PMA_URL_getHiddenInputs($url_params); $html .= '<table class="gis_table">'; $html .= '<tr><td><label for="fileName">'; $html .= __("File name") . '</label></td>'; diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php index e995710052..345fea01d6 100644 --- a/libraries/url_generating.lib.php +++ b/libraries/url_generating.lib.php @@ -19,7 +19,7 @@ if (! defined('PHPMYADMIN')) { * @param string $skip do not generate a hidden field for this parameter * (can be an array of strings) * - * @see PMA_generate_common_url() + * @see PMA_URL_getCommon() * * @return string string with input fields * @@ -32,7 +32,7 @@ if (! defined('PHPMYADMIN')) { * * @access public */ -function PMA_generate_common_hidden_inputs($db = '', $table = '', +function PMA_URL_getHiddenInputs($db = '', $table = '', $indent = 0, $skip = array() ) { if (is_array($db)) { @@ -125,7 +125,7 @@ function PMA_getHiddenFields($values, $pre = '') $fields .= PMA_getHiddenFields($value, $name); } else { // do not generate an ending "\n" because - // PMA_generate_common_hidden_inputs() is sometimes called + // PMA_URL_getHiddenInputs() is sometimes called // from a JS document.write() $fields .= '<input type="hidden" name="' . htmlspecialchars($name) . '" value="' . htmlspecialchars($value) . '" />'; @@ -141,7 +141,7 @@ function PMA_getHiddenFields($values, $pre = '') * <code> * // OLD (deprecated) style * // note the ? - * echo 'script.php?' . PMA_generate_common_url('mysql', 'rights'); + * echo 'script.php?' . PMA_URL_getCommon('mysql', 'rights'); * // produces with cookies enabled: * // script.php?db=mysql&table=rights * // with cookies disabled: @@ -152,14 +152,14 @@ function PMA_getHiddenFields($values, $pre = '') * $params['db'] = 'mysql'; * $params['table'] = 'rights'; * // note the missing ? - * echo 'script.php' . PMA_generate_common_url($params); + * echo 'script.php' . PMA_URL_getCommon($params); * // produces with cookies enabled: * // script.php?myparam=myvalue&db=mysql&table=rights * // with cookies disabled: * // script.php?server=1&lang=en&myparam=myvalue&db=mysql&table=rights * * // note the missing ? - * echo 'script.php' . PMA_generate_common_url(); + * echo 'script.php' . PMA_URL_getCommon(); * // produces with cookies enabled: * // script.php * // with cookies disabled: @@ -183,7 +183,7 @@ function PMA_getHiddenFields($values, $pre = '') * @return string string with URL parameters * @access public */ -function PMA_generate_common_url() +function PMA_URL_getCommon() { $args = func_get_args(); @@ -222,7 +222,7 @@ function PMA_generate_common_url() $questionmark = ''; } - $separator = PMA_get_arg_separator(); + $separator = PMA_URL_getArgSeparator(); // avoid overwriting when creating navi panel links to servers if (isset($GLOBALS['server']) @@ -270,7 +270,7 @@ function PMA_generate_common_url() * @return string character used for separating url parts usally ; or & * @access public */ -function PMA_get_arg_separator($encode = 'none') +function PMA_URL_getArgSeparator($encode = 'none') { static $separator = null; diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php index a1cef249e1..539b95391d 100644 --- a/libraries/user_preferences.lib.php +++ b/libraries/user_preferences.lib.php @@ -254,7 +254,7 @@ function PMA_userprefsRedirect($file_name, } PMA_sendHeaderLocation( $GLOBALS['cfg']['PmaAbsoluteUri'] . $file_name - . PMA_generate_common_url($url_params, '&') . $hash + . PMA_URL_getCommon($url_params, '&') . $hash ); } @@ -280,7 +280,7 @@ function PMA_userprefsAutoloadGetHeader() $retval .= '<div id="prefs_autoload" class="notice" style="display:none">'; $retval .= '<form action="prefs_manage.php" method="post">'; - $retval .= PMA_generate_common_hidden_inputs(); + $retval .= PMA_URL_getHiddenInputs(); $retval .= '<input type="hidden" name="json" value="" />'; $retval .= '<input type="hidden" name="submit_import" value="1" />'; $retval .= '<input type="hidden" name="return_url" value="' diff --git a/pmd_general.php b/pmd_general.php index a16812d9b6..c475dadd7e 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -850,7 +850,7 @@ if (! empty($_REQUEST['query'])) { echo '<textarea cols="80" name="sql_query" id="textSqlquery" rows="15"></textarea><div id="tblfooter">'; echo ' <input type="submit" name="submit_sql" class="btn" />'; echo ' <input type="button" name="cancel" value="' . __('Cancel') . '" onclick="closebox()" class="btn" />'; - echo PMA_generate_common_hidden_inputs($_GET['db']); + echo PMA_URL_getHiddenInputs($_GET['db']); echo '</div></p>'; echo '</form></div>'; diff --git a/pmd_pdf.php b/pmd_pdf.php index 9a1adb9f5a..566b7a4454 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -104,7 +104,7 @@ if (! empty($message)) { ?> <form name="form1" method="post" action="pmd_pdf.php"> <?php -echo PMA_generate_common_hidden_inputs($db); +echo PMA_URL_getHiddenInputs($db); echo '<div>'; echo '<fieldset><legend>' . __('Import/Export coordinates for PDF schema') . '</legend>'; diff --git a/prefs_forms.php b/prefs_forms.php index 52d25d91e6..5d8b787dee 100644 --- a/prefs_forms.php +++ b/prefs_forms.php @@ -44,7 +44,7 @@ if (isset($_POST['revert'])) { $url_params = array('form' => $form_param); PMA_sendHeaderLocation( $cfg['PmaAbsoluteUri'] . 'prefs_forms.php' - . PMA_generate_common_url($url_params, '&') + . PMA_URL_getCommon($url_params, '&') ); exit; } diff --git a/prefs_manage.php b/prefs_manage.php index 3b15ecadc0..e8a5ada593 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -118,7 +118,7 @@ if (isset($_POST['submit_export']) $form_display->displayErrors(); echo '</div>'; echo '<form action="prefs_manage.php" method="post">'; - echo PMA_generate_common_hidden_inputs() . "\n"; + echo PMA_URL_getHiddenInputs() . "\n"; echo '<input type="hidden" name="json" value="' . htmlspecialchars($json) . '" />'; echo '<input type="hidden" name="fix_errors" value="1" />'; @@ -239,7 +239,7 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: @DATE@')); <form class="group-cnt prefs-form disableAjax" name="prefs_import" action="prefs_manage.php" method="post" enctype="multipart/form-data"> <?php echo PMA_Util::generateHiddenMaxFileSize($max_upload_size) . "\n"; - echo PMA_generate_common_hidden_inputs() . "\n"; + echo PMA_URL_getHiddenInputs() . "\n"; ?> <input type="hidden" name="json" value="" /> <input type="radio" id="import_text_file" name="import_type" value="text_file" checked="checked" /> @@ -299,7 +299,7 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: @DATE@')); ?> </div> <form class="group-cnt prefs-form disableAjax" name="prefs_export" action="prefs_manage.php" method="post"> - <?php echo PMA_generate_common_hidden_inputs() . "\n" ?> + <?php echo PMA_URL_getHiddenInputs() . "\n" ?> <div style="padding-bottom:0.5em"> <input type="radio" id="export_text_file" name="export_type" value="text_file" checked="checked" /> <label for="export_text_file"><?php echo __('Save as file') ?></label> @@ -325,7 +325,7 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: @DATE@')); <div class="group"> <h2><?php echo __('Reset') ?></h2> <form class="group-cnt prefs-form disableAjax" name="prefs_reset" action="prefs_manage.php" method="post"> - <?php echo PMA_generate_common_hidden_inputs() . "\n" ?> + <?php echo PMA_URL_getHiddenInputs() . "\n" ?> <?php echo __('You can reset all your settings and restore them to default values.') ?> <br /><br /> <input type="submit" name="submit_clear" value="<?php echo __('Reset') ?>" /> diff --git a/querywindow.php b/querywindow.php index 551176b677..880e32a968 100644 --- a/querywindow.php +++ b/querywindow.php @@ -83,7 +83,7 @@ if ($no_js) { } $titles['Change'] = PMA_Util::getIcon('b_edit.png', __('Change')); -$url_query = PMA_generate_common_url($db, $table); +$url_query = PMA_URL_getCommon($db, $table); if (! empty($sql_query)) { $show_query = 1; @@ -163,12 +163,12 @@ if (! empty($_sql_history) 'db' => $query['db'], 'table' => $query['table'], ); - echo '<a href="querywindow.php' . PMA_generate_common_url($url_params) + echo '<a href="querywindow.php' . PMA_URL_getCommon($url_params) . '">' . $titles['Change'] . '</a>'; // execute link $url_params['auto_commit'] = 'true'; - echo '<a href="import.php' . PMA_generate_common_url($url_params) . '"' + echo '<a href="import.php' . PMA_URL_getCommon($url_params) . '"' . ' target="frame_content">'; if (! empty($query['db'])) { @@ -196,7 +196,7 @@ if (! empty($_sql_history) echo '<form action="querywindow.php" method="post" name="hiddenqueryform"'; echo ' id="hiddenqueryform">'; -echo PMA_generate_common_hidden_inputs('', ''); +echo PMA_URL_getHiddenInputs('', ''); echo '<input type="hidden" name="db" value="' . htmlspecialchars($db) . '" />'; echo '<input type="hidden" name="table" value="' . htmlspecialchars($table) . '" />'; diff --git a/server_databases.php b/server_databases.php index 762e859d31..94eb52b54f 100644 --- a/server_databases.php +++ b/server_databases.php @@ -92,7 +92,7 @@ if ((isset($_REQUEST['drop_selected_dbs']) || isset($_REQUEST['query_type'])) } else { $action = 'server_databases.php'; $submit_mult = 'drop_db'; - $err_url = 'server_databases.php?' . PMA_generate_common_url(); + $err_url = 'server_databases.php?' . PMA_URL_getCommon(); if (isset($_REQUEST['selected_dbs']) && !isset($_REQUEST['is_js_confirmed']) ) { diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php index 26c7b08332..8b5718628f 100644 --- a/setup/frames/index.inc.php +++ b/setup/frames/index.inc.php @@ -22,7 +22,7 @@ $all_languages = PMA_langList(); uasort($all_languages, 'PMA_languageCmp'); $cf = ConfigFile::getInstance(); -$separator = PMA_get_arg_separator('html'); +$separator = PMA_URL_getArgSeparator('html'); // message handling messages_begin(); @@ -70,7 +70,7 @@ if (!$is_https) { ?> <form id="select_lang" method="post" action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI']) ?>"> - <?php echo PMA_generate_common_hidden_inputs() ?> + <?php echo PMA_URL_getHiddenInputs() ?> <bdo lang="en" dir="ltr"><label for="lang"> <?php echo __('Language') . (__('Language') != 'Language' ? ' - Language' : '') ?> </label></bdo><br /> diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php index 69563a243b..35011d4807 100644 --- a/setup/frames/menu.inc.php +++ b/setup/frames/menu.inc.php @@ -10,7 +10,7 @@ if (!defined('PHPMYADMIN')) { exit; } -$separator = PMA_get_arg_separator('html'); +$separator = PMA_URL_getArgSeparator('html'); ?> <ul> <li><a href="index.php"><?php echo __('Overview') ?></a></li> diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php index 65ebb1db2e..082c28675b 100644 --- a/setup/lib/form_processing.lib.php +++ b/setup/lib/form_processing.lib.php @@ -33,7 +33,7 @@ function process_formset(FormDisplay $form_display) // check for form errors if ($form_display->hasErrors()) { // form has errors, show warning - $separator = PMA_get_arg_separator('html'); + $separator = PMA_URL_getArgSeparator('html'); $page = filter_input(INPUT_GET, 'page'); $formset = filter_input(INPUT_GET, 'formset'); $formset = $formset ? "{$separator}formset=$formset" : ''; @@ -57,7 +57,7 @@ if (! empty($goto)) { if (! isset($err_url)) { $err_url = (! empty($back) ? $back : $goto) - . '?' . PMA_generate_common_url($db) + . '?' . PMA_URL_getCommon($db) . ((strpos(' ' . $goto, 'db_') != 1 && strlen($table)) ? '&table=' . urlencode($table) : '' @@ -165,7 +165,7 @@ if (isset($_POST['store_bkm'])) { if ($goto == 'sql.php') { $is_gotofile = false; $goto = 'sql.php?' - . PMA_generate_common_url($db, $table) + . PMA_URL_getCommon($db, $table) . '&sql_query=' . urlencode($sql_query); } // end if diff --git a/tbl_addfield.php b/tbl_addfield.php index 4b2c3fe216..4968840863 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -23,7 +23,7 @@ PMA_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_generate_common_url($db, $table); +$err_url = 'tbl_sql.php?' . PMA_URL_getCommon($db, $table); /** * The form used to define the field to add has been submitted diff --git a/tbl_change.php b/tbl_change.php index c1ecdd74c8..b5de613b2c 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -51,7 +51,7 @@ if (empty($GLOBALS['goto'])) { $_url_params = PMA_getUrlParameters($db, $table); -$err_url = $GLOBALS['goto'] . PMA_generate_common_url($_url_params); +$err_url = $GLOBALS['goto'] . PMA_URL_getCommon($_url_params); unset($_url_params); $comments_map = PMA_getCommentsMap($db, $table); @@ -141,7 +141,7 @@ if ($is_upload) { $html_output .= ' enctype="multipart/form-data"'; } $html_output .= '>'; -$html_output .= PMA_generate_common_hidden_inputs($_form_params); +$html_output .= PMA_URL_getHiddenInputs($_form_params); $titles['Browse'] = PMA_Util::getIcon('b_browse.png', __('Browse foreign values')); diff --git a/tbl_chart.php b/tbl_chart.php index 88170772b2..5aa41e1d87 100644 --- a/tbl_chart.php +++ b/tbl_chart.php @@ -146,7 +146,7 @@ $htmlString = '<script type="text/javascript">' . '<!-- Display Chart options -->' . '<div id="div_view_options">' . '<form method="post" id="tblchartform" action="tbl_chart.php" class="ajax">' - . PMA_generate_common_hidden_inputs($url_params) + . PMA_URL_getHiddenInputs($url_params) . '<fieldset>' . '<legend>' . __('Display chart') . '</legend>' . '<div style="float:left; width:420px;">' diff --git a/tbl_create.php b/tbl_create.php index ced10a6247..9804ca825f 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -34,11 +34,11 @@ if ($GLOBALS['dbi']->getColumns($db, $table)) { sprintf(__('Table %s already exists!'), htmlspecialchars($table)), '', '', - 'db_structure.php?' . PMA_generate_common_url($db) + 'db_structure.php?' . PMA_URL_getCommon($db) ); } -$err_url = 'tbl_create.php?' . PMA_generate_common_url($db, $table); +$err_url = 'tbl_create.php?' . PMA_URL_getCommon($db, $table); // check number of fields to be created if (isset($_REQUEST['submit_num_fields'])) { @@ -189,20 +189,20 @@ if (isset($_REQUEST['do_save_data'])) { $new_table_string .= '<th>'; $new_table_string .= '<a href="sql.php' - . PMA_generate_common_url($tbl_url_params) . '">' + . PMA_URL_getCommon($tbl_url_params) . '">' . htmlspecialchars($table) . '</a>'; if (PMA_Tracker::isActive()) { $truename = str_replace(' ', ' ', htmlspecialchars($table)); if (PMA_Tracker::isTracked($db, $truename)) { $new_table_string .= '<a href="tbl_tracking.php' - . PMA_generate_common_url($tbl_url_params) . '">'; + . PMA_URL_getCommon($tbl_url_params) . '">'; $new_table_string .= PMA_Util::getImage( 'eye.png', __('Tracking is active.') ); } elseif (PMA_Tracker::getVersion($db, $truename) > 0) { $new_table_string .= '<a href="tbl_tracking.php' - . PMA_generate_common_url($tbl_url_params) . '">'; + . PMA_URL_getCommon($tbl_url_params) . '">'; $new_table_string .= PMA_Util::getImage( 'eye_grey.png', __('Tracking is not active.') ); @@ -215,7 +215,7 @@ if (isset($_REQUEST['do_save_data'])) { $new_table_string .= '<td>' . '<a href="tbl_structure.php' - . PMA_generate_common_url($tbl_url_params) . '">' + . PMA_URL_getCommon($tbl_url_params) . '">' . $titles['Structure'] . '</a>' . '</td>' . "\n"; @@ -224,7 +224,7 @@ if (isset($_REQUEST['do_save_data'])) { $new_table_string .= '<td>' . '<a href="tbl_change.php' - . PMA_generate_common_url($tbl_url_params) . '">' + . PMA_URL_getCommon($tbl_url_params) . '">' . $titles['Insert'] . '</a>' . '</td>' . "\n"; @@ -233,7 +233,7 @@ if (isset($_REQUEST['do_save_data'])) { $new_table_string .= '<td>' . '<a class="drop_table_anchor" href="sql.php' - . PMA_generate_common_url($tbl_url_params) . '&sql_query=' + . PMA_URL_getCommon($tbl_url_params) . '&sql_query=' . urlencode('DROP TABLE ' . PMA_Util::backquote($table)) . '">' . $titles['Drop'] . '</a>' @@ -257,7 +257,7 @@ if (isset($_REQUEST['do_save_data'])) { if ($is_show_stats) { $new_table_string .= '<td class="value tbl_size">' . '<a href="tbl_structure.php' - . PMA_generate_common_url($tbl_url_params) . '#showusage" >' + . PMA_URL_getCommon($tbl_url_params) . '#showusage" >' . '<span>' . $formatted_size . '</span>' . '<span class="unit">' . $unit . '</span>' . '</a>' diff --git a/tbl_find_replace.php b/tbl_find_replace.php index 7e7387aa39..c450cf62b5 100644 --- a/tbl_find_replace.php +++ b/tbl_find_replace.php @@ -55,7 +55,7 @@ if (! isset($goto)) { $goto = $GLOBALS['cfg']['DefaultTabTable']; } // Defines the url to return to in case of error in the next sql statement -$err_url = $goto . '?' . PMA_generate_common_url($db, $table); +$err_url = $goto . '?' . PMA_URL_getCommon($db, $table); // Displays the find and replace form $htmlOutput .= $table_search->getSelectionForm($goto); $response->addHTML($htmlOutput); diff --git a/tbl_move_copy.php b/tbl_move_copy.php index aa4b213f91..402da2efcb 100644 --- a/tbl_move_copy.php +++ b/tbl_move_copy.php @@ -17,7 +17,7 @@ PMA_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_generate_common_url($db, $table); +$err_url = 'tbl_sql.php?' . PMA_URL_getCommon($db, $table); /** diff --git a/tbl_printview.php b/tbl_printview.php index 4a331c0a6b..6287fef3e9 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -34,9 +34,9 @@ $cfgRelation = PMA_getRelationsParam(); * Defines the url to return to in case of error in a sql statement */ if (strlen($table)) { - $err_url = 'tbl_sql.php?' . PMA_generate_common_url($db, $table); + $err_url = 'tbl_sql.php?' . PMA_URL_getCommon($db, $table); } else { - $err_url = 'db_sql.php?' . PMA_generate_common_url($db); + $err_url = 'db_sql.php?' . PMA_URL_getCommon($db); } diff --git a/tbl_relation.php b/tbl_relation.php index 2789099072..b78e0877f5 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -377,7 +377,7 @@ if ($cfgRelation['displaywork']) { // common form $html_output .= '<form method="post" action="tbl_relation.php">' . "\n" - . PMA_generate_common_hidden_inputs($db, $table); + . PMA_URL_getHiddenInputs($db, $table); // Now find out the columns of our $table // need to use PMA_DatabaseInterface::QUERY_STORE with $GLOBALS['dbi']->numRows() in mysqli diff --git a/tbl_row_action.php b/tbl_row_action.php index cd2842b996..5801386df7 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -88,7 +88,7 @@ if (!empty($submit_mult)) { default: $action = 'tbl_row_action.php'; $err_url = 'tbl_row_action.php' - . PMA_generate_common_url($GLOBALS['url_params']); + . PMA_URL_getCommon($GLOBALS['url_params']); if (! isset($_REQUEST['mult_btn'])) { $original_sql_query = $sql_query; if (! empty($url_query)) { @@ -98,7 +98,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_generate_common_url($_url_params); + $url_query = PMA_URL_getCommon($_url_params); /** diff --git a/tbl_select.php b/tbl_select.php index 07be207143..f191d592a5 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -46,7 +46,7 @@ if (! isset($_POST['columnsToDisplay']) && ! isset($_POST['displayAllColumns'])) $goto = $GLOBALS['cfg']['DefaultTabTable']; } // Defines the url to return to in case of error in the next sql statement - $err_url = $goto . '?' . PMA_generate_common_url($db, $table); + $err_url = $goto . '?' . PMA_URL_getCommon($db, $table); // Displays the table search form $response->addHTML($table_search->getSecondaryTabs()); $response->addHTML($table_search->getSelectionForm($goto)); diff --git a/tbl_structure.php b/tbl_structure.php index dbc1865ba0..1f18dedaa0 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -90,7 +90,7 @@ if (isset($_REQUEST['submit_mult_change_x'])) { } if (! empty($submit_mult)) { if (isset($_REQUEST['selected_fld'])) { - $err_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table); + $err_url = 'tbl_structure.php?' . PMA_URL_getCommon($db, $table); if ($submit_mult == 'browse') { // browsing the table displaying only selected columns $GLOBALS['active_page'] = 'sql.php'; diff --git a/tbl_tracking.php b/tbl_tracking.php index 6efd3a5b96..19431dc69e 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -496,7 +496,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { echo '<br/>'; echo '<form method="post" action="tbl_tracking.php' - . PMA_generate_common_url( + . PMA_URL_getCommon( $url_params + array('report' => 'true', 'version' => $_REQUEST['version']) ) . '">'; @@ -574,7 +574,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { echo '<td><small>' . htmlspecialchars($entry['username']) . '</small></td>'; echo '<td>' . $statement . '</td>'; echo '<td class="nowrap"><a href="tbl_tracking.php?' - . PMA_generate_common_url( + . PMA_URL_getCommon( $url_params + array( 'report' => 'true', 'version' => $_REQUEST['version'], @@ -633,7 +633,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { echo '<td><small>' . htmlspecialchars($entry['username']) . '</small></td>'; echo '<td>' . $statement . '</td>'; echo '<td class="nowrap"><a href="tbl_tracking.php?' - . PMA_generate_common_url( + . PMA_URL_getCommon( $url_params + array( 'report' => 'true', 'version' => $_REQUEST['version'], @@ -658,7 +658,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { } echo '</form>'; echo '<form method="post" action="tbl_tracking.php' - . PMA_generate_common_url( + . PMA_URL_getCommon( $url_params + array('report' => 'true', 'version' => $_REQUEST['version']) ) . '">'; @@ -678,7 +678,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { . '<input type="submit" value="' . __('Go') .'" />'; echo '</form>'; echo '<form class="disableAjax" method="post" action="tbl_tracking.php' - . PMA_generate_common_url( + . PMA_URL_getCommon( $url_params + array('report' => 'true', 'version' => $_REQUEST['version']) ) . '">'; @@ -787,12 +787,12 @@ if ($last_version > 0) { echo '<td>' . htmlspecialchars($version['date_updated']) . '</td>'; echo '<td>' . $version_status . '</td>'; echo '<td><a href="tbl_tracking.php'; - echo PMA_generate_common_url( + echo PMA_URL_getCommon( $url_params + array('report' => 'true', 'version' => $version['version']) ); echo '">' . __('Tracking report') . '</a>'; echo '| <a href="tbl_tracking.php'; - echo PMA_generate_common_url( + echo PMA_URL_getCommon( $url_params + array('snapshot' => 'true', 'version' => $version['version']) ); echo '">' . __('Structure snapshot') . '</a>'; @@ -846,7 +846,7 @@ if ($last_version > 0) { echo '<div id="div_create_version">'; echo '<form method="post" action="tbl_tracking.php?' . $url_query . '">'; -echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); +echo PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']); echo '<fieldset>'; echo '<legend>'; printf( diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 41ee4b208d..6bbf9bc72b 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -103,7 +103,7 @@ if (! isset($goto)) { $goto = $GLOBALS['cfg']['DefaultTabTable']; } // Defines the url to return to in case of error in the next sql statement -$err_url = $goto . '?' . PMA_generate_common_url($db, $table); +$err_url = $goto . '?' . PMA_URL_getCommon($db, $table); //Set default datalabel if not selected if ( !isset($_POST['zoom_submit']) || $_POST['dataLabel'] == '') { diff --git a/test/libraries/PMA_display_export_test.php b/test/libraries/PMA_display_export_test.php index 559ffb0281..cc3f61caa9 100644 --- a/test/libraries/PMA_display_export_test.php +++ b/test/libraries/PMA_display_export_test.php @@ -103,7 +103,7 @@ class PMA_DisplayExport_Test extends PHPUnit_Framework_TestCase $sql_query_str ); - //validate 1: PMA_generate_common_hidden_inputs + //validate 1: PMA_URL_getHiddenInputs //$single_table $this->assertContains( '<input type="hidden" name="single_table" value="TRUE"', diff --git a/test/libraries/PMA_generateCommonUrl_test.php b/test/libraries/PMA_generateCommonUrl_test.php index 1ae056e479..3d0566757d 100644 --- a/test/libraries/PMA_generateCommonUrl_test.php +++ b/test/libraries/PMA_generateCommonUrl_test.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * tests for PMA_generate_common_url() + * tests for PMA_URL_getCommon() * * @package PhpMyAdmin-test */ @@ -25,7 +25,7 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase $GLOBALS['collation_connection'] = 'x'; $GLOBALS['cfg']['ServerDefault'] = 'y'; - $separator = PMA_get_arg_separator(); + $separator = PMA_URL_getArgSeparator(); $expected = 'server=x' . htmlentities($separator) . 'lang=en' . htmlentities($separator) . 'collation_connection=x' . htmlentities($separator) @@ -36,7 +36,7 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase . htmlentities($separator) . 'table=table' . htmlentities($separator) . $expected; - $this->assertEquals($expected, PMA_generate_common_url('db', 'table')); + $this->assertEquals($expected, PMA_URL_getCommon('db', 'table')); } public function testOldStyleDbOnly() @@ -45,7 +45,7 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase $GLOBALS['collation_connection'] = 'x'; $GLOBALS['cfg']['ServerDefault'] = 'y'; - $separator = PMA_get_arg_separator(); + $separator = PMA_URL_getArgSeparator(); $expected = 'server=x' . htmlentities($separator) . 'lang=en' . htmlentities($separator) . 'collation_connection=x' . htmlentities($separator) @@ -55,7 +55,7 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase $expected = 'db=db' . htmlentities($separator) . $expected; - $this->assertEquals($expected, PMA_generate_common_url('db')); + $this->assertEquals($expected, PMA_URL_getCommon('db')); } public function testNewStyle() @@ -64,7 +64,7 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase $GLOBALS['collation_connection'] = 'x'; $GLOBALS['cfg']['ServerDefault'] = 'y'; - $separator = PMA_get_arg_separator(); + $separator = PMA_URL_getArgSeparator(); $expected = 'server=x' . htmlentities($separator) . 'lang=en' . htmlentities($separator) . 'collation_connection=x' . htmlentities($separator) @@ -75,7 +75,7 @@ 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_generate_common_url($params)); + $this->assertEquals($expected, PMA_URL_getCommon($params)); } public function testOldStyleWithAlternateSeparator() @@ -84,7 +84,7 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase $GLOBALS['collation_connection'] = 'x'; $GLOBALS['cfg']['ServerDefault'] = 'y'; - $separator = PMA_get_arg_separator(); + $separator = PMA_URL_getArgSeparator(); $expected = 'server=x' . $separator . 'lang=en' . $separator . 'collation_connection=x' . $separator @@ -92,7 +92,7 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase ; $expected = 'db=db' . $separator . 'table=table' . $separator . $expected; - $this->assertEquals($expected, PMA_generate_common_url('db', 'table', '&')); + $this->assertEquals($expected, PMA_URL_getCommon('db', 'table', '&')); } public function testOldStyleWithAlternateSeparatorDbOnly() @@ -101,7 +101,7 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase $GLOBALS['collation_connection'] = 'x'; $GLOBALS['cfg']['ServerDefault'] = 'y'; - $separator = PMA_get_arg_separator(); + $separator = PMA_URL_getArgSeparator(); $expected = 'server=x' . $separator . 'lang=en' . $separator . 'collation_connection=x' . $separator @@ -109,7 +109,7 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase ; $expected = 'db=db' . $separator . $expected; - $this->assertEquals($expected, PMA_generate_common_url('db', '', '&')); + $this->assertEquals($expected, PMA_URL_getCommon('db', '', '&')); } public function testDefault() @@ -118,13 +118,13 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase $GLOBALS['collation_connection'] = 'x'; $GLOBALS['cfg']['ServerDefault'] = 'y'; - $separator = PMA_get_arg_separator(); + $separator = PMA_URL_getArgSeparator(); $expected = 'server=x' . htmlentities($separator) . 'lang=en' . htmlentities($separator) . 'collation_connection=x' . htmlentities($separator) . 'token=token' ; - $this->assertEquals($expected, PMA_generate_common_url()); + $this->assertEquals($expected, PMA_URL_getCommon()); } } ?> diff --git a/test/libraries/PMA_server_user_groups_test.php b/test/libraries/PMA_server_user_groups_test.php index 0878b17de3..3c6db675b5 100644 --- a/test/libraries/PMA_server_user_groups_test.php +++ b/test/libraries/PMA_server_user_groups_test.php @@ -65,7 +65,7 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase ); $this->assertContains( '<a href="server_user_groups.php?' - . PMA_generate_common_url() . '&addUserGroup=1">', + . PMA_URL_getCommon() . '&addUserGroup=1">', $html ); } @@ -122,19 +122,19 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase ); $this->assertContains( '<a class="" href="server_user_groups.php?' - . PMA_generate_common_url() . '&viewUsers=1&userGroup=' + . PMA_URL_getCommon() . '&viewUsers=1&userGroup=' . urlencode('usergroup<') . '">', $html ); $this->assertContains( '<a class="" href="server_user_groups.php?' - . PMA_generate_common_url() . '&editUserGroup=1&userGroup=' + . PMA_URL_getCommon() . '&editUserGroup=1&userGroup=' . urlencode('usergroup<') . '">', $html ); $this->assertContains( '<a class="deleteUserGroup ajax" href="server_user_groups.php?' - . PMA_generate_common_url() . '&deleteUserGroup=1&userGroup=' + . PMA_URL_getCommon() . '&deleteUserGroup=1&userGroup=' . urlencode('usergroup<') . '">', $html ); diff --git a/test/libraries/PMA_server_variables_test.php b/test/libraries/PMA_server_variables_test.php index d463a1cadb..9362e405e5 100644 --- a/test/libraries/PMA_server_variables_test.php +++ b/test/libraries/PMA_server_variables_test.php @@ -147,7 +147,7 @@ class PMA_ServerVariables_Test extends PHPUnit_Framework_TestCase { //Call the test function $html = PMA_getHtmlForLinkTemplates(); - $url = htmlspecialchars('server_variables.php?' . PMA_generate_common_url()); + $url = htmlspecialchars('server_variables.php?' . PMA_URL_getCommon()); //validate 1: URL $this->assertContains( diff --git a/test/libraries/core/PMA_headerLocation_test.php b/test/libraries/core/PMA_headerLocation_test.php index 47d1127b50..d4e1ffe7c3 100644 --- a/test/libraries/core/PMA_headerLocation_test.php +++ b/test/libraries/core/PMA_headerLocation_test.php @@ -115,7 +115,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_get_arg_separator(); + $separator = PMA_URL_getArgSeparator(); $header = array('Location: ' . $testUri . $separator . SID); @@ -139,7 +139,7 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase runkit_constant_redefine('SID', md5('test_hash')); $testUri = 'http://testurl.com/test.php'; - $separator = PMA_get_arg_separator(); + $separator = PMA_URL_getArgSeparator(); $header = array('Location: ' . $testUri . '?' . SID); @@ -159,7 +159,7 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase runkit_constant_redefine('PMA_IS_IIS', true); $testUri = 'http://testurl.com/test.php'; - $separator = PMA_get_arg_separator(); + $separator = PMA_URL_getArgSeparator(); $header = array('Location: ' . $testUri); PMA_sendHeaderLocation($testUri); // sets $GLOBALS['header'] diff --git a/test/theme.php b/test/theme.php index 98af5cb7e7..f2e0391315 100644 --- a/test/theme.php +++ b/test/theme.php @@ -28,7 +28,7 @@ header('Content-Type: text/html; charset=utf-8'); <?php echo htmlspecialchars($_SERVER['HTTP_HOST']); ?> - Theme Test</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="stylesheet" type="text/css" - href="../phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> + href="../phpmyadmin.css.php?<?php echo PMA_URL_getCommon(); ?>&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> <link rel="stylesheet" type="text/css" media="print" href="../print.css" /> <script src="../js/jquery/jquery-1.8.3.min.js" type="text/javascript"></script> @@ -53,7 +53,7 @@ echo '<div id="serverinfo">' . "\n"; printf( $item, $GLOBALS['cfg']['DefaultTabServer'], - PMA_generate_common_url(), + PMA_URL_getCommon(), 'Server', __('Server'), 'ic_s_host' diff --git a/user_password.php b/user_password.php index 6e9c4c8a77..75316cbfd2 100644 --- a/user_password.php +++ b/user_password.php @@ -170,7 +170,7 @@ function PMA_changePassHashingFunction() function PMA_changePassUrlParamsAndSubmitQuery( $password, $_url_params, $sql_query, $hashing_function ) { - $err_url = 'user_password.php' . PMA_generate_common_url($_url_params); + $err_url = 'user_password.php' . PMA_URL_getCommon($_url_params); $local_query = 'SET password = ' . (($password == '') ? '\'\'' : $hashing_function . '(\'' . PMA_Util::sqlAddSlashes($password) . '\')'); @@ -234,7 +234,7 @@ function PMA_changePassDisplayPage($message, $sql_query, $_url_params) echo PMA_Util::getMessage( $message, $sql_query, 'success' ); - echo '<a href="index.php'.PMA_generate_common_url($_url_params) + echo '<a href="index.php'.PMA_URL_getCommon($_url_params) .' target="_parent">'. "\n" .'<strong>'.__('Back').'</strong></a>'; exit; diff --git a/view_create.php b/view_create.php index 743329f3b8..d59eb9c39b 100644 --- a/view_create.php +++ b/view_create.php @@ -170,7 +170,7 @@ $url_params['reload'] = 1; $htmlString = '<!-- CREATE VIEW options -->' . '<div id="div_view_options">' . '<form method="post" action="view_create.php">' - . PMA_generate_common_hidden_inputs($url_params) + . PMA_URL_getHiddenInputs($url_params) . '<fieldset>' . '<legend>' . (isset($_REQUEST['ajax_dialog']) ? diff --git a/view_operations.php b/view_operations.php index 3be8ce94d6..05c310536e 100644 --- a/view_operations.php +++ b/view_operations.php @@ -81,7 +81,7 @@ $url_params['back'] = 'view_operations.php'; <!-- Table operations --> <div class="operations_half_width"> <form method="post" action="view_operations.php"> -<?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?> +<?php echo PMA_URL_getHiddenInputs($GLOBALS['db'], $GLOBALS['table']); ?> <input type="hidden" name="reload" value="1" /> <fieldset> <legend><?php echo __('Operations'); ?></legend> |