xle/tt-rss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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
classes/feeds.php
+4 -6
View File
@@ -715,12 +715,10 @@ class Feeds extends Protected_Handler {
onclick=\"editArticleNote($id)\"
alt='PubNote' title='".__('Edit article note')."'>";
if (DIGEST_ENABLE) {
$reply['content'] .= "<img src=\"".theme_image($this->link, 'images/art-email.png')."\"
style=\"cursor : pointer\"
onclick=\"emailArticle($id)\"
alt='Zoom' title='".__('Forward by email')."'>";
}
$reply['content'] .= "<img src=\"".theme_image($this->link, 'images/art-email.png')."\"
style=\"cursor : pointer\"
onclick=\"emailArticle($id)\"
alt='Zoom' title='".__('Forward by email')."'>";
if (ENABLE_TWEET_BUTTON) {
$reply['content'] .= "<img src=\"".theme_image($this->link, 'images/art-tweet.png')."\"
classes/pref_users.php
+7 -7
View File
@@ -308,16 +308,16 @@ class Pref_Users extends Protected_Handler {
$mail->CharSet = "UTF-8";
$mail->From = DIGEST_FROM_ADDRESS;
$mail->FromName = DIGEST_FROM_NAME;
$mail->From = SMTP_FROM_ADDRESS;
$mail->FromName = SMTP_FROM_NAME;
$mail->AddAddress($email, $login);
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);
classes/rpc.php
+6 -6
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);