Merge pull request #317 from CatoTH/master

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
old mode 100755 (executable)
new mode 100644 (file)
index a505f1f..f7ef74f
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -5,9 +5,15 @@ function notification($params) {
        logger('notification: entry', LOGGER_DEBUG);
 
        $a = get_app();
+
+       // from here on everything is in the recipients language
+
+       push_lang($params['language']);
+
+
        $banner = t('Friendica Notification');
        $product = FRIENDICA_PLATFORM;
-       $siteurl = z_path();
+       $siteurl = $a->get_baseurl(true);
        $thanks = t('Thank You,');
        $sitename = get_config('config','sitename');
        $site_admin = sprintf( t('%s Administrator'), $sitename);
@@ -153,9 +159,33 @@ function notification($params) {
 
        }
 
-       // from here on everything is in the recipients language
+       if($params['type'] == NOTIFY_SYSTEM) {
+               
+       }
+
+       $h = array(
+               'params'    => $params, 
+               'subject'   => $subject,
+               'preamble'  => $preamble, 
+               'epreamble' => $epreamble, 
+               'body'      => $body, 
+               'sitelink'  => $sitelink,
+               'tsitelink' => $tsitelink,
+               'hsitelink' => $hsitelink,
+               'itemlink'  => $itemlink
+       );
+               
+       call_hooks('enotify',$h);
+
+       $subject   = $h['subject'];
+       $preamble  = $h['preamble'];
+       $epreamble = $h['epreamble'];
+       $body      = $h['body'];
+       $sitelink  = $h['sitelink'];
+       $tsitelink = $h['tsitelink'];
+       $hsitelink = $h['hsitelink'];
+       $itemlink  = $h['itemlink']; 
 
-       push_lang($params['language']);
 
        require_once('include/html2bbcode.php');        
 
@@ -207,8 +237,10 @@ function notification($params) {
        );
        if($r)
                $notify_id = $r[0]['id'];
-       else
+       else {
+               pop_lang();
                return;
+       }
 
        $itemlink = $a->get_baseurl() . '/notify/view/' . $notify_id;
        $msg = replace_macros($epreamble,array('$itemlink' => $itemlink));
@@ -219,11 +251,10 @@ function notification($params) {
        );
                
 
-
        // send email notification if notification preferences permit
 
        require_once('bbcode.php');
-       if(intval($params['notify_flags']) & intval($params['type'])) {
+       if((intval($params['notify_flags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM) {
 
                logger('notification: sending notification email');
 
@@ -371,8 +402,8 @@ class enotify {
         */
        static public function send($params) {
 
-               $fromName = email_header_encode($params['fromName'],'UTF-8'); 
-               $messageSubject = email_header_encode($params['messageSubject'],'UTF-8');
+               $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)."-"