public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-01-08 20:39:16 +00:00
Code Issues Releases Wiki Activity

simplify default global config, expand sanity_check messages

Browse Source
This commit is contained in:
Andrew Dolgov
2011-12-13 19:20:26 +04:00
parent a3b5394aaf
commit 09e8bdfd18
12 changed files with 283 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
classes/rpc.php
View File

@@ -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);