Adding @package, third part.

This commit is contained in:
Michal Čihař
2008-11-24 11:22:44 +00:00
parent 2f457eebbd
commit 84ae0420fe
27 changed files with 85 additions and 56 deletions

View File

@@ -4,6 +4,7 @@
* hold PMA_Theme class * hold PMA_Theme class
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**
@@ -14,6 +15,7 @@
* @todo make css optionally replacing 'parent' css or extending it (by appending at the end) * @todo make css optionally replacing 'parent' css or extending it (by appending at the end)
* @todo add an optional global css file - which will be used for both frames * @todo add an optional global css file - which will be used for both frames
* *
* @package phpMyAdmin
*/ */
class PMA_Theme { class PMA_Theme {
/** /**

View File

@@ -3,6 +3,7 @@
/** /**
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**
@@ -12,6 +13,7 @@ require_once './libraries/Theme.class.php';
/** /**
* *
* @package phpMyAdmin
*/ */
class PMA_Theme_Manager class PMA_Theme_Manager
{ {

View File

@@ -7,6 +7,7 @@
* @todo this should be recoded as functions, to avoid messing with global variables * @todo this should be recoded as functions, to avoid messing with global variables
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
if (! defined('PHPMYADMIN')) { if (! defined('PHPMYADMIN')) {
exit; exit;

View File

@@ -3,6 +3,7 @@
/** /**
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
if (! defined('PHPMYADMIN')) { if (! defined('PHPMYADMIN')) {
exit; exit;

View File

@@ -3,6 +3,7 @@
/** /**
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
if (! defined('PHPMYADMIN')) { if (! defined('PHPMYADMIN')) {
exit; exit;

View File

@@ -4,6 +4,7 @@
* Set of functions used with the relation and pdf feature * Set of functions used with the relation and pdf feature
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**

View File

@@ -4,6 +4,7 @@
* URL/hidden inputs generating. * URL/hidden inputs generating.
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**
@@ -124,7 +125,7 @@ function PMA_getHiddenFields($values, $pre = '')
if (is_array($value)) { if (is_array($value)) {
$fields .= PMA_getHiddenFields($value, $name); $fields .= PMA_getHiddenFields($value, $name);
} else { } else {
// do not generate an ending "\n" because // do not generate an ending "\n" because
// PMA_generate_common_hidden_inputs() is sometimes called // PMA_generate_common_hidden_inputs() is sometimes called
// from a JS document.write() // from a JS document.write()
$fields .= '<input type="hidden" name="' . htmlspecialchars($name) $fields .= '<input type="hidden" name="' . htmlspecialchars($name)
@@ -188,11 +189,11 @@ function PMA_getHiddenFields($values, $pre = '')
* on the resulting URL (for a normal URL displayed in HTML) * on the resulting URL (for a normal URL displayed in HTML)
* or something else to avoid using htmlspecialchars() (for * or something else to avoid using htmlspecialchars() (for
* a URL sent via a header); if not set,'html' is assumed * a URL sent via a header); if not set,'html' is assumed
* - if first param is not array: optional table name * - if first param is not array: optional table name
* *
* @param string - if first param is array: optional character to * @param string - if first param is array: optional character to
* use instead of '?' * use instead of '?'
* - if first param is not array: optional character to use * - if first param is not array: optional character to use
* instead of '&amp;' for dividing URL parameters * instead of '&amp;' for dividing URL parameters
* @return string string with URL parameters * @return string string with URL parameters
* @access public * @access public

View File

@@ -3,6 +3,7 @@
/** /**
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**
@@ -67,7 +68,7 @@ if (isset($_REQUEST['do_save_data'])) {
} }
} // end if } // end if
} // end for } // end for
// Builds the field creation statement and alters the table // Builds the field creation statement and alters the table
for ($i = 0; $i < $field_cnt; ++$i) { for ($i = 0; $i < $field_cnt; ++$i) {
// '0' is also empty for php :-( // '0' is also empty for php :-(
@@ -76,23 +77,23 @@ if (isset($_REQUEST['do_save_data'])) {
} }
$definition = ' ADD ' . PMA_Table::generateFieldSpec( $definition = ' ADD ' . PMA_Table::generateFieldSpec(
$_REQUEST['field_name'][$i], $_REQUEST['field_name'][$i],
$_REQUEST['field_type'][$i], $_REQUEST['field_type'][$i],
$_REQUEST['field_length'][$i], $_REQUEST['field_length'][$i],
$_REQUEST['field_attribute'][$i], $_REQUEST['field_attribute'][$i],
isset($_REQUEST['field_collation'][$i]) isset($_REQUEST['field_collation'][$i])
? $_REQUEST['field_collation'][$i] ? $_REQUEST['field_collation'][$i]
: '', : '',
isset($_REQUEST['field_null'][$i]) isset($_REQUEST['field_null'][$i])
? $_REQUEST['field_null'][$i] ? $_REQUEST['field_null'][$i]
: 'NOT NULL', : 'NOT NULL',
$_REQUEST['field_default_type'][$i], $_REQUEST['field_default_type'][$i],
$_REQUEST['field_default_value'][$i], $_REQUEST['field_default_value'][$i],
isset($_REQUEST['field_extra'][$i]) isset($_REQUEST['field_extra'][$i])
? $_REQUEST['field_extra'][$i] ? $_REQUEST['field_extra'][$i]
: false, : false,
isset($_REQUEST['field_comments'][$i]) isset($_REQUEST['field_comments'][$i])
? $_REQUEST['field_comments'][$i] ? $_REQUEST['field_comments'][$i]
: '', : '',
$field_primary, $field_primary,
$i $i
@@ -121,7 +122,7 @@ if (isset($_REQUEST['do_save_data'])) {
} }
$definitions[] = ' ADD PRIMARY KEY (' . implode(', ', $fields) . ') '; $definitions[] = ' ADD PRIMARY KEY (' . implode(', ', $fields) . ') ';
} }
// Builds the indexes statements and updates the table // Builds the indexes statements and updates the table
if (count($field_index)) { if (count($field_index)) {
$fields = array(); $fields = array();
@@ -130,7 +131,7 @@ if (isset($_REQUEST['do_save_data'])) {
} }
$definitions[] = ' ADD INDEX (' . implode(', ', $fields) . ') '; $definitions[] = ' ADD INDEX (' . implode(', ', $fields) . ') ';
} }
// Builds the uniques statements and updates the table // Builds the uniques statements and updates the table
if (count($field_unique)) { if (count($field_unique)) {
$fields = array(); $fields = array();
@@ -167,10 +168,10 @@ if (isset($_REQUEST['do_save_data'])) {
foreach ($_REQUEST['field_mimetype'] as $fieldindex => $mimetype) { foreach ($_REQUEST['field_mimetype'] as $fieldindex => $mimetype) {
if (isset($_REQUEST['field_name'][$fieldindex]) if (isset($_REQUEST['field_name'][$fieldindex])
&& strlen($_REQUEST['field_name'][$fieldindex])) { && strlen($_REQUEST['field_name'][$fieldindex])) {
PMA_setMIME($db, $table, PMA_setMIME($db, $table,
$_REQUEST['field_name'][$fieldindex], $_REQUEST['field_name'][$fieldindex],
$mimetype, $mimetype,
$_REQUEST['field_transformation'][$fieldindex], $_REQUEST['field_transformation'][$fieldindex],
$_REQUEST['field_transformation_options'][$fieldindex]); $_REQUEST['field_transformation_options'][$fieldindex]);
} }
} }

View File

@@ -7,6 +7,7 @@
* form and handles this form data * form and handles this form data
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**

View File

@@ -6,6 +6,7 @@
* register_globals_save (mark this file save for disabling register globals) * register_globals_save (mark this file save for disabling register globals)
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**
@@ -426,10 +427,10 @@ foreach ($rows as $row_id => $vrow) {
} else { } else {
// loic1: special binary "characters" // loic1: special binary "characters"
if ($field['is_binary'] || $field['is_blob']) { if ($field['is_binary'] || $field['is_blob']) {
$vrow[$field['Field']] = PMA_replace_binary_contents($vrow[$field['Field']]); $vrow[$field['Field']] = PMA_replace_binary_contents($vrow[$field['Field']]);
} // end if } // end if
$special_chars = htmlspecialchars($vrow[$field['Field']]); $special_chars = htmlspecialchars($vrow[$field['Field']]);
//We need to duplicate the first \n or otherwise we will lose the first newline entered in a VARCHAR or TEXT column //We need to duplicate the first \n or otherwise we will lose the first newline entered in a VARCHAR or TEXT column
$special_chars_encoded = PMA_duplicateFirstNewline($special_chars); $special_chars_encoded = PMA_duplicateFirstNewline($special_chars);
@@ -452,7 +453,7 @@ foreach ($rows as $row_id => $vrow) {
$data = $field['Default']; $data = $field['Default'];
} }
if ($field['True_Type'] == 'bit') { if ($field['True_Type'] == 'bit') {
$special_chars = PMA_printable_bit_value($field['Default'], $extracted_fieldspec['spec_in_brackets']); $special_chars = PMA_printable_bit_value($field['Default'], $extracted_fieldspec['spec_in_brackets']);
} else { } else {
$special_chars = htmlspecialchars($field['Default']); $special_chars = htmlspecialchars($field['Default']);
} }
@@ -925,7 +926,7 @@ foreach ($rows as $row_id => $vrow) {
if (!empty($bs_tables) && strlen($db) > 0) if (!empty($bs_tables) && strlen($db) > 0)
{ {
$bs_tables = $bs_tables[$db]; $bs_tables = $bs_tables[$db];
// check if reference to BLOBStreaming tables exists // check if reference to BLOBStreaming tables exists
if (isset($bs_tables)) if (isset($bs_tables))
{ {

View File

@@ -32,6 +32,7 @@
* @uses sprintf() * @uses sprintf()
* @uses htmlspecialchars() * @uses htmlspecialchars()
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**
@@ -99,7 +100,7 @@ if (isset($_REQUEST['do_save_data'])) {
} }
} // end if } // end if
} // end for } // end for
// Builds the fields creation statements // Builds the fields creation statements
for ($i = 0; $i < $field_cnt; $i++) { for ($i = 0; $i < $field_cnt; $i++) {
// '0' is also empty for php :-( // '0' is also empty for php :-(
@@ -108,25 +109,25 @@ if (isset($_REQUEST['do_save_data'])) {
} }
$query = PMA_Table::generateFieldSpec( $query = PMA_Table::generateFieldSpec(
$_REQUEST['field_name'][$i], $_REQUEST['field_name'][$i],
$_REQUEST['field_type'][$i], $_REQUEST['field_type'][$i],
$_REQUEST['field_length'][$i], $_REQUEST['field_length'][$i],
$_REQUEST['field_attribute'][$i], $_REQUEST['field_attribute'][$i],
isset($_REQUEST['field_collation'][$i]) isset($_REQUEST['field_collation'][$i])
? $_REQUEST['field_collation'][$i] ? $_REQUEST['field_collation'][$i]
: '', : '',
isset($_REQUEST['field_null'][$i]) isset($_REQUEST['field_null'][$i])
? $_REQUEST['field_null'][$i] ? $_REQUEST['field_null'][$i]
: 'NOT NULL', : 'NOT NULL',
$_REQUEST['field_default_type'][$i], $_REQUEST['field_default_type'][$i],
$_REQUEST['field_default_value'][$i], $_REQUEST['field_default_value'][$i],
isset($_REQUEST['field_extra'][$i]) isset($_REQUEST['field_extra'][$i])
? $_REQUEST['field_extra'][$i] ? $_REQUEST['field_extra'][$i]
: false, : false,
isset($_REQUEST['field_comments'][$i]) isset($_REQUEST['field_comments'][$i])
? $_REQUEST['field_comments'][$i] ? $_REQUEST['field_comments'][$i]
: '', : '',
$field_primary, $field_primary,
$i); $i);
$query .= ', '; $query .= ', ';

View File

@@ -3,6 +3,7 @@
/** /**
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**

View File

@@ -3,6 +3,7 @@
/** /**
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**

View File

@@ -4,6 +4,7 @@
* Displays index edit/creation form and handles it * Displays index edit/creation form and handles it
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**
@@ -44,7 +45,7 @@ if (isset($_REQUEST['index'])) {
*/ */
if (isset($_REQUEST['do_save_data'])) { if (isset($_REQUEST['do_save_data'])) {
$error = false; $error = false;
// $sql_query is the one displayed in the query box // $sql_query is the one displayed in the query box
$sql_query = 'ALTER TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table); $sql_query = 'ALTER TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table);
@@ -77,7 +78,7 @@ if (isset($_REQUEST['do_save_data'])) {
. ($index->getName() ? PMA_backquote($index->getName()) : ''); . ($index->getName() ? PMA_backquote($index->getName()) : '');
break; break;
} // end switch } // end switch
$index_fields = array(); $index_fields = array();
foreach ($index->getColumns() as $key => $column) { foreach ($index->getColumns() as $key => $column) {
$index_fields[$key] = PMA_backquote($column->getName()); $index_fields[$key] = PMA_backquote($column->getName());
@@ -85,18 +86,18 @@ if (isset($_REQUEST['do_save_data'])) {
$index_fields[$key] .= '(' . $column->getSubPart() . ')'; $index_fields[$key] .= '(' . $column->getSubPart() . ')';
} }
} // end while } // end while
if (empty($index_fields)){ if (empty($index_fields)){
$error = PMA_Message::error('strNoIndexPartsDefined'); $error = PMA_Message::error('strNoIndexPartsDefined');
} else { } else {
$sql_query .= ' (' . implode(', ', $index_fields) . ')'; $sql_query .= ' (' . implode(', ', $index_fields) . ')';
} }
if (! $error) { if (! $error) {
PMA_DBI_query($sql_query); PMA_DBI_query($sql_query);
$message = PMA_Message::success('strTableAlteredSuccessfully'); $message = PMA_Message::success('strTableAlteredSuccessfully');
$message->addParam($table); $message->addParam($table);
$active_page = 'tbl_structure.php'; $active_page = 'tbl_structure.php';
require './tbl_structure.php'; require './tbl_structure.php';
exit; exit;
@@ -119,7 +120,7 @@ require_once './libraries/tbl_links.inc.php';
if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) { if (isset($_REQUEST['index']) && is_array($_REQUEST['index'])) {
// coming already from form // coming already from form
$add_fields = $add_fields =
count($_REQUEST['index']['columns']['names']) - $index->getColumnCount(); count($_REQUEST['index']['columns']['names']) - $index->getColumnCount();
if (isset($_REQUEST['add_fields'])) { if (isset($_REQUEST['add_fields'])) {
$add_fields += $_REQUEST['added_fields']; $add_fields += $_REQUEST['added_fields'];
@@ -155,8 +156,8 @@ echo PMA_generate_common_hidden_inputs($form_params);
<fieldset> <fieldset>
<legend> <legend>
<?php <?php
echo (isset($_REQUEST['create_index']) echo (isset($_REQUEST['create_index'])
? $strCreateIndexTopic ? $strCreateIndexTopic
: $strModifyIndexTopic); : $strModifyIndexTopic);
?> ?>
</legend> </legend>
@@ -201,7 +202,7 @@ foreach ($index->getColumns() as $column) {
|| preg_match('/(char|text)/i', $field_type)) { || preg_match('/(char|text)/i', $field_type)) {
echo '<option value="' . htmlspecialchars($field_name) . '"' echo '<option value="' . htmlspecialchars($field_name) . '"'
. (($field_name == $column->getName()) ? ' selected="selected"' : '') . '>' . (($field_name == $column->getName()) ? ' selected="selected"' : '') . '>'
. htmlspecialchars($field_name) . ' [' . $field_type . ']' . htmlspecialchars($field_name) . ' [' . $field_type . ']'
. '</option>' . "\n"; . '</option>' . "\n";
} }
} // end foreach $fields } // end foreach $fields
@@ -223,7 +224,7 @@ for ($i = 0; $i < $add_fields; $i++) {
<?php <?php
foreach ($fields as $field_name => $field_type) { foreach ($fields as $field_name => $field_type) {
echo '<option value="' . htmlspecialchars($field_name) . '">' echo '<option value="' . htmlspecialchars($field_name) . '">'
. htmlspecialchars($field_name) . ' [' . $field_type . ']' . htmlspecialchars($field_name) . ' [' . $field_type . ']'
. '</option>' . "\n"; . '</option>' . "\n";
} // end foreach $fields } // end foreach $fields
?> ?>

View File

@@ -3,6 +3,7 @@
/** /**
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**
@@ -28,8 +29,8 @@ PMA_DBI_select_db($db);
$goto = $cfg['DefaultTabTable']; $goto = $cfg['DefaultTabTable'];
/** /**
* $_REQUEST['target_db'] could be empty in case we came from an input field * $_REQUEST['target_db'] could be empty in case we came from an input field
* (when there are many databases, no drop-down) * (when there are many databases, no drop-down)
*/ */
if (empty($_REQUEST['target_db'])) { if (empty($_REQUEST['target_db'])) {

View File

@@ -3,6 +3,7 @@
/** /**
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**
@@ -190,7 +191,7 @@ unset($reread_info);
require_once './libraries/tbl_links.inc.php'; require_once './libraries/tbl_links.inc.php';
if (isset($result)) { if (isset($result)) {
// set to success by default, because result set could be empty // set to success by default, because result set could be empty
// (for example, a table rename) // (for example, a table rename)
$_type = 'success'; $_type = 'success';
if (empty($_message)) { if (empty($_message)) {
@@ -701,13 +702,13 @@ if ($cfgRelation['relwork'] && ! $is_innodb) {
require_once './libraries/footer.inc.php'; require_once './libraries/footer.inc.php';
function PMA_set_global_variables_for_engine($tbl_type) function PMA_set_global_variables_for_engine($tbl_type)
{ {
global $is_myisam_or_maria, $is_innodb, $is_isam, $is_berkeleydb, $is_maria, $is_pbxt; global $is_myisam_or_maria, $is_innodb, $is_isam, $is_berkeleydb, $is_maria, $is_pbxt;
$is_myisam_or_maria = $is_isam = $is_innodb = $is_berkeleydb = $is_maria = $is_pbxt = false; $is_myisam_or_maria = $is_isam = $is_innodb = $is_berkeleydb = $is_maria = $is_pbxt = false;
$upper_tbl_type = strtoupper($tbl_type); $upper_tbl_type = strtoupper($tbl_type);
//Options that apply to MYISAM usually apply to MARIA //Options that apply to MYISAM usually apply to MARIA
$is_myisam_or_maria = ($upper_tbl_type == 'MYISAM' || $upper_tbl_type == 'MARIA'); $is_myisam_or_maria = ($upper_tbl_type == 'MYISAM' || $upper_tbl_type == 'MARIA');
$is_maria = ($upper_tbl_type == 'MARIA'); $is_maria = ($upper_tbl_type == 'MARIA');

View File

@@ -3,6 +3,7 @@
/** /**
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**

View File

@@ -11,6 +11,7 @@
* @todo add an link to create an index required for constraints, or an option to do automatically * @todo add an link to create an index required for constraints, or an option to do automatically
* @todo if above todos are fullfilled we can add all fields meet requirements in the select dropdown * @todo if above todos are fullfilled we can add all fields meet requirements in the select dropdown
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**
@@ -304,7 +305,7 @@ echo PMA_generate_common_hidden_inputs($db, $table);
if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_type)) { if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_type)) {
// To choose relations we first need all tables names in current db // To choose relations we first need all tables names in current db
// and if the main table supports foreign keys // and if the main table supports foreign keys
// we use SHOW TABLE STATUS because we need to find other tables of the // we use SHOW TABLE STATUS because we need to find other tables of the
// same engine. // same engine.

View File

@@ -36,6 +36,7 @@
* @uses $GLOBALS['goto'] * @uses $GLOBALS['goto']
* @uses $GLOBALS['sql_query'] * @uses $GLOBALS['sql_query']
* @uses PMA_File::getRecentBLOBReference() * @uses PMA_File::getRecentBLOBReference()
* @package phpMyAdmin
*/ */
/** /**

View File

@@ -4,6 +4,7 @@
* handle row specifc actions like edit, delete, export * handle row specifc actions like edit, delete, export
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */

View File

@@ -8,6 +8,7 @@
* *
* @todo display search form again if no results from previous search * @todo display search form again if no results from previous search
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**

View File

@@ -3,6 +3,7 @@
/** /**
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**

View File

@@ -4,6 +4,7 @@
* Displays table structure infos like fields/columns, indexes, size, rows * Displays table structure infos like fields/columns, indexes, size, rows
* and allows manipulation of indexes and columns/fields * and allows manipulation of indexes and columns/fields
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**
@@ -213,8 +214,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
$type = $row['Type']; $type = $row['Type'];
$extracted_fieldspec = PMA_extractFieldSpec($row['Type']); $extracted_fieldspec = PMA_extractFieldSpec($row['Type']);
if ('set' == $extracted_fieldspec['type'] || 'enum' == $extracted_fieldspec['type']) { if ('set' == $extracted_fieldspec['type'] || 'enum' == $extracted_fieldspec['type']) {
$type = $extracted_fieldspec['type'] . '(' . $extracted_fieldspec['spec_in_brackets'] . ')'; $type = $extracted_fieldspec['type'] . '(' . $extracted_fieldspec['spec_in_brackets'] . ')';
// for the case ENUM('&#8211;','&ldquo;') // for the case ENUM('&#8211;','&ldquo;')
$type = htmlspecialchars($type); $type = htmlspecialchars($type);
@@ -334,11 +335,11 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
<td nowrap="nowrap" style="font-size: 70%"><?php echo $attribute; ?></td> <td nowrap="nowrap" style="font-size: 70%"><?php echo $attribute; ?></td>
<td><?php echo (($row['Null'] == 'YES') ? $strYes : $strNo); ?></td> <td><?php echo (($row['Null'] == 'YES') ? $strYes : $strNo); ?></td>
<td nowrap="nowrap"><?php <td nowrap="nowrap"><?php
if (isset($row['Default'])) { if (isset($row['Default'])) {
if ($extracted_fieldspec['type'] == 'bit') { if ($extracted_fieldspec['type'] == 'bit') {
echo PMA_printable_bit_value($row['Default'], $extracted_fieldspec['spec_in_brackets']); echo PMA_printable_bit_value($row['Default'], $extracted_fieldspec['spec_in_brackets']);
} else { } else {
echo $row['Default']; echo $row['Default'];
} }
} }
else { else {
@@ -481,7 +482,7 @@ echo $strPrintView;
<?php <?php
if (! $tbl_is_view && ! $db_is_information_schema) { if (! $tbl_is_view && ! $db_is_information_schema) {
// if internal relations are available, or foreign keys are supported // if internal relations are available, or foreign keys are supported
// ($tbl_type comes from libraries/tbl_info.inc.php) // ($tbl_type comes from libraries/tbl_info.inc.php)
if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_type)) { if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_type)) {
?> ?>
@@ -527,7 +528,7 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
$choices = array( $choices = array(
'last' => $strAtEndOfTable, 'last' => $strAtEndOfTable,
'first' => $strAtBeginningOfTable, 'first' => $strAtBeginningOfTable,
'after' => sprintf($strAfter, $fieldOptions) 'after' => sprintf($strAfter, $fieldOptions)
); );
PMA_generate_html_radio('field_where', $choices, 'last', false, false); PMA_generate_html_radio('field_where', $choices, 'last', false, false);
unset($fieldOptions, $choices); unset($fieldOptions, $choices);

View File

@@ -3,6 +3,7 @@
/** /**
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**

View File

@@ -3,6 +3,7 @@
/** /**
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**

View File

@@ -3,6 +3,7 @@
/** /**
* *
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**

View File

@@ -26,6 +26,7 @@
* @uses PMA_showMessage() * @uses PMA_showMessage()
* @uses define() * @uses define()
* @version $Id$ * @version $Id$
* @package phpMyAdmin
*/ */
/** /**