Merge pull request #14 from roccivic/remove_php_enum_editor
Removed the PHP version of the ENUM editor
This commit is contained in:
Michal Čihař
commit
9c68a629de
@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog
|
||||
+ rfe #3507804 Session upload progress (PHP 5.4)
|
||||
+ rfe #3488185 draggable columns vs copy column name
|
||||
+ Patch #3507001 Contest-4: Textarea for large character columns
|
||||
+ Removed the PHP version of the ENUM editor
|
||||
|
||||
3.5.1.0 (not yet released)
|
||||
- bug #3510784 [edit] Limit clause ignored when sort order is remembered
|
||||
|
||||
149
enum_editor.php
149
enum_editor.php
@ -1,149 +0,0 @@
|
||||
<?php
|
||||
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* Displays a form for editing ENUM and SET values with more
|
||||
* space (as an alternative to doing it in tbl_alter.php).
|
||||
* This form is only for users with JavaScript disabled,
|
||||
* users with JavaScript enabled will see a jQuery dialog.
|
||||
*
|
||||
* @package PhpMyAdmin
|
||||
*/
|
||||
|
||||
require_once 'libraries/common.inc.php';
|
||||
require_once 'libraries/header_http.inc.php';
|
||||
require_once 'libraries/header_meta_style.inc.php';
|
||||
?>
|
||||
</head>
|
||||
<body>
|
||||
<form action="enum_editor.php" method="get">
|
||||
<?php echo PMA_generate_common_hidden_inputs(); ?>
|
||||
<input type="hidden" name="field" value="<?php echo htmlspecialchars($_GET['field']); ?>" />
|
||||
<fieldset class="enum_editor_no_js">
|
||||
<legend><?php echo __('ENUM/SET editor'); ?></legend>
|
||||
<div class="enum_editor_no_js">
|
||||
<h3>
|
||||
<?php
|
||||
if (empty($_GET['field'])) {
|
||||
echo __('Values for a new column');
|
||||
} else {
|
||||
printf(__('Values for column %s'), '"' . htmlspecialchars($_GET['field']) . '"');
|
||||
}
|
||||
?>
|
||||
</h3>
|
||||
<p><?php echo PMA_getImage('s_info.png') . __('Enter each value in a separate field'); ?></p>
|
||||
<table id="values">
|
||||
<?php
|
||||
// Get the enum values
|
||||
$values = array();
|
||||
// If the values are in an array
|
||||
if (isset($_GET['values']) && is_array($_GET['values'])) {
|
||||
// then this page was called from itself via the "Add a value", "Drop" or "Go" buttons
|
||||
$values = $_GET['values'];
|
||||
foreach ($values as $key => $value) {
|
||||
$values[$key] = htmlentities($value);
|
||||
}
|
||||
// If the values are in a string
|
||||
} elseif (isset($_GET['values']) && is_string($_GET['values'])) {
|
||||
// then this page was called via a link from some external page
|
||||
$values_string = htmlentities($_GET['values']);
|
||||
// There is a JS port of the below parser in functions.js
|
||||
// If you are fixing something here,
|
||||
// you need to also update the JS port.
|
||||
$values = array();
|
||||
$in_string = false;
|
||||
$buffer = '';
|
||||
for ($i=0; $i<strlen($values_string); $i++) {
|
||||
$curr = $values_string[$i];
|
||||
$next = $i == strlen($values_string)-1 ? '' : $values_string[$i+1];
|
||||
if (! $in_string && $curr == "'") {
|
||||
$in_string = true;
|
||||
} else if ($in_string && $curr == "\\" && $next == "\\") {
|
||||
$buffer .= "\";
|
||||
$i++;
|
||||
} else if ($in_string && $next == "'" && ($curr == "'" || $curr == "\\")) {
|
||||
$buffer .= "'";
|
||||
$i++;
|
||||
} else if ($in_string && $curr == "'") {
|
||||
$in_string = false;
|
||||
$values[] = $buffer;
|
||||
$buffer = '';
|
||||
} else if ($in_string) {
|
||||
$buffer .= $curr;
|
||||
}
|
||||
}
|
||||
if (strlen($buffer) > 0) {
|
||||
// The leftovers in the buffer are the last value (if any)
|
||||
$values[] = $buffer;
|
||||
}
|
||||
}
|
||||
// Escape double quotes
|
||||
foreach ($values as $key => $value) {
|
||||
$values[$key] = str_replace('"', ""e;", $value);
|
||||
}
|
||||
// If there are no values, maybe the user is about to make a
|
||||
// new list so we add a few for him/her to get started with.
|
||||
if (! count($values)
|
||||
|| (count($values) == 1 && strlen($values[0]) == 0)
|
||||
) {
|
||||
array_push($values, '', '', '');
|
||||
}
|
||||
// Add an empty value, if there was a request to do so
|
||||
if (! empty($_GET['add_field'])) {
|
||||
$values[] = '';
|
||||
}
|
||||
// Remove a value, given a valid index, from the list
|
||||
// of values, if there was a request to do so.
|
||||
if (isset($_GET['drop']) && is_array($_GET['drop'])) {
|
||||
foreach ($_GET['drop'] as $index => $value) {
|
||||
if ((int)$index == $index
|
||||
&& $index > 0
|
||||
&& $index <= count($values)
|
||||
) {
|
||||
unset($values[$index]);
|
||||
}
|
||||
}
|
||||
}
|
||||
// Display the values in text fields
|
||||
$field_counter = 0;
|
||||
foreach ($values as $value) {
|
||||
$field_counter++;
|
||||
echo sprintf(
|
||||
'<tr><td><input class="text" type="text" size="30" value="%s" name="values[' . $field_counter . ']" />' . "\n",
|
||||
$value
|
||||
);
|
||||
echo '</td><td>';
|
||||
echo '<input class="drop" type="submit" value="' . __('Drop') . '" name="drop[' . $field_counter . ']" />' . "\n";
|
||||
echo '</td></tr>' . "\n";
|
||||
}
|
||||
?>
|
||||
<tr><td>
|
||||
<input type="submit" class="submit" value="<?php echo __('Go'); ?>" />
|
||||
</td><td>
|
||||
<input type="submit" class="submit" name="add_field" value="<?php echo __('Add a value'); ?>" />
|
||||
</td></tr>
|
||||
</table>
|
||||
</div>
|
||||
<hr class='enum_editor_no_js' />
|
||||
<div id="enum_editor_output">
|
||||
<h3><?php echo __('Output'); ?></h3>
|
||||
<p><?php echo PMA_getImage('s_info.png') . __('Copy and paste the joined values into the "Length/Values" field'); ?></p>
|
||||
<?php
|
||||
// Escape quotes and slashes for usage with MySQL
|
||||
foreach ($values as $key => $value) {
|
||||
$values[$key] = "'";
|
||||
$values[$key] .= str_replace(
|
||||
array("'", "\\", "'", "\"),
|
||||
array("''", '\\\\', "''", '\\\\'),
|
||||
$value
|
||||
);
|
||||
$values[$key] .= "'";
|
||||
}
|
||||
// Print out the values as a string
|
||||
?>
|
||||
<textarea id="joined_values" cols="95" rows="5"><?php echo join(",", $values); ?></textarea>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
</body>
|
||||
</html>
|
||||
@ -2523,9 +2523,6 @@ $(document).ready(function() {
|
||||
.html();
|
||||
// Parse the values, escaping quotes and
|
||||
// slashes on the fly, into an array
|
||||
//
|
||||
// There is a PHP port of the below parser in enum_editor.php
|
||||
// If you are fixing something here, you need to also update the PHP port.
|
||||
var values = [];
|
||||
var in_string = false;
|
||||
var curr, next, buffer = '';
|
||||
|
||||
@ -685,8 +685,7 @@ function PMA_RTN_getParameterRow($routine = array(), $index = null, $class = '')
|
||||
$retval .= " name='item_param_length[$index]' type='text'\n";
|
||||
$retval .= " value='{$routine['item_param_length'][$i]}' />\n";
|
||||
$retval .= " <div class='enum_hint'>\n";
|
||||
$retval .= " <a class='open_enum_editor' target='_blank'\n";
|
||||
$retval .= " href='enum_editor.php?" . PMA_generate_common_url() . "&values=" . $routine['item_param_length'][$i] . "&field=" . $routine['item_param_name'][$i] . "'>\n";
|
||||
$retval .= " <a href='#' class='open_enum_editor'>\n";
|
||||
$retval .= " " . PMA_getImage('b_edit', '', array('title'=>__('ENUM/SET editor'))) . "\n";
|
||||
$retval .= " </a>\n";
|
||||
$retval .= " </div>\n";
|
||||
|
||||
@ -319,11 +319,7 @@ for ($i = 0; $i < $num_fields; $i++) {
|
||||
. ' class="textfield" />'
|
||||
. '<p class="enum_notice" id="enum_notice_' . $i . '_' . ($ci - $ci_offset) . '">';
|
||||
$content_cells[$i][$ci] .= __('ENUM or SET data too long?')
|
||||
. '<a onclick="return false;" href="enum_editor.php?'
|
||||
. PMA_generate_common_url()
|
||||
. '&values=' . urlencode($length_to_display)
|
||||
. '&field=' . (isset($row['Field']) ? urlencode($row['Field']) : "")
|
||||
. '" class="open_enum_editor" target="_blank"> '
|
||||
. '<a href="#" class="open_enum_editor"> '
|
||||
. __('Get more editing space') . '</a>'
|
||||
. '</p>';
|
||||
$ci++;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
