From: Michael Vogel Date: Sat, 21 May 2016 11:19:30 +0000 (+0200) Subject: Bugfix: Under certain circumstances notifications were send X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a1691664f36987f8734e80bdea56ebfc07bdf3e5;p=friendica.git Bugfix: Under certain circumstances notifications were send --- diff --git a/include/enotify.php b/include/enotify.php index 54b59857c2..bed00c5eaf 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -4,38 +4,43 @@ require_once('include/email.php'); require_once('include/bbcode.php'); require_once('include/html2bbcode.php'); +/** + * @brief Creates a notification entry and possibly sends a mail + * + * @param array $params Array with the elements: + uid, item, parent, type, otype, verb, event, + link, subject, body, to_name, to_email, source_name, + source_link, activity, preamble, notify_flags, + language, show_in_notification_page + */ function notification($params) { - #logger('notification()', 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 = $a->get_baseurl(true); $thanks = t('Thank You,'); $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); - } + 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 = $sitename; $hostname = $a->get_hostname(); - if(strpos($hostname,':')) - $hostname = substr($hostname,0,strpos($hostname,':')); + if (strpos($hostname, ':')) + $hostname = substr($hostname, 0, strpos($hostname, ':')); $sender_email = $a->config['sender_email']; - if (empty($sender_email)) { - $sender_email = t('noreply') . '@' . $hostname; - } + if (empty($sender_email)) + $sender_email = t('noreply').'@'.$hostname; $user = q("SELECT `nickname` FROM `user` WHERE `uid` = %d", intval($params['uid'])); if ($user) @@ -44,7 +49,7 @@ function notification($params) { // 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); + $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"; @@ -55,14 +60,11 @@ function notification($params) { $additional_mail_header .= "List-ID: \n"; $additional_mail_header .= "List-Archive: <".$a->get_baseurl()."/notifications/system>\n"; - - if(array_key_exists('item',$params)) { + if (array_key_exists('item', $params)) { $title = $params['item']['title']; $body = $params['item']['body']; - } - else { + } else $title = $body = ''; - } // e.g. "your post", "David's photo", etc. $possess_desc = t('%s '); @@ -77,23 +79,19 @@ function notification($params) { else $parent_id = 0; - if($params['type'] == NOTIFY_MAIL) { + if ($params['type'] == NOTIFY_MAIL) { + $subject = sprintf(t('[Friendica:Notify] New mail received at %s'), $sitename); - $subject = sprintf( t('[Friendica:Notify] New mail received at %s'),$sitename); + $preamble = sprintf(t('%1$s sent you a new private message at %2$s.'), $params['source_name'], $sitename); + $epreamble = sprintf(t('%1$s sent you %2$s.'), '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', '[url=$itemlink]'.t('a private message').'[/url]'); - $preamble = sprintf( t('%1$s sent you a new private message at %2$s.'),$params['source_name'],$sitename); - $epreamble = sprintf( t('%1$s sent you %2$s.'),'[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . t('a private message') . '[/url]'); $sitelink = t('Please visit %s to view and/or reply to your private messages.'); - $tsitelink = sprintf( $sitelink, $siteurl . '/message/' . $params['item']['id'] ); - $hsitelink = sprintf( $sitelink, '' . $sitename . ''); - $itemlink = $siteurl . '/message/' . $params['item']['id']; + $tsitelink = sprintf($sitelink, $siteurl.'/message/'.$params['item']['id']); + $hsitelink = sprintf($sitelink, ''.$sitename.''); + $itemlink = $siteurl.'/message/'.$params['item']['id']; } - if($params['type'] == NOTIFY_COMMENT) { -// logger("notification: params = " . print_r($params, true), LOGGER_DEBUG); - - //$parent_id = $params['parent']; - + if ($params['type'] == NOTIFY_COMMENT) { $p = q("SELECT `ignored` FROM `thread` WHERE `iid` = %d AND `uid` = %d LIMIT 1", intval($parent_id), intval($params['uid']) @@ -107,51 +105,49 @@ function notification($params) { // If so don't create a second notification $p = null; - $p = q("select id from notify where (type = %d or 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']) ); - if($p and count($p)) { + if ($p and count($p)) { pop_lang(); return; } - // if it's a post figure out who's post it is. $p = null; - if($params['otype'] === 'item' && $parent_id) { - $p = q("select * from item where id = %d and uid = %d limit 1", + if ($params['otype'] === 'item' && $parent_id) { + $p = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($parent_id), intval($params['uid']) ); } $item_post_type = item_post_type($p[0]); - //$possess_desc = str_replace('',$possess_desc); // "a post" $dest_str = sprintf(t('%1$s commented on [url=%2$s]a %3$s[/url]'), - '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', + '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', $itemlink, $item_post_type); // "George Bull's post" - if($p) + if ($p) $dest_str = sprintf(t('%1$s commented on [url=%2$s]%3$s\'s %4$s[/url]'), - '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', + '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', $itemlink, $p[0]['author-name'], $item_post_type); // "your post" - if($p[0]['owner-name'] == $p[0]['author-name'] && $p[0]['wall']) + 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]'), - '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', + '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', $itemlink, $item_post_type); @@ -160,190 +156,200 @@ function notification($params) { // 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']); + $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; $sitelink = t('Please visit %s to view and/or reply to the conversation.'); - $tsitelink = sprintf( $sitelink, $siteurl ); - $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $tsitelink = sprintf($sitelink, $siteurl); + $hsitelink = sprintf($sitelink, ''.$sitename.''); $itemlink = $params['link']; } - if($params['type'] == NOTIFY_WALL) { - $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); + if ($params['type'] == NOTIFY_WALL) { + $subject = sprintf(t('[Friendica:Notify] %s posted to your profile wall'), $params['source_name']); - $epreamble = sprintf( t('%1$s posted to [url=%2$s]your wall[/url]') , - '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', - $params['link']); + $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]'), + '[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 ); - $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $tsitelink = sprintf($sitelink, $siteurl); + $hsitelink = sprintf($sitelink, ''.$sitename.''); $itemlink = $params['link']; } - 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].') , - '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', - $params['link']); + 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].'), + '[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 ); - $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $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']); + 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 ); - $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $tsitelink = sprintf($sitelink, $siteurl); + $hsitelink = sprintf($sitelink, ''.$sitename.''); $itemlink = $params['link']; } - if($params['type'] == NOTIFY_POKE) { + if ($params['type'] == NOTIFY_POKE) { + $subject = sprintf(t('[Friendica:Notify] %1$s poked you'), $params['source_name']); - $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].') , - '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', - $params['link']); + $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].'), + '[url='.$params['source_link'].']'.$params['source_name'].'[/url]', + $params['link']); $subject = str_replace('poked', t($params['activity']), $subject); $preamble = str_replace('poked', t($params['activity']), $preamble); $epreamble = str_replace('poked', t($params['activity']), $epreamble); $sitelink = t('Please visit %s to view and/or reply to the conversation.'); - $tsitelink = sprintf( $sitelink, $siteurl ); - $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $tsitelink = sprintf($sitelink, $siteurl); + $hsitelink = sprintf($sitelink, ''.$sitename.''); $itemlink = $params['link']; } - if($params['type'] == NOTIFY_TAGSHARE) { - $subject = sprintf( t('[Friendica:Notify] %s tagged your post') , $params['source_name']); - $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); + if ($params['type'] == NOTIFY_TAGSHARE) { + $subject = sprintf(t('[Friendica:Notify] %s tagged your post'), $params['source_name']); + + $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); $sitelink = t('Please visit %s to view and/or reply to the conversation.'); - $tsitelink = sprintf( $sitelink, $siteurl ); - $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $tsitelink = sprintf($sitelink, $siteurl); + $hsitelink = sprintf($sitelink, ''.$sitename.''); $itemlink = $params['link']; } - 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); - $epreamble = sprintf( t('You\'ve received [url=%1$s]an introduction[/url] from %2$s.'), - $itemlink, - '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); - $body = sprintf( t('You may visit their profile at %s'),$params['source_link']); + 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); + $epreamble = sprintf(t('You\'ve received [url=%1$s]an introduction[/url] from %2$s.'), + $itemlink, + '[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 . ''); + $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); + $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); + $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); - $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]'); + 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); + $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]'); - $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']); + $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']); $sitelink = t('Please visit %s to approve or reject the suggestion.'); - $tsitelink = sprintf( $sitelink, $siteurl ); - $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $tsitelink = sprintf($sitelink, $siteurl); + $hsitelink = sprintf($sitelink, ''.$sitename.''); $itemlink = $params['link']; } - 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.'); + if ($params['type'] == NOTIFY_CONFIRM) { + if ($params['verb'] == ACTIVITY_FRIEND) { // mutual connection + $subject = sprintf(t('[Friendica:Notify] Connection accepted')); - $sitelink = t('Please visit %s if you wish to make any changes to this relationship.'); - $tsitelink = sprintf( $sitelink, $siteurl ); - $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $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]'); + $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']); + $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 . ''); + $tsitelink = sprintf($sitelink, $siteurl); + $hsitelink = sprintf($sitelink, ''.$sitename.''); $itemlink = $params['link']; } - } - if($params['type'] == NOTIFY_SYSTEM) { + 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)'), + $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 . '

'); + $tsitelink = sprintf($sitelink, $params['link']); + $hsitelink = sprintf($sitelink, ''.$sitename.'

'); $itemlink = $params['link']; break; case "SYSTEM_DB_UPDATE_FAIL": @@ -351,20 +357,23 @@ function notification($params) { } } - if ($params['type'] == "SYSTEM_EMAIL"){ + 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 = $params['subject']; + + $preamble = $params['preamble']; + + $body = $params['body']; + + $sitelink = ""; + $tsitelink = ""; + $hsitelink = ""; + $itemlink = ""; + $show_in_notification_page = false; } $subject .= " (".$nickname."@".$hostname.")"; @@ -381,19 +390,20 @@ function notification($params) { 'itemlink' => $itemlink ); - call_hooks('enotify',$h); + 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']; - - if ($show_in_notification_page) { logger("adding notification entry", LOGGER_DEBUG); do { @@ -401,11 +411,10 @@ function notification($params) { $hash = random_string(); $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1", dbesc($hash)); - if(count($r)) + if (count($r)) $dups = true; } while($dups == true); - $datarray = array(); $datarray['hash'] = $hash; $datarray['name'] = $params['source_name']; @@ -423,15 +432,15 @@ function notification($params) { call_hooks('enotify_store', $datarray); - if($datarray['abort']) { + if ($datarray['abort']) { pop_lang(); 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')", + $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']), @@ -446,11 +455,11 @@ function notification($params) { dbesc($datarray['otype']) ); - $r = q("select id from notify where hash = '%s' and uid = %d limit 1", + $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' AND `uid` = %d LIMIT 1", dbesc($hash), intval($params['uid']) ); - if($r) + if ($r) $notify_id = $r[0]['id']; else { pop_lang(); @@ -461,40 +470,39 @@ function notification($params) { // 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", + $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)) { + if ($p && (count($p) > 1)) { for ($d = 1; $d < count($p); $d ++) { - q("delete from notify where id = %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']) { + 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", + $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']) ); - } // send email notification if notification preferences permit - if((intval($params['notify_flags']) & intval($params['type'])) + if ((intval($params['notify_flags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM || $params['type'] == "SYSTEM_EMAIL") { @@ -505,39 +513,37 @@ function notification($params) { // 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", + $r = q("SELECT `id` FROM `notify-threads` WHERE `master-parent-item` = %d AND `receiver-uid` = %d LIMIT 1", intval($params['parent']), - intval($params['uid']) ); + intval($params['uid'])); // If so, create the record of it and use a message-id smtp header. - if(!$r) { + 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)", + $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 ); + 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"; + $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); + 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(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'); $datarray = array(); $datarray['banner'] = $banner; @@ -554,7 +560,7 @@ function notification($params) { $datarray['username'] = $params['to_name']; $datarray['hsitelink'] = $hsitelink; $datarray['tsitelink'] = $tsitelink; - $datarray['hitemlink'] = '' . $itemlink . ''; + $datarray['hitemlink'] = ''.$itemlink.''; $datarray['titemlink'] = $itemlink; $datarray['thanks'] = $thanks; $datarray['site_admin'] = $site_admin; @@ -568,14 +574,14 @@ function notification($params) { // check whether sending post content in email notifications is allowed // always true for "SYSTEM_EMAIL" - $content_allowed = ((!get_config('system','enotify_no_content')) || ($params['type'] == "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( + $email_html_body = replace_macros($tpl, array( '$banner' => $datarray['banner'], '$product' => $datarray['product'], - '$preamble' => str_replace("\n","
\n",$datarray['preamble']), + '$preamble' => str_replace("\n", "
\n", $datarray['preamble']), '$sitename' => $datarray['sitename'], '$siteurl' => $datarray['siteurl'], '$source_name' => $datarray['source_name'], @@ -586,14 +592,14 @@ function notification($params) { '$hitemlink' => $datarray['hitemlink'], '$thanks' => $datarray['thanks'], '$site_admin' => $datarray['site_admin'], - '$title' => $datarray['title'], + '$title' => $datarray['title'], '$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( + $email_text_body = replace_macros($tpl, array( '$banner' => $datarray['banner'], '$product' => $datarray['product'], '$preamble' => $datarray['preamble'], @@ -607,13 +613,11 @@ function notification($params) { '$titemlink' => $datarray['titemlink'], '$thanks' => $datarray['thanks'], '$site_admin' => $datarray['site_admin'], - '$title' => $datarray['title'], + '$title' => $datarray['title'], '$textversion' => $datarray['textversion'], '$content_allowed' => $content_allowed, )); -// logger('text: ' . $email_text_body); - // use the Emailer class to send the message return Emailer::send(array( @@ -630,7 +634,6 @@ function notification($params) { } return False; - } /** @@ -647,7 +650,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { $profiles = $notification_data["profiles"]; - $user = q("SELECT `notify-flags`, `language`, `username`, `email` FROM `user` WHERE `uid` = %d", intval($uid)); + $user = q("SELECT `notify-flags`, `language`, `username`, `email`, `nickname` FROM `user` WHERE `uid` = %d", intval($uid)); if (!$user) return false; @@ -655,13 +658,30 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { if (!$owner) return false; + // This is our regular URL format $profiles[] = $owner[0]["url"]; + // Notifications from Diaspora are often with an URL in the Diaspora format + $profiles[] = App::get_baseurl()."/u/".$user[0]["nickname"]; + $profiles2 = array(); foreach ($profiles AS $profile) { - $profiles2[] = normalise_link($profile); - $profiles2[] = str_replace("http://", "https://", normalise_link($profile)); + // Check for invalid profile urls. 13 should be the shortest possible profile length: + // http://a.bc/d + // Additionally check for invalid urls that would return the normalised value "http:" + if ((strlen($profile) >= 13) AND (normalise_link($profile) != "http:")) { + if (!in_array($profile, $profiles2)) + $profiles2[] = $profile; + + $profile = normalise_link($profile); + if (!in_array($profile, $profiles2)) + $profiles2[] = $profile; + + $profile = str_replace("http://", "https://", $profile); + if (!in_array($profile, $profiles2)) + $profiles2[] = $profile; + } } $profiles = $profiles2; @@ -703,26 +723,26 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { $params["source_photo"] = $item[0]["author-avatar"]; if ($item[0]["parent-uri"] === $item[0]["uri"]) { - // Send a notification for every new post? - $r = q("SELECT `notify_new_posts` FROM `contact` WHERE `id` = %d AND `uid` = %d AND `notify_new_posts` LIMIT 1", - intval($item[0]['contact-id']), - intval($uid) - ); - $send_notification = count($r); - - if (!$send_notification) { - $tags = q("SELECT `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` = %d AND `uid` = %d", - intval(TERM_OBJ_POST), intval($itemid), intval(TERM_MENTION), intval($uid)); - - if (count($tags)) { - foreach ($tags AS $tag) { - $r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `notify_new_posts`", - normalise_link($tag["url"]), intval($uid)); - if (count($r)) - $send_notification = true; - } - } - } + // Send a notification for every new post? + $r = q("SELECT `notify_new_posts` FROM `contact` WHERE `id` = %d AND `uid` = %d AND `notify_new_posts` LIMIT 1", + intval($item[0]['contact-id']), + intval($uid) + ); + $send_notification = count($r); + + if (!$send_notification) { + $tags = q("SELECT `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` = %d AND `uid` = %d", + intval(TERM_OBJ_POST), intval($itemid), intval(TERM_MENTION), intval($uid)); + + if (count($tags)) { + foreach ($tags AS $tag) { + $r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `notify_new_posts`", + normalise_link($tag["url"]), intval($uid)); + if (count($r)) + $send_notification = true; + } + } + } if ($send_notification) { $params["type"] = NOTIFY_SHARE;