diff --git a/ChangeLog b/ChangeLog index 08f5609dc..cf101fbdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ $HeadURL$ * Documentation.html, libraries/tbl_properties.inc.php, libraries/config.default.php: Allow to edit small number of fields vertically and lange number horizontally (RFE #1581773). + * [too much files]: Rename tbl_* files to drop useless _properties part. 2006-10-19 Marc Delisle * libraries/common.lib.php, /database_interface.lib.php,/session.inc.php: diff --git a/Documentation.html b/Documentation.html index 7ea7e19d8..259c4b6d8 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1340,8 +1340,8 @@ ALTER TABLE `pma_column_comments`
$cfg['DefaultTabTable'] string
Defines the tab displayed by default on table view. Possible - values: "tbl_properties_structure.php", - "tbl_properties.php", "tbl_select.php", + values: "tbl_structure.php", + "tbl_sql.php", "tbl_select.php", "tbl_change.php" or "sql.php".
$cfg['MySQLManualBase'] string
@@ -1998,7 +1998,7 @@ ALTER TABLE `pma_column_comments`

2. Usage

-

Go to your tbl_properties_structure.php page (i.e. reached through +

Go to your tbl_structure.php page (i.e. reached through clicking on the 'Structure' link for a table). There click on "Change" (or change icon) and there you will see three new fields at the end of the line. They are called 'MIME-type', 'Browser transformation' and diff --git a/db_datadict.php b/db_datadict.php index 77de08ed2..449a7e529 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -29,7 +29,7 @@ PMA_checkParameters(array('db')); * Defines the url to return to in case of error in a sql statement */ if (isset($table)) { - $err_url = 'tbl_properties.php?' . PMA_generate_common_url($db, $table); + $err_url = 'tbl_sql.php?' . PMA_generate_common_url($db, $table); } else { $err_url = 'db_details.php?' . PMA_generate_common_url($db); } @@ -239,7 +239,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { // NULL attribute, but SHOW CREATE TABLE says the contrary. Believe // the latter. /** - * @todo merge this logic with the one in tbl_properties_structure.php + * @todo merge this logic with the one in tbl_structure.php * or move it in a function similar to PMA_DBI_get_columns_full() * but based on SHOW CREATE TABLE because information_schema * cannot be trusted in this case (MySQL bug) diff --git a/db_details_structure.php b/db_details_structure.php index e76b0da9a..a0adf5440 100644 --- a/db_details_structure.php +++ b/db_details_structure.php @@ -290,7 +290,7 @@ foreach ($tables as $keyname => $each_table) { if ($is_show_stats) { if (isset($formatted_overhead)) { - $overhead = '' . $formatted_overhead . ' ' . $overhead_unit . '' . "\n"; unset($formatted_overhead); @@ -324,7 +324,7 @@ foreach ($tables as $keyname => $each_table) { - + @@ -365,7 +365,7 @@ foreach ($tables as $keyname => $each_table) { diff --git a/export.php b/export.php index 8202a62da..b19ab8992 100644 --- a/export.php +++ b/export.php @@ -35,8 +35,8 @@ if (isset($export_list[$type]['force_file']) && ! isset($asfile)) { $active_page = 'db_details_export.php'; require('./db_details_export.php'); } else { - $active_page = 'tbl_properties_export.php'; - require('./tbl_properties_export.php'); + $active_page = 'tbl_export.php'; + require('./tbl_export.php'); } exit(); } @@ -47,7 +47,7 @@ if ($export_type == 'server') { } elseif ($export_type == 'database' && isset($db) && strlen($db)) { $err_url = 'db_details_export.php?' . PMA_generate_common_url($db); } elseif ($export_type == 'table' && isset($db) && strlen($db) && isset($table) && strlen($table)) { - $err_url = 'tbl_properties_export.php?' . PMA_generate_common_url($db, $table); + $err_url = 'tbl_export.php?' . PMA_generate_common_url($db, $table); } else { die('Bad parameters!'); } @@ -303,8 +303,8 @@ if ($save_on_server) { $active_page = 'db_details_export.php'; require('./db_details_export.php'); } else { - $active_page = 'tbl_properties_export.php'; - require('./tbl_properties_export.php'); + $active_page = 'tbl_export.php'; + require('./tbl_export.php'); } exit(); } @@ -552,8 +552,8 @@ if ($save_on_server && isset($message)) { $active_page = 'db_details_export.php'; require('./db_details_export.php'); } else { - $active_page = 'tbl_properties_export.php'; - require('./tbl_properties_export.php'); + $active_page = 'tbl_export.php'; + require('./tbl_export.php'); } exit(); } @@ -614,8 +614,8 @@ if (!empty($asfile)) { $active_page = 'db_details_export.php'; require_once('./db_details_export.php'); } else { - $active_page = 'tbl_properties_export.php'; - require_once('./tbl_properties_export.php'); + $active_page = 'tbl_export.php'; + require_once('./tbl_export.php'); } exit(); } else { diff --git a/import.php b/import.php index bfab899c5..370076983 100644 --- a/import.php +++ b/import.php @@ -75,7 +75,7 @@ if ($import_type == 'table') { } else { if (empty($goto) || !preg_match('@^(server|db|tbl)(_[a-z]*)*\.php$@i', $goto)) { if (isset($table) && isset($db)) { - $goto = 'tbl_properties_structure.php'; + $goto = 'tbl_structure.php'; } elseif (isset($db)) { $goto = 'db_details_structure.php'; } else { @@ -91,7 +91,7 @@ if ($import_type == 'table') { } $err_url = $goto . '?' . $common - . (preg_match('@^tbl_properties(_[a-z]*)?\.php$@', $goto) ? '&table=' . urlencode($table) : ''); + . (preg_match('@^tbl_[a-z]*\.php$@', $goto) ? '&table=' . urlencode($table) : ''); } diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 53b5f1772..c7bea311e 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -744,7 +744,7 @@ if (!defined('PMA_MINIMUM_COMMON')) { } if ($is_modify_link && isset($db)) { if (isset($table)) { - $doedit_goto = ''; + $doedit_goto = ''; } else { $doedit_goto = ''; } @@ -1371,7 +1371,7 @@ window.parent.updateTableTitle('', '' . "\n"; echo '   ' . "\n"; echo PMA_linkOrButton( - 'tbl_properties_export.php' . $url_query . '&unlim_num_rows=' . $unlim_num_rows . $single_table, + 'tbl_export.php' . $url_query . '&unlim_num_rows=' . $unlim_num_rows . $single_table, ($GLOBALS['cfg']['PropertiesIconic'] ? '' . $GLOBALS['strExport'] . '' : '') . $GLOBALS['strExport'], '', true, true, '') . "\n"; } diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 9b3457d4d..e89b023a5 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -210,7 +210,7 @@ if (empty($GLOBALS['is_header_sent'])) { 's_db.png' ); if (isset($GLOBALS['table']) && strlen($GLOBALS['table'])) { - require_once './libraries/tbl_properties_table_info.inc.php'; + require_once './libraries/tbl_info.inc.php'; echo $separator; printf( $item, @@ -222,7 +222,7 @@ if (empty($GLOBALS['is_header_sent'])) { /** * Displays table comment - * @uses $show_comment from libraries/tbl_properties_table_info.inc.php + * @uses $show_comment from libraries/tbl_info.inc.php * @uses $GLOBALS['avoid_show_comment'] from tbl_relation.php */ if (!empty($show_comment) && !isset($GLOBALS['avoid_show_comment'])) { diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 04ffe20f9..c9b2a1c73 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -127,9 +127,9 @@ if ( !empty($submit_mult) && !empty($what)) { $js_to_run = 'functions.js'; unset($message); if (isset($table) && strlen($table)) { - require('./libraries/tbl_properties_common.php'); - $url_query .= '&goto=tbl_properties.php&back=tbl_properties.php'; - require('./libraries/tbl_properties_table_info.inc.php'); + require('./libraries/tbl_common.php'); + $url_query .= '&goto=tbl_sql.php&back=tbl_sql.php'; + require('./libraries/tbl_info.inc.php'); } elseif (isset($db) && strlen($db)) { require('./libraries/db_details_common.inc.php'); require('./libraries/db_info.inc.php'); @@ -231,7 +231,7 @@ if ( !empty($submit_mult) && !empty($what)) { 0) { $tbl_type = isset($showtable['Type']) ? strtoupper($showtable['Type']) : ''; - // a new comment could be coming from tbl_properties_operations.php + // a new comment could be coming from tbl_operations.php // and we want to show it in the header if (isset($submitcomment) && isset($comment)) { $show_comment = $comment; diff --git a/libraries/tbl_properties_links.inc.php b/libraries/tbl_links.inc.php similarity index 92% rename from libraries/tbl_properties_links.inc.php rename to libraries/tbl_links.inc.php index 6c7de1999..799b3cf78 100644 --- a/libraries/tbl_properties_links.inc.php +++ b/libraries/tbl_links.inc.php @@ -45,11 +45,11 @@ $tabs['browse']['icon'] = 'b_browse.png'; $tabs['browse']['text'] = $strBrowse; $tabs['structure']['icon'] = 'b_props.png'; -$tabs['structure']['link'] = 'tbl_properties_structure.php'; +$tabs['structure']['link'] = 'tbl_structure.php'; $tabs['structure']['text'] = $strStructure; $tabs['sql']['icon'] = 'b_sql.png'; -$tabs['sql']['link'] = 'tbl_properties.php'; +$tabs['sql']['link'] = 'tbl_sql.php'; $tabs['sql']['text'] = $strSQL; $tabs['search']['icon'] = 'b_search.png'; @@ -62,7 +62,7 @@ if ( ! (isset($db_is_information_schema) && $db_is_information_schema) ) { } $tabs['export']['icon'] = 'b_tblexport.png'; -$tabs['export']['link'] = 'tbl_properties_export.php'; +$tabs['export']['link'] = 'tbl_export.php'; $tabs['export']['args']['single_table'] = 'true'; $tabs['export']['text'] = $strExport; @@ -76,7 +76,7 @@ if ( ! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information $tabs['import']['text'] = $strImport; $tabs['operation']['icon'] = 'b_tblops.png'; - $tabs['operation']['link'] = 'tbl_properties_operations.php'; + $tabs['operation']['link'] = 'tbl_operations.php'; $tabs['operation']['text'] = $strOperations; if ($table_info_num_rows > 0) { @@ -87,7 +87,7 @@ if ( ! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information $tabs['empty']['args']['sql_query'] = $ln8_stt . PMA_backquote($table); $tabs['empty']['args']['zero_rows'] = sprintf($strTableHasBeenEmptied, htmlspecialchars($table)); $tabs['empty']['attr'] = 'onclick="return confirmLink(this, \'' . $ln8_stt . PMA_jsFormat($table) . '\')"'; - $tabs['empty']['args']['goto'] = 'tbl_properties_structure.php'; + $tabs['empty']['args']['goto'] = 'tbl_structure.php'; $tabs['empty']['class'] = 'caution'; } $tabs['empty']['icon'] = 'b_empty.png'; diff --git a/querywindow.php b/querywindow.php index 25b2ccb94..300e2fc67 100644 --- a/querywindow.php +++ b/querywindow.php @@ -227,7 +227,7 @@ if (isset($no_js) && $no_js) { // ... we redirect to appropriate query sql page // works only full if $db and $table is also stored/grabbed from $_COOKIE if ( isset( $table ) && strlen($table) ) { - require './tbl_properties.php'; + require './tbl_sql.php'; } elseif ( isset($db) && strlen($db) ) { require './db_details.php'; } else { diff --git a/scripts/setup.php b/scripts/setup.php index b2a423b2f..dce42f338 100644 --- a/scripts/setup.php +++ b/scripts/setup.php @@ -1043,7 +1043,7 @@ function show_tabs_form($defaults = array()) { show_config_form(array( array('Default tab for server', 'DefaultTabServer', 'Tab that is displayed when entering server', array('main.php', 'server_databases.php', 'server_status.php', 'server_variables.php', 'server_privileges.php', 'server_processlist.php')), array('Default tab for database', 'DefaultTabDatabase', 'Tab that is displayed when entering database', array('db_details_structure.php', 'db_details.php', 'db_search.php', 'db_operations.php')), - array('Default tab for table', 'DefaultTabTable', 'Tab that is displayed when entering table', array('tbl_properties_structure.php', 'sql.php', 'tbl_properties.php', 'tbl_select.php', 'tbl_change.php')), + array('Default tab for table', 'DefaultTabTable', 'Tab that is displayed when entering table', array('tbl_structure.php', 'sql.php', 'tbl_sql.php', 'tbl_select.php', 'tbl_change.php')), array('Use lighter tabs', 'LightTabs', 'If you want simpler tabs enable this', FALSE), ), 'Configure tabs', diff --git a/sql.php b/sql.php index e2265223c..1231921a2 100644 --- a/sql.php +++ b/sql.php @@ -71,7 +71,7 @@ if (! isset($sql_query) && isset($table) && isset($db)) { unset($book_sql_query); // set $goto to what will be displayed if query returns 0 rows - $goto = 'tbl_properties_structure.php'; + $goto = 'tbl_structure.php'; } else { // Now we can check the parameters PMA_checkParameters(array('sql_query')); @@ -368,7 +368,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { // Displays an error message if required and stop parsing the script if ($error = PMA_DBI_getError()) { require_once './libraries/header.inc.php'; - $full_err_url = (preg_match('@^(db_details|tbl_properties)@', $err_url)) + $full_err_url = (preg_match('@^(db_details|tbl_)@', $err_url)) ? $err_url . '&show_query=1&sql_query=' . urlencode($sql_query) : $err_url; PMA_mysqlDie($error, $full_sql_query, '', $full_err_url); @@ -625,7 +625,7 @@ if ($num_rows < 1 || $is_affected) { // Checks for a valid target script $is_db = $is_table = false; include 'libraries/db_table_exists.lib.php'; - if (strpos($goto, 'tbl_properties') === 0 && ! $is_table) { + if (strpos($goto, 'tbl_') === 0 && ! $is_table) { if (isset($table)) { unset($table); } @@ -639,7 +639,7 @@ if ($num_rows < 1 || $is_affected) { } // Loads to target script if (strpos($goto, 'db_details') === 0 - || strpos($goto, 'tbl_properties') === 0) { + || strpos($goto, 'tbl_') === 0) { $js_to_run = 'functions.js'; } if ($goto != 'main.php') { @@ -665,10 +665,10 @@ else { $js_to_run = 'functions.js'; unset($message); if (isset($table) && strlen($table)) { - require './libraries/tbl_properties_common.php'; - $url_query .= '&goto=tbl_properties.php&back=tbl_properties.php'; - require './libraries/tbl_properties_table_info.inc.php'; - require './libraries/tbl_properties_links.inc.php'; + require './libraries/tbl_common.php'; + $url_query .= '&goto=tbl_sql.php&back=tbl_sql.php'; + require './libraries/tbl_info.inc.php'; + require './libraries/tbl_links.inc.php'; } elseif (isset($db) && strlen($db)) { require './libraries/db_details_common.inc.php'; require './libraries/db_info.inc.php'; diff --git a/tbl_addfield.php b/tbl_addfield.php index 82d79358e..c342a469c 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -18,7 +18,7 @@ PMA_checkParameters(array('db', 'table')); /** * Defines the url to return to in case of error in a sql statement */ -$err_url = 'tbl_properties.php?' . PMA_generate_common_url($db, $table); +$err_url = 'tbl_sql.php?' . PMA_generate_common_url($db, $table); /** * The form used to define the field to add has been submitted @@ -187,8 +187,8 @@ if (isset($submit_num_fields)) { $sql_query = $sql_query_cpy; unset($sql_query_cpy); $message = $strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenAltered; - $active_page = 'tbl_properties_structure.php'; - require('./tbl_properties_structure.php'); + $active_page = 'tbl_structure.php'; + require('./tbl_structure.php'); } else { PMA_mysqlDie('', '', '', $err_url, FALSE); // garvin: An error happened while inserting/updating a table definition. @@ -212,13 +212,13 @@ if ($abort == FALSE) { /** * Gets tables informations */ - require_once('./libraries/tbl_properties_common.php'); - require_once('./libraries/tbl_properties_table_info.inc.php'); + require_once('./libraries/tbl_common.php'); + require_once('./libraries/tbl_info.inc.php'); /** * Displays top menu links */ - $active_page = 'tbl_properties_structure.php'; - require_once('./libraries/tbl_properties_links.inc.php'); + $active_page = 'tbl_structure.php'; + require_once('./libraries/tbl_links.inc.php'); /** * Display the form */ diff --git a/tbl_alter.php b/tbl_alter.php index 33e270158..5e620d98d 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -17,20 +17,20 @@ PMA_checkParameters(array('db', 'table')); /** * Gets tables informations */ -require_once('./libraries/tbl_properties_common.php'); -require_once('./libraries/tbl_properties_table_info.inc.php'); +require_once('./libraries/tbl_common.php'); +require_once('./libraries/tbl_info.inc.php'); /** * Displays top menu links */ -$active_page = 'tbl_properties_structure.php'; +$active_page = 'tbl_structure.php'; // I don't see the need to display the links here, they will be displayed later -//require('./libraries/tbl_properties_links.inc.php'); +//require('./libraries/tbl_links.inc.php'); /** * Defines the url to return to in case of error in a sql statement */ -$err_url = 'tbl_properties_structure.php?' . PMA_generate_common_url($db, $table); +$err_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table); /** @@ -40,7 +40,7 @@ $abort = false; if (isset($do_save_data)) { $field_cnt = count($field_orig); for ($i = 0; $i < $field_cnt; $i++) { - // to """ in tbl_properties.php + // to """ in tbl_sql.php $field_orig[$i] = urldecode($field_orig[$i]); if (strcmp(str_replace('"', '"', $field_orig[$i]), $field_name[$i]) == 0) { $field_name[$i] = $field_orig[$i]; @@ -137,8 +137,8 @@ if (isset($do_save_data)) { } } - $active_page = 'tbl_properties_structure.php'; - require('./tbl_properties_structure.php'); + $active_page = 'tbl_structure.php'; + require('./tbl_structure.php'); } else { PMA_mysqlDie('', '', '', $err_url, FALSE); // garvin: An error happened while inserting/updating a table definition. diff --git a/tbl_change.php b/tbl_change.php index 90cd28fe4..56fd0496c 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -47,7 +47,7 @@ require_once './libraries/file_listing.php'; // file listing if (!empty($disp_message)) { if (isset($goto)) { $goto_cpy = $goto; - $goto = 'tbl_properties.php?' + $goto = 'tbl_sql.php?' . PMA_generate_common_url($db, $table) . '&$show_query=1' . '&sql_query=' . (isset($disp_query) ? urlencode($disp_query) : ''); @@ -83,12 +83,12 @@ if (empty($goto)) { /** * @todo check if we could replace by "db_details|tbl" */ -if (!preg_match('@^(db_details|tbl_properties|tbl_select|tbl_import)@', $goto)) { +if (!preg_match('@^(db_details|tbl_)@', $goto)) { $err_url = $goto . "?" . PMA_generate_common_url($db) . "&sql_query=" . urlencode($sql_query); } else { $err_url = $goto . '?' . PMA_generate_common_url($db) - . ((preg_match('@^(tbl_properties|tbl_select)@', $goto)) ? '&table=' . urlencode($table) : ''); + . ((preg_match('@^(tbl_)@', $goto)) ? '&table=' . urlencode($table) : ''); } @@ -102,9 +102,9 @@ require_once './libraries/db_table_exists.lib.php'; * Sets parameters for links */ $url_query = PMA_generate_common_url($db, $table) - . '&goto=tbl_properties.php'; + . '&goto=tbl_sql.php'; -require_once './libraries/tbl_properties_table_info.inc.php'; +require_once './libraries/tbl_info.inc.php'; /* Get comments */ @@ -124,7 +124,7 @@ if ($GLOBALS['cfg']['ShowPropertyComments']) { /** * Displays top menu links */ -require_once './libraries/tbl_properties_links.inc.php'; +require_once './libraries/tbl_links.inc.php'; /** @@ -161,7 +161,7 @@ if (isset($primary_key)) { unset($row[$rowcount]); unset($primary_key_array[$rowcount]); $goto_cpy = $goto; - $goto = 'tbl_properties.php?' + $goto = 'tbl_sql.php?' . PMA_generate_common_url($db, $table) . '&$show_query=1' . '&sql_query=' . urlencode($local_query); diff --git a/tbl_properties_export.php b/tbl_export.php similarity index 93% rename from tbl_properties_export.php rename to tbl_export.php index 2ddfe2218..d4ea66b61 100644 --- a/tbl_properties_export.php +++ b/tbl_export.php @@ -7,9 +7,9 @@ require_once('./libraries/common.lib.php'); /** * Gets tables informations and displays top links */ -require_once('./libraries/tbl_properties_common.php'); -$url_query .= '&goto=tbl_properties_export.php&back=tbl_properties_export.php'; -require_once('./libraries/tbl_properties_table_info.inc.php'); +require_once('./libraries/tbl_common.php'); +$url_query .= '&goto=tbl_export.php&back=tbl_export.php'; +require_once('./libraries/tbl_info.inc.php'); // Dump of a table @@ -103,7 +103,7 @@ if (isset($sql_query)) { /** * Displays top menu links */ -require('./libraries/tbl_properties_links.inc.php'); +require('./libraries/tbl_links.inc.php'); $export_type = 'table'; require_once('./libraries/display_export.lib.php'); diff --git a/tbl_import.php b/tbl_import.php index eade040bc..b5d4a8036 100644 --- a/tbl_import.php +++ b/tbl_import.php @@ -7,14 +7,14 @@ require_once('./libraries/common.lib.php'); /** * Gets tables informations and displays top links */ -require_once('./libraries/tbl_properties_common.php'); +require_once('./libraries/tbl_common.php'); $url_query .= '&goto=tbl_import.php&back=tbl_import.php'; -require_once('./libraries/tbl_properties_table_info.inc.php'); +require_once('./libraries/tbl_info.inc.php'); /** * Displays top menu links */ -require_once('./libraries/tbl_properties_links.inc.php'); +require_once('./libraries/tbl_links.inc.php'); $import_type = 'table'; require_once('./libraries/display_import.lib.php'); diff --git a/tbl_indexes.php b/tbl_indexes.php index 0ca219535..b50ea04fd 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -17,7 +17,7 @@ $index_types_cnt = count($index_types); /** * Ensures the db & table are valid, then loads headers and gets indexes * informations. - * Skipped if this script is called by "tbl_properties.php" + * Skipped if this script is called by "tbl_sql.php" */ if (!defined('PMA_IDX_INCLUDED')) { // Not a valid db name -> back to the welcome page @@ -71,7 +71,7 @@ if (!defined('PMA_IDX_INCLUDED')) { $indexes = array(); $indexes_info = array(); $indexes_data = array(); -// keys had already been grabbed in "tbl_properties.php" +// keys had already been grabbed in "tbl_sql.php" if (!defined('PMA_IDX_INCLUDED')) { $ret_keys = PMA_get_indexes($table, $err_url_0); } @@ -79,7 +79,7 @@ if (!defined('PMA_IDX_INCLUDED')) { PMA_extract_indexes($ret_keys, $indexes, $indexes_info, $indexes_data); // Get fields and stores their name/type -// fields had already been grabbed in "tbl_properties.php" +// fields had already been grabbed in "tbl_sql.php" if (!defined('PMA_IDX_INCLUDED')) { $fields_rs = PMA_DBI_query('SHOW FIELDS FROM ' . PMA_backquote($table) . ';'); @@ -110,7 +110,7 @@ if ($fields_rs) { /** * Do run the query to build the new index and moves back to - * "tbl_properties.php" + * "tbl_sql.php" */ if (!defined('PMA_IDX_INCLUDED') && (isset($index) && isset($do_save_data))) { @@ -183,8 +183,8 @@ if (!defined('PMA_IDX_INCLUDED') $message = $strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenAltered; - $active_page = 'tbl_properties_structure.php'; - require('./tbl_properties_structure.php'); + $active_page = 'tbl_structure.php'; + require('./tbl_structure.php'); } // end builds the new index diff --git a/tbl_move_copy.php b/tbl_move_copy.php index 48f52af38..78f4e8c01 100644 --- a/tbl_move_copy.php +++ b/tbl_move_copy.php @@ -15,7 +15,7 @@ PMA_checkParameters(array('db', 'table')); /** * Defines the url to return to in case of error in a sql statement */ -$err_url = 'tbl_properties.php?' . PMA_generate_common_url($db, $table); +$err_url = 'tbl_sql.php?' . PMA_generate_common_url($db, $table); /** @@ -67,5 +67,5 @@ else { * Back to the calling script */ -require './tbl_properties.php'; +require './tbl_sql.php'; ?> diff --git a/tbl_properties_operations.php b/tbl_operations.php similarity index 96% rename from tbl_properties_operations.php rename to tbl_operations.php index ced3cd18d..22d6f8aad 100644 --- a/tbl_properties_operations.php +++ b/tbl_operations.php @@ -10,9 +10,9 @@ $pma_table = new PMA_Table($GLOBALS['table'], $GLOBALS['db']); /** * Runs common work */ -require './libraries/tbl_properties_common.php'; -$url_query .= '&goto=tbl_properties_operations.php&back=tbl_properties_operations.php'; -$url_params['goto'] = $url_params['back'] = 'tbl_properties_operations.php'; +require './libraries/tbl_common.php'; +$url_query .= '&goto=tbl_operations.php&back=tbl_operations.php'; +$url_params['goto'] = $url_params['back'] = 'tbl_operations.php'; /** * Gets relation settings @@ -34,7 +34,7 @@ PMA_DBI_select_db($GLOBALS['db']); * Gets tables informations */ -require './libraries/tbl_properties_table_info.inc.php'; +require './libraries/tbl_info.inc.php'; $reread_info = false; $errors = array(); @@ -123,17 +123,17 @@ if (isset($_REQUEST['submitorderby']) && ! empty($_REQUEST['order_field'])) { if ($reread_info) { $checksum = $delay_key_write = 0; - require './libraries/tbl_properties_table_info.inc.php'; + require './libraries/tbl_info.inc.php'; } unset($reread_info); /** * Displays top menu links */ -require_once './libraries/tbl_properties_links.inc.php'; +require_once './libraries/tbl_links.inc.php'; -$url_params['goto'] = 'tbl_properties_operations.php'; -$url_params['back'] = 'tbl_properties_operations.php'; +$url_params['goto'] = 'tbl_operations.php'; +$url_params['back'] = 'tbl_operations.php'; /** * Get columns names @@ -151,7 +151,7 @@ unset($local_query); ?>

-
+
@@ -226,7 +226,7 @@ if (strstr($show_comment, '; InnoDB free') === false) {
- +
diff --git a/tbl_printview.php b/tbl_printview.php index 3b3e3b9f3..d9151ed03 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -3,7 +3,7 @@ require_once './libraries/common.lib.php'; -require './libraries/tbl_properties_common.php'; +require './libraries/tbl_common.php'; /** * Gets the variables sent or posted to this script, then displays headers @@ -32,7 +32,7 @@ $cfgRelation = PMA_getRelationsParam(); * Defines the url to return to in case of error in a sql statement */ if (isset($table)) { - $err_url = 'tbl_properties.php?' . PMA_generate_common_url($db, $table); + $err_url = 'tbl_sql.php?' . PMA_generate_common_url($db, $table); } else { $err_url = 'db_details.php?' . PMA_generate_common_url($db); } @@ -221,7 +221,7 @@ foreach ($the_tables as $key => $table) { // NULL attribute, but SHOW CREATE TABLE says the contrary. Believe // the latter. /** - * @todo merge this logic with the one in tbl_properties_structure.php + * @todo merge this logic with the one in tbl_structure.php * or move it in a function similar to PMA_DBI_get_columns_full() * but based on SHOW CREATE TABLE because information_schema * cannot be trusted in this case (MySQL bug) diff --git a/tbl_relation.php b/tbl_relation.php index b46b3447a..5280e369b 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -6,16 +6,16 @@ * Gets some core libraries */ require_once('./libraries/common.lib.php'); -require_once('./libraries/tbl_properties_common.php'); -$url_query .= '&goto=tbl_properties.php'; +require_once('./libraries/tbl_common.php'); +$url_query .= '&goto=tbl_sql.php'; /** * Gets tables informations */ -require_once('./libraries/tbl_properties_table_info.inc.php'); +require_once('./libraries/tbl_info.inc.php'); -// Note: in libraries/tbl_properties_links.inc.php we get and display the table comment. +// Note: in libraries/tbl_links.inc.php we get and display the table comment. // For InnoDB, this comment contains the REFER information but any update // has not been done yet (will be done in tbl_relation.php later). $avoid_show_comment = TRUE; @@ -23,7 +23,7 @@ $avoid_show_comment = TRUE; /** * Displays top menu links */ -require_once('./libraries/tbl_properties_links.inc.php'); +require_once('./libraries/tbl_links.inc.php'); require_once('./libraries/relation.lib.php'); diff --git a/tbl_replace.php b/tbl_replace.php index 4d131dbfa..c9602d9ae 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -86,7 +86,7 @@ if (isset($after_insert) && $after_insert == 'new_insert') { // Security checkings $is_gotofile = preg_replace('@^([^?]+).*$@', '\\1', $goto); if (!@file_exists('./' . $is_gotofile)) { - $goto = (! isset($table) || ! strlen($table)) ? 'db_details.php' : 'tbl_properties.php'; + $goto = (! isset($table) || ! strlen($table)) ? 'db_details.php' : 'tbl_sql.php'; $is_gotofile = TRUE; } else { $is_gotofile = ($is_gotofile == $goto); diff --git a/tbl_row_action.php b/tbl_row_action.php index 206f28492..9c2b7c36a 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -98,8 +98,8 @@ if (!empty($submit_mult)) { $primary_key[] = urldecode($i_primary_key); } - $active_page = 'tbl_properties_export.php'; - include './tbl_properties_export.php'; + $active_page = 'tbl_export.php'; + include './tbl_export.php'; break; case 'row_delete': @@ -113,7 +113,7 @@ if (!empty($submit_mult)) { } require('./libraries/mult_submits.inc.php'); $url_query = PMA_generate_common_url($db, $table) - . '&goto=tbl_properties.php'; + . '&goto=tbl_sql.php'; /** @@ -137,7 +137,7 @@ if (!empty($submit_mult)) { $pos = $original_pos; } - // this is because sql.php could call tbl_properties_structure + // this is because sql.php could call tbl_structure // which would think it needs to call mult_submits.inc.php: unset($submit_mult); unset($mult_btn); diff --git a/tbl_select.php b/tbl_select.php index 0ab6e10b0..89ae7ff32 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -28,19 +28,19 @@ if ( $GLOBALS['cfg']['PropertiesIconic'] == true ) { */ if (!isset($param) || $param[0] == '') { // Gets some core libraries - require_once('./libraries/tbl_properties_common.php'); + require_once('./libraries/tbl_common.php'); //$err_url = 'tbl_select.php' . $err_url; $url_query .= '&goto=tbl_select.php&back=tbl_select.php'; /** * Gets tables informations */ - require_once('./libraries/tbl_properties_table_info.inc.php'); + require_once('./libraries/tbl_info.inc.php'); /** * Displays top menu links */ - require_once('./libraries/tbl_properties_links.inc.php'); + require_once('./libraries/tbl_links.inc.php'); if (!isset($goto)) { $goto = $GLOBALS['cfg']['DefaultTabTable']; diff --git a/tbl_properties.php b/tbl_sql.php similarity index 53% rename from tbl_properties.php rename to tbl_sql.php index 873771ba0..a022f2054 100644 --- a/tbl_properties.php +++ b/tbl_sql.php @@ -7,24 +7,24 @@ require_once('./libraries/common.lib.php'); /** * Runs common work */ -require('./libraries/tbl_properties_common.php'); -$url_query .= '&goto=tbl_properties.php&back=tbl_properties.php'; +require('./libraries/tbl_common.php'); +$url_query .= '&goto=tbl_sql.php&back=tbl_sql.php'; require_once('./libraries/sql_query_form.lib.php'); -$err_url = 'tbl_properties.php' . $err_url; -$goto = 'tbl_properties.php'; -$back = 'tbl_properties.php'; +$err_url = 'tbl_sql.php' . $err_url; +$goto = 'tbl_sql.php'; +$back = 'tbl_sql.php'; /** * Get table information */ -require_once('./libraries/tbl_properties_table_info.inc.php'); +require_once('./libraries/tbl_info.inc.php'); /** * Displays top menu links */ -require_once('./libraries/tbl_properties_links.inc.php'); +require_once('./libraries/tbl_links.inc.php'); /** * Query box, bookmark, insert data from textfile diff --git a/tbl_properties_structure.php b/tbl_structure.php similarity index 97% rename from tbl_properties_structure.php rename to tbl_structure.php index 0144816d7..7286a6739 100644 --- a/tbl_properties_structure.php +++ b/tbl_structure.php @@ -33,16 +33,16 @@ if (isset($submit_mult_change_x)) { if ((!empty($submit_mult) && isset($selected_fld)) || isset($mult_btn)) { - $action = 'tbl_properties_structure.php'; - $err_url = 'tbl_properties_structure.php?' . PMA_generate_common_url($db, $table); + $action = 'tbl_structure.php'; + $err_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table); require './libraries/mult_submits.inc.php'; } /** * Runs common work */ -require_once './libraries/tbl_properties_common.php'; -$url_query .= '&goto=tbl_properties_structure.php&back=tbl_properties_structure.php'; +require_once './libraries/tbl_common.php'; +$url_query .= '&goto=tbl_structure.php&back=tbl_structure.php'; /** * Prepares the table structure display @@ -51,7 +51,7 @@ $url_query .= '&goto=tbl_properties_structure.php&back=tbl_properties_st /** * Gets tables informations */ -require_once './libraries/tbl_properties_table_info.inc.php'; +require_once './libraries/tbl_info.inc.php'; /** * Show result of multi submit operation @@ -64,7 +64,7 @@ if ((!empty($submit_mult) && isset($selected_fld)) /** * Displays top menu links */ -require_once './libraries/tbl_properties_links.inc.php'; +require_once './libraries/tbl_links.inc.php'; // 2. Gets table keys and retains them $result = PMA_DBI_query('SHOW INDEX FROM ' . PMA_backquote($table) . ';'); @@ -187,7 +187,7 @@ if ($cfg['PropertiesIconic'] == true) { // table header $i = 0; ?> - + @@ -469,7 +469,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { echo '' . "\n" .'
' . "\n"; -$checkall_url = 'tbl_properties_structure.php?' . PMA_generate_common_url($db, $table); +$checkall_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table); ?> 20) { - require './libraries/tbl_properties_links.inc.php'; + require './libraries/tbl_links.inc.php'; } // end if ($fields_cnt > 20) echo "\n\n";