require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1206' );
+define ( 'FRIENDICA_VERSION', '2.3.1208' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1112 );
'$lpassword' => array('password', t('Password: '), '', ''),
'$openid' => !$noid,
- '$lopenid' => array('openid_url', t('OpenID: '),'',''),
+ '$lopenid' => array('openid_url', t('Or login using OpenID: '),'',''),
'$hiddens' => $hiddens,
<?php
-
- // send email notification if requested.
-/*
- $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'],
- );
-*/
- //notification($notif_params);
-
-
function notification($params) {
- logger('notification: entry');
+ logger('notification: entry', LOGGER_DEBUG);
$a = get_app();
$banner = t('Friendica Notification');
$sitename = get_config('config','sitename');
$site_admin = sprintf( t('%s Administrator'), $sitename);
- $sender_name = t('Administrator');
+ $sender_name = $product;
$sender_email = t('noreply') . '@' . $a->get_hostname();
- $title = $params['item']['title'];
- $body = $params['item']['body'];
+ if(array_key_exists('item',$params)) {
+ $title = $params['item']['title'];
+ $body = $params['item']['body'];
+ }
+ else {
+ $title = $body = '';
+ }
if($params['type'] == NOTIFY_MAIL) {
- logger('notification: email');
-
$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) {
+
+ $preamble = $subject = sprintf( t('%s commented on an item 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_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 email');
+ logger('notification: sending notification email');
push_lang($params['language']);
'$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),
'$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);
+// logger('text: ' . $email_text_body);
// use the EmailNotification library to send the message
*/
static public function send($params) {
- logger('enotify: send: ' . print_r($params,true));
$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)."-"
// generate a multipart/alternative message header
$messageHeader =
"From: {$params['fromName']} <{$params['fromEmail']}>\n" .
- "Reply-To: {$params['replyTo']}\n" .
+ "Reply-To: {$params['fromName']} <{$params['replyTo']}>\n" .
"MIME-Version: 1.0\n" .
"Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\"";
$multipartMessageBody, // message body
$messageHeader // message headers
);
- logger("sendTextHtmlEmail: returns " . $res, LOGGER_DEBUG);
+ logger("notification: enotify::send returns " . $res, LOGGER_DEBUG);
}
}
?>
\ No newline at end of file
if(count($r)) {
if($r[0]['page-flags'] != PAGE_NORMAL)
$auto_confirm = true;
- if(($r[0]['notify-flags'] & NOTIFY_INTRO) && (! $auto_confirm)) {
- $email_tpl = get_intltext_template('request_notify_eml.tpl');
- $email = replace_macros($email_tpl, array(
- '$requestor' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
- '$url' => stripslashes($r[0]['url']),
- '$myname' => $r[0]['username'],
- '$siteurl' => $a->get_baseurl(),
- '$sitename' => $a->config['sitename']
+
+ if(! $auto_confirm) {
+ require_once('include/enotify.php');
+ notification(array(
+ 'type' => NOTIFY_INTRO,
+ 'notify_flags' => $r[0]['notify-flags'],
+ 'language' => $r[0]['language'],
+ 'to_name' => $r[0]['username'],
+ 'to_email' => $r[0]['email'],
+ 'link' => $a->get_baseurl() . '/notifications/intros',
+ 'source_name' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
+ 'source_link' => $r[0]['url'],
+ 'source_photo' => $r[0]['photo']
));
- $res = mail($r[0]['email'],
- t("Introduction received at ") . $a->config['sitename'],
- $email,
- 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
- . 'Content-type: text/plain; charset=UTF-8' . "\n"
- . 'Content-transfer-encoding: 8bit' );
-
- // This is a redundant notification - no point throwing errors if it fails.
}
+
if($auto_confirm) {
require_once('mod/dfrn_confirm.php');
$handsfree = array(
*/
require_once('include/crypto.php');
+require_once('include/enotify.php');
function item_post(&$a) {
intval($post_id)
);
- // Send a notification email to the conversation owner, unless the owner is me and I wrote this item
- if(($user['notify-flags'] & NOTIFY_COMMENT) && ($contact_record != $author)) {
- push_lang($user['language']);
- require_once('bbcode.php');
- $from = $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']))));
-
- // 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' => $user['username'],
- '$sitename' => $a->config['sitename'], // name of this site
- '$siteurl' => $a->get_baseurl(), // descriptive url of this site
- '$thumb' => $author['thumb'], // thumbnail url for sender icon
- '$email' => $importer['email'], // email address to send to
- '$url' => $author['url'], // 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/' . $user['nickname'] . '/' . $post_id,
+ if($contact_record != $author) {
+ notification(array(
+ 'type' => NOTIFY_COMMENT,
+ 'notify_flags' => $user['notify-flags'],
+ 'language' => $user['language'],
+ 'to_name' => $user['username'],
+ 'to_email' => $user['email'],
+ 'item' => $datarray,
+ 'link' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+ 'source_name' => $datarray['author-name'],
+ 'source_link' => $datarray['author-link'],
+ 'source_photo' => $datarray['author-avatar']
));
- // 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' => $user['username'],
- '$sitename' => $a->config['sitename'], // name of this site
- '$siteurl' => $a->get_baseurl(), // descriptive url of this site
- '$thumb' => $author['thumb'], // thumbnail url for sender icon
- '$email' => $importer['email'], // email address to send to
- '$url' => $author['url'], // profile url for the author
- '$from' => $from, // name of the person sending the message
- '$body' => $msg['textversion'], // text version of the message
- '$display' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
- ));
-
- // 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(),
- $user['email'],
- sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']),
- $email_html_body_tpl,
- $email_text_body_tpl
- );
-
- pop_lang();
}
// We won't be able to sign Diaspora comments for authenticated visitors - we don't have their private key
else {
$parent = $post_id;
- // let me know if somebody did a wall-to-wall post on my profile
-
- if(($user['notify-flags'] & NOTIFY_WALL) && ($contact_record != $author)) {
- push_lang($user['language']);
- require_once('bbcode.php');
- $from = $author['name'];
-
- // name of the automated email sender
- $msg['notificationfromname'] = $from;
- // 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']))));
-
- // load the template for private message notifications
- $tpl = load_view_file('view/wall_received_html_body_eml.tpl');
- $email_html_body_tpl = replace_macros($tpl,array(
- '$username' => $user['username'],
- '$sitename' => $a->config['sitename'], // name of this site
- '$siteurl' => $a->get_baseurl(), // descriptive url of this site
- '$thumb' => $author['thumb'], // thumbnail url for sender icon
- '$url' => $author['url'], // 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/' . $user['nickname'] . '/' . $post_id,
+ if($contact_record != $author) {
+ notification(array(
+ 'type' => NOTIFY_WALL,
+ 'notify_flags' => $user['notify-flags'],
+ 'language' => $user['language'],
+ 'to_name' => $user['username'],
+ 'to_email' => $user['email'],
+ 'item' => $datarray,
+ 'link' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
+ 'source_name' => $datarray['author-name'],
+ 'source_link' => $datarray['author-link'],
+ 'source_photo' => $datarray['author-avatar']
));
-
- // load the template for private message notifications
- $tpl = load_view_file('view/wall_received_text_body_eml.tpl');
- $email_text_body_tpl = replace_macros($tpl,array(
- '$username' => $user['username'],
- '$sitename' => $a->config['sitename'], // name of this site
- '$siteurl' => $a->get_baseurl(), // descriptive url of this site
- '$thumb' => $author['thumb'], // thumbnail url for sender icon
- '$url' => $author['url'], // 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/' . $user['nickname'] . '/' . $post_id,
- ));
-
- // 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(),
- $user['email'],
- sprintf( t('%s posted to your profile wall at %s') , $from , $a->config['sitename']),
- $email_html_body_tpl,
- $email_text_body_tpl
- );
- pop_lang();
}
}
<td style="padding-top:22px;"><a href="$source_link">$source_name</a></td></tr>
<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
<tr><td style="padding-right:22px;">$htmlversion</td></tr>
- <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">$hsitelink</td></tr>
+ <tr><td style="padding-top:11px;" colspan="2">$hsitelink</td></tr>
+ <tr><td style="padding-bottom:11px;" colspan="2">$itemlink</td></tr>
<tr><td></td><td>$thanks</td></tr>
<tr><td></td><td>$site_admin</td></tr>
</tbody>
$textversion
$tsitelink
+$itemlink
$thanks
$site_admin
projects / friendica.git / commitdiff