From 09e8bdfd18f81e432c5f392e398b8c8088168721 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 13 Dec 2011 19:20:26 +0400 Subject: simplify default global config, expand sanity_check messages --- classes/rpc.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'classes/rpc.php') diff --git a/classes/rpc.php b/classes/rpc.php index c553b9b90..272c25ef4 100644 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -570,7 +570,7 @@ class RPC extends Protected_Handler { $reply = array(); - if (DIGEST_ENABLE && $_SESSION['email_secretkey'] && + if ($_SESSION['email_secretkey'] && $secretkey == $_SESSION['email_secretkey']) { $_SESSION['email_secretkey'] = ''; @@ -593,12 +593,12 @@ class RPC extends Protected_Handler { $mail->FromName = $fromname; $mail->AddAddress($destination); - if (DIGEST_SMTP_HOST) { - $mail->Host = DIGEST_SMTP_HOST; + if (SMTP_HOST) { + $mail->Host = SMTP_HOST; $mail->Mailer = "smtp"; - $mail->SMTPAuth = DIGEST_SMTP_LOGIN != ''; - $mail->Username = DIGEST_SMTP_LOGIN; - $mail->Password = DIGEST_SMTP_PASSWORD; + $mail->SMTPAuth = SMTP_LOGIN != ''; + $mail->Username = SMTP_LOGIN; + $mail->Password = SMTP_PASSWORD; } $mail->IsHTML(false); -- cgit v1.2.3