Remove (move to bc.php) unused strip_newlines() and strip_quotes() functions

pull/78/head
Aleksander Machniak 12 years ago
parent 56e0cabdec
commit 1d67fe13f6

@ -405,6 +405,16 @@ function enriched_to_html($data)
return rcube_enriched::to_html($data); return rcube_enriched::to_html($data);
} }
function strip_quotes($str)
{
return str_replace(array("'", '"'), '', $str);
}
function strip_newlines($str)
{
return preg_replace('/[\r\n]/', '', $str);
}
class rcube_html_page extends rcmail_html_page class rcube_html_page extends rcmail_html_page
{ {
} }

@ -292,32 +292,6 @@ function is_ascii($str, $control_chars = true)
} }
/**
* Remove single and double quotes from a given string
*
* @param string Input value
*
* @return string Dequoted string
*/
function strip_quotes($str)
{
return str_replace(array("'", '"'), '', $str);
}
/**
* Remove new lines characters from given string
*
* @param string $str Input value
*
* @return string Stripped string
*/
function strip_newlines($str)
{
return preg_replace('/[\r\n]/', '', $str);
}
/** /**
* Compose a valid representation of name and e-mail address * Compose a valid representation of name and e-mail address
* *

@ -495,9 +495,9 @@ class rcube_user
"INSERT INTO ".$dbh->table_name('users'). "INSERT INTO ".$dbh->table_name('users').
" (created, last_login, username, mail_host, language)". " (created, last_login, username, mail_host, language)".
" VALUES (".$dbh->now().", ".$dbh->now().", ?, ?, ?)", " VALUES (".$dbh->now().", ".$dbh->now().", ?, ?, ?)",
strip_newlines($data['user']), $data['user'],
strip_newlines($data['host']), $data['host'],
strip_newlines($data['language'])); $data['language']);
if ($user_id = $dbh->insert_id('users')) { if ($user_id = $dbh->insert_id('users')) {
// create rcube_user instance to make plugin hooks work // create rcube_user instance to make plugin hooks work
@ -517,7 +517,7 @@ class rcube_user
if (empty($user_email)) { if (empty($user_email)) {
$user_email = strpos($data['user'], '@') ? $user : sprintf('%s@%s', $data['user'], $mail_domain); $user_email = strpos($data['user'], '@') ? $user : sprintf('%s@%s', $data['user'], $mail_domain);
} }
$email_list[] = strip_newlines($user_email); $email_list[] = $user_email;
} }
// identities_level check // identities_level check
else if (count($email_list) > 1 && $rcube->config->get('identities_level', 0) > 1) { else if (count($email_list) > 1 && $rcube->config->get('identities_level', 0) > 1) {
@ -547,7 +547,6 @@ class rcube_user
$record['name'] = $user_name != $record['email'] ? $user_name : ''; $record['name'] = $user_name != $record['email'] ? $user_name : '';
} }
$record['name'] = strip_newlines($record['name']);
$record['user_id'] = $user_id; $record['user_id'] = $user_id;
$record['standard'] = $standard; $record['standard'] = $standard;

Loading…
Cancel
Save