From be83855acf2db7f4f55d4cb30878c67d53ca69b6 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 17 Jan 2016 16:50:37 -0800
Subject: generalise the site icon

---
 include/network.php | 49 +++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

(limited to 'include/network.php')

diff --git a/include/network.php b/include/network.php
index 2e34bd7ff..fe6b553e9 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1619,18 +1619,19 @@ function format_and_send_email($sender,$xchan,$item) {
 		// load the template for private message notifications
 		$tpl = get_markup_template('email_notify_html.tpl');
 		$email_html_body = replace_macros($tpl,array(
-			'$banner'	   => $banner,
-			'$product'	  => $product,
-			'$preamble'	 => '',
-			'$sitename'	 => $sitename,
-			'$siteurl'	  => $siteurl,
+			'$banner'	    => $banner,
+			'$notify_icon'  => get_notify_icon(),
+			'$product'	    => $product,
+			'$preamble'	    => '',
+			'$sitename'	    => $sitename,
+			'$siteurl'	    => $siteurl,
 			'$source_name'  => $sender['xchan_name'],
 			'$source_link'  => $sender['xchan_url'],
 			'$source_photo' => $sender['xchan_photo_m'],
-			'$username'	 => $xchan['xchan_name'],
+			'$username'	    => $xchan['xchan_name'],
 			'$hsitelink'	=> $datarray['hsitelink'],
 			'$hitemlink'	=> $datarray['hitemlink'],
-			'$thanks'	   => $thanks,
+			'$thanks'	    => $thanks,
 			'$site_admin'   => $site_admin,
 			'$title'		=> $title,
 			'$htmlversion'  => $htmlversion,
@@ -1639,20 +1640,20 @@ function format_and_send_email($sender,$xchan,$item) {
 		// load the template for private message notifications
 		$tpl = get_markup_template('email_notify_text.tpl');
 		$email_text_body = replace_macros($tpl, array(
-			'$banner'	   => $banner,
-			'$product'	  => $product,
-			'$preamble'	 => '',
-			'$sitename'	 => $sitename,
-			'$siteurl'	  => $siteurl,
+			'$banner'       => $banner,
+			'$product'      => $product,
+			'$preamble'     => '',
+			'$sitename'     => $sitename,
+			'$siteurl'      => $siteurl,
 			'$source_name'  => $sender['xchan_name'],
 			'$source_link'  => $sender['xchan_url'],
 			'$source_photo' => $sender['xchan_photo_m'],
-			'$username'	 => $xchan['xchan_name'],
-			'$hsitelink'	=> $datarray['hsitelink'],
-			'$hitemlink'	=> $datarray['hitemlink'],
-			'$thanks'	   => $thanks,
+			'$username'     => $xchan['xchan_name'],
+			'$hsitelink'    => $datarray['hsitelink'],
+			'$hitemlink'    => $datarray['hitemlink'],
+			'$thanks'       => $thanks,
 			'$site_admin'   => $site_admin,
-			'$title'		=> $title,
+			'$title'        => $title,
 			'$textversion'  => $textversion
 		));
 
@@ -1666,13 +1667,13 @@ function format_and_send_email($sender,$xchan,$item) {
 		// use the EmailNotification library to send the message
 
 		enotify::send(array(
-			'fromName'			 => $product,
-			'fromEmail'			=> $sender_email,
-			'replyTo'			  => $sender_email,
-			'toEmail'			  => str_replace('mailto:','',$xchan['xchan_addr']),
-			'messageSubject'	   => (($title) ? $title : t('No Subject')),
-			'htmlVersion'		  => $email_html_body,
-			'textVersion'		  => $email_text_body,
+			'fromName'             => $product,
+			'fromEmail'            => $sender_email,
+			'replyTo'              => $sender_email,
+			'toEmail'              => str_replace('mailto:','',$xchan['xchan_addr']),
+			'messageSubject'       => (($title) ? $title : t('No Subject')),
+			'htmlVersion'          => $email_html_body,
+			'textVersion'          => $email_text_body,
 			'additionalMailHeader' => '',
 		));
 
-- 
cgit v1.2.3