Merge pull request #764 from fabrixxm/bug729

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index d9f100831c66c77a5254b651c261cd06337ecc9d..72365a762f983ce7c0a576aa4bf57eb9580d9428 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -17,7 +17,7 @@ function notification($params) {
        $product = FRIENDICA_PLATFORM;
        $siteurl = $a->get_baseurl(true);
        $thanks = t('Thank You,');
-       $sitename = get_config('config','sitename');
+       $sitename = $a->config['sitename'];
        $site_admin = sprintf( t('%s Administrator'), $sitename);
 
        $sender_name = $product;
@@ -214,11 +214,10 @@ function notification($params) {
        }
 
        if($params['type'] == NOTIFY_CONFIRM) {
-
        }
 
        if($params['type'] == NOTIFY_SYSTEM) {
-               
+
        }
 
        $h = array(
@@ -269,9 +268,15 @@ function notification($params) {
        $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;
+       }
+
        // create notification entry in DB
 
        $r = q("insert into notify (hash,name,url,photo,date,uid,link,parent,type,verb,otype)
@@ -300,6 +305,38 @@ function notification($params) {
                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'])
+                       );
+               }
+
+               // only continue on if we stored the first one
+
+               if($notify_id != $p[0]['id']) {
+                       pop_lang();
+                       return;
+               }
+       }
+
+
+
+
+
+
+
+
        $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",
@@ -383,6 +420,9 @@ 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');
+
                // load the template for private message notifications
                $tpl = get_markup_template('email_notify_html.tpl');
                $email_html_body = replace_macros($tpl,array(
@@ -400,7 +440,8 @@ intval($params['uid']), LOGGER_DEBUG);
                        '$thanks'       => $datarray['thanks'],
                        '$site_admin'   => $datarray['site_admin'],
                        '$title'                => $datarray['title'],
-                       '$htmlversion'  => $datarray['htmlversion'],    
+                       '$htmlversion'  => $datarray['htmlversion'],
+                       '$content_allowed'      => $content_allowed,
                ));
                
                // load the template for private message notifications
@@ -421,6 +462,7 @@ intval($params['uid']), LOGGER_DEBUG);
                        '$site_admin'   => $datarray['site_admin'],
                        '$title'                => $datarray['title'],
                        '$textversion'  => $datarray['textversion'],    
+                       '$content_allowed'      => $content_allowed,
                ));
 
 //             logger('text: ' . $email_text_body);