diff options
author | zotlabs <mike@macgirvin.com> | 2017-06-20 18:34:17 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-06-20 18:34:17 -0700 |
commit | 08c0729f5ff8ac97c27db08ae2dde1a052c71e25 (patch) | |
tree | 9ce2ee515601a79156e89e5158fc3b8047f6e90a /Zotlabs/Lib/Enotify.php | |
parent | 234c64574b4ee5ca22b85ae2fecc301286423068 (diff) | |
parent | 76e98091690cf5f2726bf7cefea217d49b23a5b4 (diff) | |
download | volse-hubzilla-08c0729f5ff8ac97c27db08ae2dde1a052c71e25.tar.gz volse-hubzilla-08c0729f5ff8ac97c27db08ae2dde1a052c71e25.tar.bz2 volse-hubzilla-08c0729f5ff8ac97c27db08ae2dde1a052c71e25.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Lib/Enotify.php')
-rw-r--r-- | Zotlabs/Lib/Enotify.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index a10675a87..90662ce84 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -170,6 +170,7 @@ class Enotify { xchan_query($p); + $moderated = (($p[0]['item_blocked'] = ITEM_MODERATED) ? true : false); $item_post_type = item_post_type($p[0]); // $private = $p[0]['item_private']; @@ -208,13 +209,21 @@ class Enotify { // Before this we have the name of the replier on the subject rendering // differents subjects for messages on the same thread. - $subject = sprintf( t('[$Projectname:Notify] Comment to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']); + if($moderated) + $subject = sprintf( t('[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']); + else + $subject = sprintf( t('[$Projectname:Notify] Comment to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']); $preamble = sprintf( t('%1$s, %2$s commented on an item/conversation you have been following.'), $recip['channel_name'], $sender['xchan_name']); $epreamble = $dest_str; $sitelink = t('Please visit %s to view and/or reply to the conversation.'); $tsitelink = sprintf( $sitelink, $siteurl ); $hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>'); + if($moderated) { + $tsitelink .= "\n\n" . sprintf( t('Please visit %s to approve or reject this comment.'), z_root() . '/moderate' ); + $hsitelink .= "<br><br>" . sprintf( t('Please visit %s to approve or reject this comment.'), '<a href="' . z_root() . '/moderate">' . z_root() . '/moderate</a>' ); + } + } if ($params['type'] == NOTIFY_LIKE) { |