From 2ed38036a53a489d2fcadc46ce601f8c876fca31 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 21 Sep 2012 11:53:17 +0200
Subject: consolidate more notification code in subscription class

This is untested and probably broken currently
---
 inc/auth.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'inc/auth.php')

diff --git a/inc/auth.php b/inc/auth.php
index cedfdee36..3fb937613 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -778,23 +778,18 @@ function register() {
         return false;
     }
 
-    // create substitutions for use in notification email
-    $substitutions = array(
-        'NEWUSER'  => $_POST['login'],
-        'NEWNAME'  => $_POST['fullname'],
-        'NEWEMAIL' => $_POST['email'],
-    );
+    $subscription = new Subscription();
 
     if(!$conf['autopasswd']) {
         msg($lang['regsuccess2'], 1);
-        notify('', 'register', '', $_POST['login'], false, $substitutions);
+        $subscription->send_register($_POST['login'], $_POST['fullname'], $_POST['email']);
         return true;
     }
 
     // autogenerated password? then send him the password
     if(auth_sendPassword($_POST['login'], $pass)) {
         msg($lang['regsuccess'], 1);
-        notify('', 'register', '', $_POST['login'], false, $substitutions);
+        $subscription->send_register($_POST['login'], $_POST['fullname'], $_POST['email']);
         return true;
     } else {
         msg($lang['regmailfail'], -1);
-- 
cgit v1.2.3


From 10b5c32d6486ab0884deda109b1e5947f7ec7662 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 30 Nov 2012 12:35:46 +0100
Subject: fixed merge error in inc/auth.php

merged the wrong change here
---
 inc/auth.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'inc/auth.php')

diff --git a/inc/auth.php b/inc/auth.php
index 54d2cd50a..9c458338d 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -782,21 +782,21 @@ function register() {
 
     // create substitutions for use in notification email
     $substitutions = array(
-        'NEWUSER'  => $_POST['login'],
-        'NEWNAME'  => $_POST['fullname'],
-        'NEWEMAIL' => $_POST['email'],
+        'NEWUSER'  => $login,
+        'NEWNAME'  => $fullname,
+        'NEWEMAIL' => $email,
     );
 
     if(!$conf['autopasswd']) {
         msg($lang['regsuccess2'], 1);
-        notify('', 'register', '', $_POST['login'], false, $substitutions);
+        notify('', 'register', '', $login, false, $substitutions);
         return true;
     }
 
     // autogenerated password? then send him the password
     if(auth_sendPassword($login, $pass)) {
         msg($lang['regsuccess'], 1);
-        notify('', 'register', '', $_POST['login'], false, $substitutions);
+        notify('', 'register', '', $login, false, $substitutions);
         return true;
     } else {
         msg($lang['regmailfail'], -1);
-- 
cgit v1.2.3


From 790b77202079261b11d425e0c814608d626eea70 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 30 Nov 2012 13:09:15 +0100
Subject: moved registration notification to subscription class

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

(limited to 'inc/auth.php')

diff --git a/inc/auth.php b/inc/auth.php
index 9c458338d..29a46b37e 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -780,23 +780,19 @@ function register() {
         return false;
     }
 
-    // create substitutions for use in notification email
-    $substitutions = array(
-        'NEWUSER'  => $login,
-        'NEWNAME'  => $fullname,
-        'NEWEMAIL' => $email,
-    );
+    // send notification about the new user
+    $subscription = new Subscription();
+    $subscription->send_register($login, $fullname, $email);
 
+    // are we done?
     if(!$conf['autopasswd']) {
         msg($lang['regsuccess2'], 1);
-        notify('', 'register', '', $login, false, $substitutions);
         return true;
     }
 
-    // autogenerated password? then send him the password
+    // autogenerated password? then send password to user
     if(auth_sendPassword($login, $pass)) {
         msg($lang['regsuccess'], 1);
-        notify('', 'register', '', $login, false, $substitutions);
         return true;
     } else {
         msg($lang['regmailfail'], -1);
-- 
cgit v1.2.3