From aa985502c99d96aa5d7fb5af49870b9ffa806c4c Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 29 Sep 2016 23:16:17 -0400 Subject: [PATCH] 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()); -- 2.39.5