From aa985502c99d96aa5d7fb5af49870b9ffa806c4c Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <ben.lort@gmail.com>
Date: Thu, 29 Sep 2016 23:16:17 -0400
Subject: [PATCH 1/2] Fix Issue #2813

- Remove adding a notification for each admin on register approval
request
- Fix wrong display of the above notification that is removed anyway
- Fix comments
---
 js/main.js       | 10 +++++-----
 mod/register.php | 18 ------------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/js/main.js b/js/main.js
index 72bef88490..79b5aae2bc 100644
--- a/js/main.js
+++ b/js/main.js
@@ -264,13 +264,13 @@
 					var html = notifications_tpl.format(
 						e.attr('href'),                     // {0}  // link to the source
 						e.attr('photo'),                    // {1}  // photo of the contact
-						text,                               // {2}  // preformatet text (autor + text)
+						text,                               // {2}  // preformatted text (autor + text)
 						e.attr('date'),                     // {3}  // date of notification (time ago)
-						seenclass,                          // {4}  // vistiting status of the notification
-						new Date(e.attr('timestamp')*1000), // {5}  //date of notification
+						seenclass,                          // {4}  // visited status of the notification
+						new Date(e.attr('timestamp')*1000), // {5}  // date of notification
 						e.attr('url'),                      // {6}  // profile url of the contact
-						e.text().format(""),                // {7}  // clean status text
-						contact                             // {8}  //preformatat author (name + profile url)
+						e.text().format(contact),           // {7}  // preformatted html (text including author profile url)
+						''                                  // {8}  // Deprecated
 					);
 					nnm.append(html);
 				});
diff --git a/mod/register.php b/mod/register.php
index 6fc5887ef5..62b6a5f033 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -132,24 +132,6 @@ function register_post(&$a) {
 			$admin_mail_list
 		);
 
-
-		foreach ($adminlist as $admin) {
-			notification(array(
-				'type' => NOTIFY_SYSTEM,
-				'event' => 'SYSTEM_REGISTER_REQUEST',
-				'source_name' => $user['username'],
-				'source_mail' => $user['email'],
-				'source_nick' => $user['nickname'],
-				'source_link' => $a->get_baseurl()."/admin/users/",
-				'link' => $a->get_baseurl()."/admin/users/",
-				'source_photo' => $a->get_baseurl() . "/photo/avatar/".$user['uid'].".jpg",
-				'to_email' => $admin['email'],
-				'uid' => $admin['uid'],
-				'language' => ($admin['language']?$admin['language']:'en'))
-			);
-		}
-
-
 		info( t('Your registration is pending approval by the site owner.') . EOL ) ;
 		goaway(z_root());
 

From f0382bb159244b8f9d9243f737e673b0375ca7c8 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <ben.lort@gmail.com>
Date: Fri, 30 Sep 2016 08:57:16 -0400
Subject: [PATCH 2/2] Restore admin notification email on register approval

- Reverted changes to mod/register.php
- Added "show_in_notification_page" flag to prevent `notify` DB
insertion
---
 include/enotify.php |  2 +-
 mod/register.php    | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/include/enotify.php b/include/enotify.php
index bed00c5eaf..4973bedc24 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -49,7 +49,7 @@ function notification($params) {
 	// with $params['show_in_notification_page'] == false, the notification isn't inserted into
 	// the database, and an email is sent if applicable.
 	// default, if not specified: true
-	$show_in_notification_page = ((x($params, 'show_in_notification_page'))	? $params['show_in_notification_page']:True);
+	$show_in_notification_page = ((x($params, 'show_in_notification_page'))	? $params['show_in_notification_page']:true);
 
 	$additional_mail_header = "";
 	$additional_mail_header .= "Precedence: list\n";
diff --git a/mod/register.php b/mod/register.php
index 62b6a5f033..0d29b3f9e5 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -132,6 +132,23 @@ function register_post(&$a) {
 			$admin_mail_list
 		);
 
+		foreach ($adminlist as $admin) {
+			notification(array(
+				'type' => NOTIFY_SYSTEM,
+				'event' => 'SYSTEM_REGISTER_REQUEST',
+				'source_name' => $user['username'],
+				'source_mail' => $user['email'],
+				'source_nick' => $user['nickname'],
+				'source_link' => $a->get_baseurl()."/admin/users/",
+				'link' => $a->get_baseurl()."/admin/users/",
+				'source_photo' => $a->get_baseurl() . "/photo/avatar/".$user['uid'].".jpg",
+				'to_email' => $admin['email'],
+				'uid' => $admin['uid'],
+				'language' => ($admin['language']?$admin['language']:'en'),
+				'show_in_notification_page' => false
+			));
+		}
+
 		info( t('Your registration is pending approval by the site owner.') . EOL ) ;
 		goaway(z_root());