more work on enotify

diff --git a/include/enotify.php b/include/enotify.php
index 3ff1596c9b553a71033cca8ef1d4c3e11da1e0c7..5febe411337343a517b763d70047425426102a39 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -1,9 +1,24 @@
 <?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 notify_setup($type,$params) {
+function notification($params) {
 
        $a = get_app();
        $banner = t('Friendica Notification');
@@ -14,17 +29,86 @@ function notify_setup($type,$params) {
        $site_admin = sprintf( t('%s Administrator'), $sitename);
 
        $sender_name = t('Administrator');
-       $sender_email = t('noreply') . '@' . $a->get_hostname(),
+       $sender_email = t('noreply') . '@' . $a->get_hostname();
+
+       $title = $params['item']['title'];
+       $body = $params['item']['body'];
+
+       if($params['type'] == NOTIFY_MAIL) {
+
+               $subject =      sprintf( t('New mail received at %s'),$sitename);
 
-       if($type === NOTIFICATION_MAIL) {
-               $new_email = sprintf( t('%s sent you a new private message at %s.'),$params['from'],$sitename);
+               $new_email = sprintf( t('%s sent you a new private message at %s.'),$params['source_name'],$sitename);
                $email_visit = t('Please visit %s to view and/or reply to your private messages.');
                $email_tlink = sprintf( $email_visit, $siteurl . '/message' );
                $email_hlink = sprintf( $email_visit, '<a href="' . $siteurl . '/message">' . $sitename . '</a>');
+
        }
 
-}
 
+       // send email notification if notification preferences permit
+
+       require_once('bbcode.php');
+       if(intval($params['notify-flags']) & intval($params['type'])) {
+
+               push_lang($params['language']);
+
+               $msg['notificationfromname']    = $sender_name;
+               $msg['notificationfromemail']   = $sender_email;
+
+               $msg['textversion']
+                               = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",
+                                       $body))),ENT_QUOTES,'UTF-8'));
+               $msg['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_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
+               ));
+               
+               // 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'],
+                       $subject,
+                       $email_html_body_tpl,
+                       $email_text_body_tpl
+               );
+                       pop_lang();
+       }
+}
 
 require_once('include/email.php');
 
@@ -42,7 +126,7 @@ class enotify {
         */
        static public function send($params) {
                $fromName = email_header_encode($params['fromName'],'UTF-8'); 
-               $messageSubject = email_header_encode(params['messageSubject'],'UTF-8');
+               $messageSubject = email_header_encode($params['messageSubject'],'UTF-8');
                
                
                // generate a mime boundary

diff --git a/include/items.php b/include/items.php
index 278a9242e430e97d5be3e063b31f3cc5e36a22f8..4666211d82ca655410f82fed751f2c0e451ef468 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -1830,8 +1830,7 @@ function local_delivery($importer,$data) {
                        'language' => $importer['language'],
                        'to_name' => $importer['username'],
                        'to_email' => $importer['email'],
-                       'title' => $msg['title'],
-                       'body' => $msg['body'],
+                       'item' => $msg,
                        'source_name' => $msg['from-name'],
                        'source_link' => $importer['url'],
                        'source_photo' => $importer['thumb'],