fixed a couple of bugs

2 files changed, 52 insertions, 46 deletions

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 6709ed275..5f6ed59d4 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -79,6 +79,9 @@ function dfrn_notify_post(&$a) {
 	// $importer in this case contains the contact record for the remote contact joined with the user record of our user. 
 
 	$importer = $r[0];
+	foreach($importer as $key => $val) {
+		logger( "importer - key: " . $key . " val: " . $val);
+	}
 
 	if(($writable != (-1)) && ($writable != $importer['writable'])) {
 		q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1",
@@ -212,31 +215,31 @@ function dfrn_notify_post(&$a) {
 			// load the template for private message notifications
 			$tpl = get_intltext_template('mail_received_html_body_eml.tpl');
 			$email_html_body_tpl = replace_macros($tpl,array(
-				'$siteName'		=> $a->config['sitename'],				// name of this site
-				'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
-				'$thumb'		=> $importer['thumb'],					// thumbnail url for sender icon
-				'$email'		=> $importer['email'],					// email address to send to
-				'$url'			=> $importer['url'],					// full url for the site
-				'$from'			=> $msg['from-name'],					// name of the person sending the message
+				'$siteName'		=> $a->config['sitename'],			// name of this site
+				'$siteurl'		=> $a->get_baseurl(),				// descriptive url of this site
+				'$thumb'		=> $importer['thumb'],				// thumbnail url for sender icon
+				'$email'		=> $importer['email'],				// email address to send to
+				'$url'			=> $importer['url'],				// full url for the site
+				'$from'			=> $msg['from-name'],				// name of the person sending the message
 				'$title'		=> stripslashes($msg['title']),			// subject of the message
 				'$htmlversion'	=> $msg['htmlversion'],					// html version of the message
 				'$mimeboundary'	=> $msg['mimeboundary'],				// mime message divider
-				'$hostname'		=> $a->get_hostname()					// name of this host
+				'$hostname'		=> $a->get_hostname()				// name of this host
 			));
 			
 			// load the template for private message notifications
 			$tpl = get_intltext_template('mail_received_text_body_eml.tpl');
 			$email_text_body_tpl = replace_macros($tpl,array(
-				'$siteName'		=> $a->config['sitename'],				// name of this site
-				'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
-				'$thumb'		=> $importer['thumb'],					// thumbnail url for sender icon
-				'$email'		=> $importer['email'],					// email address to send to
-				'$url'			=> $importer['url'],					// full url for the site
-				'$from'			=> $msg['from-name'],					// name of the person sending the message
+				'$siteName'		=> $a->config['sitename'],			// name of this site
+				'$siteurl'		=> $a->get_baseurl(),				// descriptive url of this site
+				'$thumb'		=> $importer['thumb'],				// thumbnail url for sender icon
+				'$email'		=> $importer['email'],				// email address to send to
+				'$url'			=> $importer['url'],				// full url for the site
+				'$from'			=> $msg['from-name'],				// name of the person sending the message
 				'$title'		=> stripslashes($msg['title']),			// subject of the message
 				'$textversion'	=> $msg['textversion'],					// text version of the message
 				'$mimeboundary'	=> $msg['mimeboundary'],				// mime message divider
-				'$hostname'		=> $a->get_hostname()					// name of this host
+				'$hostname'		=> $a->get_hostname()				// name of this host
 			));
 
 			// use the EmailNotification library to send the message
@@ -408,27 +411,27 @@ function dfrn_notify_post(&$a) {
 							// load the template for private message notifications
 							$tpl = get_intltext_template('cmnt_received_html_body_eml.tpl');
 							$email_html_body_tpl = replace_macros($tpl,array(
-								'$sitename'		=> $a->config['sitename'],				// name of this site
-								'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
+								'$sitename'		=> $a->config['sitename'],			// name of this site
+								'$siteurl'		=> $a->get_baseurl(),				// descriptive url of this site
 								'$thumb'		=> $datarray['author-avatar'],			// thumbnail url for sender icon
-								'$email'		=> $importer['email'],					// email address to send to
+								'$email'		=> $importer['email'],				// email address to send to
 								'$url'			=> $datarray['author-link'],			// full url for the site
-								'$from'			=> $from,								// name of the person sending the message
-								'$body'			=> 'q1' .$msg['htmlversion'],					// html version of the message
-								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r,
+								'$from'			=> $from,					// name of the person sending the message
+								'$body'			=> 'q1' .$msg['htmlversion'],			// html version of the message
+								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nick'] . '/' . $posted_id,
 							));
 			
 							// load the template for private message notifications
 							$tpl = get_intltext_template('cmnt_received_text_body_eml.tpl');
 							$email_text_body_tpl = replace_macros($tpl,array(
-								'$sitename'		=> $a->config['sitename'],				// name of this site
-								'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
+								'$sitename'		=> $a->config['sitename'],			// name of this site
+								'$siteurl'		=> $a->get_baseurl(),				// descriptive url of this site
 								'$thumb'		=> $datarray['author-avatar'],			// thumbnail url for sender icon
-								'$email'		=> $importer['email'],					// email address to send to
+								'$email'		=> $importer['email'],				// email address to send to
 								'$url'			=> $datarray['author-link'],			// full url for the site
-								'$from'			=> $from,								// name of the person sending the message
-								'$body'			=> $msg['textversion'],					// text version of the message
-								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r,
+								'$from'			=> $from,					// name of the person sending the message
+								'$body'			=> $msg['textversion'],				// text version of the message
+								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nick'] . '/' . $posted_id,
 							));
 
 							// use the EmailNotification library to send the message
@@ -539,9 +542,9 @@ function dfrn_notify_post(&$a) {
 								'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
 								'$thumb'		=> $conv['author-avatar'],				// thumbnail url for sender icon
 								'$url'			=> $conv['author-link'],				// full url for the site
-								'$from'			=> $from,								// name of the person sending the message
+								'$from'			=> $from,						// name of the person sending the message
 								'$body'			=> $msg['htmlversion'],					// html version of the message
-								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r,
+								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nick'] . '/' . $posted_id,
 							));
 			
 							// load the template for private message notifications
@@ -551,9 +554,9 @@ function dfrn_notify_post(&$a) {
 								'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
 								'$thumb'		=> $conv['author-avatar'],				// thumbnail url for sender icon
 								'$url'			=> $conv['author-link'],				// full url for the site
-								'$from'			=> $from,								// name of the person sending the message
+								'$from'			=> $from,						// name of the person sending the message
 								'$body'			=> $msg['textversion'],					// text version of the message
-								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r,
+								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nick'] . '/' . $posted_id,
 							));
 
 							// use the EmailNotification library to send the message
diff --git a/mod/item.php b/mod/item.php
index 0b5e32e88..8c9e004c3 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -485,12 +485,12 @@ function item_post(&$a) {
 				$email_html_body_tpl = replace_macros($tpl,array(
 					'$sitename'		=> $a->config['sitename'],				// name of this site
 					'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
-					'$thumb'		=> $conv['author-avatar'],				// thumbnail url for sender icon
+					'$thumb'		=> $author['thumb'],					// thumbnail url for sender icon
 					'$email'		=> $importer['email'],					// email address to send to
-					'$url'			=> $conv['author-link'],				// full url for the site
-					'$from'			=> $from,								// name of the person sending the message
+					'$url'			=> $author['url'],					// full url for the site
+					'$from'			=> $from,						// name of the person sending the message
 					'$body'			=> $msg['htmlversion'],					// html version of the message
-					'$display'		=> $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r,
+					'$display'		=> $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
 				));
 			
 				// load the template for private message notifications
@@ -498,12 +498,12 @@ function item_post(&$a) {
 				$email_text_body_tpl = replace_macros($tpl,array(
 					'$sitename'		=> $a->config['sitename'],				// name of this site
 					'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
-					'$thumb'		=> $conv['author-avatar'],				// thumbnail url for sender icon
+					'$thumb'		=> $author['thumb'],					// thumbnail url for sender icon
 					'$email'		=> $importer['email'],					// email address to send to
-					'$url'			=> $conv['author-link'],				// full url for the site
-					'$from'			=> $from,								// name of the person sending the message
+					'$url'			=> $author['url'],					// full url for the site
+					'$from'			=> $from,						// name of the person sending the message
 					'$body'			=> $msg['textversion'],					// text version of the message
-					'$display'		=> $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r,
+					'$display'		=> $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
 				));
 
 				// use the EmailNotification library to send the message
@@ -548,11 +548,11 @@ function item_post(&$a) {
 				$email_html_body_tpl = replace_macros($tpl,array(
 					'$sitename'		=> $a->config['sitename'],				// name of this site
 					'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
-					'$thumb'		=> $conv['author-avatar'],				// thumbnail url for sender icon
-					'$url'			=> $conv['author-link'],				// full url for the site
-					'$from'			=> $from,								// name of the person sending the message
+					'$thumb'		=> $author['thumb'],					// thumbnail url for sender icon
+					'$url'			=> $author['url'],					// full url for the site
+					'$from'			=> $from,						// name of the person sending the message
 					'$body'			=> $msg['htmlversion'],					// html version of the message
-					'$display'		=> $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r,
+					'$display'		=> $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
 				));
 			
 				// load the template for private message notifications
@@ -560,11 +560,11 @@ function item_post(&$a) {
 				$email_text_body_tpl = replace_macros($tpl,array(
 					'$sitename'		=> $a->config['sitename'],				// name of this site
 					'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
-					'$thumb'		=> $conv['author-avatar'],				// thumbnail url for sender icon
-					'$url'			=> $conv['author-link'],				// full url for the site
-					'$from'			=> $from,								// name of the person sending the message
+					'$thumb'		=> $author['thumb'],					// thumbnail url for sender icon
+					'$url'			=> $author['url'],					// full url for the site
+					'$from'			=> $from,						// name of the person sending the message
 					'$body'			=> $msg['textversion'],					// text version of the message
-					'$display'		=> $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r,
+					'$display'		=> $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
 				));
 
 				// use the EmailNotification library to send the message
@@ -589,6 +589,9 @@ function item_post(&$a) {
 			dbesc(datetime_convert()),
 			intval($post_id)
 		);
+		foreach( $r as $key => $val) {
+			logger("key: " . $key . " val: " . $val);
+		}
 
 		// photo comments turn the corresponding item visible to the profile wall
 		// This way we don't see every picture in your new photo album posted to your wall at once.