diff options
author | Andrew Dolgov <[email protected]> | 2011-12-13 19:20:26 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2011-12-13 19:20:26 +0400 |
commit | 09e8bdfd18f81e432c5f392e398b8c8088168721 (patch) | |
tree | 341e9f4bdfb3503a8427fff40e57000e98d3ad4c /classes | |
parent | a3b5394aaf793d045256f67eb6fad0616b1ff950 (diff) |
simplify default global config, expand sanity_check messages
Diffstat (limited to 'classes')
-rw-r--r-- | classes/feeds.php | 10 | ||||
-rw-r--r-- | classes/pref_users.php | 14 | ||||
-rw-r--r-- | classes/rpc.php | 12 |
3 files changed, 17 insertions, 19 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 98ea55c0b..5ecac494a 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -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')."\"
diff --git a/classes/pref_users.php b/classes/pref_users.php index 63e1fd22c..b9d162fd2 100644 --- a/classes/pref_users.php +++ b/classes/pref_users.php @@ -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); 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); |