notify_intro

3 files changed, 40 insertions, 19 deletions

diff --git a/boot.php b/boot.php
index 1be6a26ff..cb7b7fc76 100644
--- a/boot.php
+++ b/boot.php
@@ -701,7 +701,7 @@ function login($register = false, $hiddens=false) {
 		'$lpassword' 	=> array('password', t('Password: '), '', ''),
 		
 		'$openid'		=> !$noid,
-		'$lopenid'	=> array('openid_url', t('OpenID: '),'',''),
+		'$lopenid'	=> array('openid_url', t('Or login using OpenID: '),'',''),
 		
 		'$hiddens'	=> $hiddens,
 		
diff --git a/include/enotify.php b/include/enotify.php
index 6f0d65aed..49a8597b9 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -15,8 +15,13 @@ function notification($params) {
 	$sender_name = t('Administrator');
 	$sender_email = t('noreply') . '@' . $a->get_hostname();
 
-	$title = $params['item']['title'];
-	$body = $params['item']['body'];
+	if(in_array('item',$params)) {
+		$title = $params['item']['title'];
+		$body = $params['item']['body'];
+	}
+	else {
+		$title = $body = '';
+	}
 
 	if($params['type'] == NOTIFY_MAIL) {
 
@@ -49,6 +54,24 @@ function notification($params) {
 		$itemlink =  $params['link'];
 	}
 
+	if($params['type'] == NOTIFY_INTRO) {
+		$subject = sprintf( t('Introduction received at %s'), $sitename);
+		$preamble = sprintf( t('You\'ve received an introduction from \'%s\' at %s'), $params['source_name'], $sitename); 
+		$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, '<a href="' . $siteurl . '">' . $sitename . '</a>');
+		$itemlink =  $params['link'];
+	}
+
+	if($params['type'] == NOTIFY_CONFIRM) {
+
+	}
+
+	// TODO - create notification entry in DB
+
+
 
 	// send email notification if notification preferences permit
 
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index d7c918490..a96860403 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -568,24 +568,22 @@ function dfrn_request_content(&$a) {
 			if(count($r)) {
 				if($r[0]['page-flags'] != PAGE_NORMAL)
 					$auto_confirm = true;				
-				if(($r[0]['notify-flags'] & NOTIFY_INTRO) && (! $auto_confirm)) {
-					$email_tpl = get_intltext_template('request_notify_eml.tpl');
-					$email = replace_macros($email_tpl, array(
-						'$requestor' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
-						'$url' => stripslashes($r[0]['url']),
-						'$myname' => $r[0]['username'],
-						'$siteurl' => $a->get_baseurl(),
-						'$sitename' => $a->config['sitename']
+
+				if(! $auto_confirm) {
+					require_once('include/enotify.php');
+					notification(array(
+						'type'         => NOTIFY_INTRO,
+						'notify_flags' => $r[0]['notify-flags'],
+						'language'     => $r[0]['language'],
+						'to_name'      => $r[0]['username'],
+						'to_email'     => $r[0]['email'],
+						'link'		   => $a->get_baseurl() . '/notifications/intros',
+						'source_name'  => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
+						'source_link'  => $r[0]['url'],
+						'source_photo' => $r[0]['photo']
 					));
-					$res = mail($r[0]['email'], 
-					    t("Introduction received at ") . $a->config['sitename'],
-						$email,
-						'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
-						. 'Content-type: text/plain; charset=UTF-8' . "\n"
-						. 'Content-transfer-encoding: 8bit' );
-
-					// This is a redundant notification - no point throwing errors if it fails.
 				}
+
 				if($auto_confirm) {
 					require_once('mod/dfrn_confirm.php');
 					$handsfree = array(