' - . __('MySQL said: ') . PMA_DBI_getError(null); + $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 = PMA_Message::success( + __('Routine %1$s has been created.') + ); $message->addParam(PMA_backquote($_REQUEST['item_name'])); $sql_query = $routine_query; } @@ -291,7 +325,9 @@ function PMA_RTN_handleEditor() } if (count($errors)) { - $message = PMA_Message::error(__('One or more errors have occured while processing your request:')); + $message = PMA_Message::error( + __('One or more errors have occured while processing your request:') + ); $message->addString('
- ');
foreach ($errors as $string) {
$message->addString('
- ' . $string . ' '); @@ -505,10 +541,10 @@ function PMA_RTN_getDataFromRequest() * This function will generate the values that are required to complete * the "Edit routine" form given the name of a routine. * - * @param string $name The name of the routine. - * @param string $type Type of routine (ROUTINE|PROCEDURE) - * @param bool $all Whether to return all data or just - * the info about parameters. + * @param string $name The name of the routine. + * @param string $type Type of routine (ROUTINE|PROCEDURE) + * @param bool $all Whether to return all data or just + * the info about parameters. * * @return array Data necessary to create the routine editor. */ @@ -577,7 +613,9 @@ function PMA_RTN_getDataFromName($name, $type, $all = true) && strtoupper($parsed_query[$i]['data']) == 'RETURNS' ) { $fetching = true; - } else if ($fetching == true && $parsed_query[$i]['type'] == 'alpha_reservedWord') { + } else if ($fetching == true + && $parsed_query[$i]['type'] == 'alpha_reservedWord' + ) { // We will not be looking for options such as UNSIGNED // or ZEROFILL because there is no way that a numeric // field's DTD_IDENTIFIER can be longer than 64 @@ -604,8 +642,8 @@ function PMA_RTN_getDataFromName($name, $type, $all = true) $retval['item_returnopts_num'] = $returnparam[4]; $retval['item_returnopts_text'] = $returnparam[4]; } - $retval['item_definer'] = PMA_RTN_parseRoutineDefiner($parsed_query); - $retval['item_definition'] = $routine['ROUTINE_DEFINITION']; + $retval['item_definer'] = PMA_RTN_parseRoutineDefiner($parsed_query); + $retval['item_definition'] = $routine['ROUTINE_DEFINITION']; $retval['item_isdeterministic'] = ''; if ($routine['IS_DETERMINISTIC'] == 'YES') { $retval['item_isdeterministic'] = " checked='checked'"; @@ -627,13 +665,13 @@ function PMA_RTN_getDataFromName($name, $type, $all = true) /** * Creates one row for the parameter table used in the routine editor. * - * @param array $routine Data for the routine returned by - * PMA_RTN_getDataFromRequest() or - * PMA_RTN_getDataFromName() - * @param mixed $index Either a numeric index of the row being processed - * or NULL to create a template row for AJAX request - * @param string $class Class used to hide the direction column, if the - * row is for a stored function. + * @param array $routine Data for the routine returned by + * PMA_RTN_getDataFromRequest() or + * PMA_RTN_getDataFromName() + * @param mixed $index Either a numeric index of the row being processed + * or NULL to create a template row for AJAX request + * @param string $class Class used to hide the direction column, if the + * row is for a stored function. * * @return string HTML code of one row of parameter table for the editor. */ @@ -732,14 +770,14 @@ function PMA_RTN_getParameterRow($routine = array(), $index = null, $class = '') /** * Displays a form used to add/edit a routine * - * @param string $mode If the editor will be used edit a routine - * or add a new one: 'edit' or 'add'. - * @param string $operation If the editor was previously invoked with - * JS turned off, this will hold the name of - * the current operation - * @param array $routine Data for the routine returned by - * PMA_RTN_getDataFromRequest() or - * PMA_RTN_getDataFromName() + * @param string $mode If the editor will be used edit a routine + * or add a new one: 'edit' or 'add'. + * @param string $operation If the editor was previously invoked with + * JS turned off, this will hold the name of + * the current operation + * @param array $routine Data for the routine returned by + * PMA_RTN_getDataFromRequest() or + * PMA_RTN_getDataFromName() * * @return string HTML code for the editor. */ @@ -779,7 +817,9 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine) $routine['item_type'] = 'PROCEDURE'; $routine['item_type_toggle'] = 'FUNCTION'; } - } else if ($operation == 'add' || ($routine['item_num_params'] == 0 && $mode == 'add' && ! $errors)) { + } else if ($operation == 'add' + || ($routine['item_num_params'] == 0 && $mode == 'add' && ! $errors) + ) { $routine['item_param_dir'][] = ''; $routine['item_param_name'][] = ''; $routine['item_param_type'][] = ''; @@ -989,7 +1029,8 @@ function PMA_RTN_getQueryFromRequest() { global $_REQUEST, $errors, $param_sqldataaccess, $param_directions; - $_REQUEST['item_type'] = isset($_REQUEST['item_type']) ? $_REQUEST['item_type'] : ''; + $_REQUEST['item_type'] = isset($_REQUEST['item_type']) + ? $_REQUEST['item_type'] : ''; $query = 'CREATE '; if (! empty($_REQUEST['item_definer'])) { @@ -1006,7 +1047,10 @@ function PMA_RTN_getQueryFromRequest() ) { $query .= $_REQUEST['item_type'] . ' '; } else { - $errors[] = sprintf(__('Invalid routine type: "%s"'), htmlspecialchars($_REQUEST['item_type'])); + $errors[] = sprintf( + __('Invalid routine type: "%s"'), + htmlspecialchars($_REQUEST['item_type']) + ); } if (! empty($_REQUEST['item_name'])) { $query .= PMA_backquote($_REQUEST['item_name']); @@ -1133,6 +1177,8 @@ function PMA_RTN_getQueryFromRequest() /** * Handles requests for executing a routine + * + * @return Does not return */ function PMA_RTN_handleExecute() { @@ -1344,8 +1390,8 @@ function PMA_RTN_handleExecute() /** * Creates the HTML code that shows the routine execution dialog. * - * @param array $routine Data for the routine returned by - * PMA_RTN_getDataFromName() + * @param array $routine Data for the routine returned by + * PMA_RTN_getDataFromName() * * @return string HTML code for the routine execution dialog. */ diff --git a/pmd_general.php b/pmd_general.php index 8f2c48d0dc..d620da82ec 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -228,23 +228,24 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
- ; ?>pmd/FieldKey_small.png)
-
- ; ?>pmd/Field_small<?php
- if (strstr($tab_column[$t_n][)
+
+
+ ; ?>pmd/Field_small<?php
+ if (strstr($tab_column[$t_n][)
.png" alt="*" />
+ .png" alt="*" />
- \n\n";
+ if (isset($_REQUEST['query'])) {
+ //$temp = $GLOBALS['PMD_OUT']["OWNER"][$i].'.'.$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i];
+ echo '';
+ echo '
+ . ' "options")
';
+ }
+ echo "
-
-
+
+  . ' "options")
';
- }
- ?>
-
-
-
-
- \n\n";
}
?>
diff --git a/po/fr.po b/po/fr.po
index e6841dda11..df8e92641a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-06-18 10:54+0200\n"
-"PO-Revision-Date: 2012-05-25 18:45+0200\n"
+"PO-Revision-Date: 2012-06-20 18:40+0200\n"
"Last-Translator: Marc Delisle
@@ -872,25 +871,25 @@ echo __('Runtime Information');
@@ -1024,11 +1023,11 @@ function printQueryStatistics()
@@ -910,17 +909,17 @@ echo __('Runtime Information');
; ?>text.png)
-
+