nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename tbl_* files to drop useless _properties part.

Browse Source
This commit is contained in:
Michal Čihař
2006-10-25 10:55:20 +00:00
parent 5760b41378
commit ad06b4a991
33 changed files with 138 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -9,6 +9,7 @@ $HeadURL$
* Documentation.html, libraries/tbl_properties.inc.php, * Documentation.html, libraries/tbl_properties.inc.php,
libraries/config.default.php: Allow to edit small number of fields libraries/config.default.php: Allow to edit small number of fields
vertically and lange number horizontally (RFE #1581773). vertically and lange number horizontally (RFE #1581773).
* [too much files]: Rename tbl_* files to drop useless _properties part.
2006-10-19 Marc Delisle <lem9@users.sourceforge.net> 2006-10-19 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php, /database_interface.lib.php,/session.inc.php: * libraries/common.lib.php, /database_interface.lib.php,/session.inc.php:

6
Documentation.html
View File

@@ -1340,8 +1340,8 @@ ALTER TABLE `pma_column_comments`
<dt id="cfg_DefaultTabTable">$cfg['DefaultTabTable'] string</dt> <dt id="cfg_DefaultTabTable">$cfg['DefaultTabTable'] string</dt>
<dd>Defines the tab displayed by default on table view. Possible <dd>Defines the tab displayed by default on table view. Possible
values: &quot;tbl_properties_structure.php&quot;, values: &quot;tbl_structure.php&quot;,
&quot;tbl_properties.php&quot;, &quot;tbl_select.php&quot;, &quot;tbl_sql.php&quot;, &quot;tbl_select.php&quot;,
&quot;tbl_change.php&quot; or &quot;sql.php&quot;.</dd> &quot;tbl_change.php&quot; or &quot;sql.php&quot;.</dd>
<dt id="cfg_MySQLManualBase">$cfg['MySQLManualBase'] string</dt> <dt id="cfg_MySQLManualBase">$cfg['MySQLManualBase'] string</dt>
@@ -1998,7 +1998,7 @@ ALTER TABLE `pma_column_comments`
<h3 id="transformationshowto">2. Usage</h3> <h3 id="transformationshowto">2. Usage</h3>
<p> Go to your <i>tbl_properties_structure.php</i> page (i.e. reached through <p> Go to your <i>tbl_structure.php</i> page (i.e. reached through
clicking on the 'Structure' link for a table). There click on clicking on the 'Structure' link for a table). There click on
&quot;Change&quot; (or change icon) and there you will see three new fields at &quot;Change&quot; (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 the end of the line. They are called 'MIME-type', 'Browser transformation' and

4
db_datadict.php
View File

@@ -29,7 +29,7 @@ PMA_checkParameters(array('db'));
* Defines the url to return to in case of error in a sql statement * Defines the url to return to in case of error in a sql statement
*/ */
if (isset($table)) { 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 { } else {
$err_url = 'db_details.php?' . PMA_generate_common_url($db); $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 // NULL attribute, but SHOW CREATE TABLE says the contrary. Believe
// the latter. // 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() * or move it in a function similar to PMA_DBI_get_columns_full()
* but based on SHOW CREATE TABLE because information_schema * but based on SHOW CREATE TABLE because information_schema
* cannot be trusted in this case (MySQL bug) * cannot be trusted in this case (MySQL bug)

6
db_details_structure.php
View File

@@ -290,7 +290,7 @@ foreach ($tables as $keyname => $each_table) {
if ($is_show_stats) { if ($is_show_stats) {
if (isset($formatted_overhead)) { if (isset($formatted_overhead)) {
$overhead = '<a href="tbl_properties_structure.php?' $overhead = '<a href="tbl_structure.php?'
. $tbl_url_query . '#showusage">' . $formatted_overhead . $tbl_url_query . '#showusage">' . $formatted_overhead
. ' ' . $overhead_unit . '</a>' . "\n"; . ' ' . $overhead_unit . '</a>' . "\n";
unset($formatted_overhead); unset($formatted_overhead);
@@ -324,7 +324,7 @@ foreach ($tables as $keyname => $each_table) {
</th> </th>
<td align="center"><?php echo $browse_table; ?></td> <td align="center"><?php echo $browse_table; ?></td>
<td align="center"> <td align="center">
<a href="tbl_properties_structure.php?<?php echo $tbl_url_query; ?>"> <a href="tbl_structure.php?<?php echo $tbl_url_query; ?>">
<?php echo $titles['Structure']; ?></a></td> <?php echo $titles['Structure']; ?></a></td>
<td align="center"><?php echo $search_table; ?></td> <td align="center"><?php echo $search_table; ?></td>
<?php if (! $db_is_information_schema) { ?> <?php if (! $db_is_information_schema) { ?>
@@ -365,7 +365,7 @@ foreach ($tables as $keyname => $each_table) {
<?php if ($is_show_stats) { ?> <?php if ($is_show_stats) { ?>
<td class="value"><a <td class="value"><a
href="tbl_properties_structure.php?<?php echo $tbl_url_query; ?>#showusage" href="tbl_structure.php?<?php echo $tbl_url_query; ?>#showusage"
><?php echo $formatted_size . ' ' . $unit; ?></a></td> ><?php echo $formatted_size . ' ' . $unit; ?></a></td>
<td class="value"><?php echo $overhead; ?></td> <td class="value"><?php echo $overhead; ?></td>
<?php } // end if ?> <?php } // end if ?>

18
export.php
View File

@@ -35,8 +35,8 @@ if (isset($export_list[$type]['force_file']) && ! isset($asfile)) {
$active_page = 'db_details_export.php'; $active_page = 'db_details_export.php';
require('./db_details_export.php'); require('./db_details_export.php');
} else { } else {
$active_page = 'tbl_properties_export.php'; $active_page = 'tbl_export.php';
require('./tbl_properties_export.php'); require('./tbl_export.php');
} }
exit(); exit();
} }
@@ -47,7 +47,7 @@ if ($export_type == 'server') {
} elseif ($export_type == 'database' && isset($db) && strlen($db)) { } elseif ($export_type == 'database' && isset($db) && strlen($db)) {
$err_url = 'db_details_export.php?' . PMA_generate_common_url($db); $err_url = 'db_details_export.php?' . PMA_generate_common_url($db);
} elseif ($export_type == 'table' && isset($db) && strlen($db) && isset($table) && strlen($table)) { } 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 { } else {
die('Bad parameters!'); die('Bad parameters!');
} }
@@ -303,8 +303,8 @@ if ($save_on_server) {
$active_page = 'db_details_export.php'; $active_page = 'db_details_export.php';
require('./db_details_export.php'); require('./db_details_export.php');
} else { } else {
$active_page = 'tbl_properties_export.php'; $active_page = 'tbl_export.php';
require('./tbl_properties_export.php'); require('./tbl_export.php');
} }
exit(); exit();
} }
@@ -552,8 +552,8 @@ if ($save_on_server && isset($message)) {
$active_page = 'db_details_export.php'; $active_page = 'db_details_export.php';
require('./db_details_export.php'); require('./db_details_export.php');
} else { } else {
$active_page = 'tbl_properties_export.php'; $active_page = 'tbl_export.php';
require('./tbl_properties_export.php'); require('./tbl_export.php');
} }
exit(); exit();
} }
@@ -614,8 +614,8 @@ if (!empty($asfile)) {
$active_page = 'db_details_export.php'; $active_page = 'db_details_export.php';
require_once('./db_details_export.php'); require_once('./db_details_export.php');
} else { } else {
$active_page = 'tbl_properties_export.php'; $active_page = 'tbl_export.php';
require_once('./tbl_properties_export.php'); require_once('./tbl_export.php');
} }
exit(); exit();
} else { } else {

4
import.php
View File

@@ -75,7 +75,7 @@ if ($import_type == 'table') {
} else { } else {
if (empty($goto) || !preg_match('@^(server|db|tbl)(_[a-z]*)*\.php$@i', $goto)) { if (empty($goto) || !preg_match('@^(server|db|tbl)(_[a-z]*)*\.php$@i', $goto)) {
if (isset($table) && isset($db)) { if (isset($table) && isset($db)) {
$goto = 'tbl_properties_structure.php'; $goto = 'tbl_structure.php';
} elseif (isset($db)) { } elseif (isset($db)) {
$goto = 'db_details_structure.php'; $goto = 'db_details_structure.php';
} else { } else {
@@ -91,7 +91,7 @@ if ($import_type == 'table') {
} }
$err_url = $goto $err_url = $goto
. '?' . $common . '?' . $common
. (preg_match('@^tbl_properties(_[a-z]*)?\.php$@', $goto) ? '&amp;table=' . urlencode($table) : ''); . (preg_match('@^tbl_[a-z]*\.php$@', $goto) ? '&amp;table=' . urlencode($table) : '');
} }

12
libraries/common.lib.php
View File

@@ -744,7 +744,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
} }
if ($is_modify_link && isset($db)) { if ($is_modify_link && isset($db)) {
if (isset($table)) { if (isset($table)) {
$doedit_goto = '<a href="tbl_properties.php?' . PMA_generate_common_url($db, $table) . '&amp;sql_query=' . urlencode($the_query) . '&amp;show_query=1">'; $doedit_goto = '<a href="tbl_sql.php?' . PMA_generate_common_url($db, $table) . '&amp;sql_query=' . urlencode($the_query) . '&amp;show_query=1">';
} else { } else {
$doedit_goto = '<a href="db_details.php?' . PMA_generate_common_url($db) . '&amp;sql_query=' . urlencode($the_query) . '&amp;show_query=1">'; $doedit_goto = '<a href="db_details.php?' . PMA_generate_common_url($db) . '&amp;sql_query=' . urlencode($the_query) . '&amp;show_query=1">';
} }
@@ -1371,7 +1371,7 @@ window.parent.updateTableTitle('<?php echo $uni_tbl; ?>', '<?php echo PMA_jsForm
//if (!isset($GLOBALS['goto'])) { //if (!isset($GLOBALS['goto'])) {
//$edit_target = (isset($GLOBALS['table'])) ? $cfg['DefaultTabTable'] : $cfg['DefaultTabDatabase']; //$edit_target = (isset($GLOBALS['table'])) ? $cfg['DefaultTabTable'] : $cfg['DefaultTabDatabase'];
$edit_target = isset($GLOBALS['db']) ? (isset($GLOBALS['table']) ? 'tbl_properties.php' : 'db_details.php') : 'server_sql.php'; $edit_target = isset($GLOBALS['db']) ? (isset($GLOBALS['table']) ? 'tbl_sql.php' : 'db_details.php') : 'server_sql.php';
//} elseif ($GLOBALS['goto'] != 'main.php') { //} elseif ($GLOBALS['goto'] != 'main.php') {
// $edit_target = $GLOBALS['goto']; // $edit_target = $GLOBALS['goto'];
//} else { //} else {
@@ -2616,10 +2616,10 @@ $goto_whitelist = array(
'tbl_indexes.php', 'tbl_indexes.php',
'tbl_move_copy.php', 'tbl_move_copy.php',
'tbl_printview.php', 'tbl_printview.php',
'tbl_properties.php', 'tbl_sql.php',
'tbl_properties_export.php', 'tbl_export.php',
'tbl_properties_operations.php', 'tbl_operations.php',
'tbl_properties_structure.php', 'tbl_structure.php',
'tbl_relation.php', 'tbl_relation.php',
'tbl_replace.php', 'tbl_replace.php',
'tbl_row_action.php', 'tbl_row_action.php',

6
libraries/config.default.php
View File

@@ -241,10 +241,10 @@ $cfg['DefaultTabDatabase'] = 'db_details_structure.php';
// 'db_details.php' = sql form // 'db_details.php' = sql form
// 'db_search.php' = search query // 'db_search.php' = search query
// 'db_operations.php' = operations on database // 'db_operations.php' = operations on database
$cfg['DefaultTabTable'] = 'tbl_properties_structure.php'; $cfg['DefaultTabTable'] = 'tbl_structure.php';
// Possible values: // Possible values:
// 'tbl_properties_structure.php' = fields list // 'tbl_structure.php' = fields list
// 'tbl_properties.php' = sql form // 'tbl_sql.php' = sql form
// 'tbl_select.php' = select page // 'tbl_select.php' = select page
// 'tbl_change.php' = insert row page // 'tbl_change.php' = insert row page
// 'sql.php' = browse page // 'sql.php' = browse page

4
libraries/display_tbl.lib.php
View File

@@ -1132,7 +1132,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
. '?' . str_replace('&amp;', '&', $url_query) . '?' . str_replace('&amp;', '&', $url_query)
. '&sql_query=' . urlencode($url_sql_query) . '&sql_query=' . urlencode($url_sql_query)
. '&zero_rows=' . urlencode(htmlspecialchars($GLOBALS['strDeleted'])) . '&zero_rows=' . urlencode(htmlspecialchars($GLOBALS['strDeleted']))
. '&goto=' . (empty($goto) ? 'tbl_properties.php' : $goto); . '&goto=' . (empty($goto) ? 'tbl_sql.php' : $goto);
$del_query = urlencode('DELETE FROM ' . PMA_backquote($table) . ' WHERE') . $uva_condition . '+LIMIT+1'; $del_query = urlencode('DELETE FROM ' . PMA_backquote($table) . ' WHERE') . $uva_condition . '+LIMIT+1';
$del_url = 'sql.php' $del_url = 'sql.php'
. '?' . $url_query . '?' . $url_query
@@ -2008,7 +2008,7 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) {
echo ' <!-- Export -->' . "\n"; echo ' <!-- Export -->' . "\n";
echo ' &nbsp;&nbsp;' . "\n"; echo ' &nbsp;&nbsp;' . "\n";
echo PMA_linkOrButton( echo PMA_linkOrButton(
'tbl_properties_export.php' . $url_query . '&amp;unlim_num_rows=' . $unlim_num_rows . $single_table, 'tbl_export.php' . $url_query . '&amp;unlim_num_rows=' . $unlim_num_rows . $single_table,
($GLOBALS['cfg']['PropertiesIconic'] ? '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_tblexport.png" height="16" width="16" alt="' . $GLOBALS['strExport'] . '" />' : '') . $GLOBALS['strExport'], ($GLOBALS['cfg']['PropertiesIconic'] ? '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_tblexport.png" height="16" width="16" alt="' . $GLOBALS['strExport'] . '" />' : '') . $GLOBALS['strExport'],
'', true, true, '') . "\n"; '', true, true, '') . "\n";
} }

4
libraries/header.inc.php
View File

@@ -210,7 +210,7 @@ if (empty($GLOBALS['is_header_sent'])) {
's_db.png' ); 's_db.png' );
if (isset($GLOBALS['table']) && strlen($GLOBALS['table'])) { 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; echo $separator;
printf( $item, printf( $item,
@@ -222,7 +222,7 @@ if (empty($GLOBALS['is_header_sent'])) {
/** /**
* Displays table comment * 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 * @uses $GLOBALS['avoid_show_comment'] from tbl_relation.php
*/ */
if (!empty($show_comment) && !isset($GLOBALS['avoid_show_comment'])) { if (!empty($show_comment) && !isset($GLOBALS['avoid_show_comment'])) {

8
libraries/mult_submits.inc.php
View File

@@ -127,9 +127,9 @@ if ( !empty($submit_mult) && !empty($what)) {
$js_to_run = 'functions.js'; $js_to_run = 'functions.js';
unset($message); unset($message);
if (isset($table) && strlen($table)) { if (isset($table) && strlen($table)) {
require('./libraries/tbl_properties_common.php'); require('./libraries/tbl_common.php');
$url_query .= '&amp;goto=tbl_properties.php&amp;back=tbl_properties.php'; $url_query .= '&amp;goto=tbl_sql.php&amp;back=tbl_sql.php';
require('./libraries/tbl_properties_table_info.inc.php'); require('./libraries/tbl_info.inc.php');
} elseif (isset($db) && strlen($db)) { } elseif (isset($db) && strlen($db)) {
require('./libraries/db_details_common.inc.php'); require('./libraries/db_details_common.inc.php');
require('./libraries/db_info.inc.php'); require('./libraries/db_info.inc.php');
@@ -231,7 +231,7 @@ if ( !empty($submit_mult) && !empty($what)) {
<?php <?php
if (strpos(' ' . $action, 'db_details') == 1) { if (strpos(' ' . $action, 'db_details') == 1) {
echo PMA_generate_common_hidden_inputs($db); echo PMA_generate_common_hidden_inputs($db);
} elseif (strpos(' ' . $action, 'tbl_properties') == 1 } elseif (strpos(' ' . $action, 'tbl_') == 1
|| $what == 'row_delete') { || $what == 'row_delete') {
echo PMA_generate_common_hidden_inputs($db, $table); echo PMA_generate_common_hidden_inputs($db, $table);
} else { } else {

10
libraries/sql_query_form.lib.php
View File

@@ -6,8 +6,8 @@
* *
* @usedby server_sql.php * @usedby server_sql.php
* @usedby db_details.php * @usedby db_details.php
* @usedby tbl_properties.php * @usedby tbl_sql.php
* @usedby tbl_properties_structure.php * @usedby tbl_structure.php
* @usedby querywindow.php * @usedby querywindow.php
*/ */
@@ -19,8 +19,8 @@ require_once './libraries/bookmark.lib.php'; // used for file listing
* *
* @usedby server_sql.php * @usedby server_sql.php
* @usedby db_details.php * @usedby db_details.php
* @usedby tbl_properties.php * @usedby tbl_sql.php
* @usedby tbl_properties_structure.php * @usedby tbl_structure.php
* @usedby querywindow.php * @usedby querywindow.php
* @uses $GLOBALS['table'] * @uses $GLOBALS['table']
* @uses $GLOBALS['db'] * @uses $GLOBALS['db']
@@ -95,7 +95,7 @@ function PMA_sqlQueryForm($query = true, $display_tab = false)
$table = $GLOBALS['table']; $table = $GLOBALS['table'];
$db = $GLOBALS['db']; $db = $GLOBALS['db'];
$goto = empty($GLOBALS['goto']) ? $goto = empty($GLOBALS['goto']) ?
'tbl_properties.php' : $GLOBALS['goto']; 'tbl_sql.php' : $GLOBALS['goto'];
} }

0
libraries/tbl_properties_common.php → libraries/tbl_common.php
View File

2
libraries/tbl_properties_table_info.inc.php → libraries/tbl_info.inc.php
View File

@@ -62,7 +62,7 @@ if ($table_info_result && PMA_DBI_num_rows($table_info_result) > 0) {
$tbl_type = isset($showtable['Type']) $tbl_type = isset($showtable['Type'])
? strtoupper($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 // and we want to show it in the header
if (isset($submitcomment) && isset($comment)) { if (isset($submitcomment) && isset($comment)) {
$show_comment = $comment; $show_comment = $comment;

10
libraries/tbl_properties_links.inc.php → libraries/tbl_links.inc.php
View File

@@ -45,11 +45,11 @@ $tabs['browse']['icon'] = 'b_browse.png';
$tabs['browse']['text'] = $strBrowse; $tabs['browse']['text'] = $strBrowse;
$tabs['structure']['icon'] = 'b_props.png'; $tabs['structure']['icon'] = 'b_props.png';
$tabs['structure']['link'] = 'tbl_properties_structure.php'; $tabs['structure']['link'] = 'tbl_structure.php';
$tabs['structure']['text'] = $strStructure; $tabs['structure']['text'] = $strStructure;
$tabs['sql']['icon'] = 'b_sql.png'; $tabs['sql']['icon'] = 'b_sql.png';
$tabs['sql']['link'] = 'tbl_properties.php'; $tabs['sql']['link'] = 'tbl_sql.php';
$tabs['sql']['text'] = $strSQL; $tabs['sql']['text'] = $strSQL;
$tabs['search']['icon'] = 'b_search.png'; $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']['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']['args']['single_table'] = 'true';
$tabs['export']['text'] = $strExport; $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['import']['text'] = $strImport;
$tabs['operation']['icon'] = 'b_tblops.png'; $tabs['operation']['icon'] = 'b_tblops.png';
$tabs['operation']['link'] = 'tbl_properties_operations.php'; $tabs['operation']['link'] = 'tbl_operations.php';
$tabs['operation']['text'] = $strOperations; $tabs['operation']['text'] = $strOperations;
if ($table_info_num_rows > 0) { 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']['sql_query'] = $ln8_stt . PMA_backquote($table);
$tabs['empty']['args']['zero_rows'] = sprintf($strTableHasBeenEmptied, htmlspecialchars($table)); $tabs['empty']['args']['zero_rows'] = sprintf($strTableHasBeenEmptied, htmlspecialchars($table));
$tabs['empty']['attr'] = 'onclick="return confirmLink(this, \'' . $ln8_stt . PMA_jsFormat($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']['class'] = 'caution';
} }
$tabs['empty']['icon'] = 'b_empty.png'; $tabs['empty']['icon'] = 'b_empty.png';

2
querywindow.php
View File

@@ -227,7 +227,7 @@ if (isset($no_js) && $no_js) {
// ... we redirect to appropriate query sql page // ... we redirect to appropriate query sql page
// works only full if $db and $table is also stored/grabbed from $_COOKIE // works only full if $db and $table is also stored/grabbed from $_COOKIE
if ( isset( $table ) && strlen($table) ) { if ( isset( $table ) && strlen($table) ) {
require './tbl_properties.php'; require './tbl_sql.php';
} elseif ( isset($db) && strlen($db) ) { } elseif ( isset($db) && strlen($db) ) {
require './db_details.php'; require './db_details.php';
} else { } else {

2
scripts/setup.php
View File

@@ -1043,7 +1043,7 @@ function show_tabs_form($defaults = array()) {
show_config_form(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 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 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), array('Use lighter tabs', 'LightTabs', 'If you want simpler tabs enable this', FALSE),
), ),
'Configure tabs', 'Configure tabs',

16
sql.php
View File

@@ -71,7 +71,7 @@ if (! isset($sql_query) && isset($table) && isset($db)) {
unset($book_sql_query); unset($book_sql_query);
// set $goto to what will be displayed if query returns 0 rows // set $goto to what will be displayed if query returns 0 rows
$goto = 'tbl_properties_structure.php'; $goto = 'tbl_structure.php';
} else { } else {
// Now we can check the parameters // Now we can check the parameters
PMA_checkParameters(array('sql_query')); 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 // Displays an error message if required and stop parsing the script
if ($error = PMA_DBI_getError()) { if ($error = PMA_DBI_getError()) {
require_once './libraries/header.inc.php'; 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 . '&amp;show_query=1&amp;sql_query=' . urlencode($sql_query) ? $err_url . '&amp;show_query=1&amp;sql_query=' . urlencode($sql_query)
: $err_url; : $err_url;
PMA_mysqlDie($error, $full_sql_query, '', $full_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 // Checks for a valid target script
$is_db = $is_table = false; $is_db = $is_table = false;
include 'libraries/db_table_exists.lib.php'; 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)) { if (isset($table)) {
unset($table); unset($table);
} }
@@ -639,7 +639,7 @@ if ($num_rows < 1 || $is_affected) {
} }
// Loads to target script // Loads to target script
if (strpos($goto, 'db_details') === 0 if (strpos($goto, 'db_details') === 0
|| strpos($goto, 'tbl_properties') === 0) { || strpos($goto, 'tbl_') === 0) {
$js_to_run = 'functions.js'; $js_to_run = 'functions.js';
} }
if ($goto != 'main.php') { if ($goto != 'main.php') {
@@ -665,10 +665,10 @@ else {
$js_to_run = 'functions.js'; $js_to_run = 'functions.js';
unset($message); unset($message);
if (isset($table) && strlen($table)) { if (isset($table) && strlen($table)) {
require './libraries/tbl_properties_common.php'; require './libraries/tbl_common.php';
$url_query .= '&amp;goto=tbl_properties.php&amp;back=tbl_properties.php'; $url_query .= '&amp;goto=tbl_sql.php&amp;back=tbl_sql.php';
require './libraries/tbl_properties_table_info.inc.php'; require './libraries/tbl_info.inc.php';
require './libraries/tbl_properties_links.inc.php'; require './libraries/tbl_links.inc.php';
} elseif (isset($db) && strlen($db)) { } elseif (isset($db) && strlen($db)) {
require './libraries/db_details_common.inc.php'; require './libraries/db_details_common.inc.php';
require './libraries/db_info.inc.php'; require './libraries/db_info.inc.php';

14
tbl_addfield.php
View File

@@ -18,7 +18,7 @@ PMA_checkParameters(array('db', 'table'));
/** /**
* Defines the url to return to in case of error in a sql statement * 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 * 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; $sql_query = $sql_query_cpy;
unset($sql_query_cpy); unset($sql_query_cpy);
$message = $strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenAltered; $message = $strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenAltered;
$active_page = 'tbl_properties_structure.php'; $active_page = 'tbl_structure.php';
require('./tbl_properties_structure.php'); require('./tbl_structure.php');
} else { } else {
PMA_mysqlDie('', '', '', $err_url, FALSE); PMA_mysqlDie('', '', '', $err_url, FALSE);
// garvin: An error happened while inserting/updating a table definition. // garvin: An error happened while inserting/updating a table definition.
@@ -212,13 +212,13 @@ if ($abort == FALSE) {
/** /**
* Gets tables informations * Gets tables informations
*/ */
require_once('./libraries/tbl_properties_common.php'); require_once('./libraries/tbl_common.php');
require_once('./libraries/tbl_properties_table_info.inc.php'); require_once('./libraries/tbl_info.inc.php');
/** /**
* Displays top menu links * Displays top menu links
*/ */
$active_page = 'tbl_properties_structure.php'; $active_page = 'tbl_structure.php';
require_once('./libraries/tbl_properties_links.inc.php'); require_once('./libraries/tbl_links.inc.php');
/** /**
* Display the form * Display the form
*/ */

16
tbl_alter.php
View File

@@ -17,20 +17,20 @@ PMA_checkParameters(array('db', 'table'));
/** /**
* Gets tables informations * Gets tables informations
*/ */
require_once('./libraries/tbl_properties_common.php'); require_once('./libraries/tbl_common.php');
require_once('./libraries/tbl_properties_table_info.inc.php'); require_once('./libraries/tbl_info.inc.php');
/** /**
* Displays top menu links * 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 // 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 * 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)) { if (isset($do_save_data)) {
$field_cnt = count($field_orig); $field_cnt = count($field_orig);
for ($i = 0; $i < $field_cnt; $i++) { for ($i = 0; $i < $field_cnt; $i++) {
// to "&quot;" in tbl_properties.php // to "&quot;" in tbl_sql.php
$field_orig[$i] = urldecode($field_orig[$i]); $field_orig[$i] = urldecode($field_orig[$i]);
if (strcmp(str_replace('"', '&quot;', $field_orig[$i]), $field_name[$i]) == 0) { if (strcmp(str_replace('"', '&quot;', $field_orig[$i]), $field_name[$i]) == 0) {
$field_name[$i] = $field_orig[$i]; $field_name[$i] = $field_orig[$i];
@@ -137,8 +137,8 @@ if (isset($do_save_data)) {
} }
} }
$active_page = 'tbl_properties_structure.php'; $active_page = 'tbl_structure.php';
require('./tbl_properties_structure.php'); require('./tbl_structure.php');
} else { } else {
PMA_mysqlDie('', '', '', $err_url, FALSE); PMA_mysqlDie('', '', '', $err_url, FALSE);
// garvin: An error happened while inserting/updating a table definition. // garvin: An error happened while inserting/updating a table definition.

14
tbl_change.php
View File

@@ -47,7 +47,7 @@ require_once './libraries/file_listing.php'; // file listing
if (!empty($disp_message)) { if (!empty($disp_message)) {
if (isset($goto)) { if (isset($goto)) {
$goto_cpy = $goto; $goto_cpy = $goto;
$goto = 'tbl_properties.php?' $goto = 'tbl_sql.php?'
. PMA_generate_common_url($db, $table) . PMA_generate_common_url($db, $table)
. '&amp;$show_query=1' . '&amp;$show_query=1'
. '&amp;sql_query=' . (isset($disp_query) ? urlencode($disp_query) : ''); . '&amp;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" * @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) . "&amp;sql_query=" . urlencode($sql_query); $err_url = $goto . "?" . PMA_generate_common_url($db) . "&amp;sql_query=" . urlencode($sql_query);
} else { } else {
$err_url = $goto . '?' $err_url = $goto . '?'
. PMA_generate_common_url($db) . PMA_generate_common_url($db)
. ((preg_match('@^(tbl_properties|tbl_select)@', $goto)) ? '&amp;table=' . urlencode($table) : ''); . ((preg_match('@^(tbl_)@', $goto)) ? '&amp;table=' . urlencode($table) : '');
} }
@@ -102,9 +102,9 @@ require_once './libraries/db_table_exists.lib.php';
* Sets parameters for links * Sets parameters for links
*/ */
$url_query = PMA_generate_common_url($db, $table) $url_query = PMA_generate_common_url($db, $table)
. '&amp;goto=tbl_properties.php'; . '&amp;goto=tbl_sql.php';
require_once './libraries/tbl_properties_table_info.inc.php'; require_once './libraries/tbl_info.inc.php';
/* Get comments */ /* Get comments */
@@ -124,7 +124,7 @@ if ($GLOBALS['cfg']['ShowPropertyComments']) {
/** /**
* Displays top menu links * 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($row[$rowcount]);
unset($primary_key_array[$rowcount]); unset($primary_key_array[$rowcount]);
$goto_cpy = $goto; $goto_cpy = $goto;
$goto = 'tbl_properties.php?' $goto = 'tbl_sql.php?'
. PMA_generate_common_url($db, $table) . PMA_generate_common_url($db, $table)
. '&amp;$show_query=1' . '&amp;$show_query=1'
. '&amp;sql_query=' . urlencode($local_query); . '&amp;sql_query=' . urlencode($local_query);

8
tbl_properties_export.php → tbl_export.php
View File

@@ -7,9 +7,9 @@ require_once('./libraries/common.lib.php');
/** /**
* Gets tables informations and displays top links * Gets tables informations and displays top links
*/ */
require_once('./libraries/tbl_properties_common.php'); require_once('./libraries/tbl_common.php');
$url_query .= '&amp;goto=tbl_properties_export.php&amp;back=tbl_properties_export.php'; $url_query .= '&amp;goto=tbl_export.php&amp;back=tbl_export.php';
require_once('./libraries/tbl_properties_table_info.inc.php'); require_once('./libraries/tbl_info.inc.php');
// Dump of a table // Dump of a table
@@ -103,7 +103,7 @@ if (isset($sql_query)) {
/** /**
* Displays top menu links * Displays top menu links
*/ */
require('./libraries/tbl_properties_links.inc.php'); require('./libraries/tbl_links.inc.php');
$export_type = 'table'; $export_type = 'table';
require_once('./libraries/display_export.lib.php'); require_once('./libraries/display_export.lib.php');

6
tbl_import.php
View File

@@ -7,14 +7,14 @@ require_once('./libraries/common.lib.php');
/** /**
* Gets tables informations and displays top links * Gets tables informations and displays top links
*/ */
require_once('./libraries/tbl_properties_common.php'); require_once('./libraries/tbl_common.php');
$url_query .= '&amp;goto=tbl_import.php&amp;back=tbl_import.php'; $url_query .= '&amp;goto=tbl_import.php&amp;back=tbl_import.php';
require_once('./libraries/tbl_properties_table_info.inc.php'); require_once('./libraries/tbl_info.inc.php');
/** /**
* Displays top menu links * Displays top menu links
*/ */
require_once('./libraries/tbl_properties_links.inc.php'); require_once('./libraries/tbl_links.inc.php');
$import_type = 'table'; $import_type = 'table';
require_once('./libraries/display_import.lib.php'); require_once('./libraries/display_import.lib.php');

12
tbl_indexes.php
View File

@@ -17,7 +17,7 @@ $index_types_cnt = count($index_types);
/** /**
* Ensures the db & table are valid, then loads headers and gets indexes * Ensures the db & table are valid, then loads headers and gets indexes
* informations. * 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')) { if (!defined('PMA_IDX_INCLUDED')) {
// Not a valid db name -> back to the welcome page // Not a valid db name -> back to the welcome page
@@ -71,7 +71,7 @@ if (!defined('PMA_IDX_INCLUDED')) {
$indexes = array(); $indexes = array();
$indexes_info = array(); $indexes_info = array();
$indexes_data = 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')) { if (!defined('PMA_IDX_INCLUDED')) {
$ret_keys = PMA_get_indexes($table, $err_url_0); $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); PMA_extract_indexes($ret_keys, $indexes, $indexes_info, $indexes_data);
// Get fields and stores their name/type // 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')) { if (!defined('PMA_IDX_INCLUDED')) {
$fields_rs = PMA_DBI_query('SHOW FIELDS FROM ' $fields_rs = PMA_DBI_query('SHOW FIELDS FROM '
. PMA_backquote($table) . ';'); . PMA_backquote($table) . ';');
@@ -110,7 +110,7 @@ if ($fields_rs) {
/** /**
* Do run the query to build the new index and moves back to * Do run the query to build the new index and moves back to
* "tbl_properties.php" * "tbl_sql.php"
*/ */
if (!defined('PMA_IDX_INCLUDED') if (!defined('PMA_IDX_INCLUDED')
&& (isset($index) && isset($do_save_data))) { && (isset($index) && isset($do_save_data))) {
@@ -183,8 +183,8 @@ if (!defined('PMA_IDX_INCLUDED')
$message = $strTable . ' ' . htmlspecialchars($table) . ' ' $message = $strTable . ' ' . htmlspecialchars($table) . ' '
. $strHasBeenAltered; . $strHasBeenAltered;
$active_page = 'tbl_properties_structure.php'; $active_page = 'tbl_structure.php';
require('./tbl_properties_structure.php'); require('./tbl_structure.php');
} // end builds the new index } // end builds the new index

4
tbl_move_copy.php
View File

@@ -15,7 +15,7 @@ PMA_checkParameters(array('db', 'table'));
/** /**
* Defines the url to return to in case of error in a sql statement * 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 * Back to the calling script
*/ */
require './tbl_properties.php'; require './tbl_sql.php';
?> ?>

20
tbl_properties_operations.php → tbl_operations.php
View File

@@ -10,9 +10,9 @@ $pma_table = new PMA_Table($GLOBALS['table'], $GLOBALS['db']);
/** /**
* Runs common work * Runs common work
*/ */
require './libraries/tbl_properties_common.php'; require './libraries/tbl_common.php';
$url_query .= '&amp;goto=tbl_properties_operations.php&amp;back=tbl_properties_operations.php'; $url_query .= '&amp;goto=tbl_operations.php&amp;back=tbl_operations.php';
$url_params['goto'] = $url_params['back'] = 'tbl_properties_operations.php'; $url_params['goto'] = $url_params['back'] = 'tbl_operations.php';
/** /**
* Gets relation settings * Gets relation settings
@@ -34,7 +34,7 @@ PMA_DBI_select_db($GLOBALS['db']);
* Gets tables informations * Gets tables informations
*/ */
require './libraries/tbl_properties_table_info.inc.php'; require './libraries/tbl_info.inc.php';
$reread_info = false; $reread_info = false;
$errors = array(); $errors = array();
@@ -123,17 +123,17 @@ if (isset($_REQUEST['submitorderby']) && ! empty($_REQUEST['order_field'])) {
if ($reread_info) { if ($reread_info) {
$checksum = $delay_key_write = 0; $checksum = $delay_key_write = 0;
require './libraries/tbl_properties_table_info.inc.php'; require './libraries/tbl_info.inc.php';
} }
unset($reread_info); unset($reread_info);
/** /**
* Displays top menu links * 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['goto'] = 'tbl_operations.php';
$url_params['back'] = 'tbl_properties_operations.php'; $url_params['back'] = 'tbl_operations.php';
/** /**
* Get columns names * Get columns names
@@ -151,7 +151,7 @@ unset($local_query);
?> ?>
<!-- Order the table --> <!-- Order the table -->
<div id="div_table_order"> <div id="div_table_order">
<form method="post" action="tbl_properties_operations.php"> <form method="post" action="tbl_operations.php">
<?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?>
<fieldset id="fieldset_table_order"> <fieldset id="fieldset_table_order">
<legend><?php echo $strAlterOrderBy; ?></legend> <legend><?php echo $strAlterOrderBy; ?></legend>
@@ -226,7 +226,7 @@ if (strstr($show_comment, '; InnoDB free') === false) {
<!-- Table options --> <!-- Table options -->
<div id="div_table_options"> <div id="div_table_options">
<form method="post" action="tbl_properties_operations.php"> <form method="post" action="tbl_operations.php">
<?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?>
<input type="hidden" name="reload" value="1" /> <input type="hidden" name="reload" value="1" />
<fieldset> <fieldset>

6
tbl_printview.php
View File

@@ -3,7 +3,7 @@
require_once './libraries/common.lib.php'; 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 * 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 * Defines the url to return to in case of error in a sql statement
*/ */
if (isset($table)) { 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 { } else {
$err_url = 'db_details.php?' . PMA_generate_common_url($db); $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 // NULL attribute, but SHOW CREATE TABLE says the contrary. Believe
// the latter. // 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() * or move it in a function similar to PMA_DBI_get_columns_full()
* but based on SHOW CREATE TABLE because information_schema * but based on SHOW CREATE TABLE because information_schema
* cannot be trusted in this case (MySQL bug) * cannot be trusted in this case (MySQL bug)

10
tbl_relation.php
View File

@@ -6,16 +6,16 @@
* Gets some core libraries * Gets some core libraries
*/ */
require_once('./libraries/common.lib.php'); require_once('./libraries/common.lib.php');
require_once('./libraries/tbl_properties_common.php'); require_once('./libraries/tbl_common.php');
$url_query .= '&amp;goto=tbl_properties.php'; $url_query .= '&amp;goto=tbl_sql.php';
/** /**
* Gets tables informations * 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 // For InnoDB, this comment contains the REFER information but any update
// has not been done yet (will be done in tbl_relation.php later). // has not been done yet (will be done in tbl_relation.php later).
$avoid_show_comment = TRUE; $avoid_show_comment = TRUE;
@@ -23,7 +23,7 @@ $avoid_show_comment = TRUE;
/** /**
* Displays top menu links * 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'); require_once('./libraries/relation.lib.php');

2
tbl_replace.php
View File

@@ -86,7 +86,7 @@ if (isset($after_insert) && $after_insert == 'new_insert') {
// Security checkings // Security checkings
$is_gotofile = preg_replace('@^([^?]+).*$@', '\\1', $goto); $is_gotofile = preg_replace('@^([^?]+).*$@', '\\1', $goto);
if (!@file_exists('./' . $is_gotofile)) { 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; $is_gotofile = TRUE;
} else { } else {
$is_gotofile = ($is_gotofile == $goto); $is_gotofile = ($is_gotofile == $goto);

8
tbl_row_action.php
View File

@@ -98,8 +98,8 @@ if (!empty($submit_mult)) {
$primary_key[] = urldecode($i_primary_key); $primary_key[] = urldecode($i_primary_key);
} }
$active_page = 'tbl_properties_export.php'; $active_page = 'tbl_export.php';
include './tbl_properties_export.php'; include './tbl_export.php';
break; break;
case 'row_delete': case 'row_delete':
@@ -113,7 +113,7 @@ if (!empty($submit_mult)) {
} }
require('./libraries/mult_submits.inc.php'); require('./libraries/mult_submits.inc.php');
$url_query = PMA_generate_common_url($db, $table) $url_query = PMA_generate_common_url($db, $table)
. '&amp;goto=tbl_properties.php'; . '&amp;goto=tbl_sql.php';
/** /**
@@ -137,7 +137,7 @@ if (!empty($submit_mult)) {
$pos = $original_pos; $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: // which would think it needs to call mult_submits.inc.php:
unset($submit_mult); unset($submit_mult);
unset($mult_btn); unset($mult_btn);

6
tbl_select.php
View File

@@ -28,19 +28,19 @@ if ( $GLOBALS['cfg']['PropertiesIconic'] == true ) {
*/ */
if (!isset($param) || $param[0] == '') { if (!isset($param) || $param[0] == '') {
// Gets some core libraries // Gets some core libraries
require_once('./libraries/tbl_properties_common.php'); require_once('./libraries/tbl_common.php');
//$err_url = 'tbl_select.php' . $err_url; //$err_url = 'tbl_select.php' . $err_url;
$url_query .= '&amp;goto=tbl_select.php&amp;back=tbl_select.php'; $url_query .= '&amp;goto=tbl_select.php&amp;back=tbl_select.php';
/** /**
* Gets tables informations * Gets tables informations
*/ */
require_once('./libraries/tbl_properties_table_info.inc.php'); require_once('./libraries/tbl_info.inc.php');
/** /**
* Displays top menu links * Displays top menu links
*/ */
require_once('./libraries/tbl_properties_links.inc.php'); require_once('./libraries/tbl_links.inc.php');
if (!isset($goto)) { if (!isset($goto)) {
$goto = $GLOBALS['cfg']['DefaultTabTable']; $goto = $GLOBALS['cfg']['DefaultTabTable'];

14
tbl_properties.php → tbl_sql.php
View File

@@ -7,24 +7,24 @@ require_once('./libraries/common.lib.php');
/** /**
* Runs common work * Runs common work
*/ */
require('./libraries/tbl_properties_common.php'); require('./libraries/tbl_common.php');
$url_query .= '&amp;goto=tbl_properties.php&amp;back=tbl_properties.php'; $url_query .= '&amp;goto=tbl_sql.php&amp;back=tbl_sql.php';
require_once('./libraries/sql_query_form.lib.php'); require_once('./libraries/sql_query_form.lib.php');
$err_url = 'tbl_properties.php' . $err_url; $err_url = 'tbl_sql.php' . $err_url;
$goto = 'tbl_properties.php'; $goto = 'tbl_sql.php';
$back = 'tbl_properties.php'; $back = 'tbl_sql.php';
/** /**
* Get table information * Get table information
*/ */
require_once('./libraries/tbl_properties_table_info.inc.php'); require_once('./libraries/tbl_info.inc.php');
/** /**
* Displays top menu links * 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 * Query box, bookmark, insert data from textfile

20
tbl_properties_structure.php → tbl_structure.php
View File

@@ -33,16 +33,16 @@ if (isset($submit_mult_change_x)) {
if ((!empty($submit_mult) && isset($selected_fld)) if ((!empty($submit_mult) && isset($selected_fld))
|| isset($mult_btn)) { || isset($mult_btn)) {
$action = 'tbl_properties_structure.php'; $action = 'tbl_structure.php';
$err_url = 'tbl_properties_structure.php?' . PMA_generate_common_url($db, $table); $err_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table);
require './libraries/mult_submits.inc.php'; require './libraries/mult_submits.inc.php';
} }
/** /**
* Runs common work * Runs common work
*/ */
require_once './libraries/tbl_properties_common.php'; require_once './libraries/tbl_common.php';
$url_query .= '&amp;goto=tbl_properties_structure.php&amp;back=tbl_properties_structure.php'; $url_query .= '&amp;goto=tbl_structure.php&amp;back=tbl_structure.php';
/** /**
* Prepares the table structure display * Prepares the table structure display
@@ -51,7 +51,7 @@ $url_query .= '&amp;goto=tbl_properties_structure.php&amp;back=tbl_properties_st
/** /**
* Gets tables informations * 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 * Show result of multi submit operation
@@ -64,7 +64,7 @@ if ((!empty($submit_mult) && isset($selected_fld))
/** /**
* Displays top menu links * 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 // 2. Gets table keys and retains them
$result = PMA_DBI_query('SHOW INDEX FROM ' . PMA_backquote($table) . ';'); $result = PMA_DBI_query('SHOW INDEX FROM ' . PMA_backquote($table) . ';');
@@ -187,7 +187,7 @@ if ($cfg['PropertiesIconic'] == true) {
// table header // table header
$i = 0; $i = 0;
?> ?>
<form method="post" action="tbl_properties_structure.php" name="fieldsForm" id="fieldsForm"> <form method="post" action="tbl_structure.php" name="fieldsForm" id="fieldsForm">
<?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
<table id="tablestructure" class="data"> <table id="tablestructure" class="data">
<thead> <thead>
@@ -469,7 +469,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
echo '</tbody>' . "\n" echo '</tbody>' . "\n"
.'</table>' . "\n"; .'</table>' . "\n";
$checkall_url = 'tbl_properties_structure.php?' . PMA_generate_common_url($db, $table); $checkall_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table);
?> ?>
<img class="selectallarrow" src="<?php echo $pmaThemeImage . 'arrow_' . $text_dir . '.png'; ?>" <img class="selectallarrow" src="<?php echo $pmaThemeImage . 'arrow_' . $text_dir . '.png'; ?>"
@@ -541,7 +541,7 @@ echo $strPrintView;
if (! $tbl_is_view && ! $db_is_information_schema) { if (! $tbl_is_view && ! $db_is_information_schema) {
// if internal relations are available, or the table type is INNODB // if internal relations are available, or the table type is INNODB
// ($tbl_type comes from libraries/tbl_properties_table_info.inc.php) // ($tbl_type comes from libraries/tbl_info.inc.php)
if ($cfgRelation['relwork'] || $tbl_type=="INNODB") { if ($cfgRelation['relwork'] || $tbl_type=="INNODB") {
?> ?>
<a href="tbl_relation.php?<?php echo $url_query; ?>"><?php <a href="tbl_relation.php?<?php echo $url_query; ?>"><?php
@@ -592,7 +592,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
* links again * links again
*/ */
if ($fields_cnt > 20) { if ($fields_cnt > 20) {
require './libraries/tbl_properties_links.inc.php'; require './libraries/tbl_links.inc.php';
} // end if ($fields_cnt > 20) } // end if ($fields_cnt > 20)
echo "\n\n"; echo "\n\n";