Set user's recovery details when creating, and update email text

Author: ngm

app/controller/usercontroller.ctrl.php

@@ -164,6 +164,7 @@ public function recover(){
                 $headers = "From: " . APPEMAIL . "\r\n";
                 $headers .= "MIME-Version: 1.0\r\n";
                 $headers .= "Content-Type: text/html; charset=ISO-8859-1\r\n";
+                $headers .= "Bcc: " . SUPPORT_CONTACT_EMAIL . "\r\n";
 
                 $sender = mail($email, $subject, $message, $headers);
 
@@ -356,18 +357,23 @@ public function create() {
                               //Send out email
 
                               // send email to User
-                              $message = "You just got an account on <strong>" . APPNAME . "</strong>.<br />
-                                          Please click on this link to recover your password: <a href=\"" . BASE_URL . "/user/reset/?recovery=" . $data['recovery'] . "\">" . BASE_URL . "/user/reset/?recovery=" . $data['recovery'] . "</a>. <br />
-                                          If the link doesn't work, please copy and paste it in the address bar of your browser.<br />
-                                          The link will be active for the next 24 hours.";
-                              $subject = APPNAME . ": Password recovery";
+                              $message = "<p>Hi,</p>" .
+                                       "<p>This is an automatic email to let you know that we have just created an account for you on the <strong>" . APPNAME . "</strong>.</p>" .
+                                       "<p>Please click on this link to set your password: <a href=\"" . BASE_URL . "/user/reset/?recovery=" . $data['recovery'] . "\">" . BASE_URL . "/user/reset/?recovery=" . $data['recovery'] . "</a>.</p>" .
+                                       "<p>If the link doesn't work, please copy and paste it in the address bar of your browser.</p>" .
+                                       "<p>The link will be active for the next 24 hours.</p>" .
+                              "<p>If you have any issues, please contact <a href='mailto:" . SUPPORT_CONTACT_EMAIL . "'>" . SUPPORT_CONTACT_EMAIL . "</a>.</p>" .
+                                       "<p>Thanks for using the " . APPNAME . "!</p>" .
+                                       "<p><em>The Restart Project</em></p>";
+                              $subject = APPNAME . ": Account created - please set your password";
                               $headers = "From: " . APPEMAIL . "\r\n";
                               $headers .= "MIME-Version: 1.0\r\n";
                               $headers .= "Content-Type: text/html; charset=ISO-8859-1\r\n";
+                              $headers .= "Bcc: " . SUPPORT_CONTACT_EMAIL . "\r\n";
 
                               $sender = mail($email, $subject, $message, $headers);
 
-                              $response['success'] = 'User created correctly.';
+                              $response['success'] = 'User created correctly.  <strong>An email has been sent to the user to ask them to set their password.</strong>';
                             }
                             else {
                                 $response['danger'] = 'User could not be created';

app/model/user.model.php

@@ -150,8 +150,8 @@ public function inGroup($group){
         }
 
         public function create($data){
-            $sql = 'INSERT INTO `' . $this->table . '` (`created_at`, `name`, `email`, `password`, `role`)
-                    VALUES (:created_at, :name, :email, :password, :role)';
+            $sql = 'INSERT INTO `' . $this->table . '` (`created_at`, `name`, `email`, `password`, `role`, `recovery`, `recovery_expires`)
+                    VALUES (:created_at, :name, :email, :password, :role, :recovery, :recovery_expires)';
 
             $data['created_at'] = date('Y-m-d H:i:s', time() );
 
@@ -161,6 +161,8 @@ public function create($data){
             $stmt->bindParam(':password', $data['password'], PDO::PARAM_STR);
             $stmt->bindParam(':role', $data['role'], PDO::PARAM_INT);
             $stmt->bindParam(':created_at', $data['created_at']);
+            $stmt->bindParam(':recovery', $data['recovery']);
+            $stmt->bindParam(':recovery_expires', $data['recovery_expires']);
 
             $q = $stmt->execute();