From 5bb73034088a3f69009140f6a43e0ea1d46f6a5a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 25 Mar 2012 04:37:09 -0700
Subject: NOTIFY_SYSTEM

---
 include/enotify.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'include/enotify.php')

diff --git a/include/enotify.php b/include/enotify.php
index a505f1f04..e4617ab49 100755
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -151,6 +151,11 @@ function notification($params) {
 
 	if($params['type'] == NOTIFY_CONFIRM) {
 
+	}
+
+	if($params['type'] == NOTIFY_SYSTEM) {
+
+
 	}
 
 	// from here on everything is in the recipients language
@@ -223,7 +228,7 @@ function notification($params) {
 	// send email notification if notification preferences permit
 
 	require_once('bbcode.php');
-	if(intval($params['notify_flags']) & intval($params['type'])) {
+	if((intval($params['notify_flags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM) {
 
 		logger('notification: sending notification email');
 
-- 
cgit v1.2.3


From 873a55e9186cdf3d92b2793cd366debf237c8cda Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 25 Mar 2012 05:06:11 -0700
Subject: enotify plugin hook

---
 include/enotify.php | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

(limited to 'include/enotify.php')

diff --git a/include/enotify.php b/include/enotify.php
index e4617ab49..1918f26df 100755
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -154,10 +154,32 @@ function notification($params) {
 	}
 
 	if($params['type'] == NOTIFY_SYSTEM) {
-
-
+		
 	}
 
+	$h = array(
+		'params'    => $params, 
+		'subject'   => $subject,
+		'preamble'  => $preamble, 
+		'epreamble' => $epreamble, 
+		'body'      => $body, 
+		'sitelink'  => $sitelink,
+		'tsitelink' => $tsitelink,
+		'hsitelink' => $hsitelink,
+		'itemlink'  => $itemlink
+	);
+		
+	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']; 
+
 	// from here on everything is in the recipients language
 
 	push_lang($params['language']);
-- 
cgit v1.2.3


From b240b8489aa34d3016ffb11c8a2176eca41c5e5a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 26 Mar 2012 01:43:26 -0700
Subject: language issues in enotify

---
 include/enotify.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'include/enotify.php')

diff --git a/include/enotify.php b/include/enotify.php
index 1918f26df..8385bdec5 100755
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -5,6 +5,12 @@ function notification($params) {
 	logger('notification: entry', 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 = z_path();
@@ -180,9 +186,6 @@ function notification($params) {
 	$hsitelink = $h['hsitelink'];
 	$itemlink  = $h['itemlink']; 
 
-	// from here on everything is in the recipients language
-
-	push_lang($params['language']);
 
 	require_once('include/html2bbcode.php');	
 
@@ -234,8 +237,10 @@ function notification($params) {
 	);
 	if($r)
 		$notify_id = $r[0]['id'];
-	else
+	else {
+		pop_lang();
 		return;
+	}
 
 	$itemlink = $a->get_baseurl() . '/notify/view/' . $notify_id;
 	$msg = replace_macros($epreamble,array('$itemlink' => $itemlink));
@@ -246,7 +251,6 @@ function notification($params) {
 	);
 		
 
-
 	// send email notification if notification preferences permit
 
 	require_once('bbcode.php');
-- 
cgit v1.2.3