Merge pull request #262 from bvipul/develop

Changes in Email Template

app/Notifications/Frontend/Auth/UserNeedsConfirmation.php

@@ -43,13 +43,15 @@ class UserNeedsConfirmation extends Notification
     /**
      * Get the mail representation of the notification.
      *
-     * @param mixed $notifiable
+     * @param \App\Models\Access\User\User $user
      *
      * @return \Illuminate\Notifications\Messages\MailMessage
      */
-    public function toMail($notifiable)
+    public function toMail($user)
     {
+        $confirmation_url = route('frontend.auth.account.confirm', $user->confirmation_code);
+
         return (new MailMessage())
-        ->view('emails.template');
+            ->view('emails.template', compact('confirmation_url'));
     }
 }

app/Repositories/Frontend/Access/User/UserRepository.php

@@ -115,7 +115,7 @@ class UserRepository extends BaseRepository
             $user->confirmed = 1;
         }
 
-        DB::transaction(function () use ($user) {
+        DB::transaction(function () use ($user, $provider) {
             if ($user->save()) {
 
                 /*
@@ -130,19 +130,19 @@ class UserRepository extends BaseRepository
                  * Assigned permissions to user
                 */
                 $user->permissions()->sync($permissions);
+
+                /*
+                 * If users have to confirm their email and this is not a social account,
+                 * send the confirmation email
+                 *
+                 * If this is a social account they are confirmed through the social provider by default
+                 */
+                if (config('access.users.confirm_email') && $provider === false) {
+                    $user->notify(new UserNeedsConfirmation($user->confirmation_code));
+                }
             }
         });
 
-        /*
-         * If users have to confirm their email and this is not a social account,
-         * send the confirmation email
-         *
-         * If this is a social account they are confirmed through the social provider by default
-         */
-        if (config('access.users.confirm_email') && $provider === false) {
-            $user->notify(new UserNeedsConfirmation($user->confirmation_code));
-        }
-
         /*
          * Return the user object
          */

config/access.php

@@ -104,7 +104,7 @@ return [
         /*
          * Whether or not the user has to confirm their email when signing up
          */
-        'confirm_email' => false,
+        'confirm_email' => true,
 
         /*
          * Whether or not the users email can be changed on the edit profile screen

public/humans.txt

-# humanstxt.org/
-# The humans responsible & technology colophon
-
-# TEAM
-
-    <name> -- <role> -- <twitter>
-
-# THANKS
-
-    <name>
-
-# TECHNOLOGY COLOPHON
-
-    CSS3, HTML5
-    Apache Server Configs, jQuery, Modernizr, Normalize.css