From 526419d1a127ff0784df634eaf0ee2f4f73a6474 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Thu, 14 Jul 2011 13:57:05 +0100 Subject: [PATCH 1/6] Renamed some functions to avoid conflicts of redefinition in unit tests --- db_events.php | 1 + db_routines.php | 1 + db_triggers.php | 1 + libraries/rte/rte_events.lib.php | 28 +------------- libraries/rte/rte_main.inc.php | 20 +++++++--- libraries/rte/rte_routines.lib.php | 28 +------------- libraries/rte/rte_triggers.lib.php | 28 +------------- libraries/rte/rte_words.lib.php | 60 ++++++++++++++++++++++++++++++ 8 files changed, 83 insertions(+), 84 deletions(-) create mode 100644 libraries/rte/rte_words.lib.php diff --git a/db_events.php b/db_events.php index f65960770a..c4397e79b9 100644 --- a/db_events.php +++ b/db_events.php @@ -28,6 +28,7 @@ require_once './libraries/rte/rte_events.lib.php'; /** * Do the magic */ +$_PMA_RTE = 'EVN'; require_once './libraries/rte/rte_main.inc.php'; ?> diff --git a/db_routines.php b/db_routines.php index efac9ea380..739e69a5d2 100644 --- a/db_routines.php +++ b/db_routines.php @@ -30,6 +30,7 @@ require_once './libraries/rte/rte_routines.lib.php'; /** * Do the magic */ +$_PMA_RTE = 'RTN'; require_once './libraries/rte/rte_main.inc.php'; ?> diff --git a/db_triggers.php b/db_triggers.php index 1bd792ec41..aef164266d 100644 --- a/db_triggers.php +++ b/db_triggers.php @@ -27,6 +27,7 @@ require_once './libraries/rte/rte_triggers.lib.php'; /** * Do the magic */ +$_PMA_RTE = 'TRI'; require_once './libraries/rte/rte_main.inc.php'; ?> diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php index d7ffbc57dc..a449ff2e8d 100644 --- a/libraries/rte/rte_events.lib.php +++ b/libraries/rte/rte_events.lib.php @@ -43,34 +43,10 @@ function PMA_EVN_setGlobals() 'MINUTE_SECOND'); } -/** - * This function is defined in: rte_routines.lib.php, rte_triggers.lib.php and - * rte_events.lib.php. It is used to retreive some language strings that are - * used in functionalities that are common to routines, triggers and events. - * - * @param string $index The index of the string to get - * - * @return string The requested string or an empty string, if not available - */ -function PMA_RTE_getWord($index) -{ - $words = array( - 'add' => __('Add event'), - 'docu' => 'EVENTS', - 'export' => __('Export of event %s'), - 'human' => __('event'), - 'no_create' => __('You do not have the necessary privileges to create a new event'), - 'not_found' => __('No event with name %1$s found in database %2$s'), - 'nothing' => __('There are no events to display.'), - 'title' => __('Events'), - ); - return isset($words[$index]) ? $words[$index] : ''; -} // end PMA_RTE_getWord() - /** * Main function for the events functionality */ -function PMA_RTE_main() +function PMA_EVN_main() { global $db; @@ -95,7 +71,7 @@ function PMA_RTE_main() * toggle the state of the event scheduler. */ echo PMA_EVN_getFooterLinks(); -} // end PMA_RTE_main() +} // end PMA_EVN_main() /** * Handles editor requests for adding or editing an item diff --git a/libraries/rte/rte_main.inc.php b/libraries/rte/rte_main.inc.php index dd3e4c0351..d2950bfca1 100644 --- a/libraries/rte/rte_main.inc.php +++ b/libraries/rte/rte_main.inc.php @@ -13,6 +13,7 @@ if (! defined('PHPMYADMIN')) { * Include all other files that are common * to routines, triggers and events. */ +require_once './libraries/rte/rte_words.lib.php'; require_once './libraries/rte/rte_export.lib.php'; require_once './libraries/rte/rte_list.lib.php'; require_once './libraries/rte/rte_footer.lib.php'; @@ -71,14 +72,21 @@ $titles = PMA_buildActionTitles(); */ $errors = array(); + /** - * The below function is defined in rte_routines.lib.php, - * rte_triggers.lib.php and rte_events.lib.php - * - * The appropriate function will now be called based on which one - * of these files was included earlier in the top-level folder + * Call the appropriate main function */ -PMA_RTE_main(); +switch ($_PMA_RTE) { +case 'RTN': + PMA_RTN_main(); + break; +case 'TRI': + PMA_TRI_main(); + break; +case 'EVN': + PMA_EVN_main(); + break; +} /** * Display the footer, if necessary diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 9a9c8f23f2..5ac8536632 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -28,34 +28,10 @@ function PMA_RTN_setGlobals() 'MODIFIES SQL DATA'); } -/** - * This function is defined in: rte_routines.lib.php, rte_triggers.lib.php and - * rte_events.lib.php. It is used to retreive some language strings that are - * used in functionalities that are common to routines, triggers and events. - * - * @param string $index The index of the string to get - * - * @return string The requested string or an empty string, if not available - */ -function PMA_RTE_getWord($index) -{ - $words = array( - 'add' => __('Add routine'), - 'docu' => 'STORED_ROUTINES', - 'export' => __('Export of routine %s'), - 'human' => __('routine'), - 'no_create' => __('You do not have the necessary privileges to create a new routine'), - 'not_found' => __('No routine with name %1$s found in database %2$s'), - 'nothing' => __('There are no routines to display.'), - 'title' => __('Routines'), - ); - return isset($words[$index]) ? $words[$index] : ''; -} // end PMA_RTE_getWord() - /** * Main function for the routines functionality */ -function PMA_RTE_main() +function PMA_RTN_main() { global $db; @@ -93,7 +69,7 @@ function PMA_RTE_main() E_USER_WARNING ); } -} // end PMA_RTE_main() +} // end PMA_RTN_main() /** * This function parses a string containing one parameter of a routine, diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php index 61b9943169..8c65a6781d 100644 --- a/libraries/rte/rte_triggers.lib.php +++ b/libraries/rte/rte_triggers.lib.php @@ -24,34 +24,10 @@ function PMA_TRI_setGlobals() 'DELETE'); } -/** - * This function is defined in: rte_routines.lib.php, rte_triggers.lib.php and - * rte_events.lib.php. It is used to retreive some language strings that are - * used in functionalities that are common to routines, triggers and events. - * - * @param string $index The index of the string to get - * - * @return string The requested string or an empty string, if not available - */ -function PMA_RTE_getWord($index) -{ - $words = array( - 'add' => __('Add trigger'), - 'docu' => 'TRIGGERS', - 'export' => __('Export of trigger %s'), - 'human' => __('trigger'), - 'no_create' => __('You do not have the necessary privileges to create a new trigger'), - 'not_found' => __('No trigger with name %1$s found in database %2$s'), - 'nothing' => __('There are no triggers to display.'), - 'title' => __('Triggers'), - ); - return isset($words[$index]) ? $words[$index] : ''; -} // end PMA_RTE_getWord() - /** * Main function for the triggers functionality */ -function PMA_RTE_main() +function PMA_TRI_main() { global $db, $table; @@ -71,7 +47,7 @@ function PMA_RTE_main() * if the user has the necessary privileges */ echo PMA_TRI_getFooterLinks(); -} // end PMA_RTE_main() +} // end PMA_TRI_main() /** * Handles editor requests for adding or editing an item diff --git a/libraries/rte/rte_words.lib.php b/libraries/rte/rte_words.lib.php new file mode 100644 index 0000000000..657bec1821 --- /dev/null +++ b/libraries/rte/rte_words.lib.php @@ -0,0 +1,60 @@ + __('Add routine'), + 'docu' => 'STORED_ROUTINES', + 'export' => __('Export of routine %s'), + 'human' => __('routine'), + 'no_create' => __('You do not have the necessary privileges to create a new routine'), + 'not_found' => __('No routine with name %1$s found in database %2$s'), + 'nothing' => __('There are no routines to display.'), + 'title' => __('Routines'), + ); + break; + case 'TRI': + $words = array( + 'add' => __('Add trigger'), + 'docu' => 'TRIGGERS', + 'export' => __('Export of trigger %s'), + 'human' => __('trigger'), + 'no_create' => __('You do not have the necessary privileges to create a new trigger'), + 'not_found' => __('No trigger with name %1$s found in database %2$s'), + 'nothing' => __('There are no triggers to display.'), + 'title' => __('Triggers'), + ); + break; + case 'EVN': + $words = array( + 'add' => __('Add event'), + 'docu' => 'EVENTS', + 'export' => __('Export of event %s'), + 'human' => __('event'), + 'no_create' => __('You do not have the necessary privileges to create a new event'), + 'not_found' => __('No event with name %1$s found in database %2$s'), + 'nothing' => __('There are no events to display.'), + 'title' => __('Events'), + ); + break; + default: + $words = array(); + break; + } + + return isset($words[$index]) ? $words[$index] : ''; +} // end PMA_RTE_getWord() + +?> From 28881e4f4a66adea4d5efd5acb97027810b23d45 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Sat, 16 Jul 2011 19:31:36 +0100 Subject: [PATCH 2/6] Simplified check for maximum number of routine parameters --- libraries/rte/rte_routines.lib.php | 58 ++++++------------------------ 1 file changed, 11 insertions(+), 47 deletions(-) diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 5ac8536632..6fa6fa5669 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -106,8 +106,7 @@ function PMA_RTN_parseOneParameter($value) $param_opts = array(); for ($i=$pos; $i<$parsed_param['len']; $i++) { if (($parsed_param[$i]['type'] == 'alpha_columnType' - || $parsed_param[$i]['type'] == 'alpha_functionName') // "CHAR" seems to be mistaken for a function by the parser - && $depth == 0 + || $parsed_param[$i]['type'] == 'alpha_functionName') && $depth == 0 // "CHAR" seems to be mistaken for a function by the parser ) { $retval[2] = strtoupper($parsed_param[$i]['data']); } else if ($parsed_param[$i]['type'] == 'punct_bracket_open_round' && $depth == 0) { @@ -428,7 +427,7 @@ function PMA_RTN_getDataFromRequest() $retval['item_param_length'] = array(); $retval['item_param_opts_num'] = array(); $retval['item_param_opts_text'] = array(); - if (isset($_REQUEST['item_param_name']) + if ( isset($_REQUEST['item_param_name']) && isset($_REQUEST['item_param_type']) && isset($_REQUEST['item_param_length']) && isset($_REQUEST['item_param_opts_num']) @@ -440,65 +439,30 @@ function PMA_RTN_getDataFromRequest() && is_array($_REQUEST['item_param_opts_text']) ) { if ($_REQUEST['item_type'] == 'PROCEDURE') { - $temp_num_params = 0; $retval['item_param_dir'] = $_REQUEST['item_param_dir']; foreach ($retval['item_param_dir'] as $key => $value) { if (! in_array($value, $param_directions, true)) { $retval['item_param_dir'][$key] = ''; } - $retval['item_num_params']++; - } - if ($temp_num_params > $retval['item_num_params']) { - $retval['item_num_params'] = $temp_num_params; } } - $temp_num_params = 0; $retval['item_param_name'] = $_REQUEST['item_param_name']; - foreach ($retval['item_param_name'] as $key => $value) { - $retval['item_param_name'][$key] = $value; - $temp_num_params++; - } - if ($temp_num_params > $retval['item_num_params']) { - $retval['item_num_params'] = $temp_num_params; - } - $temp_num_params = 0; $retval['item_param_type'] = $_REQUEST['item_param_type']; foreach ($retval['item_param_type'] as $key => $value) { if (! in_array($value, PMA_getSupportedDatatypes(), true)) { $retval['item_param_type'][$key] = ''; } - $temp_num_params++; } - if ($temp_num_params > $retval['item_num_params']) { - $retval['item_num_params'] = $temp_num_params; - } - $temp_num_params = 0; - $retval['item_param_length'] = $_REQUEST['item_param_length']; - foreach ($retval['item_param_length'] as $key => $value) { - $retval['item_param_length'][$key] = $value; - $temp_num_params++; - } - if ($temp_num_params > $retval['item_num_params']) { - $retval['item_num_params'] = $temp_num_params; - } - $temp_num_params = 0; - $retval['item_param_opts_num'] = $_REQUEST['item_param_opts_num']; - foreach ($retval['item_param_opts_num'] as $key => $value) { - $retval['item_param_opts_num'][$key] = $value; - $temp_num_params++; - } - if ($temp_num_params > $retval['item_num_params']) { - $retval['item_num_params'] = $temp_num_params; - } - $temp_num_params = 0; + $retval['item_param_length'] = $_REQUEST['item_param_length']; + $retval['item_param_opts_num'] = $_REQUEST['item_param_opts_num']; $retval['item_param_opts_text'] = $_REQUEST['item_param_opts_text']; - foreach ($retval['item_param_opts_text'] as $key => $value) { - $retval['item_param_opts_text'][$key] = $value; - $temp_num_params++; - } - if ($temp_num_params > $retval['item_num_params']) { - $retval['item_num_params'] = $temp_num_params; - } + $retval['item_num_params'] = max( + count($retval['item_param_name']), + count($retval['item_param_type']), + count($retval['item_param_length']), + count($retval['item_param_opts_num']), + count($retval['item_param_opts_text']) + ); } $retval['item_returntype'] = ''; if (isset($_REQUEST['item_returntype']) From 6d714e5d7da833217a05a10598dca0a88a08ad39 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Sat, 16 Jul 2011 19:32:29 +0100 Subject: [PATCH 3/6] E_ALL fix when generating CREATE ROUTINE query from empty request --- libraries/rte/rte_routines.lib.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 6fa6fa5669..6d334a6d8a 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -972,7 +972,9 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine) */ function PMA_RTN_getQueryFromRequest() { - global $_REQUEST, $cfg, $errors, $param_sqldataaccess, $param_opts_num; + global $_REQUEST, $cfg, $errors, $param_sqldataaccess, $param_opts_num, $param_directions; + + $_REQUEST['item_type'] = isset($_REQUEST['item_type']) ? $_REQUEST['item_type'] : ''; $query = 'CREATE '; if (! empty($_REQUEST['item_definer'])) { From d8b14b5dc745d7bc0bc79740887a3790c85f08dc Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Sat, 16 Jul 2011 19:33:08 +0100 Subject: [PATCH 4/6] Removed redundant whitespaces from CREATE ROUTINE query --- libraries/rte/rte_routines.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 6d334a6d8a..d9a11c6aad 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -994,7 +994,7 @@ function PMA_RTN_getQueryFromRequest() $errors[] = sprintf(__('Invalid routine type: "%s"'), htmlspecialchars($_REQUEST['item_type'])); } if (! empty($_REQUEST['item_name'])) { - $query .= PMA_backquote($_REQUEST['item_name']) . ' '; + $query .= PMA_backquote($_REQUEST['item_name']); } else { $errors[] = __('You must provide a routine name'); } @@ -1060,7 +1060,7 @@ function PMA_RTN_getQueryFromRequest() } } } - $query .= " (" . $params . ") "; + $query .= "(" . $params . ") "; if ($_REQUEST['item_type'] == 'FUNCTION') { if (! empty($_REQUEST['item_returntype']) && in_array($_REQUEST['item_returntype'], PMA_getSupportedDatatypes())) { $query .= "RETURNS {$_REQUEST['item_returntype']}"; From bdb3423bc9f11ecf6d893dd749891aabbe85bd3c Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Sat, 16 Jul 2011 19:34:17 +0100 Subject: [PATCH 5/6] Validate parameter direction when generating a CREATE PROCEDURE query --- libraries/rte/rte_routines.lib.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index d9a11c6aad..0fba86ab9e 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -1011,7 +1011,10 @@ function PMA_RTN_getQueryFromRequest() ) { for ($i=0; $i Date: Sat, 16 Jul 2011 19:35:02 +0100 Subject: [PATCH 6/6] Better validation of parameter types when generating a CREATE ROUTINE query --- libraries/rte/rte_routines.lib.php | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 0fba86ab9e..9a99b8c395 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -1038,19 +1038,13 @@ function PMA_RTN_getQueryFromRequest() } } if (! empty($_REQUEST['item_param_opts_text'][$i])) { - if (isset($cfg['RestrictColumnTypes'][strtoupper($_REQUEST['item_param_type'][$i])])) { - $group = $cfg['RestrictColumnTypes'][strtoupper($_REQUEST['item_param_type'][$i])]; - if ($group == 'FUNC_CHAR') { - $params .= ' CHARSET ' . strtolower($_REQUEST['item_param_opts_text'][$i]); - } + if (in_array($_REQUEST['item_param_type'][$i], $cfg['ColumnTypes']['STRING'])) { + $params .= ' CHARSET ' . strtolower($_REQUEST['item_param_opts_text'][$i]); } } if (! empty($_REQUEST['item_param_opts_num'][$i])) { - if (isset($cfg['RestrictColumnTypes'][strtoupper($_REQUEST['item_param_type'][$i])])) { - $group = $cfg['RestrictColumnTypes'][strtoupper($_REQUEST['item_param_type'][$i])]; - if ($group == 'FUNC_NUMBER' && in_array($_REQUEST['item_param_opts_num'][$i], $param_opts_num)) { - $params .= ' ' . strtoupper($_REQUEST['item_param_opts_num'][$i]); - } + if (in_array($_REQUEST['item_param_type'][$i], $cfg['ColumnTypes']['NUMERIC'])) { + $params .= ' ' . strtoupper($_REQUEST['item_param_opts_num'][$i]); } } if ($i != count($_REQUEST['item_param_name'])-1) { @@ -1082,19 +1076,13 @@ function PMA_RTN_getQueryFromRequest() } } if (! empty($_REQUEST['item_returnopts_text'])) { - if (isset($cfg['RestrictColumnTypes'][strtoupper($_REQUEST['item_returntype'])])) { - $group = $cfg['RestrictColumnTypes'][strtoupper($_REQUEST['item_returntype'])]; - if ($group == 'FUNC_CHAR') { - $query .= ' CHARSET ' . strtolower($_REQUEST['item_returnopts_text']); - } + if (in_array($_REQUEST['item_returntype'], $cfg['ColumnTypes']['STRING'])) { + $query .= ' CHARSET ' . strtolower($_REQUEST['item_returnopts_text']); } } if (! empty($_REQUEST['item_returnopts_num'])) { - if (isset($cfg['RestrictColumnTypes'][strtoupper($_REQUEST['item_returntype'])])) { - $group = $cfg['RestrictColumnTypes'][strtoupper($_REQUEST['item_returntype'])]; - if ($group == 'FUNC_NUMBER' && in_array($_REQUEST['item_returnopts_num'], $param_opts_num)) { - $query .= ' ' . strtoupper($_REQUEST['item_returnopts_num']); - } + if (in_array($_REQUEST['item_returntype'], $cfg['ColumnTypes']['NUMERIC'])) { + $query .= ' ' . strtoupper($_REQUEST['item_returnopts_num']); } } $query .= ' ';