Fix sending invites when site is in invite mode

Changelog

@@ -1,3 +1,5 @@
+2019-08-05 DariusIII
+	* Chg: Fix sending invites when site is in invite mode
 2019-08-04 DariusIII
 	* Chg: Update used libraries to their latest versions
 2019-08-02 DariusIII

app/Http/Controllers/Admin/UserController.php

@@ -151,7 +151,7 @@ class UserController extends BasePageController
                             \Firewall::blacklist($editedUser->host);
                         }
                         $editedUser->refresh();
-                        SendAccountChangedEmail::dispatch($editedUser);
+                        SendAccountChangedEmail::dispatch($editedUser)->onQueue('emails');
                     }
                 }
 

app/Http/Controllers/AjaxController.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\User;
+use Illuminate\Http\Request;
+
+class AjaxController extends BasePageController
+{
+    public function profile(Request $request)
+    {
+        $this->setPrefs();
+        if ($request->has('action') && (int) $request->input('action') === 1 && $request->has('emailto')) {
+            $emailTo = $request->input('emailto');
+            $ret = User::sendInvite(url('/'), $this->userdata->id, $emailTo);
+            if (! $ret) {
+                print 'Invite not sent.';
+            } else {
+                print 'Invite sent. Alternatively paste them following link to register - ' . $ret;
+            }
+        } else {
+            print 'Invite not sent.';
+        }
+    }
+}

app/Http/Controllers/ContactUsController.php

@@ -42,7 +42,7 @@ class ContactUsController extends BasePageController
             }
 
             if (! preg_match("/\n/i", $request->input('useremail'))) {
-                SendContactUsEmail::dispatch($email, $mailTo, $mailBody);
+                SendContactUsEmail::dispatch($email, $mailTo, $mailBody)->onQueue('contactemail');
             }
             $msg = "<h2 style='text-align:center;'>Thank you for getting in touch with ".Settings::settingValue('site.main.title').'.</h2>';
         }

app/Models/User.php

@@ -400,13 +400,13 @@ class User extends Authenticatable
             $users = self::query()->whereDate('rolechangedate', '=', $value)->get();
             $days = $now->diffInDays($value);
             foreach ($users as $user) {
-                SendAccountWillExpireEmail::dispatch($user, $days);
+                SendAccountWillExpireEmail::dispatch($user, $days)->onQueue('emails');
             }
         }
         foreach (self::query()->whereDate('rolechangedate', '<', $now)->get() as $expired) {
             $expired->update(['roles_id' => self::ROLE_USER, 'rolechangedate' => null]);
             $expired->syncRoles('User');
-            SendAccountExpiredEmail::dispatch($expired);
+            SendAccountExpiredEmail::dispatch($expired)->onQueue('emails');
         }
     }
 
@@ -881,10 +881,10 @@ class User extends Authenticatable
     public static function sendInvite($serverUrl, $uid, $emailTo): string
     {
         $token = \Token::randomString(40);
-        $url = $serverUrl.'register?invitecode='.$token;
+        $url = $serverUrl.'/register?invitecode='.$token;
 
         Invitation::addInvite($uid, $token);
-        SendInviteEmail::dispatch($emailTo, $uid, $url);
+        SendInviteEmail::dispatch($emailTo, $uid, $url)->onQueue('emails');
 
         return $url;
     }
@@ -896,6 +896,7 @@ class User extends Authenticatable
      * limits to apply.
      *
      * @param int $days
+     * @throws \Exception
      */
     public static function pruneRequestHistory($days = 0): void
     {

app/Observers/UserServiceObserver.php

@@ -37,8 +37,8 @@ class UserServiceObserver
             ]
         );
         if (! empty(Settings::settingValue('site.main.email') && File::isFile(base_path().'/_install/install.lock'))) {
-            SendNewRegisteredAccountMail::dispatch($user);
-            SendWelcomeEmail::dispatch($user);
+            SendNewRegisteredAccountMail::dispatch($user)->onQueue('newreg');
+            SendWelcomeEmail::dispatch($user)->onQueue('welcomeemails');
             UserVerification::generate($user);
 
             UserVerification::send($user, 'User email verification required');
@@ -50,6 +50,6 @@ class UserServiceObserver
      */
     public function deleting(User $user)
     {
-        SendAccountDeletedEmail::dispatch($user);
+        SendAccountDeletedEmail::dispatch($user)->onQueue('deleted');
     }
 }

resources/views/themes/Gentele/profile.tpl

@@ -183,7 +183,6 @@
                                                                     <div style="display:none;" id="divInvite">
                                                                         {{Form::open(['id' => 'frmSendInvite', 'method' => 'get'])}}
                                                                         {{Form::label('txtInvite', 'Email')}}
-                                                                        {{Form::text(['id' => txtInvite])}}
                                                                         {{Form::text('txtInvite', null, ['id' => 'txtInvite'])}}
                                                                         {{Form::submit('Send')}}
                                                                         {{Form::close()}}

resources/views/themes/admin/group-list.tpl

@@ -8,7 +8,7 @@
 		<div class="row" style="position:relative;margin-bottom:5px;">
             <div class="col-md-4">
             {{Form::open(['name' => 'groupsearch', 'style' => 'margin-bottom:5px;'])}}
-                {{Form::label('grouopname', 'Group')}}
+                {{Form::label('groupname', 'Group')}}
 				<input id="groupname" type="text" name="groupname" value="{$groupname}" size="15"/>
 				&nbsp;&nbsp;
 				<input class="btn btn-success" type="submit" value="Go"/>
@@ -85,7 +85,7 @@
         <div class="row" style="position:relative;margin-bottom:5px;">
             <div class="col-md-4">
                 {{Form::open(['name' => 'groupsearch', 'style' => 'margin-bottom:5px;'])}}
-                {{Form::label('grouopname', 'Group')}}
+                {{Form::label('groupname', 'Group')}}
                 <input id="groupname" type="text" name="groupname" value="{$groupname}" size="15"/>
                 &nbsp;&nbsp;
                 <input class="btn btn-success" type="submit" value="Go"/>

routes/web.php

@@ -207,6 +207,10 @@ Route::group(['middleware' => ['isVerified', 'fw-block-blacklisted']], function
     Route::get('nzbvortex', 'QueueController@nzbvortex');
 
     Route::post('nzbvortex', 'QueueController@nzbvortex');
+
+    Route::get('ajax_profile', 'AjaxController@profile');
+
+    Route::post('ajax_profile', 'AjaxController@profile');
 });
 
 Route::get('forum-delete/{id}', 'ForumController@destroy')->middleware('role:Admin');