'; - $message .= sprintf(_ngettext('%d row affected by the last statement inside the procedure', '%d rows affected by the last statement inside the procedure', $affected), $affected); - } - $message = PMA_message::success($message); - // Pass the SQL queries through the "pretty printer" - $output = '
';
- $output .= PMA_SQP_formatHtml(PMA_SQP_parse(implode($queries)));
- $output .= '';
- // Display results
- if ($result) {
- $output .= "";
- } else {
- $notice = __('MySQL returned an empty result set (i.e. zero rows).');
- $output .= PMA_message::notice($notice)->getDisplay();
- }
- } else {
- $output = '';
- $message = PMA_message::error(sprintf(__('The following query has failed: "%s"'), $query) . '' - . __('MySQL said: ') . PMA_DBI_getError(null)); - } - // Print/send output - if ($GLOBALS['is_ajax_request']) { - $extra_data = array('dialog' => false); - PMA_ajaxResponse($message->getDisplay() . $output, $message->isSuccess(), $extra_data); - } else { - echo $message->getDisplay() . $output; - if ($message->isError()) { - // At least one query has failed, so shouldn't - // execute any more queries, so we quit. - exit; - } - unset($_POST); - // Now deliberately fall through to displaying the routines list - } - } else { - $message = __('Error in processing request') . ' : ' - . sprintf(__('No routine with name %1$s found in database %2$s'), - htmlspecialchars(PMA_backquote($_REQUEST['routine_name'])), - htmlspecialchars(PMA_backquote($db))); - $message = PMA_message::error($message); - if ($GLOBALS['is_ajax_request']) { - PMA_ajaxResponse($message, $message->isSuccess()); - } else { - echo $message->getDisplay(); - unset($_POST); - } - } -} else if (! empty($_GET['execute_dialog']) && ! empty($_GET['routine_name'])) { - /** - * Display the execute form for a routine. - */ - $routine = PMA_RTN_getRoutineDataFromName($db, $_GET['routine_name'], false); - if ($routine !== false) { - $form = PMA_RTN_getExecuteForm($routine, $GLOBALS['is_ajax_request']); - if ($GLOBALS['is_ajax_request'] == true) { - $extra_data = array(); - $extra_data['dialog'] = true; - $extra_data['title'] = __("Execute routine") . " "; - $extra_data['title'] .= PMA_backquote(htmlentities($_GET['routine_name'], ENT_QUOTES)); - PMA_ajaxResponse($form, true, $extra_data); - } else { - echo "\n\n
" . __("Execute routine") . "
\n\n"; - echo $form; - require './libraries/footer.inc.php'; - // exit; - } - } else if (($GLOBALS['is_ajax_request'] == true)) { - $message = __('Error in processing request') . ' : ' - . sprintf(__('No routine with name %1$s found in database %2$s'), - htmlspecialchars(PMA_backquote($_REQUEST['routine_name'])), - htmlspecialchars(PMA_backquote($db))); - $message = PMA_message::error($message); - PMA_ajaxResponse($message, false); - } -} else if (! empty($_GET['exportroutine']) && ! empty($_GET['routine_name'])) { - /** - * Display the export for a routine. - */ - $routine_name = htmlspecialchars(PMA_backquote($_GET['routine_name'])); - $routine_type = PMA_DBI_fetch_value("SELECT ROUTINE_TYPE " - . "FROM INFORMATION_SCHEMA.ROUTINES " - . "WHERE ROUTINE_SCHEMA='" . PMA_sqlAddSlashes($db) . "' " - . "AND SPECIFIC_NAME='" . PMA_sqlAddSlashes($_GET['routine_name']) . "';"); - if (! empty($routine_type) && $create_proc = PMA_DBI_get_definition($db, $routine_type, $_GET['routine_name'])) { - $create_proc = ''; - if ($GLOBALS['is_ajax_request']) { - $extra_data = array('title' => sprintf(__('Export of routine %s'), $routine_name)); - PMA_ajaxResponse($create_proc, true, $extra_data); - } else { - echo ''; - } - } else { - $response = __('Error in processing request') . ' : ' - . sprintf(__('No routine with name %1$s found in database %2$s'), - $routine_name, htmlspecialchars(PMA_backquote($db))); - $response = PMA_message::error($response); - if ($GLOBALS['is_ajax_request']) { - PMA_ajaxResponse($response, false); - } else { - $response->display(); - } - } -} else if (! empty($_REQUEST['routine_process_addroutine']) || ! empty($_REQUEST['routine_process_editroutine'])) { - /** - * Handle a request to create/edit a routine - */ - $sql_query = ''; - $routine_query = PMA_RTN_getQueryFromRequest(); - if (! count($routine_errors)) { // set by PMA_RTN_getQueryFromRequest() - // Execute the created query - if (! empty($_REQUEST['routine_process_editroutine'])) { - if (! in_array($_REQUEST['routine_original_type'], array('PROCEDURE', 'FUNCTION'))) { - $routine_errors[] = sprintf(__('Invalid routine type: "%s"'), htmlspecialchars($_REQUEST['routine_original_type'])); - } else { - // Backup the old routine, in case something goes wrong - $create_routine = PMA_DBI_get_definition($db, $_REQUEST['routine_original_type'], $_REQUEST['routine_original_name']); - $drop_routine = "DROP {$_REQUEST['routine_original_type']} " . PMA_backquote($_REQUEST['routine_original_name']) . ";\n"; - $result = PMA_DBI_try_query($drop_routine); - if (! $result) { - $routine_errors[] = sprintf(__('The following query has failed: "%s"'), $drop_routine) . '' - . __('MySQL said: ') . PMA_DBI_getError(null); - } else { - $result = PMA_DBI_try_query($routine_query); - if (! $result) { - $routine_errors[] = sprintf(__('The following query has failed: "%s"'), $routine_query) . '
' - . __('MySQL said: ') . PMA_DBI_getError(null); - // We dropped the old routine, but were unable to create the new one - // Try to restore the backup query - $result = PMA_DBI_try_query($create_routine); - if (! $result) { - // OMG, this is really bad! We dropped the query, failed to create a new one - // and now even the backup query does not execute! - // This should not happen, but we better handle this just in case. - $routine_errors[] = __('Sorry, we failed to restore the dropped routine.') . '
' - . __('The backed up query was:') . "\"$create_routine\"" . '
' - . __('MySQL said: ') . PMA_DBI_getError(null); - } - } else { - $message = PMA_Message::success(__('Routine %1$s has been modified.')); - $message->addParam(PMA_backquote($_REQUEST['routine_name'])); - $sql_query = $drop_routine . $routine_query; - } - } - } - } else { - // 'Add a new routine' mode - $result = PMA_DBI_try_query($routine_query); - if (! $result) { - $routine_errors[] = sprintf(__('The following query has failed: "%s"'), $routine_query) . '
' - . __('MySQL said: ') . PMA_DBI_getError(null); - } else { - $message = PMA_Message::success(__('Routine %1$s has been created.')); - $message->addParam(PMA_backquote($_REQUEST['routine_name'])); - $sql_query = $routine_query; - } - } - } - - if (count($routine_errors)) { - $message = PMA_Message::error(__('One or more errors have occured while processing your request:')); - $message->addString('
- ');
- foreach ($routine_errors as $num => $string) {
- $message->addString('
- ' . $string . ' '); - } - $message->addString('
$title
\n\n$editor"; - require './libraries/footer.inc.php'; - // exit; - } else { - $message = __('Error in processing request') . ' : ' - . sprintf(__('No routine with name %1$s found in database %2$s'), - htmlspecialchars(PMA_backquote($_REQUEST['routine_name'])), - htmlspecialchars(PMA_backquote($db))); - $message = PMA_message::error($message); - if ($GLOBALS['is_ajax_request']) { - PMA_ajaxResponse($message, false); - } else { - $message->display(); - } - } -} - -/** - * Display a list of available routines - */ -echo PMA_RTN_getRoutinesList(); - -/** - * Display the form for adding a new routine, if the user has the privileges. - */ -echo PMA_RTN_getAddRoutineLink(); - -/** - * Display a warning for users with PHP's old "mysql" extension. - */ -if ($GLOBALS['cfg']['Server']['extension'] === 'mysql') { - trigger_error(__('You are using PHP\'s deprecated \'mysql\' extension, ' - . 'which is not capable of handling multi queries. ' - . 'The execution of some stored routines may fail! ' - . 'Please use the improved \'mysqli\' extension to ' - . 'avoid any problems.'), E_USER_WARNING); -} - -if ($GLOBALS['is_ajax_request'] != true) { - /** - * Displays the footer - */ - require './libraries/footer.inc.php'; -} +require_once './libraries/rte/rte_main.inc.php'; ?> diff --git a/db_triggers.php b/db_triggers.php index 416be77c15..1bd792ec41 100644 --- a/db_triggers.php +++ b/db_triggers.php @@ -1,38 +1,32 @@ diff --git a/js/db_events.js b/js/db_events.js deleted file mode 100644 index 3a0ccd5650..0000000000 --- a/js/db_events.js +++ /dev/null @@ -1,2 +0,0 @@ -/* vim: set expandtab sw=4 ts=4 sts=4: */ - diff --git a/js/db_routines.js b/js/db_routines.js deleted file mode 100644 index ceb09626dd..0000000000 --- a/js/db_routines.js +++ /dev/null @@ -1,568 +0,0 @@ -/* vim: set expandtab sw=4 ts=4 sts=4: */ - -/** - * Validate routine editor form fields. - * - * @param syntaxHiglighter an object containing the reference to the - * codemirror editor. This will be used to - * focus the form on the codemirror editor - * if it contains invalid data. - */ -function validateRoutineEditor(syntaxHiglighter) { - /** - * @var inputname Will contain the value of the name - * attribute of input fields being checked. - */ - var inputname = ''; - /** - * @var $elm a jQuery object containing the reference - * to an element that is being validated. - */ - var $elm = null; - /** - * @var isError Stores the outcome of the validation. - */ - var isError = false; - - $elm = $('.rte_table').last().find('input[name=routine_name]'); - if ($elm.val() == '') { - $elm.focus(); - isError = true; - } else if ($elm.val().length > 64) { - alert(PMA_messages['strValueTooLong']); - $elm.focus().select(); - return false; - } - if (! isError) { - $elm = $('.rte_table').find('textarea[name=routine_definition]'); - if ($elm.val() == '') { - syntaxHiglighter.focus(); - isError = true; - } - } - if (! isError) { - $('.routine_params_table').last().find('tr').each(function() { - if (! isError) { - $(this).find(':input').each(function() { - inputname = $(this).attr('name'); - if (inputname.substr(0, 17) == 'routine_param_dir' || - inputname.substr(0, 18) == 'routine_param_name' || - inputname.substr(0, 18) == 'routine_param_type') { - if ($(this).val() == '') { - $(this).focus(); - isError = true; - return false; - } - } - }); - } - }); - } - if (! isError) { - // SET, ENUM, VARCHAR and VARBINARY fields must have length/values - $('.routine_params_table').last().find('tr').each(function() { - var $inputtyp = $(this).find('select[name^=routine_param_type]'); - var $inputlen = $(this).find('input[name^=routine_param_length]'); - if ($inputtyp.length && $inputlen.length) { - if (($inputtyp.val() == 'ENUM' || $inputtyp.val() == 'SET' || $inputtyp.val().substr(0,3) == 'VAR') - && $inputlen.val() == '') { - $inputlen.focus(); - isError = true; - return false; - } - } - }); - } - if (! isError && $('select[name=routine_type]').find(':selected').val() == 'FUNCTION') { - // The length/values of return variable for functions must - // be set, if the type is SET, ENUM, VARCHAR or VARBINARY. - var $returntyp = $('select[name=routine_returntype]'); - var $returnlen = $('input[name=routine_returnlength]'); - if (($returntyp.val() == 'ENUM' || $returntyp.val() == 'SET' || $returntyp.val().substr(0,3) == 'VAR') - && $returnlen.val() == '') { - $returnlen.focus(); - isError = true; - } - } - if (! isError && $('select[name=routine_type]').find(':selected').val() == 'FUNCTION') { - if ($('.rte_table').find('textarea[name=routine_definition]').val().toLowerCase().indexOf('return') < 0) { - syntaxHiglighter.focus(); - alert(PMA_messages['MissingReturn']); - return false; - } - } - if (! isError) { - $elm = $('.rte_table').last().find('input[name=routine_comment]'); - if ($elm.val().length > 64) { - alert(PMA_messages['strValueTooLong']); - $elm.focus().select(); - return false; - } - } - if (! isError) { - return true; - } else { - alert(PMA_messages['strFormEmpty']); - return false; - } -} // end validateRoutineEditor() - -/** - * Enable/disable the "options" dropdown and "length" input for - * parameters and the return variable in the routine editor - * as necessary. - * - * @param $type a jQuery object containing the reference - * to the "Type" dropdown box - * @param $len a jQuery object containing the reference - * to the "Length" input box - * @param $text a jQuery object containing the reference - * to the dropdown box with options for - * parameters of text type - * @param $num a jQuery object containing the reference - * to the dropdown box with options for - * parameters of numeric type - */ -function setOptionsForParameter($type, $len, $text, $num) { - // Process for parameter options - switch ($type.val()) { - case 'TINYINT': - case 'SMALLINT': - case 'MEDIUMINT': - case 'INT': - case 'BIGINT': - case 'DECIMAL': - case 'FLOAT': - case 'DOUBLE': - case 'REAL': - $text.parent().hide(); - $num.parent().show(); - break; - case 'TINYTEXT': - case 'TEXT': - case 'MEDIUMTEXT': - case 'LONGTEXT': - case 'CHAR': - case 'VARCHAR': - case 'SET': - case 'ENUM': - $text.parent().show(); - $text.show(); - $num.parent().hide(); - break; - default: - $text.parent().show(); - $text.hide(); - $num.parent().hide(); - break; - } - // Process for parameter length - switch ($type.val()) { - case 'DATE': - case 'DATETIME': - case 'TIME': - case 'TINYBLOB': - case 'TINYTEXT': - case 'BLOB': - case 'TEXT': - case 'MEDIUMBLOB': - case 'MEDIUMTEXT': - case 'LONGBLOB': - case 'LONGTEXT': - $len.hide(); - break; - default: - $len.show(); - break; - } -} - -/** - * Attach Ajax event handlers for the Routines functionalities. - * - * @see $cfg['AjaxEnable'] - */ -$(document).ready(function() { - /** - * @var $ajaxDialog jQuery object containing the reference to the - * dialog that contains the routine editor. - */ - var $ajaxDialog = null; - /** - * @var param_template This variable contains the template for one row - * of the parameters table that is attached to the - * dialog when a new parameter is added. - */ - var param_template = ''; - /** - * @var syntaxHiglighter Reference to the codemirror editor. - */ - var syntaxHiglighter = null; - /** - * @var button_options Object containing options for jQueryUI dialog buttons - */ - var button_options = {}; - - /** - * Attach Ajax event handlers for the Add/Edit routine functionality. - * - * @uses PMA_ajaxShowMessage() - * @uses PMA_ajaxRemoveMessage() - * - * @see $cfg['AjaxEnable'] - */ - $('.add_routine_anchor, .edit_routine_anchor').live('click', function(event) { - event.preventDefault(); - /** - * @var $edit_row jQuery object containing the reference to - * the row of the the routine being edited - * from the list of routines . - */ - var $edit_row = null; - if ($(this).hasClass('edit_routine_anchor')) { - // Remeber the row of the routine being edited for later, - // so that if the edit is successful, we can replace the - // row with info about the modified routine. - $edit_row = $(this).parents('tr'); - } - /** - * @var $msg jQuery object containing the reference to - * the AJAX message shown to the user. - */ - var $msg = PMA_ajaxShowMessage(PMA_messages['strLoading']); - $.get($(this).attr('href'), {'ajax_request': true}, function(data) { - if(data.success == true) { - PMA_ajaxRemoveMessage($msg); - button_options[PMA_messages['strGo']] = function() { - syntaxHiglighter.save(); - // Validate editor and submit request, if passed. - if (validateRoutineEditor(syntaxHiglighter)) { - /** - * @var data Form data to be sent in the AJAX request. - */ - var data = $('.rte_form').last().serialize(); - $msg = PMA_ajaxShowMessage(PMA_messages['strLoading']); - $.post('db_routines.php', data, function (data) { - if(data.success == true) { - // Routine created successfully - PMA_ajaxRemoveMessage($msg); - PMA_slidingMessage(data.message); - $ajaxDialog.dialog('close'); - // If we are in 'edit' mode, we must remove the reference to the old row. - if (mode == 'edit') { - $edit_row.remove(); - } - // Insert the new row at the correct location in the list of routines - /** - * @var text Contains the name of a routine from the list - * that is used in comparisons to find the correct - * location where to insert a new row. - */ - var text = ''; - /** - * @var inserted Whether a new has been inserted - * in the list of routines or not. - */ - var inserted = false; - $('table.data').find('tr').each(function() { - text = $(this).children('td').eq(0).find('strong').text().toUpperCase(); - if (text != '' && text > data.name) { - $(this).before(data.new_row); - inserted = true; - return false; - } - }); - if (! inserted) { - $('table.data').append(data.new_row); - } - // Fade-in the new row - $('.ajaxInsert').show('slow').removeClass('ajaxInsert'); - // Now we have inserted the row at the correct position, but surely - // at least some row classes are wrong now. So we will itirate - // throught all rows and assign correct classes to them. - /** - * @var ct Count of processed rows. - */ - var ct = 0; - $('table.data').find('tr').has('td').each(function() { - rowclass = (ct % 2 == 0) ? 'even' : 'odd'; - $(this).removeClass().addClass(rowclass); - ct++; - }); - // If this is the first routine being added, remove the - // "No routines" message and show the list of routines. - if ($('table.data').find('tr').has('td').length > 0 && $('#nothing2display').is(':visible')) { - $('#nothing2display').hide("slow", function () { - $('table.data').show("slow"); - }); - } - } else { - PMA_ajaxShowMessage(data.error); - } - }); - } - } // end of function that handles the submission of the Editor - button_options[PMA_messages['strClose']] = function() { - $(this).dialog("close"); - } - /** - * Display the dialog to the user - */ - $ajaxDialog = $(''+data.message+'
').dialog({
- width: 700, // TODO: make a better decision about the size
- height: 550, // of the dialog based on the size of the viewport
- buttons: button_options,
- title: data.title,
- modal: true,
- close: function () {
- $(this).remove();
- }
- });
- $ajaxDialog.find('input[name=routine_name]').focus();
- /**
- * @var mode Used to remeber whether the editor is in
- * "Edit Routine" or "Add Routine" mode.
- */
- var mode = 'add';
- if ($('input[name=routine_process_editroutine]').length > 0) {
- mode = 'edit';
- }
- // Cache the template for a parameter table row
- param_template = data.param_template;
- // Make adjustments in the dialog to make it AJAX compatible
- $('.routine_param_remove').show();
- $('input[name=routine_removeparameter]').remove();
- $('input[name=routine_addparameter]').css('width', '100%');
- // Enable/disable the 'options' dropdowns for parameters as necessary
- $('.routine_params_table').last().find('th[colspan=2]').attr('colspan', '1');
- $('.routine_params_table').last().find('tr').has('td').each(function() {
- setOptionsForParameter(
- $(this).find('select[name^=routine_param_type]'),
- $(this).find('input[name^=routine_param_length]'),
- $(this).find('select[name^=routine_param_opts_text]'),
- $(this).find('select[name^=routine_param_opts_num]')
- );
- });
- // Enable/disable the 'options' dropdowns for function return value as necessary
- setOptionsForParameter(
- $('.rte_table').last().find('select[name=routine_returntype]'),
- $('.rte_table').last().find('input[name=routine_returnlength]'),
- $('.rte_table').last().find('select[name=routine_returnopts_text]'),
- $('.rte_table').last().find('select[name=routine_returnopts_num]')
- );
- // Attach syntax highlited editor to routine definition
- /**
- * @var $elm jQuery object containing the reference to
- * the "Routine Definition" textarea.
- */
- var $elm = $('textarea[name=routine_definition]').last();
- /**
- * @var opts Options to pass to the codemirror editor.
- */
- var opts = {lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql"};
- syntaxHiglighter = CodeMirror.fromTextArea($elm[0], opts);
- // Hack to prevent the syntax highlighter from expanding beyond dialog boundries
- $('.CodeMirror-scroll').find('div').first().css('width', '1px');
- } else {
- PMA_ajaxShowMessage(data.error);
- }
- }) // end $.get()
- }); // end $.live()
-
- /**
- * Attach Ajax event handlers for the "Add parameter to routine" functionality.
- *
- * @see $cfg['AjaxEnable']
- */
- $('input[name=routine_addparameter]').live('click', function(event) {
- event.preventDefault();
- /**
- * @var $routine_params_table jQuery object containing the reference
- * to the routine parameters table.
- */
- var $routine_params_table = $('.routine_params_table').last();
- /**
- * @var $new_param_row A string containing the HTML code for the
- * new row for the routine paramaters table.
- */
- var new_param_row = param_template.replace(/%s/g, $routine_params_table.find('tr').length-1);
- $routine_params_table.append(new_param_row);
- if ($('.rte_table').find('select[name=routine_type]').val() == 'FUNCTION') {
- $('.routine_return_row').show();
- $('.routine_direction_cell').hide();
- }
- /**
- * @var $newrow jQuery object containing the reference to the newly
- * inserted row in the routine parameters table.
- */
- var $newrow = $('.routine_params_table').last().find('tr').has('td').last();
- setOptionsForParameter(
- $newrow.find('select[name^=routine_param_type]'),
- $newrow.find('input[name^=routine_param_length]'),
- $newrow.find('select[name^=routine_param_opts_text]'),
- $newrow.find('select[name^=routine_param_opts_num]')
- );
- }); // end $.live()
-
- /**
- * Attach Ajax event handlers for the "Remove parameter from routine" functionality.
- *
- * @see $cfg['AjaxEnable']
- */
- $('.routine_param_remove_anchor').live('click', function (event) {
- event.preventDefault();
- $(this).parent().parent().remove();
- // After removing a parameter, the indices of the name attributes in
- // the input fields lose the correct order and need to be reordered.
- /**
- * @var index Counter used for reindexing the input
- * fields in the routine parameters table.
- */
- var index = 0;
- $('.routine_params_table').last().find('tr').has('td').each(function() {
- $(this).find(':input').each(function() {
- /**
- * @var inputname The value of the name attribute of
- * the input field being reindexed.
- */
- var inputname = $(this).attr('name');
- if (inputname.substr(0, 17) == 'routine_param_dir') {
- $(this).attr('name', inputname.substr(0, 17) + '[' + index + ']');
- } else if (inputname.substr(0, 18) == 'routine_param_name') {
- $(this).attr('name', inputname.substr(0, 18) + '[' + index + ']');
- } else if (inputname.substr(0, 18) == 'routine_param_type') {
- $(this).attr('name', inputname.substr(0, 18) + '[' + index + ']');
- } else if (inputname.substr(0, 20) == 'routine_param_length') {
- $(this).attr('name', inputname.substr(0, 20) + '[' + index + ']');
- } else if (inputname.substr(0, 23) == 'routine_param_opts_text') {
- $(this).attr('name', inputname.substr(0, 23) + '[' + index + ']');
- } else if (inputname.substr(0, 22) == 'routine_param_opts_num') {
- $(this).attr('name', inputname.substr(0, 22) + '[' + index + ']');
- }
- });
- index++;
- });
- }); // end $.live()
-
- /**
- * Attach Ajax event handlers for the "Change routine type" functionality.
- *
- * @see $cfg['AjaxEnable']
- */
- $('select[name=routine_type]').live('change', function() {
- $('.routine_return_row, .routine_direction_cell').toggle();
- }); // end $.live()
-
- /**
- * Attach Ajax event handlers for the "Change parameter type" functionality.
- *
- * @see $cfg['AjaxEnable']
- */
- $('select[name^=routine_param_type]').live('change', function() {
- /**
- * @var $row jQuery object containing the reference to
- * a row in the routine parameters table.
- */
- var $row = $(this).parents('tr').first();
- setOptionsForParameter(
- $row.find('select[name^=routine_param_type]'),
- $row.find('input[name^=routine_param_length]'),
- $row.find('select[name^=routine_param_opts_text]'),
- $row.find('select[name^=routine_param_opts_num]')
- );
- });
-
- /**
- * Attach Ajax event handlers for the "Change the type of return
- * variable of function" functionality.
- *
- * @see $cfg['AjaxEnable']
- */
- $('select[name=routine_returntype]').live('change', function() {
- setOptionsForParameter(
- $('.rte_table').find('select[name=routine_returntype]'),
- $('.rte_table').find('input[name=routine_returnlength]'),
- $('.rte_table').find('select[name=routine_returnopts_text]'),
- $('.rte_table').find('select[name=routine_returnopts_num]')
- );
- });
-
- /**
- * Attach Ajax event handlers for the Execute routine functionality.
- *
- * @uses PMA_ajaxShowMessage()
- * @uses PMA_ajaxRemoveMessage()
- *
- * @see $cfg['AjaxEnable']
- */
- $('.exec_routine_anchor').live('click', function(event) {
- event.preventDefault();
- /**
- * @var $msg jQuery object containing the reference to
- * the AJAX message shown to the user.
- */
- var $msg = PMA_ajaxShowMessage(PMA_messages['strLoading']);
- $.get($(this).attr('href'), {'ajax_request': true}, function(data) {
- if(data.success == true) {
- PMA_ajaxRemoveMessage($msg);
- if (data.dialog) {
- button_options[PMA_messages['strGo']] = function() {
- /**
- * @var data Form data to be sent in the AJAX request.
- */
- var data = $('.rte_form').last().serialize();
- $msg = PMA_ajaxShowMessage(PMA_messages['strLoading']);
- $.post('db_routines.php', data, function (data) {
- if(data.success == true) {
- // Routine executed successfully
- PMA_ajaxRemoveMessage($msg);
- PMA_slidingMessage(data.message);
- $ajaxDialog.dialog('close');
- } else {
- PMA_ajaxShowMessage(data.error);
- }
- });
- }
- button_options[PMA_messages['strClose']] = function() {
- $(this).dialog("close");
- }
- /**
- * Display the dialog to the user
- */
- $ajaxDialog = $(''+data.message+'
').dialog({
- width: 650, // TODO: make a better decision about the size
- // of the dialog based on the size of the viewport
- buttons: button_options,
- title: data.title,
- modal: true,
- close: function () {
- $(this).remove();
- }
- });
- $ajaxDialog.find('input[name^=params]').first().focus();
- } else {
- // Routine executed successfully
- PMA_slidingMessage(data.message);
- }
- } else {
- PMA_ajaxShowMessage(data.error);
- }
- });
- });
-
- /**
- * Attach Ajax event handlers for input fields in the routines editor
- * and the routine execution dialog used to submit the Ajax request
- * when the ENTER key is pressed.
- *
- * @see $cfg['AjaxEnable']
- */
- $('input[name^=routine], input[name^=params]').live('keydown', function(e) {
- if (e.which == 13) {
- e.preventDefault();
- if (typeof button_options[PMA_messages['strGo']] == 'function') {
- button_options[PMA_messages['strGo']].call();
- }
- }
- });
-}); // end of $(document).ready() for the Routine Functionalities
diff --git a/js/display_triggers.js b/js/display_triggers.js
deleted file mode 100644
index 3a0ccd5650..0000000000
--- a/js/display_triggers.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-
diff --git a/js/functions.js b/js/functions.js
index 936779797d..04fe9e3d42 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2389,7 +2389,7 @@ $(function() {
* Get the row number from the classlist (for example, row_1)
*/
function PMA_getRowNumber(classlist) {
- return parseInt(classlist.split(/row_/)[1]);
+ return parseInt(classlist.split(/\s+row_/)[1]);
}
/**
@@ -2425,6 +2425,136 @@ function PMA_init_slider() {
});
}
+/**
+ * var toggleButton This is a function that creates a toggle
+ * sliding button given a jQuery reference
+ * to the correct DOM element
+ */
+var toggleButton = function ($obj) {
+ // In rtl mode the toggle switch is flipped horizontally
+ // so we need to take that into account
+ if ($('.text_direction', $obj).text() == 'ltr') {
+ var right = 'right';
+ } else {
+ var right = 'left';
+ }
+ /**
+ * var h Height of the button, used to scale the
+ * background image and position the layers
+ */
+ var h = $obj.height();
+ $('img', $obj).height(h);
+ $('table', $obj).css('bottom', h-1);
+ /**
+ * var on Width of the "ON" part of the toggle switch
+ * var off Width of the "OFF" part of the toggle switch
+ */
+ var on = $('.toggleOn', $obj).width();
+ var off = $('.toggleOff', $obj).width();
+ // Make the "ON" and "OFF" parts of the switch the same size
+ $('.toggleOn > div', $obj).width(Math.max(on, off));
+ $('.toggleOff > div', $obj).width(Math.max(on, off));
+ /**
+ * var w Width of the central part of the switch
+ */
+ var w = parseInt(($('img', $obj).height() / 16) * 22, 10);
+ // Resize the central part of the switch on the top
+ // layer to match the background
+ $('table td:nth-child(2) > div', $obj).width(w);
+ /**
+ * var imgw Width of the background image
+ * var tblw Width of the foreground layer
+ * var offset By how many pixels to move the background
+ * image, so that it matches the top layer
+ */
+ var imgw = $('img', $obj).width();
+ var tblw = $('table', $obj).width();
+ var offset = parseInt(((imgw - tblw) / 2), 10);
+ // Move the background to match the layout of the top layer
+ $obj.find('img').css(right, offset);
+ /**
+ * var offw Outer width of the "ON" part of the toggle switch
+ * var btnw Outer width of the central part of the switch
+ */
+ var offw = $('.toggleOff', $obj).outerWidth();
+ var btnw = $('table td:nth-child(2)', $obj).outerWidth();
+ // Resize the main div so that exactly one side of
+ // the switch plus the central part fit into it.
+ $obj.width(offw + btnw + 2);
+ /**
+ * var move How many pixels to move the
+ * switch by when toggling
+ */
+ var move = $('.toggleOff', $obj).outerWidth();
+ // If the switch is initialized to the
+ // OFF state we need to move it now.
+ if ($('.container', $obj).hasClass('off')) {
+ if (right == 'right') {
+ $('table, img', $obj).animate({'left': '-=' + move + 'px'}, 0);
+ } else {
+ $('table, img', $obj).animate({'left': '+=' + move + 'px'}, 0);
+ }
+ }
+ // Attach an 'onclick' event to the switch
+ $('.container', $obj).click(function () {
+ if ($(this).hasClass('isActive')) {
+ return false;
+ } else {
+ $(this).addClass('isActive');
+ }
+ var $msg = PMA_ajaxShowMessage(PMA_messages['strLoading']);
+ var $container = $(this);
+ var callback = $('.callback', this).text();
+ // Perform the actual toggle
+ if ($(this).hasClass('on')) {
+ if (right == 'right') {
+ var operator = '-=';
+ } else {
+ var operator = '+=';
+ }
+ var url = $(this).find('.toggleOff > span').text();
+ var removeClass = 'on';
+ var addClass = 'off';
+ } else {
+ if (right == 'right') {
+ var operator = '+=';
+ } else {
+ var operator = '-=';
+ }
+ var url = $(this).find('.toggleOn > span').text();
+ var removeClass = 'off';
+ var addClass = 'on';
+ }
+ $.post(url, {'ajax_request': true}, function(data) {
+ if(data.success == true) {
+ PMA_ajaxRemoveMessage($msg);
+ $container
+ .removeClass(removeClass)
+ .addClass(addClass)
+ .animate({'left': operator + move + 'px'}, function () {
+ $container.removeClass('isActive');
+ });
+ eval(callback);
+ } else {
+ PMA_ajaxShowMessage(data.error);
+ $container.removeClass('isActive');
+ }
+ });
+ });
+};
+
+/**
+ * Initialise all toggle buttons
+ */
+$(window).load(function () {
+ $('.toggleAjax').each(function () {
+ $(this)
+ .show()
+ .find('.toggleButton')
+ toggleButton($(this));
+ });
+});
+
/**
* Vertical pointer
*/
@@ -2528,44 +2658,6 @@ $(document).ready(function() {
}) // end of $(document).ready()
-/**
- * Attach Ajax event handlers for Export of Routines, Triggers and Events.
- *
- * @uses PMA_ajaxShowMessage()
- * @uses PMA_ajaxRemoveMessage()
- *
- * @see $cfg['AjaxEnable']
- */
-$(document).ready(function() {
- $('.export_routine_anchor, .export_trigger_anchor, .export_event_anchor').live('click', function(event) {
- event.preventDefault();
- var $msg = PMA_ajaxShowMessage(PMA_messages['strLoading']);
- $.get($(this).attr('href'), {'ajax_request': true}, function(data) {
- if(data.success == true) {
- PMA_ajaxRemoveMessage($msg);
- /**
- * @var button_options Object containing options for jQueryUI dialog buttons
- */
- var button_options = {};
- button_options[PMA_messages['strClose']] = function() {$(this).dialog("close").remove();}
- /**
- * Display the dialog to the user
- */
- var $ajaxDialog = $(''+data.message+'
').dialog({
- width: 500,
- buttons: button_options,
- title: data.title
- });
- // Attach syntax highlited editor to export dialog
- var elm = $ajaxDialog.find('textarea');
- CodeMirror.fromTextArea(elm[0], {lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql"});
- } else {
- PMA_ajaxShowMessage(data.error);
- }
- }) // end $.get()
- }); // end $.live()
-}); // end of $(document).ready() for Export of Routines, Triggers and Events.
-
/**
* Creates a message inside an object with a sliding effect
*
@@ -2643,69 +2735,6 @@ function PMA_slidingMessage(msg, $obj) {
return true;
} // end PMA_slidingMessage()
-/**
- * Attach Ajax event handlers for Drop functionality of Routines, Triggers and Events.
- *
- * @uses $.PMA_confirm()
- * @uses PMA_ajaxShowMessage()
- * @see $cfg['AjaxEnable']
- */
-$(document).ready(function() {
- $('.drop_routine_anchor, .drop_trigger_anchor, .drop_event_anchor').live('click', function(event) {
- event.preventDefault();
- /**
- * @var $curr_row Object containing reference to the current row
- */
- var $curr_row = $(this).parents('tr');
- /**
- * @var question String containing the question to be asked for confirmation
- */
- var question = $('').text($curr_row.children('td').children('.drop_sql').html());
- $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
- /**
- * @var $msg jQuery object containing the reference to
- * the AJAX message shown to the user.
- */
- var $msg = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
- $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) {
- if(data.success == true) {
- /**
- * @var $table Object containing reference to the main list of elements.
- */
- var $table = $curr_row.parent();
- if ($table.find('tr').length == 2) {
- $table.hide("slow", function () {
- $(this).find('tr.even, tr.odd').remove();
- $('#nothing2display').show("slow");
- });
- } else {
- $curr_row.hide("slow", function () {
- $(this).remove();
- // Now we have removed the row from the list, but maybe
- // some row classes are wrong now. So we will itirate
- // throught all rows and assign correct classes to them.
- /**
- * @var ct Count of processed rows.
- */
- var ct = 0;
- $table.find('tr').has('td').each(function() {
- rowclass = (ct % 2 == 0) ? 'even' : 'odd';
- $(this).removeClass().addClass(rowclass);
- ct++;
- });
- });
- }
- // Show the query that we just executed
- PMA_ajaxRemoveMessage($msg);
- PMA_slidingMessage(data.sql_query);
- } else {
- PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
- }
- }) // end $.get()
- }) // end $.PMA_confirm()
- }); // end $.live()
-}); //end $(document).ready() for Drop functionality of Routines, Triggers and Events.
-
/**
* Attach Ajax event handlers for Drop Table.
*
diff --git a/js/makegrid.js b/js/makegrid.js
index 11bfa09f17..970ed595ef 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -6,7 +6,6 @@
minColWidth: 15,
// variables, assigned with default value, changed later
- alignment: 'horizontal', // 3 possibilities: vertical, horizontal, horizontalflipped
actionSpan: 5,
colOrder: new Array(), // array of column order
colVisib: new Array(), // array of column visibility
@@ -32,9 +31,7 @@
n: n,
obj: obj,
objLeft: $(obj).position().left,
- objWidth: this.alignment != 'vertical' ?
- $(this.t).find('th.draggable:visible:eq(' + n + ') span').outerWidth() :
- $(this.t).find('tr:first td:eq(' + n + ') span').outerWidth()
+ objWidth: $(this.t).find('th.draggable:visible:eq(' + n + ') span').outerWidth()
};
$('body').css('cursor', 'col-resize');
$('body').noSelect();
@@ -44,27 +41,15 @@
// prepare the cCpy and cPointer from the dragged column
$(this.cCpy).text($(obj).text());
var objPos = $(obj).position();
- if (this.alignment != 'vertical') {
- $(this.cCpy).css({
- top: objPos.top + 20,
- left: objPos.left,
- height: $(obj).height(),
- width: $(obj).width()
- });
- $(this.cPointer).css({
- top: objPos.top
- });
- } else { // vertical alignment
- $(this.cCpy).css({
- top: objPos.top,
- left: objPos.left + 30,
- height: $(obj).height(),
- width: $(obj).width()
- });
- $(this.cPointer).css({
- top: objPos.top
- });
- }
+ $(this.cCpy).css({
+ top: objPos.top + 20,
+ left: objPos.left,
+ height: $(obj).height(),
+ width: $(obj).width()
+ });
+ $(this.cPointer).css({
+ top: objPos.top
+ });
// get the column index, zero-based
var n = this.getHeaderIdx(obj);
@@ -90,17 +75,10 @@
$(this.colRsz.obj).css('left', this.colRsz.objLeft + dx + 'px');
} else if (this.colMov) {
// dragged column animation
- if (this.alignment != 'vertical') {
- var dx = e.pageX - this.colMov.x0;
- $(this.cCpy)
- .css('left', this.colMov.objLeft + dx)
- .show();
- } else { // vertical alignment
- var dy = e.pageY - this.colMov.y0;
- $(this.cCpy)
- .css('top', this.colMov.objTop + dy)
- .show();
- }
+ var dx = e.pageX - this.colMov.x0;
+ $(this.cCpy)
+ .css('left', this.colMov.objLeft + dx)
+ .show();
// pointer animation
var hoveredCol = this.getHoveredCol(e);
@@ -110,25 +88,14 @@
if (newn != this.colMov.n) {
// show the column pointer in the right place
var colPos = $(hoveredCol).position();
- if (this.alignment != 'vertical') {
- var newleft = newn < this.colMov.n ?
- colPos.left :
- colPos.left + $(hoveredCol).outerWidth();
- $(this.cPointer)
- .css({
- left: newleft,
- visibility: 'visible'
- });
- } else { // vertical alignment
- var newtop = newn < this.colMov.n ?
- colPos.top :
- colPos.top + $(hoveredCol).outerHeight();
- $(this.cPointer)
- .css({
- top: newtop,
- visibility: 'visible'
- });
- }
+ var newleft = newn < this.colMov.n ?
+ colPos.left :
+ colPos.left + $(hoveredCol).outerWidth();
+ $(this.cPointer)
+ .css({
+ left: newleft,
+ visibility: 'visible'
+ });
} else {
// no movement to other column, hide the column pointer
$(this.cPointer).css('visibility', 'hidden');
@@ -187,18 +154,11 @@
* Resize column n to new width "nw"
*/
resize: function(n, nw) {
- if (this.alignment != 'vertical') {
- $(this.t).find('tr').each(function() {
- $(this).find('th.draggable:visible:eq(' + n + ') span,' +
- 'td:visible:eq(' + (g.actionSpan + n) + ') span')
- .css('width', nw);
- });
- } else { // vertical alignment
- $(this.t).find('tr').each(function() {
- $(this).find('td:eq(' + n + ') span')
- .css('width', nw);
- });
- }
+ $(this.t).find('tr').each(function() {
+ $(this).find('th.draggable:visible:eq(' + n + ') span,' +
+ 'td:visible:eq(' + (g.actionSpan + n) + ') span')
+ .css('width', nw);
+ });
},
/**
@@ -206,9 +166,7 @@
*/
reposRsz: function() {
$(this.cRsz).find('div').hide();
- $firstRowCols = this.alignment != 'vertical' ?
- $(this.t).find('tr:first th.draggable:visible') :
- $(this.t).find('tr:first td');
+ $firstRowCols = $(this.t).find('tr:first th.draggable:visible');
for (var n = 0; n < $firstRowCols.length; n++) {
$this = $($firstRowCols[n]);
$cb = $(g.cRsz).find('div:eq(' + n + ')'); // column border
@@ -222,40 +180,29 @@
* Shift column from index oldn to newn.
*/
shiftCol: function(oldn, newn) {
- if (this.alignment != 'vertical') {
- $(this.t).find('tr').each(function() {
- if (newn < oldn) {
- $(this).find('th.draggable:eq(' + newn + '),' +
- 'td:eq(' + (g.actionSpan + newn) + ')')
- .before($(this).find('th.draggable:eq(' + oldn + '),' +
- 'td:eq(' + (g.actionSpan + oldn) + ')'));
- } else {
- $(this).find('th.draggable:eq(' + newn + '),' +
- 'td:eq(' + (g.actionSpan + newn) + ')')
- .after($(this).find('th.draggable:eq(' + oldn + '),' +
- 'td:eq(' + (g.actionSpan + oldn) + ')'));
- }
- });
- // reposition the column resize bars
- this.reposRsz();
-
- } else { // vertical alignment
- // shift rows
+ $(this.t).find('tr').each(function() {
if (newn < oldn) {
- $(this.t).find('tr:eq(' + (g.actionSpan + newn) + ')')
- .before($(this.t).find('tr:eq(' + (g.actionSpan + oldn) + ')'));
+ $(this).find('th.draggable:eq(' + newn + '),' +
+ 'td:eq(' + (g.actionSpan + newn) + ')')
+ .before($(this).find('th.draggable:eq(' + oldn + '),' +
+ 'td:eq(' + (g.actionSpan + oldn) + ')'));
} else {
- $(this.t).find('tr:eq(' + (g.actionSpan + newn) + ')')
- .after($(this.t).find('tr:eq(' + (g.actionSpan + oldn) + ')'));
+ $(this).find('th.draggable:eq(' + newn + '),' +
+ 'td:eq(' + (g.actionSpan + newn) + ')')
+ .after($(this).find('th.draggable:eq(' + oldn + '),' +
+ 'td:eq(' + (g.actionSpan + oldn) + ')'));
}
- }
+ });
+ // reposition the column resize bars
+ this.reposRsz();
+
// adjust the column visibility list
if (newn < oldn) {
- $(g.cList).find('tr:eq(' + newn + ')')
- .before($(g.cList).find('tr:eq(' + oldn + ')'));
+ $(g.cList).find('.lDiv div:eq(' + newn + ')')
+ .before($(g.cList).find('.lDiv div:eq(' + oldn + ')'));
} else {
- $(g.cList).find('tr:eq(' + newn + ')')
- .after($(g.cList).find('tr:eq(' + oldn + ')'));
+ $(g.cList).find('.lDiv div:eq(' + newn + ')')
+ .after($(g.cList).find('.lDiv div:eq(' + oldn + ')'));
}
// adjust the colOrder
var tmp = this.colOrder[oldn];
@@ -274,23 +221,13 @@
getHoveredCol: function(e) {
var hoveredCol;
$headers = $(this.t).find('th.draggable:visible');
- if (this.alignment != 'vertical') {
- $headers.each(function() {
- var left = $(this).offset().left;
- var right = left + $(this).outerWidth();
- if (left <= e.pageX && e.pageX <= right) {
- hoveredCol = this;
- }
- });
- } else { // vertical alignment
- $headers.each(function() {
- var top = $(this).offset().top;
- var bottom = top + $(this).height();
- if (top <= e.pageY && e.pageY <= bottom) {
- hoveredCol = this;
- }
- });
- }
+ $headers.each(function() {
+ var left = $(this).offset().left;
+ var right = left + $(this).outerWidth();
+ if (left <= e.pageX && e.pageX <= right) {
+ hoveredCol = this;
+ }
+ });
return hoveredCol;
},
@@ -298,15 +235,7 @@
* Get a zero-based index from a ' + data.message + '
').dialog({
+ width: 700,
+ height: 555,
+ buttons: RTE.buttonOptions,
+ title: data.title,
+ modal: true,
+ close: function () {
+ $(this).remove();
+ }
+ });
+ RTE.$ajaxDialog.find('input[name=item_name]').focus();
+ RTE.$ajaxDialog.find('.datefield, .datetimefield').each(function () {
+ PMA_addDatepicker($(this).css('width', '95%'));
+ });
+ /**
+ * @var mode Used to remeber whether the editor is in
+ * "Edit" or "Add" mode.
+ */
+ var mode = 'add';
+ if ($('input[name=editor_process_edit]').length > 0) {
+ mode = 'edit';
+ }
+ // Attach syntax highlited editor to the definition
+ /**
+ * @var $elm jQuery object containing the reference to
+ * the Definition textarea.
+ */
+ var $elm = $('textarea[name=item_definition]').last();
+ /**
+ * @var opts Options to pass to the codemirror editor.
+ */
+ var opts = {lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql"};
+ RTE.syntaxHiglighter = CodeMirror.fromTextArea($elm[0], opts);
+ // Hack to prevent the syntax highlighter from expanding beyond dialog boundries
+ $('.CodeMirror-scroll').find('div').first().css('width', '1px');
+ // Execute item-specific code
+ RTE.postDialogShow(data);
+ } else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ }); // end $.get()
+ }); // end $.live()
+
+ /**
+ * Attach Ajax event handlers for input fields in the editor
+ * and the routine execution dialog used to submit the Ajax
+ * request when the ENTER key is pressed.
+ */
+ $('.rte_table').find('input[name^=item], input[name^=params]').live('keydown', function (e) {
+ if (e.which === 13) { // 13 is the ENTER key
+ e.preventDefault();
+ if (typeof RTE.buttonOptions[PMA_messages['strGo']] === 'function') {
+ RTE.buttonOptions[PMA_messages['strGo']].call();
+ }
+ }
+ }); // end $.live()
+
+ /**
+ * Attach Ajax event handlers for Export of Routines, Triggers and Events.
+ */
+ $('.ajax_export_anchor').live('click', function (event) {
+ event.preventDefault();
+ var $msg = PMA_ajaxShowMessage();
+ // Fire the ajax request straight away
+ $.get($(this).attr('href'), {'ajax_request': true}, function (data) {
+ if (data.success === true) {
+ PMA_ajaxRemoveMessage($msg);
+ /**
+ * @var button_options Object containing options for jQueryUI dialog buttons
+ */
+ var button_options = {};
+ button_options[PMA_messages['strClose']] = function () {
+ $(this).dialog("close").remove();
+ };
+ /**
+ * Display the dialog to the user
+ */
+ var $ajaxDialog = $('' + data.message + '
').dialog({
+ width: 500,
+ buttons: button_options,
+ title: data.title
+ });
+ // Attach syntax highlited editor to export dialog
+ /**
+ * @var $elm jQuery object containing the reference
+ * to the Export textarea.
+ */
+ var $elm = $ajaxDialog.find('textarea');
+ /**
+ * @var opts Options to pass to the codemirror editor.
+ */
+ var opts = {lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql"};
+ CodeMirror.fromTextArea($elm[0], opts);
+ } else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ }); // end $.get()
+ }); // end $.live()
+
+ /**
+ * Attach Ajax event handlers for Drop functionality of Routines, Triggers and Events.
+ */
+ $('.ajax_drop_anchor').live('click', function (event) {
+ event.preventDefault();
+ /**
+ * @var $curr_row Object containing reference to the current row
+ */
+ var $curr_row = $(this).parents('tr');
+ /**
+ * @var question String containing the question to be asked for confirmation
+ */
+ var question = $('').text($curr_row.children('td').children('.drop_sql').html());
+ // We ask for confirmation first here, before submitting the ajax request
+ $(this).PMA_confirm(question, $(this).attr('href'), function (url) {
+ /**
+ * @var $msg jQuery object containing the reference to
+ * the AJAX message shown to the user.
+ */
+ var $msg = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+ $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function (data) {
+ if (data.success === true) {
+ /**
+ * @var $table Object containing reference to the main list of elements.
+ */
+ var $table = $curr_row.parent();
+ // Check how many rows will be left after we remove
+ // the one that the user has requested us to remove
+ if ($table.find('tr').length === 2) {
+ // If there are two rows left, it means that they are
+ // the header of the table and the rows that we are
+ // about to remove, so after the removal there will be
+ // nothing to show in the table, so we hide it.
+ $table.hide("slow", function () {
+ $(this).find('tr.even, tr.odd').remove();
+ $('#nothing2display').show("slow");
+ });
+ } else {
+ $curr_row.hide("slow", function () {
+ $(this).remove();
+ // Now we have removed the row from the list, but maybe
+ // some row classes are wrong now. So we will itirate
+ // throught all rows and assign correct classes to them.
+ /**
+ * @var ct Count of processed rows.
+ */
+ var ct = 0;
+ /**
+ * @var rowclass Class to be attached to the row
+ * that is being processed
+ */
+ var rowclass = '';
+ $table.find('tr').has('td').each(function () {
+ rowclass = (ct % 2 === 0) ? 'even' : 'odd';
+ $(this).removeClass().addClass(rowclass);
+ ct++;
+ });
+ });
+ }
+ // Get rid of the "Loading" message
+ PMA_ajaxRemoveMessage($msg);
+ // Show the query that we just executed
+ PMA_slidingMessage(data.sql_query);
+ } else {
+ PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error);
+ }
+ }); // end $.get()
+ }); // end $.PMA_confirm()
+ }); // end $.live()
+}); // end of $(document).ready()
diff --git a/js/rte/events.js b/js/rte/events.js
new file mode 100644
index 0000000000..257a17dd9f
--- /dev/null
+++ b/js/rte/events.js
@@ -0,0 +1,43 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+
+/**
+ * Overriding the validateCustom() function defined in common.js
+ */
+RTE.validateCustom = function () {
+ /**
+ * @var $elm a jQuery object containing the reference
+ * to an element that is being validated.
+ */
+ var $elm = null;
+ if ($('select[name=item_type]').find(':selected').val() === 'RECURRING') {
+ // The interval field must not be empty for recurring events
+ $elm = $('input[name=item_interval_value]');
+ if ($elm.val() === '') {
+ $elm.focus();
+ alert(PMA_messages['strFormEmpty']);
+ return false;
+ }
+ } else {
+ // The execute_at field must not be empty for "once off" events
+ $elm = $('input[name=item_execute_at]');
+ if ($elm.val() === '') {
+ $elm.focus();
+ alert(PMA_messages['strFormEmpty']);
+ return false;
+ }
+ }
+ return true;
+}; // end RTE.validateCustom()
+
+/**
+ * Attach Ajax event handlers for the "Change event type"
+ * functionality in the events editor, so that the correct
+ * rows are shown in the editor when changing the event type
+ *
+ * @see $cfg['AjaxEnable']
+ */
+$(document).ready(function () {
+ $('select[name=item_type]').live('change', function () {
+ $('.recurring_event_row, .onetime_event_row').toggle();
+ }); // end $.live()
+}); // end of $(document).ready()
diff --git a/js/rte/routines.js b/js/rte/routines.js
new file mode 100644
index 0000000000..50c4f00051
--- /dev/null
+++ b/js/rte/routines.js
@@ -0,0 +1,395 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+
+/**
+ * @var param_template This variable contains the template for one row
+ * of the parameters table that is attached to the
+ * dialog when a new parameter is added.
+ */
+RTE.param_template = '';
+
+/**
+ * Overriding the postDialogShow() function defined in common.js
+ *
+ * @param data JSON-encoded data from the ajax request
+ */
+RTE.postDialogShow = function (data) {
+ // Cache the template for a parameter table row
+ RTE.param_template = data.param_template;
+ // Make adjustments in the dialog to make it AJAX compatible
+ $('.routine_param_remove').show();
+ $('input[name=routine_removeparameter]').remove();
+ $('input[name=routine_addparameter]').css('width', '100%');
+ // Enable/disable the 'options' dropdowns for parameters as necessary
+ $('.routine_params_table').last().find('th[colspan=2]').attr('colspan', '1');
+ $('.routine_params_table').last().find('tr').has('td').each(function () {
+ RTE.setOptionsForParameter(
+ $(this).find('select[name^=item_param_type]'),
+ $(this).find('input[name^=item_param_length]'),
+ $(this).find('select[name^=item_param_opts_text]'),
+ $(this).find('select[name^=item_param_opts_num]')
+ );
+ });
+ // Enable/disable the 'options' dropdowns for
+ // function return value as necessary
+ RTE.setOptionsForParameter(
+ $('.rte_table').last().find('select[name=item_returntype]'),
+ $('.rte_table').last().find('input[name=item_returnlength]'),
+ $('.rte_table').last().find('select[name=item_returnopts_text]'),
+ $('.rte_table').last().find('select[name=item_returnopts_num]')
+ );
+}; // end RTE.postDialogShow()
+
+/**
+ * Overriding the validateCustom() function defined in common.js
+ */
+RTE.validateCustom = function () {
+ /**
+ * @var isSuccess Stores the outcome of the validation
+ */
+ var isSuccess = true;
+ /**
+ * @var inputname The value of the "name" attribute for
+ * the field that is being processed
+ */
+ var inputname = '';
+ $('.routine_params_table').last().find('tr').each(function () {
+ // Every parameter of a routine must have
+ // a non-empty direction, name and type
+ if (isSuccess) {
+ $(this).find(':input').each(function () {
+ inputname = $(this).attr('name');
+ if (inputname.substr(0, 17) === 'item_param_dir' ||
+ inputname.substr(0, 18) === 'item_param_name' ||
+ inputname.substr(0, 18) === 'item_param_type') {
+ if ($(this).val() === '') {
+ $(this).focus();
+ isSuccess = false;
+ return false;
+ }
+ }
+ });
+ } else {
+ return false;
+ }
+ });
+ if (! isSuccess) {
+ alert(PMA_messages['strFormEmpty']);
+ return false;
+ }
+ $('.routine_params_table').last().find('tr').each(function () {
+ // SET, ENUM, VARCHAR and VARBINARY fields must have length/values
+ var $inputtyp = $(this).find('select[name^=item_param_type]');
+ var $inputlen = $(this).find('input[name^=item_param_length]');
+ if ($inputtyp.length && $inputlen.length) {
+ if (($inputtyp.val() === 'ENUM' || $inputtyp.val() === 'SET' || $inputtyp.val().substr(0, 3) === 'VAR')
+ && $inputlen.val() === '') {
+ $inputlen.focus();
+ isSuccess = false;
+ return false;
+ }
+ }
+ });
+ if (! isSuccess) {
+ alert(PMA_messages['strFormEmpty']);
+ return false;
+ }
+ if ($('select[name=item_type]').find(':selected').val() === 'FUNCTION') {
+ // The length/values of return variable for functions must
+ // be set, if the type is SET, ENUM, VARCHAR or VARBINARY.
+ var $returntyp = $('select[name=item_returntype]');
+ var $returnlen = $('input[name=item_returnlength]');
+ if (($returntyp.val() === 'ENUM' || $returntyp.val() === 'SET' || $returntyp.val().substr(0, 3) === 'VAR')
+ && $returnlen.val() === '') {
+ $returnlen.focus();
+ alert(PMA_messages['strFormEmpty']);
+ return false;
+ }
+ }
+ if ($('select[name=item_type]').find(':selected').val() === 'FUNCTION') {
+ // A function must contain a RETURN statement in its definition
+ if ($('.rte_table').find('textarea[name=item_definition]').val().toUpperCase().indexOf('RETURN') < 0) {
+ RTE.syntaxHiglighter.focus();
+ alert(PMA_messages['MissingReturn']);
+ return false;
+ }
+ }
+ return true;
+}; // end RTE.validateCustom()
+
+/**
+ * Enable/disable the "options" dropdown and "length" input for
+ * parameters and the return variable in the routine editor
+ * as necessary.
+ *
+ * @param $type a jQuery object containing the reference
+ * to the "Type" dropdown box
+ * @param $len a jQuery object containing the reference
+ * to the "Length" input box
+ * @param $text a jQuery object containing the reference
+ * to the dropdown box with options for
+ * parameters of text type
+ * @param $num a jQuery object containing the reference
+ * to the dropdown box with options for
+ * parameters of numeric type
+ */
+RTE.setOptionsForParameter = function ($type, $len, $text, $num) {
+ /**
+ * @var $no_opts a jQuery object containing the reference
+ * to an element to be displayed when no
+ * options are available
+ */
+ var $no_opts = $text.parent().parent().find('.no_opts');
+ /**
+ * @var $no_len a jQuery object containing the reference
+ * to an element to be displayed when no
+ * "length/values" field is available
+ */
+ var $no_len = $len.parent().parent().find('.no_len');
+
+ // Process for parameter options
+ switch ($type.val()) {
+ case 'TINYINT':
+ case 'SMALLINT':
+ case 'MEDIUMINT':
+ case 'INT':
+ case 'BIGINT':
+ case 'DECIMAL':
+ case 'FLOAT':
+ case 'DOUBLE':
+ case 'REAL':
+ $text.parent().hide();
+ $num.parent().show();
+ $no_opts.hide();
+ break;
+ case 'TINYTEXT':
+ case 'TEXT':
+ case 'MEDIUMTEXT':
+ case 'LONGTEXT':
+ case 'CHAR':
+ case 'VARCHAR':
+ case 'SET':
+ case 'ENUM':
+ $text.parent().show();
+ $num.parent().hide();
+ $no_opts.hide();
+ break;
+ default:
+ $text.parent().hide();
+ $num.parent().hide();
+ $no_opts.show();
+ break;
+ }
+ // Process for parameter length
+ switch ($type.val()) {
+ case 'DATE':
+ case 'DATETIME':
+ case 'TIME':
+ case 'TINYBLOB':
+ case 'TINYTEXT':
+ case 'BLOB':
+ case 'TEXT':
+ case 'MEDIUMBLOB':
+ case 'MEDIUMTEXT':
+ case 'LONGBLOB':
+ case 'LONGTEXT':
+ $len.parent().hide();
+ $no_len.show();
+ break;
+ default:
+ $len.parent().show();
+ $no_len.hide();
+ break;
+ }
+}; // end RTE.setOptionsForParameter()
+
+/**
+ * Attach Ajax event handlers for the Routines functionalities.
+ *
+ * @see $cfg['AjaxEnable']
+ */
+$(document).ready(function () {
+ /**
+ * Attach Ajax event handlers for the "Add parameter to routine" functionality.
+ */
+ $('input[name=routine_addparameter]').live('click', function (event) {
+ event.preventDefault();
+ /**
+ * @var $routine_params_table jQuery object containing the reference
+ * to the routine parameters table.
+ */
+ var $routine_params_table = $('.routine_params_table').last();
+ /**
+ * @var $new_param_row A string containing the HTML code for the
+ * new row for the routine paramaters table.
+ */
+ var new_param_row = RTE.param_template.replace(/%s/g, $routine_params_table.find('tr').length - 1);
+ // Append the new row to the parameters table
+ $routine_params_table.append(new_param_row);
+ // Make sure that the row is correctly shown according to the type of routine
+ if ($('.rte_table').find('select[name=item_type]').val() === 'FUNCTION') {
+ $('.routine_return_row').show();
+ $('.routine_direction_cell').hide();
+ }
+ /**
+ * @var $newrow jQuery object containing the reference to the newly
+ * inserted row in the routine parameters table.
+ */
+ var $newrow = $('.routine_params_table').last().find('tr').has('td').last();
+ // Enable/disable the 'options' dropdowns for parameters as necessary
+ RTE.setOptionsForParameter(
+ $newrow.find('select[name^=item_param_type]'),
+ $newrow.find('input[name^=item_param_length]'),
+ $newrow.find('select[name^=item_param_opts_text]'),
+ $newrow.find('select[name^=item_param_opts_num]')
+ );
+ }); // end $.live()
+
+ /**
+ * Attach Ajax event handlers for the "Remove parameter from routine" functionality.
+ */
+ $('.routine_param_remove_anchor').live('click', function (event) {
+ event.preventDefault();
+ $(this).parent().parent().remove();
+ // After removing a parameter, the indices of the name attributes in
+ // the input fields lose the correct order and need to be reordered.
+ /**
+ * @var index Counter used for reindexing the input
+ * fields in the routine parameters table.
+ */
+ var index = 0;
+ $('.routine_params_table').last().find('tr').has('td').each(function () {
+ $(this).find(':input').each(function () {
+ /**
+ * @var inputname The value of the name attribute of
+ * the input field being reindexed.
+ */
+ var inputname = $(this).attr('name');
+ if (inputname.substr(0, 17) === 'item_param_dir') {
+ $(this).attr('name', inputname.substr(0, 17) + '[' + index + ']');
+ } else if (inputname.substr(0, 18) === 'item_param_name') {
+ $(this).attr('name', inputname.substr(0, 18) + '[' + index + ']');
+ } else if (inputname.substr(0, 18) === 'item_param_type') {
+ $(this).attr('name', inputname.substr(0, 18) + '[' + index + ']');
+ } else if (inputname.substr(0, 20) === 'item_param_length') {
+ $(this).attr('name', inputname.substr(0, 20) + '[' + index + ']');
+ } else if (inputname.substr(0, 23) === 'item_param_opts_text') {
+ $(this).attr('name', inputname.substr(0, 23) + '[' + index + ']');
+ } else if (inputname.substr(0, 22) === 'item_param_opts_num') {
+ $(this).attr('name', inputname.substr(0, 22) + '[' + index + ']');
+ }
+ });
+ index++;
+ });
+ }); // end $.live()
+
+ /**
+ * Attach Ajax event handlers for the "Change routine type"
+ * functionality in the routines editor, so that the correct
+ * fields are shown in the editor when changing the routine type
+ */
+ $('select[name=item_type]').live('change', function () {
+ $('.routine_return_row, .routine_direction_cell').toggle();
+ }); // end $.live()
+
+ /**
+ * Attach Ajax event handlers for the "Change parameter type"
+ * functionality in the routines editor, so that the correct
+ * option/length fields, if any, are shown when changing
+ * a parameter type
+ */
+ $('select[name^=item_param_type]').live('change', function () {
+ /**
+ * @var $row jQuery object containing the reference to
+ * a row in the routine parameters table
+ */
+ var $row = $(this).parents('tr').first();
+ RTE.setOptionsForParameter(
+ $row.find('select[name^=item_param_type]'),
+ $row.find('input[name^=item_param_length]'),
+ $row.find('select[name^=item_param_opts_text]'),
+ $row.find('select[name^=item_param_opts_num]')
+ );
+ }); // end $.live()
+
+ /**
+ * Attach Ajax event handlers for the "Change the type of return
+ * variable of function" functionality, so that the correct fields,
+ * if any, are shown when changing the function return type type
+ */
+ $('select[name=item_returntype]').live('change', function () {
+ RTE.setOptionsForParameter(
+ $('.rte_table').find('select[name=item_returntype]'),
+ $('.rte_table').find('input[name=item_returnlength]'),
+ $('.rte_table').find('select[name=item_returnopts_text]'),
+ $('.rte_table').find('select[name=item_returnopts_num]')
+ );
+ }); // end $.live()
+
+ /**
+ * Attach Ajax event handlers for the Execute routine functionality.
+ */
+ $('.ajax_exec_anchor').live('click', function (event) {
+ event.preventDefault();
+ /**
+ * @var $msg jQuery object containing the reference to
+ * the AJAX message shown to the user
+ */
+ var $msg = PMA_ajaxShowMessage();
+ $.get($(this).attr('href'), {'ajax_request': true}, function (data) {
+ if (data.success === true) {
+ PMA_ajaxRemoveMessage($msg);
+ // If 'data.dialog' is true we show a dialog with a form
+ // to get the input parameters for routine, otherwise
+ // we just show the results of the query
+ if (data.dialog) {
+ // Define the function that is called when
+ // the user presses the "Go" button
+ RTE.buttonOptions[PMA_messages['strGo']] = function () {
+ /**
+ * @var data Form data to be sent in the AJAX request.
+ */
+ var data = $('.rte_form').last().serialize();
+ $msg = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+ $.post('db_routines.php', data, function (data) {
+ if (data.success === true) {
+ // Routine executed successfully
+ PMA_ajaxRemoveMessage($msg);
+ PMA_slidingMessage(data.message);
+ $ajaxDialog.dialog('close');
+ } else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ });
+ };
+ RTE.buttonOptions[PMA_messages['strClose']] = function () {
+ $(this).dialog("close");
+ };
+ /**
+ * Display the dialog to the user
+ */
+ $ajaxDialog = $('' + data.message + '
').dialog({
+ width: 650,
+ buttons: RTE.buttonOptions,
+ title: data.title,
+ modal: true,
+ close: function () {
+ $(this).remove();
+ }
+ });
+ $ajaxDialog.find('input[name^=params]').first().focus();
+ /**
+ * Attach the datepickers to the relevant form fields
+ */
+ $ajaxDialog.find('.datefield, .datetimefield').each(function () {
+ PMA_addDatepicker($(this).css('width', '95%'));
+ });
+ } else {
+ // Routine executed successfully
+ PMA_slidingMessage(data.message);
+ }
+ } else {
+ PMA_ajaxShowMessage(data.error);
+ }
+ }); // end $.get()
+ }); // end $.live()
+}); // end of $(document).ready() for the Routine Functionalities
diff --git a/js/rte/triggers.js b/js/rte/triggers.js
new file mode 100644
index 0000000000..826cd55cfb
--- /dev/null
+++ b/js/rte/triggers.js
@@ -0,0 +1,8 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+
+/**
+ * So far it looks like triggers don't need
+ * any special treatment as far as JavaScript
+ * goes, but leaving this file here in case
+ * the need for custom code will arise.
+ */
diff --git a/js/sql.js b/js/sql.js
index 9b54bb9a17..ab384204f7 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -28,28 +28,18 @@ function PMA_urlencode(str) {
* for inline editing
*
* @param $this_field jQuery object that points to the current field's tr
- * @param disp_mode string
*/
-function getFieldName($this_field, disp_mode) {
+function getFieldName($this_field) {
- if(disp_mode == 'vertical') {
- var field_name = $this_field.siblings('th').find('a').text();
- // happens when just one row (headings contain no a)
- if ("" == field_name) {
- field_name = $this_field.siblings('th').text();
- }
- }
- else {
- var this_field_index = $this_field.index();
- // ltr or rtl direction does not impact how the DOM was generated
- // check if the action column in the left exist
- var leftActionExist = !$('#table_results').find('th:first').hasClass('draggable');
- // 5 columns to account for the checkbox, edit, appended inline edit, copy and delete anchors but index is zero-based so substract 4
- var field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index - (leftActionExist ? 4 : 0)) + ') a').text();
- // happens when just one row (headings contain no a)
- if ("" == field_name) {
- field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index - (leftActionExist ? 4 : 0)) + ')').text();
- }
+ var this_field_index = $this_field.index();
+ // ltr or rtl direction does not impact how the DOM was generated
+ // check if the action column in the left exist
+ var leftActionExist = !$('#table_results').find('th:first').hasClass('draggable');
+ // 5 columns to account for the checkbox, edit, appended inline edit, copy and delete anchors but index is zero-based so substract 4
+ var field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index - (leftActionExist ? 4 : 0)) + ') a').text();
+ // happens when just one row (headings contain no a)
+ if ("" == field_name) {
+ field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index - (leftActionExist ? 4 : 0)) + ')').text();
}
field_name = $.trim(field_name);
@@ -63,49 +53,9 @@ function getFieldName($this_field, disp_mode) {
*
*/
function appendInlineAnchor() {
+ // TODO: remove two lines below if vertical display mode has been completely removed
var disp_mode = $("#top_direction_dropdown").val();
-
- if (disp_mode == 'vertical') {
- // there can be one or two tr containing this class, depending
- // on the RowActionLinks cfg parameter
- $('#table_results tr')
- .find('.edit_row_anchor')
- .removeClass('edit_row_anchor')
- .parent().each(function() {
- var $this_tr = $(this);
- var $cloned_tr = $this_tr.clone();
-
- var $img_object = $cloned_tr.find('img:first').attr('title', PMA_messages['strInlineEdit']);
- if ($img_object.length != 0) {
- var img_src = $img_object.attr('src').replace(/b_edit/,'b_inline_edit');
- $img_object.attr('src', img_src);
- }
-
- $cloned_tr.find('td')
- .addClass('inline_edit_anchor')
- .find('a').attr('href', '#');
- var $edit_span = $cloned_tr.find('span:contains("' + PMA_messages['strEdit'] + '")');
- var $span = $cloned_tr.find('a').find('span');
- if ($edit_span.length > 0) {
- $span.text(' ' + PMA_messages['strInlineEdit']);
- $span.prepend($img_object);
- } else {
- $span.text('');
- $span.append($img_object);
- }
-
- $cloned_tr.insertAfter($this_tr);
- });
-
- $('#resultsForm').find('tbody').find('th').each(function() {
- var $this_th = $(this);
- if ($this_th.attr('rowspan') == 4) {
- $this_th.attr('rowspan', '5');
- }
- });
- }
- else {
- // horizontal mode
+ if (disp_mode != 'vertical') {
$('.edit_row_anchor').each(function() {
var $this_td = $(this);
@@ -194,23 +144,6 @@ $(document).ready(function() {
.toggle($(this).attr('value').length > 0);
}).trigger('keyup');
- /**
- * current value of the direction in which the table is displayed
- * @type String
- * @fieldOf jQuery
- * @name disp_mode
- */
- var disp_mode = $("#top_direction_dropdown").val();
-
- /**
- * Update value of {@link jQuery.disp_mode} everytime the direction dropdown changes value
- * @memberOf jQuery
- * @name direction_dropdown_change
- */
- $("#top_direction_dropdown, #bottom_direction_dropdown").live('change', function(event) {
- disp_mode = $(this).val();
- })
-
/**
* Attach the {@link appendInlineAnchor} function to a custom event, which
* will be triggered manually everytime the table of results is reloaded
@@ -536,95 +469,39 @@ $(document).ready(function() {
// Add hide icon and/or text.
$edit_td.children('span.nowrap').append($('')).append($hide_a); - if (disp_mode != 'vertical') { - $('#table_results tbody tr td span a#hide').click(function() { - var $this_hide = $(this).parents('td'); + $('#table_results tbody tr td span a#hide').click(function() { + var $this_hide = $(this).parents('td'); - var $this_span = $this_hide.find('span'); - $this_span.find('a, br').remove(); - $this_span.append($data_a.clone()); + var $this_span = $this_hide.find('span'); + $this_span.find('a, br').remove(); + $this_span.append($data_a.clone()); - $this_hide.removeClass("inline_edit_active hover").addClass("inline_edit_anchor"); - $this_hide.parent().removeClass("hover noclick"); - $this_hide.siblings().removeClass("hover"); + $this_hide.removeClass("inline_edit_active hover").addClass("inline_edit_anchor"); + $this_hide.parent().removeClass("hover noclick"); + $this_hide.siblings().removeClass("hover"); - var $input_siblings = $this_hide.parent('tr').find('.inline_edit'); - var txt = ''; - $input_siblings.each(function() { - var $this_hide_siblings = $(this); - txt = $this_hide_siblings.data('original_data'); - if($this_hide_siblings.children('span').children().length != 0) { - $this_hide_siblings.children('span').empty(); - $this_hide_siblings.children('span').append(txt); - } - }); - $(this).prev().prev().remove(); - $(this).prev().remove(); - $(this).remove(); - - // refresh the grid - $("#sqlqueryresults").trigger('refreshgrid'); - }); - } else { + var $input_siblings = $this_hide.parent('tr').find('.inline_edit'); var txt = ''; - var rows = $edit_td.parent().siblings().length; - - $('#table_results tbody tr td span a#hide').click(function() { - var $hide_a = $(this); - var $this_hide = $(this).parents('td'); - var pos = $this_hide.index(); - - var $this_span = $hide_a.parent(); - $this_span.find('a, br').remove(); - $this_span.append($data_a.clone()); - - var $this_row = $this_span.parents('tr'); - // changing inline_edit_active to inline_edit_anchor - $this_hide.removeClass("inline_edit_active").addClass("inline_edit_anchor"); - - // removing marked and hover classes. - $this_row.parent('tbody').find('tr').find("td:eq(" + pos + ")").removeClass("marked hover"); - - for( var i = 0; i <= rows + 2; i++){ - if( $this_row.siblings("tr:eq(" + i + ") td:eq(" + pos + ")").hasClass("inline_edit") == false) { - continue; - } - $this_row_siblings = $this_row.siblings("tr:eq(" + i + ") td:eq(" + pos + ")"); - txt = $this_row_siblings.data('original_data'); - $this_row_siblings.children('span').empty(); - $this_row_siblings.children('span').append(txt); + $input_siblings.each(function() { + var $this_hide_siblings = $(this); + txt = $this_hide_siblings.data('original_data'); + if($this_hide_siblings.children('span').children().length != 0) { + $this_hide_siblings.children('span').empty(); + $this_hide_siblings.children('span').append(txt); } - $(this).prev().remove(); - $(this).prev().remove(); - $(this).remove(); - - // refresh the grid - $("#sqlqueryresults").trigger('refreshgrid'); }); - } + $(this).prev().prev().remove(); + $(this).prev().remove(); + $(this).remove(); + + // refresh the grid + $("#sqlqueryresults").trigger('refreshgrid'); + }); // Initialize some variables - if(disp_mode == 'vertical') { - /** - * @var this_row_index Index of the current
tags $del_hide.find('a, br').remove(); @@ -1241,11 +1096,7 @@ function PMA_unInlineEditRow($del_hide, $chg_submit, $this_td, $input_siblings, // removing hover, marked and noclick classes $this_td.parent('tr').removeClass('noclick'); - if(disp_mode != 'vertical') { - $this_td.parent('tr').removeClass('hover').find('td').removeClass('hover'); - } else { - $this_td.parents('tbody').find('tr').find('td:eq(' + $this_td.index() + ')').removeClass('marked hover'); - } + $this_td.parent('tr').removeClass('hover').find('td').removeClass('hover'); $input_siblings.each(function() { // Inline edit post has been successful. @@ -1265,7 +1116,7 @@ function PMA_unInlineEditRow($del_hide, $chg_submit, $this_td, $input_siblings, var new_html = $this_sibling.find('textarea').val(); if($this_sibling.is('.transformed')) { - var field_name = getFieldName($this_sibling, disp_mode); + var field_name = getFieldName($this_sibling); if (typeof data.transformations != 'undefined') { $.each(data.transformations, function(key, value) { if(key == field_name) { @@ -1294,7 +1145,7 @@ function PMA_unInlineEditRow($del_hide, $chg_submit, $this_td, $input_siblings, } if($this_sibling.is('.relation')) { - var field_name = getFieldName($this_sibling, disp_mode); + var field_name = getFieldName($this_sibling); if (typeof data.relations != 'undefined') { $.each(data.relations, function(key, value) { if(key == field_name) { diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 8ccc7c0dec..1abe88544e 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -363,6 +363,7 @@ $goto_whitelist = array( 'db_create.php', 'db_datadict.php', 'db_sql.php', + 'db_events.php', 'db_export.php', 'db_importdocsql.php', 'db_qbe.php', diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 0abff96d92..3ece8ef049 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -140,10 +140,10 @@ function PMA_displayMaximumUploadSize($max_upload_size) * * @access public */ - function PMA_generateHiddenMaxFileSize($max_size) - { - return ''; - } +function PMA_generateHiddenMaxFileSize($max_size) +{ + return ''; +} /** * Add slashes before "'" and "\" characters so a value containing them can @@ -377,7 +377,7 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju $mysql = '5.1'; /* l10n: Language to use for MySQL 5.1 documentation, please use only languages which do exist in official documentation. */ $lang = _pgettext('MySQL 5.1 documentation language', 'en'); - } elseif (PMA_MYSQL_INT_VERSION >= 50000) { + } else { $mysql = '5.0'; /* l10n: Language to use for MySQL 5.0 documentation, please use only languages which do exist in official documentation. */ $lang = _pgettext('MySQL 5.0 documentation language', 'en'); @@ -707,7 +707,7 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = $group_name_full = ''; $parts_cnt = count($parts) - 1; while ($i < $parts_cnt - && $i < $GLOBALS['cfg']['LeftFrameTableLevel']) { + && $i < $GLOBALS['cfg']['LeftFrameTableLevel']) { $group_name = $parts[$i] . $sep; $group_name_full .= $group_name; @@ -739,7 +739,7 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = if ($GLOBALS['cfg']['ShowTooltipAliasTB'] - && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested') { + && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested') { // switch tooltip and name $table['Comment'] = $table['Name']; $table['disp_name'] = $table['Comment']; @@ -807,8 +807,6 @@ function PMA_backquote($a_name, $do_it = true) */ function PMA_whichCrlf() { - $the_crlf = "\n"; - // The 'PMA_USR_OS' constant is defined in "./libraries/Config.class.php" // Win case if (PMA_USR_OS == 'Win') { @@ -825,15 +823,12 @@ function PMA_whichCrlf() /** * Reloads navigation if needed. * - * @param $jsonly prints out pure JavaScript - * @global array configuration + * @param bool $jsonly prints out pure JavaScript * * @access public */ function PMA_reloadNavigation($jsonly=false) { - global $cfg; - // Reloads the navigation frame via JavaScript if required if (isset($GLOBALS['reload']) && $GLOBALS['reload']) { // one of the reasons for a reload is when a table is dropped @@ -869,7 +864,7 @@ if (!$jsonly) * @param string $sql_query the query to display * @param string $type the type (level) of the message * @param boolean $is_view is this a message after a VIEW operation? - * @global array the configuration array + * @return string * @access public */ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view = false) @@ -1218,6 +1213,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view ob_end_clean(); return $buffer_contents; } + return null; } // end of the 'PMA_showMessage()' function /** @@ -1225,7 +1221,6 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view * * @access public * @return boolean whether profiling is supported - * */ function PMA_profilingSupported() { @@ -1250,7 +1245,6 @@ function PMA_profilingSupported() * * @param string $sql_query * @access public - * */ function PMA_profilingCheckbox($sql_query) { @@ -1350,8 +1344,6 @@ function PMA_localizeNumber($value) * @return string the formatted value and its unit * * @access public - * - * @version 1.1.0 - 2005-10-27 */ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_down = false, $noTrailingZero = true) { @@ -1769,7 +1761,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), } } // end if... else... - return $ret; + return $ret; } // end of the 'PMA_linkOrButton()' function @@ -1843,7 +1835,6 @@ function PMA_flipstring($string, $Separator = "
\n") return $format_string; } - /** * Function added to avoid path disclosures. * Called by each script that needs parameters, it displays @@ -1930,9 +1921,8 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force $meta->orgname = $meta->name; if (isset($GLOBALS['analyzed_sql'][0]['select_expr']) - && is_array($GLOBALS['analyzed_sql'][0]['select_expr'])) { - foreach ($GLOBALS['analyzed_sql'][0]['select_expr'] - as $select_expr) { + && is_array($GLOBALS['analyzed_sql'][0]['select_expr'])) { + foreach ($GLOBALS['analyzed_sql'][0]['select_expr'] as $select_expr) { // need (string) === (string) // '' !== 0 but '' == 0 if ((string) $select_expr['alias'] === (string) $meta->name) { @@ -1980,18 +1970,18 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force $condition .= '= ' . $row[$i] . ' AND'; } elseif (($meta->type == 'blob' || $meta->type == 'string') // hexify only if this is a true not empty BLOB or a BINARY - && stristr($field_flags, 'BINARY') - && !empty($row[$i])) { - // do not waste memory building a too big condition - if (strlen($row[$i]) < 1000) { - // use a CAST if possible, to avoid problems - // if the field contains wildcard characters % or _ - $condition .= '= CAST(0x' . bin2hex($row[$i]) - . ' AS BINARY) AND'; - } else { - // this blob won't be part of the final condition - $condition = ''; - } + && stristr($field_flags, 'BINARY') + && !empty($row[$i])) { + // do not waste memory building a too big condition + if (strlen($row[$i]) < 1000) { + // use a CAST if possible, to avoid problems + // if the field contains wildcard characters % or _ + $condition .= '= CAST(0x' . bin2hex($row[$i]) + . ' AS BINARY) AND'; + } else { + // this blob won't be part of the final condition + $condition = ''; + } } elseif ($meta->type == 'bit') { $condition .= "= b'" . PMA_printable_bit_value($row[$i], $meta->length) . "' AND"; } else { @@ -2167,12 +2157,12 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1, * Generate navigation for a list * * @todo use $pos from $_url_params - * @param integer number of elements in the list - * @param integer current position in the list - * @param array url parameters - * @param string script name for form target - * @param string target frame - * @param integer maximum number of elements to display from the list + * @param int $count number of elements in the list + * @param int $pos current position in the list + * @param array $_url_params url parameters + * @param string $script script name for form target + * @param string $frame target frame + * @param int $max_count maximum number of elements to display from the list * * @access public */ @@ -2354,10 +2344,11 @@ function PMA_display_html_radio($html_field_name, $choices, $checked_choice = '' * Generates and returns an HTML dropdown * * @param string $select_name - * @param array $choices the choices values - * @param string $active_choice the choice to select by default - * @param string $id the id of the select element; can be different in case - * the dropdown is present more than once on the page + * @param array $choices choices values + * @param string $active_choice the choice to select by default + * @param string $id id of the select element; can be different in case + * the dropdown is present more than once on the page + * @return string * @todo support titles */ function PMA_generate_html_dropdown($select_name, $choices, $active_choice, $id) @@ -2401,6 +2392,87 @@ function PMA_generate_slider_effect($id, $message) \n"; + if ($GLOBALS['cfg']['AjaxEnable']) { + $retval .= "\n"; + $retval .= "
";
+ $retval .= str_replace(' ', ' ', $options[0]['label']) . "
\n";
+ $retval .= " \n";
+ $retval .= " \n";
+ $retval .= " | '; - $schedulerFieldset = ' |