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

fixed notice;

Browse Source 
make use of PMA_getIcon();
changed some processing orders;
minor tweaks, fixes, docs;
This commit is contained in:
Sebastian Mendel
2007-10-02 08:18:21 +00:00
parent f648662d2a
commit a73ffff4c8
2 changed files with 71 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
libraries/mult_submits.inc.php
View File

@@ -117,14 +117,18 @@ if (! empty($submit_mult)
if (!empty($submit_mult) && !empty($what)) { if (!empty($submit_mult) && !empty($what)) {
$js_to_run = 'functions.js'; $js_to_run = 'functions.js';
unset($message); unset($message);
require_once './libraries/header.inc.php';
if (strlen($table)) { if (strlen($table)) {
require './libraries/tbl_common.php'; require './libraries/tbl_common.php';
$url_query .= '&goto=tbl_sql.php&back=tbl_sql.php'; $url_query .= '&goto=tbl_sql.php&back=tbl_sql.php';
require './libraries/tbl_info.inc.php'; require './libraries/tbl_info.inc.php';
require_once './libraries/tbl_links.inc.php';
} elseif (strlen($db)) { } elseif (strlen($db)) {
require './libraries/db_common.inc.php'; require './libraries/db_common.inc.php';
require './libraries/db_info.inc.php'; require './libraries/db_info.inc.php';
} }
// Builds the query // Builds the query
$full_query = ''; $full_query = '';
if ($what == 'drop_tbl') { if ($what == 'drop_tbl') {
@@ -214,36 +218,34 @@ if (!empty($submit_mult) && !empty($what)) {
unset($full_query_views); unset($full_query_views);
} }
// Displays the form // Displays the confirmation form
?> $_url_params = array(
<!-- Do it really ? --> 'query_type' => $what,
<form action="<?php echo $action; ?>" method="post"> 'reload' => (isset($reload) ? PMA_sanitize($reload) : 0),
<input type="hidden" name="query_type" value="<?php echo $what; ?>" /> );
<?php
if (strpos(' ' . $action, 'db_') == 1) { if (strpos(' ' . $action, 'db_') == 1) {
echo PMA_generate_common_hidden_inputs($db); $_url_params['db']= $db;
} elseif (strpos(' ' . $action, 'tbl_') == 1 } elseif (strpos(' ' . $action, 'tbl_') == 1 || $what == 'row_delete') {
|| $what == 'row_delete') { $_url_params['db']= $db;
echo PMA_generate_common_hidden_inputs($db, $table); $_url_params['table']= $table;
} else {
echo PMA_generate_common_hidden_inputs();
} }
?>
<input type="hidden" name="reload" value="<?php echo isset($reload) ? PMA_sanitize($reload) : 0; ?>" />
<?php
foreach ($selected as $idx => $sval) { foreach ($selected as $idx => $sval) {
echo '<input type="hidden" name="selected[]" value="' . htmlspecialchars($sval) . '" />' . "\n"; $_url_params['selected'][] = $sval;
} }
if ($what == 'drop_tbl' && !empty($views)) { if ($what == 'drop_tbl' && !empty($views)) {
foreach ($views as $current) { foreach ($views as $current) {
echo '<input type="hidden" name="views[]" value="' . htmlspecialchars($current) . '" />' . "\n"; $_url_params['views'][] = $current;
} }
} }
if ($what == 'row_delete') { if ($what == 'row_delete') {
echo '<input type="hidden" name="original_sql_query" value="' . htmlspecialchars($original_sql_query) . '" />' . "\n"; $_url_params['original_sql_query'] = $original_sql_query;
echo '<input type="hidden" name="original_url_query" value="' . htmlspecialchars($original_url_query) . '" />' . "\n"; $_url_params['original_url_query'] = $original_url_query;
} }
?> ?>
<form action="<?php echo $action; ?>" method="post">
<?php
echo PMA_generate_common_hidden_inputs($_url_params);
?>
<fieldset class="confirmation"> <fieldset class="confirmation">
<legend><?php echo ($what == 'drop_db' ? $strDropDatabaseStrongWarning . '&nbsp;' : '') . $strDoYouReally; ?>:</legend> <legend><?php echo ($what == 'drop_db' ? $strDropDatabaseStrongWarning . '&nbsp;' : '') . $strDoYouReally; ?>:</legend>
<tt><?php echo $full_query; ?></tt> <tt><?php echo $full_query; ?></tt>
@@ -258,7 +260,7 @@ if (!empty($submit_mult) && !empty($what)) {
/** /**
* Executes the query * Executes the query - dropping rows, columns/fields, tables or dbs
*/ */
elseif ($mult_btn == $strYes) { elseif ($mult_btn == $strYes) {

154
tbl_structure.php
View File

@@ -1,7 +1,8 @@
<?php <?php
/* vim: set expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* * Displays table structure infos like fields/columns, indexes, size, rows
* and allows manipulation of indexes and columns/fields
* @version $Id$ * @version $Id$
*/ */
@@ -13,35 +14,37 @@ require_once './libraries/mysql_charsets.lib.php';
require_once './libraries/relation.lib.php'; require_once './libraries/relation.lib.php';
/** /**
* Gets the relation settings * handle mutliple field commands if required
*
* submit_mult_*_x comes from IE if <input type="img" ...> is used
*/ */
$cfgRelation = PMA_getRelationsParam(); if (isset($_REQUEST['submit_mult_change_x'])) {
/**
* Drop multiple fields if required
*/
// workaround for IE problem:
if (isset($submit_mult_change_x)) {
$submit_mult = $strChange; $submit_mult = $strChange;
} elseif (isset($submit_mult_drop_x)) { } elseif (isset($_REQUEST['submit_mult_drop_x'])) {
$submit_mult = $strDrop; $submit_mult = $strDrop;
} elseif (isset($submit_mult_primary_x)) { } elseif (isset($_REQUEST['submit_mult_primary_x'])) {
$submit_mult = $strPrimary; $submit_mult = $strPrimary;
} elseif (isset($submit_mult_index_x)) { } elseif (isset($_REQUEST['submit_mult_index_x'])) {
$submit_mult = $strIndex; $submit_mult = $strIndex;
} elseif (isset($submit_mult_unique_x)) { } elseif (isset($_REQUEST['submit_mult_unique_x'])) {
$submit_mult = $strUnique; $submit_mult = $strUnique;
} elseif (isset($submit_mult_fulltext_x)) { } elseif (isset($_REQUEST['submit_mult_fulltext_x'])) {
$submit_mult = $strIdxFulltext; $submit_mult = $strIdxFulltext;
} elseif (isset($submit_mult_browse_x)) { } elseif (isset($_REQUEST['submit_mult_browse_x'])) {
$submit_mult = $strBrowse; $submit_mult = $strBrowse;
} elseif (isset($_REQUEST['submit_mult'])) {
$submit_mult = $_REQUEST['submit_mult'];
} elseif (isset($_REQUEST['mult_btn']) && $_REQUEST['mult_btn'] == $strYes) {
$submit_mult = 'row_delete';
if (isset($_REQUEST['selected'])) {
$_REQUEST['selected_fld'] = $_REQUEST['selected'];
}
} }
if ((!empty($submit_mult) && isset($selected_fld)) || isset($mult_btn)) { if (! empty($submit_mult) && isset($_REQUEST['selected_fld'])) {
$err_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table); $err_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table);
if ($submit_mult == $strBrowse) { if ($submit_mult == $strBrowse) {
// browsing the table displaying only selected fields/columns
$GLOBALS['active_page'] = 'sql.php'; $GLOBALS['active_page'] = 'sql.php';
$sql_query = ''; $sql_query = '';
foreach ($_REQUEST['selected_fld'] as $idx => $sval) { foreach ($_REQUEST['selected_fld'] as $idx => $sval) {
@@ -54,17 +57,26 @@ if ((!empty($submit_mult) && isset($selected_fld)) || isset($mult_btn)) {
// what is this htmlspecialchars() for?? // what is this htmlspecialchars() for??
//$sql_query .= ' FROM ' . PMA_backquote(htmlspecialchars($table)); //$sql_query .= ' FROM ' . PMA_backquote(htmlspecialchars($table));
$sql_query .= ' FROM ' . PMA_backquote($table); $sql_query .= ' FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table);
require './sql.php'; require './sql.php';
exit;
} else { } else {
// handle multiple field commands
// handle confirmation of deleting multiple fields/columns
$action = 'tbl_structure.php'; $action = 'tbl_structure.php';
require_once './libraries/header.inc.php';
require_once './libraries/tbl_links.inc.php';
require './libraries/mult_submits.inc.php'; require './libraries/mult_submits.inc.php';
//require_once './libraries/header.inc.php';
//require_once './libraries/tbl_links.inc.php';
$message = $strSuccess;
} }
exit;
} }
/**
* Gets the relation settings
*/
$cfgRelation = PMA_getRelationsParam();
/** /**
* Runs common work * Runs common work
*/ */
@@ -75,26 +87,19 @@ $url_query .= '&amp;goto=tbl_structure.php&amp;back=tbl_structure.php';
* Prepares the table structure display * Prepares the table structure display
*/ */
/** /**
* Gets tables informations * Gets tables informations
*/ */
require_once './libraries/tbl_info.inc.php'; require_once './libraries/tbl_info.inc.php';
/**
* Show result of multi submit operation
*/
if ((!empty($submit_mult) && isset($selected_fld))
|| isset($mult_btn)) {
$message = $strSuccess;
}
/** /**
* Displays top menu links * Displays top menu links
*/ */
require_once './libraries/tbl_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($db) . '.' . PMA_backquote($table) . ';');
$primary = ''; $primary = '';
$ret_keys = array(); $ret_keys = array();
$pk_array = array(); // will be use to emphasis prim. keys in the table view $pk_array = array(); // will be use to emphasis prim. keys in the table view
@@ -133,79 +138,18 @@ $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($show_create_table));
*/ */
// action titles (image or string) // action titles (image or string)
$titles = array(); $titles = array();
if ($cfg['PropertiesIconic'] == true) { $titles['Change'] = PMA_getIcon('b_edit.png', $strChange, true);
if ($cfg['PropertiesIconic'] === 'both') { $titles['Drop'] = PMA_getIcon('b_drop.png', $strDrop, true);
$iconic_spacer = '<div class="nowrap">'; $titles['NoDrop'] = PMA_getIcon('b_drop.png', $strDrop, true);
} else { $titles['Primary'] = PMA_getIcon('b_primary.png', $strPrimary, true);
$iconic_spacer = ''; $titles['Index'] = PMA_getIcon('b_index.png', $strIndex, true);
} $titles['Unique'] = PMA_getIcon('b_unique.png', $strUnique, true);
$titles['IdxFulltext'] = PMA_getIcon('b_ftext.png', $strIdxFulltext, true);
// images replaced 2004-05-08 by mkkeck $titles['NoPrimary'] = PMA_getIcon('bd_primary.png', $strPrimary, true);
$titles['Change'] = $iconic_spacer $titles['NoIndex'] = PMA_getIcon('bd_index.png', $strIndex, true);
. '<img class="icon" width="16" height="16" src="' . $pmaThemeImage $titles['NoUnique'] = PMA_getIcon('bd_unique.png', $strUnique, true);
. 'b_edit.png" alt="' . $strChange . '" title="' . $strChange . '" />'; $titles['NoIdxFulltext'] = PMA_getIcon('bd_ftext.png', $strIdxFulltext, true);
$titles['Drop'] = $iconic_spacer $titles['BrowseDistinctValues'] = PMA_getIcon('b_browse.png', $strBrowseDistinctValues, true);
. '<img class="icon" width="16" height="16" src="' . $pmaThemeImage
. 'b_drop.png" alt="' . $strDrop . '" title="' . $strDrop . '" />';
$titles['NoDrop'] = $iconic_spacer
. '<img class="icon" width="16" height="16" src="' . $pmaThemeImage
. 'b_drop.png" alt="' . $strDrop . '" title="' . $strDrop . '" />';
$titles['Primary'] = $iconic_spacer
. '<img class="icon" width="16" height="16" src="' . $pmaThemeImage
. 'b_primary.png" alt="' . $strPrimary . '" title="' . $strPrimary . '" />';
$titles['Index'] = $iconic_spacer
. '<img class="icon" width="16" height="16" src="' . $pmaThemeImage
. 'b_index.png" alt="' . $strIndex . '" title="' . $strIndex . '" />';
$titles['Unique'] = $iconic_spacer
. '<img class="icon" width="16" height="16" src="' . $pmaThemeImage
. 'b_unique.png" alt="' . $strUnique . '" title="' . $strUnique . '" />';
$titles['IdxFulltext'] = $iconic_spacer
. '<img class="icon" width="16" height="16" src="' . $pmaThemeImage
. 'b_ftext.png" alt="' . $strIdxFulltext . '" title="' . $strIdxFulltext . '" />';
$titles['NoPrimary'] = $iconic_spacer
. '<img class="icon" width="16" height="16" src="' . $pmaThemeImage
. 'bd_primary.png" alt="' . $strPrimary . '" title="' . $strPrimary . '" />';
$titles['NoIndex'] = $iconic_spacer
. '<img class="icon" width="16" height="16" src="' . $pmaThemeImage
. 'bd_index.png" alt="' . $strIndex . '" title="' . $strIndex . '" />';
$titles['NoUnique'] = $iconic_spacer
. '<img class="icon" width="16" height="16" src="' . $pmaThemeImage
. 'bd_unique.png" alt="' . $strUnique . '" title="' . $strUnique . '" />';
$titles['NoIdxFulltext'] = $iconic_spacer
. '<img class="icon" width="16" height="16" src="' . $pmaThemeImage
. 'bd_ftext.png" alt="' . $strIdxFulltext . '" title="' . $strIdxFulltext . '" />';
$titles['BrowseDistinctValues'] = $iconic_spacer
. '<img class="icon" width="16" height="16" src="' . $pmaThemeImage
. 'b_browse.png" alt="' . $strBrowseDistinctValues . '" title="' . $strBrowseDistinctValues . '" />';
if ($cfg['PropertiesIconic'] === 'both') {
$titles['Change'] .= $strChange . '</div>';
$titles['Drop'] .= $strDrop . '</div>';
$titles['NoDrop'] .= $strDrop . '</div>';
$titles['Primary'] .= $strPrimary . '</div>';
$titles['Index'] .= $strIndex . '</div>';
$titles['Unique'] .= $strUnique . '</div>';
$titles['IdxFulltext' ] .= $strIdxFulltext . '</div>';
$titles['NoPrimary'] .= $strPrimary . '</div>';
$titles['NoIndex'] .= $strIndex . '</div>';
$titles['NoUnique'] .= $strUnique . '</div>';
$titles['NoIdxFulltext'] .= $strIdxFulltext . '</div>';
$titles['BrowseDistinctValues'] .= $strBrowseDistinctValues . '</div>';
}
} else {
$titles['Change'] = $strChange;
$titles['Drop'] = $strDrop;
$titles['NoDrop'] = $strDrop;
$titles['Primary'] = $strPrimary;
$titles['Index'] = $strIndex;
$titles['Unique'] = $strUnique;
$titles['IdxFulltext'] = $strIdxFulltext;
$titles['NoPrimary'] = $strPrimary;
$titles['NoIndex'] = $strIndex;
$titles['NoUnique'] = $strUnique;
$titles['NoIdxFulltext'] = $strIdxFulltext;
$titles['BrowseDistinctValues'] = $strBrowseDistinctValues;
}
/** /**
* Displays the table structure ('show table' works correct since 3.23.03) * Displays the table structure ('show table' works correct since 3.23.03)
@@ -249,7 +193,7 @@ if ($GLOBALS['cfg']['ShowPropertyComments']) {
require_once './libraries/relation.lib.php'; require_once './libraries/relation.lib.php';
require_once './libraries/transformations.lib.php'; require_once './libraries/transformations.lib.php';
$cfgRelation = PMA_getRelationsParam(); //$cfgRelation = PMA_getRelationsParam();
if ($cfgRelation['commwork'] || PMA_MYSQL_INT_VERSION >= 40100) { if ($cfgRelation['commwork'] || PMA_MYSQL_INT_VERSION >= 40100) {
$comments_map = PMA_getComments($db, $table); $comments_map = PMA_getComments($db, $table);