summaryrefslogtreecommitdiff
path: root/program/include/rcube_smtp.php
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-04-16 11:02:21 +0000
committeralecpl <alec@alec.pl>2012-04-16 11:02:21 +0000
commit1aceb9cec82639250a603aa0806f0399f7bae68d (patch)
tree1fbeab49d53b6dccbc4230d73155e83e5547b264 /program/include/rcube_smtp.php
parent4372e9278011452ec8723fa4434e1d3ade726213 (diff)
- Framework refactoring (I hope it's the last one):
rcube,rcmail,rcube_ui -> rcube,rcmail,rcube_utils renamed main.inc into rcube_bc.inc
Diffstat (limited to 'program/include/rcube_smtp.php')
-rw-r--r--program/include/rcube_smtp.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/program/include/rcube_smtp.php b/program/include/rcube_smtp.php
index 0923e3be0..0ff07adaf 100644
--- a/program/include/rcube_smtp.php
+++ b/program/include/rcube_smtp.php
@@ -74,7 +74,7 @@ class rcube_smtp
'smtp_auth_callbacks' => array(),
));
- $smtp_host = rcmail::parse_host($CONFIG['smtp_server']);
+ $smtp_host = rcube_utils::parse_host($CONFIG['smtp_server']);
// when called from Installer it's possible to have empty $smtp_host here
if (!$smtp_host) $smtp_host = 'localhost';
$smtp_port = is_numeric($CONFIG['smtp_port']) ? $CONFIG['smtp_port'] : 25;
@@ -105,7 +105,7 @@ class rcube_smtp
$helo_host = 'localhost';
// IDNA Support
- $smtp_host = rcube_idn_to_ascii($smtp_host);
+ $smtp_host = rcube_utils::idn_to_ascii($smtp_host);
$this->conn = new Net_SMTP($smtp_host, $smtp_port, $helo_host);
@@ -152,7 +152,7 @@ class rcube_smtp
{
// IDNA Support
if (strpos($smtp_user, '@')) {
- $smtp_user = rcube_idn_to_ascii($smtp_user);
+ $smtp_user = rcube_utils::idn_to_ascii($smtp_user);
}
$result = $this->conn->auth($smtp_user, $smtp_pass, $smtp_auth_type, $use_tls, $smtp_authz);
@@ -449,12 +449,12 @@ class rcube_smtp
$recipients = implode(', ', $recipients);
$addresses = array();
- $recipients = rcube_explode_quoted_string(',', $recipients);
+ $recipients = rcube_utils::explode_quoted_string(',', $recipients);
reset($recipients);
while (list($k, $recipient) = each($recipients))
{
- $a = rcube_explode_quoted_string(' ', $recipient);
+ $a = rcube_utils::explode_quoted_string(' ', $recipient);
while (list($k2, $word) = each($a))
{
if (strpos($word, "@") > 0 && $word[strlen($word)-1] != '"')