gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backquote Routine parameters in the generated query.

Browse Source
This commit is contained in:
Rouslan Placella 2011-05-31 11:14:15 +01:00
parent 77c8f4c624
commit f964639676
2 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libraries/common.lib.php
View File

@ -841,6 +841,46 @@ function PMA_backquote($a_name, $do_it = true)
}
} // end of the 'PMA_backquote()' function
/**
* Removes backquotes on both sides of a database, table or field name.
* and the backquotes inside the names that were escaped with another backquote.
*
* example:
* <code>
* echo PMA_unbackquote('`owner``s db`'); // 'owner`s db'
*
* </code>
*
* @uses PMA_unbackquote()
* @uses is_array()
* @uses strlen()
* @uses substr()
* @uses trim()
* @uses str_replace()
* @param mixed $a_name the database, table or field name to "backquote"
* or array of it
* @return mixed the database, table or field name(s)
after being stripped of backquotes
* @access public
*/
function PMA_unbackquote($a_name)
{
if (is_array($a_name)) {
foreach ($a_name as &$data) {
$data = PMA_unbackquote($data);
}
return $a_name;
}
// '0' is also empty for php :-(
if (strlen($a_name) && $a_name !== '*') {
if (substr(trim($a_name), 0, 1) == '`' && substr(trim($a_name), -1) == '`') {
$a_name = substr(trim($a_name), 1, -1);
return str_replace('``', '`', $a_name);
}
}
return $a_name;
} // end of the 'PMA_unbackquote()' function
/**
* Defines the <CR><LF> value depending on the user OS.

6
libraries/db_routines.inc.php
View File

@ -169,7 +169,7 @@ function parseListOfParameters($str, &$num, &$dir, &$name, &$type, &$length)
}
// Get name
$space_pos = strpos($value, ' ');
$name[] = htmlspecialchars(substr($value, 0, $space_pos));
$name[] = htmlspecialchars(PMA_unbackquote(substr($value, 0, $space_pos)));
$value = ltrim(substr($value, $space_pos));
// Get type
$brac_pos = strpos($value, '(');
@ -615,10 +615,10 @@ if (! empty($_GET['exportroutine']) && ! empty($_GET['routinename']) && ! empty(
for ($i=0; $i<count($_REQUEST['routine_param_name']); $i++) {
if (! empty($_REQUEST['routine_param_name'][$i]) && ! empty($_REQUEST['routine_param_type'][$i])) {
if ($_REQUEST['routine_type'] == 'PROCEDURE' && ! empty($_REQUEST['routine_param_dir'][$i])) {
$params .= $_REQUEST['routine_param_dir'][$i] . " " . $_REQUEST['routine_param_name'][$i] . " "
$params .= $_REQUEST['routine_param_dir'][$i] . " " . PMA_backquote($_REQUEST['routine_param_name'][$i]) . " "
. $_REQUEST['routine_param_type'][$i];
} else if ($_REQUEST['routine_type'] == 'FUNCTION') {
$params .= $_REQUEST['routine_param_name'][$i] . " " . $_REQUEST['routine_param_type'][$i];
$params .= PMA_backquote($_REQUEST['routine_param_name'][$i]) . " " . $_REQUEST['routine_param_type'][$i];
} else if (! $warned_about_dir) {
$warned_about_dir = true;
$routine_errors[] = sprintf(__('Invalid Direction "%s" given for a Parameter.'),