diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/diaspora.php | 13 | ||||
| -rw-r--r-- | include/enotify.php | 203 | ||||
| -rw-r--r-- | include/items.php | 245 | ||||
| -rw-r--r-- | include/notifier.php | 8 | ||||
| -rw-r--r-- | include/poller.php | 2 |
5 files changed, 274 insertions, 197 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index d1e975a89..2d139c77c 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1223,6 +1223,19 @@ function diaspora_conversation($importer,$xml,$msg) { dbesc(datetime_convert()), intval($conversation['id']) ); + + require_once('include/enotify.php'); + notification(array( + 'type' => NOTIFY_MAIL, + 'notify_flags' => $importer['notify-flags'], + 'language' => $importer['language'], + 'to_name' => $importer['username'], + 'to_email' => $importer['email'], + 'item' => array('subject' => $subject, 'body' => $body), + 'source_name' => $person['name'], + 'source_link' => $person['url'], + 'source_photo' => $person['thumb'], + )); } return; diff --git a/include/enotify.php b/include/enotify.php new file mode 100644 index 000000000..f6f291e5d --- /dev/null +++ b/include/enotify.php @@ -0,0 +1,203 @@ +<?php + +function notification($params) { + + logger('notification: entry', LOGGER_DEBUG); + + $a = get_app(); + $banner = t('Friendica Notification'); + $product = FRIENDICA_PLATFORM; + $siteurl = z_path(); + $thanks = t('Thank You,'); + $sitename = get_config('config','sitename'); + $site_admin = sprintf( t('%s Administrator'), $sitename); + + $sender_name = $product; + $sender_email = t('noreply') . '@' . $a->get_hostname(); + + if(array_key_exists('item',$params)) { + $title = $params['item']['title']; + $body = $params['item']['body']; + } + else { + $title = $body = ''; + } + + if($params['type'] == NOTIFY_MAIL) { + + $subject = sprintf( t('New mail received at %s'),$sitename); + + $preamble = sprintf( t('%s sent you a new private message at %s.'),$params['source_name'],$sitename); + + $sitelink = t('Please visit %s to view and/or reply to your private messages.'); + $tsitelink = sprintf( $sitelink, $siteurl . '/message' ); + $hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '/message">' . $sitename . '</a>'); + $itemlink = ''; + } + + if($params['type'] == NOTIFY_COMMENT) { + + $subject = sprintf( t('%s commented on an item at %s'), $params['source_name'], $sitename); + $preamble = sprintf( t('%s commented on an item/conversation you have been following.'), $params['source_name']); + $sitelink = t('Please visit %s to view and/or reply to the conversation.'); + $tsitelink = sprintf( $sitelink, $siteurl ); + $hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>'); + $itemlink = $params['link']; + } + + if($params['type'] == NOTIFY_WALL) { + $preamble = $subject = sprintf( t('%s posted to your profile wall at %s') , $params['source_name'], $sitename); + + $sitelink = t('Please visit %s to view and/or reply to the conversation.'); + $tsitelink = sprintf( $sitelink, $siteurl ); + $hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>'); + $itemlink = $params['link']; + } + + if($params['type'] == NOTIFY_INTRO) { + $subject = sprintf( t('Introduction received at %s'), $sitename); + $preamble = sprintf( t('You\'ve received an introduction from \'%s\' at %s'), $params['source_name'], $sitename); + $body = sprintf( t('You may visit their profile at %s'),$params['source_link']); + + $sitelink = t('Please visit %s to approve or reject the introduction.'); + $tsitelink = sprintf( $sitelink, $siteurl ); + $hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>'); + $itemlink = $params['link']; + } + + if($params['type'] == NOTIFY_CONFIRM) { + + } + + // TODO - create notification entry in DB + + + + // send email notification if notification preferences permit + + require_once('bbcode.php'); + if(intval($params['notify_flags']) & intval($params['type'])) { + + logger('notification: sending notification email'); + + push_lang($params['language']); + + $textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n", + $body))),ENT_QUOTES,'UTF-8')); + $htmlversion = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), + "<br />\n",$body)))); + + // load the template for private message notifications + $tpl = get_markup_template('email_notify_html.tpl'); + $email_html_body = replace_macros($tpl,array( + '$banner' => $banner, + '$product' => $product, + '$preamble' => $preamble, + '$sitename' => $sitename, + '$siteurl' => $siteurl, + '$source_name' => $parama['source_name'], + '$source_link' => $params['source_link'], + '$source_photo' => $params['source_photo'], + '$username' => $params['to_name'], + '$hsitelink' => $hsitelink, + '$itemlink' => '<a href="' . $itemlink . '">' . $itemlink . '</a>', + '$thanks' => $thanks, + '$site_admin' => $site_admin, + '$title' => stripslashes($title), + '$htmlversion' => $htmlversion, + )); + + // load the template for private message notifications + $tpl = get_markup_template('email_notify_text.tpl'); + $email_text_body = replace_macros($tpl,array( + '$banner' => $banner, + '$product' => $product, + '$preamble' => $preamble, + '$sitename' => $sitename, + '$siteurl' => $siteurl, + '$source_name' => $parama['source_name'], + '$source_link' => $params['source_link'], + '$source_photo' => $params['source_photo'], + '$username' => $params['to_name'], + '$tsitelink' => $tsitelink, + '$itemlink' => $itemlink, + '$thanks' => $thanks, + '$site_admin' => $site_admin, + '$title' => stripslashes($title), + '$textversion' => $textversion, + )); + +// logger('text: ' . $email_text_body); + + // use the EmailNotification library to send the message + + enotify::send(array( + 'fromName' => $sender_name, + 'fromEmail' => $sender_email, + 'replyTo' => $sender_email, + 'toEmail' => $params['to_email'], + 'messageSubject' => $subject, + 'htmlVersion' => $email_html_body, + 'textVersion' => $email_text_body + )); + pop_lang(); + } +} + +require_once('include/email.php'); + +class enotify { + /** + * Send a multipart/alternative message with Text and HTML versions + * + * @param fromName name of the sender + * @param fromEmail email fo the sender + * @param replyTo replyTo address to direct responses + * @param toEmail destination email address + * @param messageSubject subject of the message + * @param htmlVersion html version of the message + * @param textVersion text only version of the message + */ + static public function send($params) { + + $fromName = email_header_encode($params['fromName'],'UTF-8'); + $messageSubject = email_header_encode($params['messageSubject'],'UTF-8'); + + // generate a mime boundary + $mimeBoundary =rand(0,9)."-" + .rand(10000000000,9999999999)."-" + .rand(10000000000,9999999999)."=:" + .rand(10000,99999); + + // generate a multipart/alternative message header + $messageHeader = + "From: {$params['fromName']} <{$params['fromEmail']}>\n" . + "Reply-To: {$params['fromName']} <{$params['replyTo']}>\n" . + "MIME-Version: 1.0\n" . + "Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\""; + + // assemble the final multipart message body with the text and html types included + $textBody = chunk_split(base64_encode($params['textVersion'])); + $htmlBody = chunk_split(base64_encode($params['htmlVersion'])); + $multipartMessageBody = + "--" . $mimeBoundary . "\n" . // plain text section + "Content-Type: text/plain; charset=UTF-8\n" . + "Content-Transfer-Encoding: base64\n\n" . + $textBody . "\n" . + "--" . $mimeBoundary . "\n" . // text/html section + "Content-Type: text/html; charset=UTF-8\n" . + "Content-Transfer-Encoding: base64\n\n" . + $htmlBody . "\n" . + "--" . $mimeBoundary . "--\n"; // message ending + + // send the message + $res = mail( + $params['toEmail'], // send to address + $params['messageSubject'], // subject + $multipartMessageBody, // message body + $messageHeader // message headers + ); + logger("notification: enotify::send returns " . $res, LOGGER_DEBUG); + } +} +?>
\ No newline at end of file diff --git a/include/items.php b/include/items.php index 50c5e56c1..9becb9ffb 100644 --- a/include/items.php +++ b/include/items.php @@ -1822,84 +1822,25 @@ function local_delivery($importer,$data) { $r = dbq("INSERT INTO `mail` (`" . implode("`, `", array_keys($msg)) . "`) VALUES ('" . implode("', '", array_values($msg)) . "')" ); - // send email notification if requested. - - require_once('bbcode.php'); - if($importer['notify-flags'] & NOTIFY_MAIL) { - - push_lang($importer['language']); - - // name of the automated email sender - $msg['notificationfromname'] = t('Administrator'); - // noreply address to send from - $msg['notificationfromemail'] = t('noreply') . '@' . $a->get_hostname(); - - // text version - // process the message body to display properly in text mode - // 1) substitute a \n character for the "\" then "n", so it behaves properly (it doesn't come in as a \n character) - // 2) remove escape slashes - // 3) decode any bbcode from the message editor - // 4) decode any encoded html tags - // 5) remove html tags - $msg['textversion'] - = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",$msg['body']))),ENT_QUOTES,'UTF-8')); - - // html version - // process the message body to display properly in text mode - // 1) substitute a <br /> tag for the "\" then "n", so it behaves properly (it doesn't come in as a \n character) - // 2) remove escape slashes - // 3) decode any bbcode from the message editor - // 4) decode any encoded html tags - $msg['htmlversion'] - = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$msg['body'])))); - - // load the template for private message notifications - $tpl = get_intltext_template('mail_received_html_body_eml.tpl'); - $email_html_body_tpl = replace_macros($tpl,array( - '$username' => $importer['username'], - '$siteName' => $a->config['sitename'], // name of this site - '$siteurl' => $a->get_baseurl(), // descriptive url of this site - '$thumb' => $importer['thumb'], // thumbnail url for sender icon - '$email' => $importer['email'], // email address to send to - '$url' => $importer['url'], // full url for the site - '$from' => $msg['from-name'], // name of the person sending the message - '$title' => stripslashes($msg['title']), // subject of the message - '$htmlversion' => $msg['htmlversion'], // html version of the message - '$mimeboundary' => $msg['mimeboundary'], // mime message divider - '$hostname' => $a->get_hostname() // name of this host - )); + // send notifications. + + require_once('include/enotify.php'); + + $notif_params = array( + 'type' => NOTIFY_MAIL, + 'notify_flags' => $importer['notify-flags'], + 'language' => $importer['language'], + 'to_name' => $importer['username'], + 'to_email' => $importer['email'], + 'item' => $msg, + 'source_name' => $msg['from-name'], + 'source_link' => $importer['url'], + 'source_photo' => $importer['thumb'], + ); - // load the template for private message notifications - $tpl = get_intltext_template('mail_received_text_body_eml.tpl'); - $email_text_body_tpl = replace_macros($tpl,array( - '$username' => $importer['username'], - '$siteName' => $a->config['sitename'], // name of this site - '$siteurl' => $a->get_baseurl(), // descriptive url of this site - '$thumb' => $importer['thumb'], // thumbnail url for sender icon - '$email' => $importer['email'], // email address to send to - '$url' => $importer['url'], // full url for the site - '$from' => $msg['from-name'], // name of the person sending the message - '$title' => stripslashes($msg['title']), // subject of the message - '$textversion' => $msg['textversion'], // text version of the message - '$mimeboundary' => $msg['mimeboundary'], // mime message divider - '$hostname' => $a->get_hostname() // name of this host - )); - - // use the EmailNotification library to send the message - require_once("include/EmailNotification.php"); - EmailNotification::sendTextHtmlEmail( - $msg['notificationfromname'], - $msg['notificationfromemail'], - $msg['notificationfromemail'], - $importer['email'], - t('New mail received at ') . $a->config['sitename'], - $email_html_body_tpl, - $email_text_body_tpl - ); - - pop_lang(); - } + notification($notif_params); return 0; + // NOTREACHED } @@ -2151,68 +2092,24 @@ function local_delivery($importer,$data) { proc_run('php',"include/notifier.php","comment-import","$posted_id"); - if((! $is_like) && ($importer['notify-flags'] & NOTIFY_COMMENT) && (! $importer['self'])) { - push_lang($importer['language']); - require_once('bbcode.php'); - $from = stripslashes($datarray['author-name']); - - // name of the automated email sender - $msg['notificationfromname'] = stripslashes($datarray['author-name']);; - // noreply address to send from - $msg['notificationfromemail'] = t('noreply') . '@' . $a->get_hostname(); - - // text version - // process the message body to display properly in text mode - $msg['textversion'] - = html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8'); - - // html version - // process the message body to display properly in text mode - $msg['htmlversion'] - = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body'])))); - - $imgtouse = ((link_compare($datarray['author-link'],$importer['url'])) ? $importer['thumb'] : $datarray['author-avatar']); - - // load the template for private message notifications - $tpl = get_intltext_template('cmnt_received_html_body_eml.tpl'); - $email_html_body_tpl = replace_macros($tpl,array( - '$username' => $importer['username'], - '$sitename' => $a->config['sitename'], // name of this site - '$siteurl' => $a->get_baseurl(), // descriptive url of this site - '$thumb' => $imgtouse, // thumbnail url for sender icon - '$email' => $importer['email'], // email address to send to - '$url' => $datarray['author-link'], // full url for the site - '$from' => $from, // name of the person sending the message - '$body' => $msg['htmlversion'], // html version of the message - '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id, - )); - - // load the template for private message notifications - $tpl = get_intltext_template('cmnt_received_text_body_eml.tpl'); - $email_text_body_tpl = replace_macros($tpl,array( - '$username' => $importer['username'], - '$sitename' => $a->config['sitename'], // name of this site - '$siteurl' => $a->get_baseurl(), // descriptive url of this site - '$thumb' => $imgtouse, // thumbnail url for sender icon - '$email' => $importer['email'], // email address to send to - '$url' => $datarray['author-link'], // full url for the site - '$from' => $from, // name of the person sending the message - '$body' => $msg['textversion'], // text version of the message - '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id, + if((! $is_like) && (! $importer['self'])) { + + require_once('include/enotify.php'); + + notification(array( + 'type' => NOTIFY_COMMENT, + 'notify_flags' => $importer['notify-flags'], + 'language' => $importer['language'], + 'to_name' => $importer['username'], + 'to_email' => $importer['email'], + 'item' => $datarray, + 'link' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id, + 'source_name' => stripslashes($datarray['author-name']), + 'source_link' => $datarray['author-link'], + 'source_photo' => ((link_compare($datarray['author-link'],$importer['url'])) + ? $importer['thumb'] : $datarray['author-avatar']) )); - // use the EmailNotification library to send the message - require_once("include/EmailNotification.php"); - EmailNotification::sendTextHtmlEmail( - $msg['notificationfromname'], - t("Administrator") . '@' . $a->get_hostname(), - t("noreply") . '@' . $a->get_hostname(), - $importer['email'], - sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']), - $email_html_body_tpl, - $email_text_body_tpl - ); - pop_lang(); } } return 0; @@ -2299,78 +2196,36 @@ function local_delivery($importer,$data) { // find out if our user is involved in this conversation and wants to be notified. - if(($datarray['type'] != 'activity') && ($importer['notify-flags'] & NOTIFY_COMMENT)) { + if($datarray['type'] != 'activity') { $myconv = q("SELECT `author-link`, `author-avatar` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ", dbesc($parent_uri), intval($importer['importer_uid']) ); + if(count($myconv)) { $importer_url = $a->get_baseurl() . '/profile/' . $importer['nickname']; foreach($myconv as $conv) { + if(! link_compare($conv['author-link'],$importer_url)) continue; - push_lang($importer['language']); - require_once('bbcode.php'); - $from = stripslashes($datarray['author-name']); - - // name of the automated email sender - $msg['notificationfromname'] = stripslashes($datarray['author-name']);; - // noreply address to send from - $msg['notificationfromemail'] = t('noreply') . '@' . $a->get_hostname(); - - // text version - // process the message body to display properly in text mode - $msg['textversion'] - = html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8'); - - // html version - // process the message body to display properly in text mode - $msg['htmlversion'] - = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body'])))); - - $imgtouse = ((link_compare($datarray['author-link'],$importer['url'])) ? $importer['thumb'] : $datarray['author-avatar']); - - - // load the template for private message notifications - $tpl = get_intltext_template('cmnt_received_html_body_eml.tpl'); - $email_html_body_tpl = replace_macros($tpl,array( - '$username' => $importer['username'], - '$sitename' => $a->config['sitename'], // name of this site - '$siteurl' => $a->get_baseurl(), // descriptive url of this site - '$thumb' => $imgtouse, // thumbnail url for sender icon - '$url' => $datarray['author-link'], // full url for the site - '$from' => $from, // name of the person sending the message - '$body' => $msg['htmlversion'], // html version of the message - '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id, - )); - - // load the template for private message notifications - $tpl = get_intltext_template('cmnt_received_text_body_eml.tpl'); - $email_text_body_tpl = replace_macros($tpl,array( - '$username' => $importer['username'], - '$sitename' => $a->config['sitename'], // name of this site - '$siteurl' => $a->get_baseurl(), // descriptive url of this site - '$thumb' => $imgtouse, // thumbnail url for sender icon - '$url' => $datarray['author-link'], // full url for the site - '$from' => $from, // name of the person sending the message - '$body' => $msg['textversion'], // text version of the message - '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id, + require_once('include/enotify.php'); + + notification(array( + 'type' => NOTIFY_COMMENT, + 'notify_flags' => $importer['notify-flags'], + 'language' => $importer['language'], + 'to_name' => $importer['username'], + 'to_email' => $importer['email'], + 'item' => $datarray, + 'link' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id, + 'source_name' => stripslashes($datarray['author-name']), + 'source_link' => $datarray['author-link'], + 'source_photo' => ((link_compare($datarray['author-link'],$importer['url'])) + ? $importer['thumb'] : $datarray['author-avatar']) )); - // use the EmailNotification library to send the message - require_once("include/EmailNotification.php"); - EmailNotification::sendTextHtmlEmail( - $msg['notificationfromname'], - t("Administrator@") . $a->get_hostname(), - t("noreply") . '@' . $a->get_hostname(), - $importer['email'], - sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']), - $email_html_body_tpl, - $email_text_body_tpl - ); - pop_lang(); break; } } diff --git a/include/notifier.php b/include/notifier.php index 2562f09eb..1db1b09da 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -626,7 +626,13 @@ function notifier_run($argv, $argc){ $reply_to = $r1[0]['reply_to']; $subject = (($it['title']) ? $it['title'] : t("\x28no subject\x29")) ; - $headers = 'From: ' . $local_user[0]['username'] . ' <' . $local_user[0]['email'] . '>' . "\n"; + + // only expose our real email address to true friends + + if($contact['rel'] == CONTACT_IS_FRIEND) + $headers = 'From: ' . $local_user[0]['username'] . ' <' . $local_user[0]['email'] . '>' . "\n"; + else + $headers = 'From: ' . $local_user[0]['username'] . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n"; if($reply_to) $headers .= 'Reply-to: ' . $reply_to . "\n"; diff --git a/include/poller.php b/include/poller.php index d568bbd03..89e4488b9 100644 --- a/include/poller.php +++ b/include/poller.php @@ -140,7 +140,7 @@ function poller_run($argv, $argc){ if($manual_id) $contact['last-update'] = '0000-00-00 00:00:00'; - if($contact['network'] === NETWORK_DFRN) + if($contact['network'] === NETWORK_DFRN || $contact['network'] === NETWORK_OSTATUS) $contact['priority'] = 2; if($contact['priority'] || $contact['subhub']) { |