Add rcube_db::escapeSimple() method for backward compat.

pull/88/head
Aleksander Machniak 12 years ago
parent ebaf850afa
commit d8752c9839

@ -55,7 +55,7 @@ class virtuser_query extends rcube_plugin
{ {
$dbh = $this->app->get_dbh(); $dbh = $this->app->get_dbh();
$sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($p['user']), $this->config['email'])); $sql_result = $dbh->query(preg_replace('/%u/', $dbh->quote($p['user']), $this->config['email']));
while ($sql_arr = $dbh->fetch_array($sql_result)) { while ($sql_arr = $dbh->fetch_array($sql_result)) {
if (strpos($sql_arr[0], '@')) { if (strpos($sql_arr[0], '@')) {
@ -91,7 +91,7 @@ class virtuser_query extends rcube_plugin
{ {
$dbh = $this->app->get_dbh(); $dbh = $this->app->get_dbh();
$sql_result = $dbh->query(preg_replace('/%m/', $dbh->escapeSimple($p['email']), $this->config['user'])); $sql_result = $dbh->query(preg_replace('/%m/', $dbh->quote($p['email']), $this->config['user']));
if ($sql_arr = $dbh->fetch_array($sql_result)) { if ($sql_arr = $dbh->fetch_array($sql_result)) {
$p['user'] = $sql_arr[0]; $p['user'] = $sql_arr[0];
@ -107,7 +107,7 @@ class virtuser_query extends rcube_plugin
{ {
$dbh = $this->app->get_dbh(); $dbh = $this->app->get_dbh();
$sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($p['user']), $this->config['host'])); $sql_result = $dbh->query(preg_replace('/%u/', $dbh->quote($p['user']), $this->config['host']));
if ($sql_arr = $dbh->fetch_array($sql_result)) { if ($sql_arr = $dbh->fetch_array($sql_result)) {
$p['host'] = $sql_arr[0]; $p['host'] = $sql_arr[0];

@ -647,6 +647,20 @@ class rcube_db
return $this->quote_identifier($str); return $this->quote_identifier($str);
} }
/**
* Quotes a string so it can be safely used as a table or column name
*
* @param string $str Value to quote
*
* @return string Quoted string for use in query
* @deprecated Replaced by rcube_db::quote
* @see rcube_db::quote
*/
public function simpleEscape($str)
{
return $this->quote($str);
}
/** /**
* Quotes a string so it can be safely used as a table or column name * Quotes a string so it can be safely used as a table or column name
* *

Loading…
Cancel
Save