starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-28 17:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply fixes from StyleCI

Browse Source 
[ci skip] [skip ci]
This commit is contained in:
DariusIII
2018-11-13 12:12:43 +00:00
committed by StyleCI Bot
parent eb90c9e051
commit 3ebe9e9583
13 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/UserController.php
+1 -1
View File
@@ -2,11 +2,11 @@
namespace App\Http\Controllers\Admin;
use App\Jobs\SendAccountChangedEmail;
use App\Models\User;
use App\Models\Invitation;
use Illuminate\Http\Request;
use Spatie\Permission\Models\Role;
use App\Jobs\SendAccountChangedEmail;
use App\Http\Controllers\BasePageController;
class UserController extends BasePageController
app/Http/Controllers/Auth/ForgotPasswordController.php
+1 -2
View File
@@ -2,13 +2,12 @@
namespace App\Http\Controllers\Auth;
use App\Jobs\SendPasswordForgottenEmail;
use App\Models\User;
use App\Models\Settings;
use Illuminate\Http\Request;
use App\Mail\ForgottenPassword;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Mail;
use App\Jobs\SendPasswordForgottenEmail;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
class ForgotPasswordController extends Controller
app/Http/Controllers/Auth/ResetPasswordController.php
+1 -2
View File
@@ -2,12 +2,11 @@
namespace App\Http\Controllers\Auth;
use App\Jobs\SendPasswordResetEmail;
use App\Models\User;
use App\Models\Settings;
use App\Mail\PasswordReset;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Jobs\SendPasswordResetEmail;
use Illuminate\Support\Facades\Mail;
use Illuminate\Foundation\Auth\ResetsPasswords;
app/Http/Controllers/ContactUsController.php
+2 -2
View File
@@ -2,9 +2,9 @@
namespace App\Http\Controllers;
use App\Jobs\SendContactUsEmail;
use App\Models\Settings;
use Illuminate\Http\Request;
use App\Jobs\SendContactUsEmail;
class ContactUsController extends BasePageController
{
@@ -41,7 +41,7 @@ class ContactUsController extends BasePageController
}
if (! preg_match("/\n/i", $request->input('useremail'))) {
SendContactUsEmail::dispatch($email, $mailTo, $mailBody);
SendContactUsEmail::dispatch($email, $mailTo, $mailBody);
}
$msg = "<h2 style='text-align:center;'>Thank you for getting in touch with ".Settings::settingValue('site.main.title').'.</h2>';
}
app/Http/Controllers/ProfileController.php
-1
View File
@@ -361,7 +361,6 @@ class ProfileController extends BasePageController
$userId = $request->input('id');
if ($userId !== null && $this->userdata->hasRole('Admin') === false && (int) $userId === Auth::id()) {
User::deleteUser($userId);
return redirect('login');
app/Jobs/SendAccountChangedEmail.php
+1 -1
View File
@@ -4,11 +4,11 @@ namespace App\Jobs;
use App\Mail\AccountChange;
use Illuminate\Bus\Queueable;
use Illuminate\Support\Facades\Mail;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Support\Facades\Mail;
class SendAccountChangedEmail implements ShouldQueue
{
app/Jobs/SendAccountDeletedEmail.php
+2 -2
View File
@@ -2,14 +2,14 @@
namespace App\Jobs;
use App\Mail\AccountDeleted;
use App\Models\Settings;
use App\Mail\AccountDeleted;
use Illuminate\Bus\Queueable;
use Illuminate\Support\Facades\Mail;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Support\Facades\Mail;
class SendAccountDeletedEmail implements ShouldQueue
{
app/Jobs/SendAccountExpiredEmail.php
+1 -2
View File
@@ -4,11 +4,11 @@ namespace App\Jobs;
use App\Mail\AccountExpired;
use Illuminate\Bus\Queueable;
use Illuminate\Support\Facades\Mail;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Support\Facades\Mail;
class SendAccountExpiredEmail implements ShouldQueue
{
@@ -28,7 +28,6 @@ class SendAccountExpiredEmail implements ShouldQueue
{
$this->email = $email;
$this->userId = $userId;
}
/**
app/Jobs/SendContactUsEmail.php
+1 -4
View File
@@ -4,11 +4,11 @@ namespace App\Jobs;
use App\Mail\ContactUs;
use Illuminate\Bus\Queueable;
use Illuminate\Support\Facades\Mail;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Support\Facades\Mail;
class SendContactUsEmail implements ShouldQueue
{
@@ -34,9 +34,6 @@ class SendContactUsEmail implements ShouldQueue
$this->mailBody = $mailBody;
}
/**
*
*/
public function handle()
{
Mail::to($this->mailTo)->send(new ContactUs($this->email, $this->mailBody));
app/Jobs/SendInviteEmail.php
+3 -2
View File
@@ -4,11 +4,11 @@ namespace App\Jobs;
use App\Mail\SendInvite;
use Illuminate\Bus\Queueable;
use Illuminate\Support\Facades\Mail;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Support\Facades\Mail;
class SendInviteEmail implements ShouldQueue
{
@@ -31,7 +31,8 @@ class SendInviteEmail implements ShouldQueue
{
$this->email = $email;
$this->userId = $userId;
$this->url = $url; }
$this->url = $url;
}
/**
* Execute the job.
app/Jobs/SendPasswordForgottenEmail.php
+2 -2
View File
@@ -2,13 +2,13 @@
namespace App\Jobs;
use App\Mail\ForgottenPassword;
use Illuminate\Bus\Queueable;
use App\Mail\ForgottenPassword;
use Illuminate\Support\Facades\Mail;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Support\Facades\Mail;
class SendPasswordForgottenEmail implements ShouldQueue
{
app/Jobs/SendPasswordResetEmail.php
+1 -1
View File
@@ -4,11 +4,11 @@ namespace App\Jobs;
use App\Mail\PasswordReset;
use Illuminate\Bus\Queueable;
use Illuminate\Support\Facades\Mail;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Support\Facades\Mail;
class SendPasswordResetEmail implements ShouldQueue
{
app/Models/User.php
+3 -3
View File
@@ -2,12 +2,12 @@
namespace App\Models;
use App\Jobs\SendAccountExpiredEmail;
use App\Jobs\SendInviteEmail;
use Illuminate\Support\Str;
use App\Jobs\SendInviteEmail;
use Illuminate\Support\Facades\DB;
use Spatie\Permission\Models\Role;
use Illuminate\Support\Facades\Hash;
use App\Jobs\SendAccountExpiredEmail;
use Spatie\Permission\Traits\HasRoles;
use Illuminate\Notifications\Notifiable;
use Illuminate\Support\Facades\Password;
@@ -940,9 +940,9 @@ class User extends Authenticatable
$token = \Token::randomString(40);
$url = $serverUrl.'register?invitecode='.$token;
Invitation::addInvite($uid, $token);
SendInviteEmail::dispatch($emailTo, $uid, $url);
return $url;
}