X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fenotify.php;h=e02c61383136f5350b01af64928883c5715e924c;hb=dd9f475ff61e5808f4429cf5de0f5fda79224991;hp=f294a4fc771746c033c07e4a86b89473a1d23f3f;hpb=108f2e1b81800f100f5896dae73af3463b1ecb6a;p=friendica.git diff --git a/include/enotify.php b/include/enotify.php index f294a4fc77..e02c613831 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -1,10 +1,12 @@ get_baseurl(true); $thanks = t('Thank You,'); - $sitename = get_config('config','sitename'); - $site_admin = sprintf( t('%s Administrator'), $sitename); + $sitename = $a->config['sitename']; + if (!x($a->config['admin_name'])) { + $site_admin = sprintf( t('%s Administrator'), $sitename); + } else { + $site_admin = sprintf( t('%1$s, %2$s Administrator'), $a->config['admin_name'], $sitename); + } + $nickname = ""; - $sender_name = $product; + $sender_name = $sitename; $hostname = $a->get_hostname(); if(strpos($hostname,':')) $hostname = substr($hostname,0,strpos($hostname,':')); - $sender_email = t('noreply') . '@' . $hostname; + $sender_email = $a->config['sender_email']; + if (empty($sender_email)) { + $sender_email = t('noreply') . '@' . $hostname; + } + + $user = q("SELECT `nickname` FROM `user` WHERE `uid` = %d", intval($params['uid'])); + if ($user) + $nickname = $user[0]["nickname"]; + + // with $params['show_in_notification_page'] == false, the notification isn't inserted into + // the database, and an email is sent if applicable. + // default, if not specified: true + $show_in_notification_page = ((x($params,'show_in_notification_page')) ? $params['show_in_notification_page']:True); + $additional_mail_header = ""; + $additional_mail_header .= "Precedence: list\n"; + $additional_mail_header .= "X-Friendica-Host: ".$hostname."\n"; + $additional_mail_header .= "X-Friendica-Account: <".$nickname."@".$hostname.">\n"; + $additional_mail_header .= "X-Friendica-Platform: ".FRIENDICA_PLATFORM."\n"; + $additional_mail_header .= "X-Friendica-Version: ".FRIENDICA_VERSION."\n"; + $additional_mail_header .= "List-ID: \n"; + $additional_mail_header .= "List-Archive: <".$a->get_baseurl()."/notifications/system>\n"; + if(array_key_exists('item',$params)) { $title = $params['item']['title']; @@ -39,6 +67,16 @@ function notification($params) { // e.g. "your post", "David's photo", etc. $possess_desc = t('%s '); + if (isset($params['item']['id'])) + $item_id = $params['item']['id']; + else + $item_id = 0; + + if (isset($params['parent'])) + $parent_id = $params['parent']; + else + $parent_id = 0; + if($params['type'] == NOTIFY_MAIL) { $subject = sprintf( t('[Friendica:Notify] New mail received at %s'),$sitename); @@ -54,15 +92,25 @@ function notification($params) { if($params['type'] == NOTIFY_COMMENT) { // logger("notification: params = " . print_r($params, true), LOGGER_DEBUG); - $parent_id = $params['parent']; + //$parent_id = $params['parent']; + + $p = q("SELECT `ignored` FROM `thread` WHERE `iid` = %d AND `uid` = %d LIMIT 1", + intval($parent_id), + intval($params['uid']) + ); + if ($p AND count($p) AND ($p[0]["ignored"])) { + logger("Thread ".$parent_id." will be ignored", LOGGER_DEBUG); + return; + } // Check to see if there was already a tag notify or comment notify for this post. // If so don't create a second notification - + $p = null; - $p = q("select id from notify where ( type = %d or type = %d ) and link = '%s' and uid = %d limit 1", + $p = q("select id from notify where (type = %d or type = %d or type = %d) and link = '%s' and uid = %d limit 1", intval(NOTIFY_TAGSELF), intval(NOTIFY_COMMENT), + intval(NOTIFY_SHARE), dbesc($params['link']), intval($params['uid']) ); @@ -70,7 +118,7 @@ function notification($params) { pop_lang(); return; } - + // if it's a post figure out who's post it is. @@ -99,7 +147,7 @@ function notification($params) { $itemlink, $p[0]['author-name'], $item_post_type); - + // "your post" if($p[0]['owner-name'] == $p[0]['author-name'] && $p[0]['wall']) $dest_str = sprintf(t('%1$s commented on [url=%2$s]your %3$s[/url]'), @@ -109,12 +157,12 @@ function notification($params) { // Some mail softwares relies on subject field for threading. // So, we cannot have different subjects for notifications of the same thread. - // Before this we have the name of the replier on the subject rendering + // Before this we have the name of the replier on the subject rendering // differents subjects for messages on the same thread. $subject = sprintf( t('[Friendica:Notify] Comment to conversation #%1$d by %2$s'), $parent_id, $params['source_name']); - $preamble = sprintf( t('%s commented on an item/conversation you have been following.'), $params['source_name']); - $epreamble = $dest_str; + $preamble = sprintf( t('%s commented on an item/conversation you have been following.'), $params['source_name']); + $epreamble = $dest_str; $sitelink = t('Please visit %s to view and/or reply to the conversation.'); $tsitelink = sprintf( $sitelink, $siteurl ); @@ -126,11 +174,11 @@ function notification($params) { $subject = sprintf( t('[Friendica:Notify] %s posted to your profile wall') , $params['source_name']); $preamble = sprintf( t('%1$s posted to your profile wall at %2$s') , $params['source_name'], $sitename); - - $epreamble = sprintf( t('%1$s posted to [url=%2$s]your wall[/url]') , + + $epreamble = sprintf( t('%1$s posted to [url=%2$s]your wall[/url]') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', - $params['link']); - + $params['link']); + $sitelink = t('Please visit %s to view and/or reply to the conversation.'); $tsitelink = sprintf( $sitelink, $siteurl ); $hsitelink = sprintf( $sitelink, '' . $sitename . ''); @@ -140,9 +188,22 @@ function notification($params) { if($params['type'] == NOTIFY_TAGSELF) { $subject = sprintf( t('[Friendica:Notify] %s tagged you') , $params['source_name']); $preamble = sprintf( t('%1$s tagged you at %2$s') , $params['source_name'], $sitename); - $epreamble = sprintf( t('%1$s [url=%2$s]tagged you[/url].') , + $epreamble = sprintf( t('%1$s [url=%2$s]tagged you[/url].') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', - $params['link']); + $params['link']); + + $sitelink = t('Please visit %s to view and/or reply to the conversation.'); + $tsitelink = sprintf( $sitelink, $siteurl ); + $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $itemlink = $params['link']; + } + + if($params['type'] == NOTIFY_SHARE) { + $subject = sprintf( t('[Friendica:Notify] %s shared a new post') , $params['source_name']); + $preamble = sprintf( t('%1$s shared a new post at %2$s') , $params['source_name'], $sitename); + $epreamble = sprintf( t('%1$s [url=%2$s]shared a post[/url].') , + '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', + $params['link']); $sitelink = t('Please visit %s to view and/or reply to the conversation.'); $tsitelink = sprintf( $sitelink, $siteurl ); @@ -154,9 +215,9 @@ function notification($params) { $subject = sprintf( t('[Friendica:Notify] %1$s poked you') , $params['source_name']); $preamble = sprintf( t('%1$s poked you at %2$s') , $params['source_name'], $sitename); - $epreamble = sprintf( t('%1$s [url=%2$s]poked you[/url].') , + $epreamble = sprintf( t('%1$s [url=%2$s]poked you[/url].') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', - $params['link']); + $params['link']); $subject = str_replace('poked', t($params['activity']), $subject); $preamble = str_replace('poked', t($params['activity']), $preamble); @@ -173,7 +234,7 @@ function notification($params) { $preamble = sprintf( t('%1$s tagged your post at %2$s') , $params['source_name'], $sitename); $epreamble = sprintf( t('%1$s tagged [url=%2$s]your post[/url]') , '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', - $itemlink); + $itemlink); $sitelink = t('Please visit %s to view and/or reply to the conversation.'); $tsitelink = sprintf( $sitelink, $siteurl ); @@ -183,26 +244,50 @@ function notification($params) { if($params['type'] == NOTIFY_INTRO) { $subject = sprintf( t('[Friendica:Notify] Introduction received')); - $preamble = sprintf( t('You\'ve received an introduction from \'%1$s\' at %2$s'), $params['source_name'], $sitename); + $preamble = sprintf( t('You\'ve received an introduction from \'%1$s\' at %2$s'), $params['source_name'], $sitename); $epreamble = sprintf( t('You\'ve received [url=%1$s]an introduction[/url] from %2$s.'), $itemlink, - '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); + '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); $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, '' . $sitename . ''); $itemlink = $params['link']; + + switch ($params['verb']) { + case ACTIVITY_FRIEND: + // someone started to share with user (mostly OStatus) + $subject = sprintf( t('[Friendica:Notify] A new person is sharing with you')); + $preamble = sprintf( t('%1$s is sharing with you at %2$s'), $params['source_name'], $sitename); + $epreamble = sprintf( t('%1$s is sharing with you at %2$s'), + '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', + $sitename); + break; + case ACTIVITY_FOLLOW: + // someone started to follow the user (mostly OStatus) + $subject = sprintf( t('[Friendica:Notify] You have a new follower')); + $preamble = sprintf( t('You have a new follower at %2$s : %1$s'), $params['source_name'], $sitename); + $epreamble = sprintf( t('You have a new follower at %2$s : %1$s'), + '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', + $sitename); + break; + default: + // ACTIVITY_REQ_FRIEND is default activity for notifications + break; + } + + } if($params['type'] == NOTIFY_SUGGEST) { $subject = sprintf( t('[Friendica:Notify] Friend suggestion received')); - $preamble = sprintf( t('You\'ve received a friend suggestion from \'%1$s\' at %2$s'), $params['source_name'], $sitename); + $preamble = sprintf( t('You\'ve received a friend suggestion from \'%1$s\' at %2$s'), $params['source_name'], $sitename); $epreamble = sprintf( t('You\'ve received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s.'), $itemlink, '[url=' . $params['item']['url'] . ']' . $params['item']['name'] . '[/url]', - '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); - + '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); + $body = t('Name:') . ' ' . $params['item']['name'] . "\n"; $body .= t('Photo:') . ' ' . $params['item']['photo'] . "\n"; $body .= sprintf( t('You may visit their profile at %s'),$params['item']['url']); @@ -214,24 +299,88 @@ function notification($params) { } if($params['type'] == NOTIFY_CONFIRM) { + if ($params['verb'] == ACTIVITY_FRIEND ){ // mutual connection + $subject = sprintf( t('[Friendica:Notify] Connection accepted')); + $preamble = sprintf( t('\'%1$s\' has accepted your connection request at %2$s'), $params['source_name'], $sitename); + $epreamble = sprintf( t('%2$s has accepted your [url=%1$s]connection request[/url].'), + $itemlink, + '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); + $body = t('You are now mutual friends and may exchange status updates, photos, and email + without restriction.'); + + $sitelink = t('Please visit %s if you wish to make any changes to this relationship.'); + $tsitelink = sprintf( $sitelink, $siteurl ); + $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $itemlink = $params['link']; + } else { // ACTIVITY_FOLLOW + $subject = sprintf( t('[Friendica:Notify] Connection accepted')); + $preamble = sprintf( t('\'%1$s\' has accepted your connection request at %2$s'), $params['source_name'], $sitename); + $epreamble = sprintf( t('%2$s has accepted your [url=%1$s]connection request[/url].'), + $itemlink, + '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); + $body = sprintf(t('\'%1$s\' has chosen to accept you a "fan", which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically.'), $params['source_name']); + $body .= "\n\n"; + $body .= sprintf(t('\'%1$s\' may choose to extend this into a two-way or more permissive relationship in the future. '), $params['source_name']); + + $sitelink = t('Please visit %s if you wish to make any changes to this relationship.'); + $tsitelink = sprintf( $sitelink, $siteurl ); + $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $itemlink = $params['link']; + } + } if($params['type'] == NOTIFY_SYSTEM) { + switch($params['event']) { + case "SYSTEM_REGISTER_REQUEST": + $subject = sprintf( t('[Friendica System:Notify] registration request')); + $preamble = sprintf( t('You\'ve received a registration request from \'%1$s\' at %2$s'), $params['source_name'], $sitename); + $epreamble = sprintf( t('You\'ve received a [url=%1$s]registration request[/url] from %2$s.'), + $itemlink, + '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); + $body = sprintf( t('Full Name: %1$s\nSite Location: %2$s\nLogin Name: %3$s (%4$s)'), + $params['source_name'], $siteurl, $params['source_mail'], $params['source_nick']); + + $sitelink = t('Please visit %s to approve or reject the request.'); + $tsitelink = sprintf( $sitelink, $params['link'] ); + $hsitelink = sprintf( $sitelink, '' . $sitename . '

'); + $itemlink = $params['link']; + break; + case "SYSTEM_DB_UPDATE_FAIL": + break; + } + } + if ($params['type'] == "SYSTEM_EMAIL"){ + // not part of the notifications. + // it just send a mail to the user. + // It will be used by the system to send emails to users (like + // password reset, invitations and so) using one look (but without + // add a notification to the user, with could be inexistent) + $subject = $params['subject']; + $preamble = $params['preamble']; + $body = $params['body']; + $sitelink = ""; + $tsitelink = ""; + $hsitelink = ""; + $itemlink = ""; + $show_in_notification_page = false; } + $subject .= " (".$nickname."@".$hostname.")"; + $h = array( - 'params' => $params, + 'params' => $params, 'subject' => $subject, - 'preamble' => $preamble, - 'epreamble' => $epreamble, - 'body' => $body, + 'preamble' => $preamble, + 'epreamble' => $epreamble, + 'body' => $body, 'sitelink' => $sitelink, 'tsitelink' => $tsitelink, 'hsitelink' => $hsitelink, 'itemlink' => $itemlink ); - + call_hooks('enotify',$h); $subject = $h['subject']; @@ -241,151 +390,154 @@ function notification($params) { $sitelink = $h['sitelink']; $tsitelink = $h['tsitelink']; $hsitelink = $h['hsitelink']; - $itemlink = $h['itemlink']; - - - require_once('include/html2bbcode.php'); - - do { - $dups = false; - $hash = random_string(); - $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1", - dbesc($hash)); - if(count($r)) - $dups = true; - } while($dups == true); - - - $datarray = array(); - $datarray['hash'] = $hash; - $datarray['name'] = $params['source_name']; - $datarray['url'] = $params['source_link']; - $datarray['photo'] = $params['source_photo']; - $datarray['date'] = datetime_convert(); - $datarray['uid'] = $params['uid']; - $datarray['link'] = $itemlink; - $datarray['parent'] = $parent_id; - $datarray['type'] = $params['type']; - $datarray['verb'] = $params['verb']; - $datarray['otype'] = $params['otype']; - - call_hooks('enotify_store', $datarray); - - // create notification entry in DB - - $r = q("insert into notify (hash,name,url,photo,date,uid,link,parent,type,verb,otype) - values('%s','%s','%s','%s','%s',%d,'%s',%d,%d,'%s','%s')", - dbesc($datarray['hash']), - dbesc($datarray['name']), - dbesc($datarray['url']), - dbesc($datarray['photo']), - dbesc($datarray['date']), - intval($datarray['uid']), - dbesc($datarray['link']), - intval($datarray['parent']), - intval($datarray['type']), - dbesc($datarray['verb']), - dbesc($datarray['otype']) - ); + $itemlink = $h['itemlink']; - $r = q("select id from notify where hash = '%s' and uid = %d limit 1", - dbesc($hash), - intval($params['uid']) - ); - if($r) - $notify_id = $r[0]['id']; - else { - pop_lang(); - return; - } - // we seem to have a lot of duplicate comment notifications due to race conditions, mostly from forums - // After we've stored everything, look again to see if there are any duplicates and if so remove them - $p = null; - $p = q("select id from notify where ( type = %d or type = %d ) and link = '%s' and uid = %d order by id", - intval(NOTIFY_TAGSELF), - intval(NOTIFY_COMMENT), - dbesc($params['link']), - intval($params['uid']) - ); - if($p && (count($p) > 1)) { - for ($d = 1; $d < count($p); $d ++) { - q("delete from notify where id = %d limit 1", - intval($p[$d]['id']) - ); - } + if ($show_in_notification_page) { + logger("adding notification entry", LOGGER_DEBUG); + do { + $dups = false; + $hash = random_string(); + $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1", + dbesc($hash)); + if(count($r)) + $dups = true; + } while($dups == true); - // only continue on if we stored the first one - if($notify_id != $p[0]['id']) { + $datarray = array(); + $datarray['hash'] = $hash; + $datarray['name'] = $params['source_name']; + $datarray['url'] = $params['source_link']; + $datarray['photo'] = $params['source_photo']; + $datarray['date'] = datetime_convert(); + $datarray['uid'] = $params['uid']; + $datarray['link'] = $itemlink; + $datarray['iid'] = $item_id; + $datarray['parent'] = $parent_id; + $datarray['type'] = $params['type']; + $datarray['verb'] = $params['verb']; + $datarray['otype'] = $params['otype']; + $datarray['abort'] = false; + + call_hooks('enotify_store', $datarray); + + if($datarray['abort']) { pop_lang(); - return; + return False; } - } - + // create notification entry in DB + + $r = q("insert into notify (hash,name,url,photo,date,uid,link,iid,parent,type,verb,otype) + values('%s','%s','%s','%s','%s',%d,'%s',%d,%d,%d,'%s','%s')", + dbesc($datarray['hash']), + dbesc($datarray['name']), + dbesc($datarray['url']), + dbesc($datarray['photo']), + dbesc($datarray['date']), + intval($datarray['uid']), + dbesc($datarray['link']), + intval($datarray['iid']), + intval($datarray['parent']), + intval($datarray['type']), + dbesc($datarray['verb']), + dbesc($datarray['otype']) + ); + $r = q("select id from notify where hash = '%s' and uid = %d limit 1", + dbesc($hash), + intval($params['uid']) + ); + if($r) + $notify_id = $r[0]['id']; + else { + pop_lang(); + return False; + } + // we seem to have a lot of duplicate comment notifications due to race conditions, mostly from forums + // After we've stored everything, look again to see if there are any duplicates and if so remove them + $p = null; + $p = q("select id from notify where ( type = %d or type = %d ) and link = '%s' and uid = %d order by id", + intval(NOTIFY_TAGSELF), + intval(NOTIFY_COMMENT), + dbesc($params['link']), + intval($params['uid']) + ); + if($p && (count($p) > 1)) { + for ($d = 1; $d < count($p); $d ++) { + q("delete from notify where id = %d", + intval($p[$d]['id']) + ); + } + + // only continue on if we stored the first one + + if($notify_id != $p[0]['id']) { + pop_lang(); + return False; + } + } + $itemlink = $a->get_baseurl() . '/notify/view/' . $notify_id; + $msg = replace_macros($epreamble,array('$itemlink' => $itemlink)); + $r = q("update notify set msg = '%s' where id = %d and uid = %d", + dbesc($msg), + intval($notify_id), + intval($params['uid']) + ); - $itemlink = $a->get_baseurl() . '/notify/view/' . $notify_id; - $msg = replace_macros($epreamble,array('$itemlink' => $itemlink)); - $r = q("update notify set msg = '%s' where id = %d and uid = %d limit 1", - dbesc($msg), - intval($notify_id), - intval($params['uid']) - ); - + } // send email notification if notification preferences permit + if((intval($params['notify_flags']) & intval($params['type'])) + || $params['type'] == NOTIFY_SYSTEM + || $params['type'] == "SYSTEM_EMAIL") { - require_once('include/bbcode.php'); - if((intval($params['notify_flags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM) { - - logger('notification: sending notification email'); - - $id_for_parent = "${params['parent']}@${hostname}"; + logger('sending notification email'); - // Is this the first email notification for this parent item and user? - - $r = q("select `id` from `notify-threads` where `master-parent-item` = %d and `receiver-uid` = %d limit 1", - intval($params['parent']), - intval($params['uid']) ); + if (isset($params['parent']) AND (intval($params['parent']) != 0)) { + $id_for_parent = $params['parent']."@".$hostname; - // If so, create the record of it and use a message-id smtp header. + // Is this the first email notification for this parent item and user? - if(!$r) { - logger("notify_id:" . intval($notify_id). ", parent: " . intval($params['parent']) . "uid: " . -intval($params['uid']), LOGGER_DEBUG); - $r = q("insert into `notify-threads` (`notify-id`, `master-parent-item`, `receiver-uid`, `parent-item`) - values(%d,%d,%d,%d)", - intval($notify_id), + $r = q("select `id` from `notify-threads` where `master-parent-item` = %d and `receiver-uid` = %d limit 1", intval($params['parent']), - intval($params['uid']), - 0 ); - - $additional_mail_header .= "Message-ID: <${id_for_parent}>\n"; - $log_msg = "include/enotify: No previous notification found for this parent:\n" . - " parent: ${params['parent']}\n" . " uid : ${params['uid']}\n"; - logger($log_msg, LOGGER_DEBUG); - } - - // If not, just "follow" the thread. - - else { - $additional_mail_header = "References: <${id_for_parent}>\nIn-Reply-To: <${id_for_parent}>\n"; - logger("include/enotify: There's already a notification for this parent:\n" . print_r($r, true), LOGGER_DEBUG); + intval($params['uid']) ); + + // If so, create the record of it and use a message-id smtp header. + + if(!$r) { + logger("notify_id:".intval($notify_id).", parent: ".intval($params['parent'])."uid: ".intval($params['uid']), LOGGER_DEBUG); + $r = q("insert into `notify-threads` (`notify-id`, `master-parent-item`, `receiver-uid`, `parent-item`) + values(%d,%d,%d,%d)", + intval($notify_id), + intval($params['parent']), + intval($params['uid']), + 0 ); + + $additional_mail_header .= "Message-ID: <${id_for_parent}>\n"; + $log_msg = "include/enotify: No previous notification found for this parent:\n" . + " parent: ${params['parent']}\n" . " uid : ${params['uid']}\n"; + logger($log_msg, LOGGER_DEBUG); + } else { + // If not, just "follow" the thread. + $additional_mail_header .= "References: <${id_for_parent}>\nIn-Reply-To: <${id_for_parent}>\n"; + logger("There's already a notification for this parent:\n" . print_r($r, true), LOGGER_DEBUG); + } } + // textversion keeps linebreaks + $textversion = strip_tags(str_replace("
","\n",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"), + "
\n",$body))),ENT_QUOTES,'UTF-8'); - $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"), - "
\n",$body)))); $datarray = array(); $datarray['banner'] = $banner; @@ -415,14 +567,15 @@ intval($params['uid']), LOGGER_DEBUG); call_hooks('enotify_mail', $datarray); // check whether sending post content in email notifications is allowed - $content_allowed = !get_config('system','enotify_no_content'); + // always true for "SYSTEM_EMAIL" + $content_allowed = ((!get_config('system','enotify_no_content')) || ($params['type'] == "SYSTEM_EMAIL")); // load the template for private message notifications $tpl = get_markup_template('email_notify_html.tpl'); $email_html_body = replace_macros($tpl,array( '$banner' => $datarray['banner'], '$product' => $datarray['product'], - '$preamble' => $datarray['preamble'], + '$preamble' => str_replace("\n","
\n",$datarray['preamble']), '$sitename' => $datarray['sitename'], '$siteurl' => $datarray['siteurl'], '$source_name' => $datarray['source_name'], @@ -437,7 +590,7 @@ intval($params['uid']), LOGGER_DEBUG); '$htmlversion' => $datarray['htmlversion'], '$content_allowed' => $content_allowed, )); - + // load the template for private message notifications $tpl = get_markup_template('email_notify_text.tpl'); $email_text_body = replace_macros($tpl,array( @@ -455,15 +608,16 @@ intval($params['uid']), LOGGER_DEBUG); '$thanks' => $datarray['thanks'], '$site_admin' => $datarray['site_admin'], '$title' => $datarray['title'], - '$textversion' => $datarray['textversion'], + '$textversion' => $datarray['textversion'], '$content_allowed' => $content_allowed, )); // logger('text: ' . $email_text_body); - // use the EmailNotification library to send the message + // use the Emailer class to send the message - enotify::send(array( + return Emailer::send(array( + 'uid' => $params['uid'], 'fromName' => $sender_name, 'fromEmail' => $sender_email, 'replyTo' => $sender_email, @@ -475,67 +629,8 @@ intval($params['uid']), LOGGER_DEBUG); )); } - pop_lang(); + return False; } -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 - * @param additionalMailHeader additions to the smtp mail header - */ - static public function send($params) { - - $fromName = email_header_encode(html_entity_decode($params['fromName'],ENT_QUOTES,'UTF-8'),'UTF-8'); - $messageSubject = email_header_encode(html_entity_decode($params['messageSubject'],ENT_QUOTES,'UTF-8'),'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 = - $params['additionalMailHeader'] . - "From: $fromName <{$params['fromEmail']}>\n" . - "Reply-To: $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 - $messageSubject, // subject - $multipartMessageBody, // message body - $messageHeader // message headers - ); - logger("notification: enotify::send header " . 'To: ' . $params['toEmail'] . "\n" . $messageHeader, LOGGER_DEBUG); - logger("notification: enotify::send returns " . $res, LOGGER_DEBUG); - } -} ?>