diff --git a/app/Http/Controllers/AnnounceController.php b/app/Http/Controllers/AnnounceController.php index e06d7b2ad3..c06b27f403 100644 --- a/app/Http/Controllers/AnnounceController.php +++ b/app/Http/Controllers/AnnounceController.php @@ -19,11 +19,8 @@ use App\PersonalFreeleech; use App\FreeleechToken; use App\Group; - use Carbon\Carbon; - use App\Services\Bencode; - use Illuminate\Http\Request; use Illuminate\Support\Facades\Response; use Illuminate\Support\Facades\Log; diff --git a/app/Http/Controllers/Auth/ActivationController.php b/app/Http/Controllers/Auth/ActivationController.php index 7f4b6d7853..4beddaefdf 100755 --- a/app/Http/Controllers/Auth/ActivationController.php +++ b/app/Http/Controllers/Auth/ActivationController.php @@ -35,7 +35,7 @@ public function activate($token) $activation->delete(); return redirect()->route('login')->with(Toastr::success('Account Confirmed! You May Now Login!', 'Yay!', ['options'])); } else { - return redirect()->route('login')->with(Toastr::warning('Banned or Invalid Token Or Account Already Confirmed!', 'Whoops!', ['options'])); + return redirect()->route('login')->with(Toastr::error('Banned or Invalid Token Or Account Already Confirmed!', 'Whoops!', ['options'])); } } } diff --git a/app/Http/Controllers/Auth/ForgotUsernameController.php b/app/Http/Controllers/Auth/ForgotUsernameController.php index 92f0dac335..3d7750c782 100644 --- a/app/Http/Controllers/Auth/ForgotUsernameController.php +++ b/app/Http/Controllers/Auth/ForgotUsernameController.php @@ -61,7 +61,7 @@ public function sendUserameReminder(Request $request) $user = User::where('email', $email)->first(); if (empty($user)) { - return redirect()->route('username.request')->with(Toastr::warning('We could not find this email in our system!', 'Error', ['options'])); + return redirect()->route('username.request')->with(Toastr::error('We could not find this email in our system!', 'Whoops!', ['options'])); } //send username reminder notification diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 12e2df03eb..727b7c8c65 100755 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -41,7 +41,7 @@ protected function authenticated(Request $request, $user) if ($user->active == 0 || $user->group_id == 1) { auth()->logout(); $request->session()->flush(); - return redirect()->route('login')->with(Toastr::warning('This account has not been activated and is still in validating group, Please check your email for activation link. If you did not receive the activation code, please click "forgot password" and complete the steps.', 'Whoops!', ['options'])); + return redirect()->route('login')->with(Toastr::error('This account has not been activated and is still in validating group, Please check your email for activation link. If you did not receive the activation code, please click "forgot password" and complete the steps.', 'Whoops!', ['options'])); } if ($user->group_id == 5) { auth()->logout(); diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 60dacb266d..01de83a957 100755 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -43,13 +43,13 @@ public function register($code = null) { // Make sure open reg is off and ivite code exsists and is not used or expired if (config('other.invite-only') == true && $code == null) { - return view('auth.login')->with(Toastr::warning('Open Reg Closed! You Must Be Invited To Register!', 'Error', ['options'])); + return view('auth.login')->with(Toastr::error('Open Reg Closed! You Must Be Invited To Register!', 'Whoops!', ['options'])); } if (Request::isMethod('post')) { $key = Invite::where('code', '=', $code)->first(); if (config('other.invite-only') == true && !$key) { - return view('auth.register', ['code' => $code])->with(Toastr::warning('Invalid or Expired Invite Key!', 'Error', ['options'])); + return view('auth.register', ['code' => $code])->with(Toastr::error('Invalid or Expired Invite Key!', 'Whoops!', ['options'])); } $current = Carbon::now(); @@ -59,7 +59,7 @@ public function register($code = null) $v = Validator::make($input, $user->rules); if ($v->fails()) { $errors = $v->messages(); - return redirect()->route('register', ['code' => $code])->with(Toastr::warning('Either The Username/Email is already in use or you missed a field. Make sure password is also min 8 charaters!', 'Error', ['options'])); + return redirect()->route('register', ['code' => $code])->with(Toastr::error('Either The Username/Email is already in use or you missed a field. Make sure password is also min 8 charaters!', 'Whoops!', ['options'])); } else { // Create The User $group = Group::where('slug', '=', 'validating')->first(); @@ -99,7 +99,7 @@ public function register($code = null) // Activity Log \LogActivity::addToLog("Member " . $user->username . " has successfully registered to site."); - return redirect()->route('login')->with(Toastr::info('Thanks for signing up! Please check your email to Validate your account', 'Yay!', ['options'])); + return redirect()->route('login')->with(Toastr::success('Thanks for signing up! Please check your email to Validate your account', 'Yay!', ['options'])); } } return view('auth.register', ['code' => $code]); diff --git a/app/Http/Controllers/BonusController.php b/app/Http/Controllers/BonusController.php index c22a9857aa..6c2b0b6e04 100755 --- a/app/Http/Controllers/BonusController.php +++ b/app/Http/Controllers/BonusController.php @@ -111,16 +111,16 @@ public function exchange($id) $flag = $this->doItemExchange($user->id, $id); if (!$flag) { - return redirect('/bonus')->with(Toastr::info('Failed!', 'Bonus Exchange', ['options'])); + return redirect('/bonus')->with(Toastr::error('Bonus Exchange Failed!', 'Whoops!', ['options'])); } $user->seedbonus -= $itemCost; $user->save(); } else { - return redirect('/bonus')->with(Toastr::info('Failed!', 'Bonus Exchange', ['options'])); + return redirect('/bonus')->with(Toastr::error('Bonus Exchange Failed!', 'Whoops!', ['options'])); } - return redirect('/bonus')->with(Toastr::info('Successful', 'Bonus Exchange', ['options'])); + return redirect('/bonus')->with(Toastr::success('Bonus Exchange Successful', 'Yay!', ['options'])); } /** @@ -200,7 +200,7 @@ public function gift() $recipient = User::where('username', 'LIKE', Request::get('to_username'))->first(); if (!$recipient || $recipient->id == $user->id) { - return redirect('/bonus')->with(Toastr::error('Unable to find specified user', 'Gifting Failed', ['options'])); + return redirect('/bonus')->with(Toastr::error('Unable to find specified user', 'Whoops!', ['options'])); } $value = Request::get('bonus_points'); @@ -228,12 +228,12 @@ public function gift() PrivateMessage::create(['sender_id' => $user->id, 'reciever_id' => $recipient->id, 'subject' => "You Have Recieved A Gift", 'message' => $transaction->comment]); - return redirect('/bonus')->with(Toastr::info('Sent', 'Gift', ['options'])); + return redirect('/bonus')->with(Toastr::success('Gift Sent', 'Yay!', ['options'])); } else { - return redirect('/bonus')->with(Toastr::error('Failed', 'Gifting', ['options'])); + return redirect('/bonus')->with(Toastr::error('Gifting Failed', 'Whoops!', ['options'])); } } else { - return redirect('/bonus')->with(Toastr::error('Unknown error occurred', 'Error!', ['options'])); + return redirect('/bonus')->with(Toastr::error('Unknown error occurred', 'Whoops!', ['options'])); } } @@ -252,13 +252,13 @@ public function tipUploader($slug, $id) $tip_amount = Request::get('tip'); if ($tip_amount > $user->seedbonus) { - return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::error('Your To Broke To Tip The Uploader!', 'Bro!', ['options'])); + return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::error('Your To Broke To Tip The Uploader!', 'Whoops!', ['options'])); } if ($user->id == $torrent->user_id) { - return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::error('You Cannot Tip Yourself!', 'Bro!', ['options'])); + return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::error('You Cannot Tip Yourself!', 'Whoops!', ['options'])); } if ($tip_amount < 0) { - return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::error('You Cannot Tip A Negative Amount!', 'Bro!', ['options'])); + return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::error('You Cannot Tip A Negative Amount!', 'Whoops!', ['options'])); } $uploader->seedbonus += $tip_amount; $uploader->save(); diff --git a/app/Http/Controllers/BookmarkController.php b/app/Http/Controllers/BookmarkController.php index c4926994df..ad9ab909c1 100644 --- a/app/Http/Controllers/BookmarkController.php +++ b/app/Http/Controllers/BookmarkController.php @@ -44,6 +44,6 @@ public function bookmarks() public function unBookmark($id) { Auth::user()->bookmarks()->detach($id); - return redirect()->route('bookmarks')->with(Toastr::info('Torrent Has Been Unbookmarked Successfully!', 'Info', ['options'])); + return redirect()->route('bookmarks')->with(Toastr::success('Torrent Has Been Unbookmarked Successfully!', 'Yay!', ['options'])); } } diff --git a/app/Http/Controllers/BugController.php b/app/Http/Controllers/BugController.php index 7d74745ec4..af29b152b8 100755 --- a/app/Http/Controllers/BugController.php +++ b/app/Http/Controllers/BugController.php @@ -39,7 +39,7 @@ public function bug() Mail::to($user->email, $user->username)->send(new Bug($input)); - Toastr::success('Your Bug Was Succefully Sent!', 'Success', ['options']); + Toastr::success('Your Bug Was Succefully Sent!', 'Yay!', ['options']); } return view('bug.bug'); } diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php index 440e91cdeb..438f421f96 100755 --- a/app/Http/Controllers/CommentController.php +++ b/app/Http/Controllers/CommentController.php @@ -60,7 +60,7 @@ public function article($slug, $id) // User's comment rights disbabled? if ($user->can_comment == 0) { - return redirect()->route('article', ['slug' => $article->slug, 'id' => $article->id])->with(Toastr::warning('Your Comment Rights Have Benn Revoked!!!', 'Error!', ['options'])); + return redirect()->route('article', ['slug' => $article->slug, 'id' => $article->id])->with(Toastr::error('Your Comment Rights Have Benn Revoked!!!', 'Whoops!', ['options'])); } $comment = new Comment(); @@ -75,7 +75,7 @@ public function article($slug, $id) $comment->save(); Toastr::success('Your Comment Has Been Added!', 'Yay!', ['options']); } else { - Toastr::warning('A Error Has Occured And Your Comment Was Not Posted!', 'Sorry', ['options']); + Toastr::error('A Error Has Occured And Your Comment Was Not Posted!', 'Whoops!', ['options']); } return redirect()->route('article', ['slug' => $article->slug, 'id' => $article->id]); } @@ -93,7 +93,7 @@ public function torrent($slug, $id) // User's comment rights disbabled? if ($user->can_comment == 0) { - return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::warning('Your Comment Rights Have Benn Revoked!!!', 'Error!', ['options'])); + return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::error('Your Comment Rights Have Benn Revoked!!!', 'Whoops!', ['options'])); } $comment = new Comment(); @@ -135,7 +135,7 @@ public function torrent($slug, $id) Cache::forget('shoutbox_messages'); } } else { - Toastr::warning('A Error Has Occured And Your Comment Was Not Posted!', 'Sorry', ['options']); + Toastr::error('A Error Has Occured And Your Comment Was Not Posted!', 'Sorry', ['options']); } return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id]); } @@ -153,7 +153,7 @@ public function request($id) // User's comment rights disbabled? if ($user->can_comment == 0) { - return redirect()->route('request', ['id' => $request->id])->with(Toastr::warning('Your Comment Rights Have Benn Revoked!!!', 'Error!', ['options'])); + return redirect()->route('request', ['id' => $request->id])->with(Toastr::error('Your Comment Rights Have Benn Revoked!!!', 'Whoops!', ['options'])); } $comment = new Comment(); @@ -196,7 +196,7 @@ public function request($id) Cache::forget('shoutbox_messages'); } } else { - Toastr::warning('A Error Has Occured And Your Comment Was Not Posted!', 'Sorry', ['options']); + Toastr::error('A Error Has Occured And Your Comment Was Not Posted!', 'Sorry', ['options']); } return redirect()->route('request', ['id' => $request->id]); } @@ -215,7 +215,7 @@ public function quickthanks($id) // User's comment rights disbabled? if ($user->can_comment == 0) { - return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::warning('Your Comment Rights Have Benn Revoked!!!', 'Error!', ['options'])); + return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::error('Your Comment Rights Have Benn Revoked!!!', 'Whoops!', ['options'])); } $comment = new Comment(); @@ -253,7 +253,7 @@ public function quickthanks($id) Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "User [url={$appurl}/" . $user->username . "." . $user->id . "]" . $user->username . "[/url] has left a comment on Torrent [url={$appurl}/torrents/" . $torrent->slug . "." . $torrent->id . "]" . $torrent->name . "[/url]"]); Cache::forget('shoutbox_messages'); } else { - Toastr::warning('A Error Has Occured And Your Comment Was Not Posted!', 'Sorry', ['options']); + Toastr::error('A Error Has Occured And Your Comment Was Not Posted!', 'Whoops!', ['options']); } return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id]); diff --git a/app/Http/Controllers/FollowController.php b/app/Http/Controllers/FollowController.php index e508ef1073..2f789930cb 100644 --- a/app/Http/Controllers/FollowController.php +++ b/app/Http/Controllers/FollowController.php @@ -30,15 +30,15 @@ class FollowController extends Controller public function follow(User $user) { if (Auth::user()->id == $user->id) { - return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error("Nice try, but sadly you can not follow yourself.", 'Error!', ['options'])); + return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error("Nice try, but sadly you can not follow yourself.", 'Whoops!', ['options'])); } elseif (!Auth::user()->isFollowing($user->id)) { // Create a new follow instance for the authenticated user Auth::user()->follows()->create([ 'target_id' => $user->id, ]); - return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('You are now following ' . $user->username, 'Success!', ['options'])); + return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('You are now following ' . $user->username, 'Yay!', ['options'])); } else { - return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('You are already following this user', 'Error!', ['options'])); + return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('You are already following this user', 'Whoops!', ['options'])); } } @@ -54,9 +54,9 @@ public function unfollow(User $user) $follow = Auth::user()->follows()->where('target_id', $user->id)->first(); $follow->delete(); - return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('You are no longer following ' . $user->username, 'Success!', ['options'])); + return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('You are no longer following ' . $user->username, 'Yay!', ['options'])); } else { - return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('You are not following this user to begin with', 'Error!', ['options'])); + return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('You are not following this user to begin with', 'Whoops!', ['options'])); } } } diff --git a/app/Http/Controllers/ForumController.php b/app/Http/Controllers/ForumController.php index 6e13ae0d6c..810c03d2fb 100755 --- a/app/Http/Controllers/ForumController.php +++ b/app/Http/Controllers/ForumController.php @@ -28,7 +28,6 @@ use Decoda\Decoda; use Cache; use \Toastr; - use App\Achievements\UserMadeFirstPost; use App\Achievements\UserMade25Posts; use App\Achievements\UserMade50Posts; @@ -93,7 +92,7 @@ public function category($slug, $id) { $category = Forum::findOrFail($id); if ($category->getPermission()->show_forum != true) { - return redirect()->route('forum_index')->with(Toastr::warning('You Do Not Have Access To This Category!', 'Sorry', ['options'])); + return redirect()->route('forum_index')->with(Toastr::error('You Do Not Have Access To This Category!', 'Whoops!', ['options'])); } return view('forum.category', ['c' => $category]); } @@ -117,7 +116,7 @@ public function display($slug, $id) $category = Forum::findOrFail($forum->parent_id); // Check if the user has permission to view the forum if ($category->getPermission()->show_forum != true) { - return redirect()->route('forum_index')->with(Toastr::warning('You Do Not Have Access To This Forum!', 'Sorry', ['options'])); + return redirect()->route('forum_index')->with(Toastr::error('You Do Not Have Access To This Forum!', 'Whoops!', ['options'])); } // Fetch topics->posts in descending order @@ -154,7 +153,7 @@ public function topic($slug, $id) // The user can post a topic here ? if ($category->getPermission()->read_topic != true) { // Redirect him to the forum index - return redirect()->route('forum_index')->with(Toastr::warning('You Do Not Have Access To Read This Topic!', 'Sorry', ['options'])); + return redirect()->route('forum_index')->with(Toastr::error('You Do Not Have Access To Read This Topic!', 'Whoops!', ['options'])); } // Increment view @@ -179,7 +178,7 @@ public function reply($slug, $id) // The user has the right to create a topic here? if (!$category->getPermission()->reply_topic || ($topic->state == "close" && !Auth::user()->group->is_modo)) { - return redirect()->route('forum_index')->with(Toastr::warning('You Cannot Reply To This Topic!', 'Sorry', ['options'])); + return redirect()->route('forum_index')->with(Toastr::error('You Cannot Reply To This Topic!', 'Whoops!', ['options'])); } $post = new Post(); @@ -247,7 +246,7 @@ public function reply($slug, $id) return redirect()->route('forum_topic', ['slug' => $topic->slug, 'id' => $topic->id])->with(Toastr::success('Post Successfully Posted', 'Yay!', ['options'])); } else { - return redirect()->route('forum_topic', ['slug' => $topic->slug, 'id' => $topic->id])->with(Toastr::warning('You Cannot Reply To This Topic!', 'Sorry', ['options'])); + return redirect()->route('forum_topic', ['slug' => $topic->slug, 'id' => $topic->id])->with(Toastr::error('You Cannot Reply To This Topic!', 'Whoops!', ['options'])); } } @@ -265,7 +264,7 @@ public function newTopic($slug, $id) // The user has the right to create a topic here? if ($category->getPermission()->start_topic != true) { - return redirect()->route('forum_index')->with(Toastr::warning('You Cannot Start A New Topic Here!', 'Sorry', ['options'])); + return redirect()->route('forum_index')->with(Toastr::error('You Cannot Start A New Topic Here!', 'Whoops!', ['options'])); } // Preview The Post @@ -338,7 +337,7 @@ public function newTopic($slug, $id) $topic->delete(); } } else { - Toastr::warning('A Error Has Occured With This Topic! Please Try Again!', 'Sorry', ['options']); + Toastr::error('A Error Has Occured With This Topic! Please Try Again!', 'Whoops!', ['options']); } } return view('forum.new_topic', ['forum' => $forum, 'category' => $category, 'parsedContent' => $parsedContent, 'title' => Request::get('title'), 'content' => Request::get('content')]); @@ -392,7 +391,7 @@ public function postEdit($slug, $id, $postId) if ($user->group->is_modo == false) { if ($post->user_id != $user->id) { - return redirect()->route('forum_topic', ['slug' => $topic->slug, 'id' => $topic->id])->with(Toastr::warning('You Cannot Edit This!', 'Sorry', ['options'])); + return redirect()->route('forum_topic', ['slug' => $topic->slug, 'id' => $topic->id])->with(Toastr::error('You Cannot Edit This!', 'Whoops!', ['options'])); } } @@ -427,7 +426,7 @@ public function postDelete($slug, $id, $postId) if ($user->group->is_modo == false) { if ($post->user_id != $user->id) { - return redirect()->route('forum_topic', ['slug' => $topic->slug, 'id' => $topic->id])->with(Toastr::warning('You Cannot Delete This!', 'Sorry', ['options'])); + return redirect()->route('forum_topic', ['slug' => $topic->slug, 'id' => $topic->id])->with(Toastr::error('You Cannot Delete This!', 'Whoops!', ['options'])); } } $post->delete(); @@ -449,7 +448,7 @@ public function closeTopic($slug, $id) $topic->state = "close"; $topic->save(); - return redirect()->route('forum_topic', ['slug' => $topic->slug, 'id' => $topic->id])->with(Toastr::warning('This Topic Is Now Closed!', 'Warning', ['options'])); + return redirect()->route('forum_topic', ['slug' => $topic->slug, 'id' => $topic->id])->with(Toastr::error('This Topic Is Now Closed!', 'Warning', ['options'])); } /** @@ -484,9 +483,9 @@ public function deleteTopic($slug, $id) $posts = $topic->posts(); $posts->delete(); $topic->delete(); - return redirect()->route('forum_display', ['slug' => $topic->forum->slug, 'id' => $topic->forum->id])->with(Toastr::warning('This Topic Is Now Deleted!', 'Warning', ['options'])); + return redirect()->route('forum_display', ['slug' => $topic->forum->slug, 'id' => $topic->forum->id])->with(Toastr::error('This Topic Is Now Deleted!', 'Warning', ['options'])); } else { - return redirect()->route('forum_topic', ['slug' => $topic->slug, 'id' => $topic->id])->with(Toastr::warning('You Do Not Have Access To Perform This Function!', 'Warning', ['options'])); + return redirect()->route('forum_topic', ['slug' => $topic->slug, 'id' => $topic->id])->with(Toastr::error('You Do Not Have Access To Perform This Function!', 'Warning', ['options'])); } } diff --git a/app/Http/Controllers/GraveyardController.php b/app/Http/Controllers/GraveyardController.php index 43b7c3f0f2..2a5e6e04df 100644 --- a/app/Http/Controllers/GraveyardController.php +++ b/app/Http/Controllers/GraveyardController.php @@ -48,7 +48,7 @@ public function resurrect($id) $torrent = Torrent::findOrFail($id); $resurrected = Graveyard::where('torrent_id', '=', $torrent->id)->first(); if ($resurrected) { - return redirect()->route('graveyard')->with(Toastr::warning('Torrent Resurrection Failed! This torrent is already pending a resurrection.', 'Yay!', ['options'])); + return redirect()->route('graveyard')->with(Toastr::error('Torrent Resurrection Failed! This torrent is already pending a resurrection.', 'Whoops!', ['options'])); } if ($user->id != $torrent->user_id) { $resurrection = Graveyard::create([ @@ -58,7 +58,7 @@ public function resurrect($id) ]); return redirect()->route('graveyard')->with(Toastr::success('Torrent Resurrection Complete! You will be rewarded automatically once seedtime requirements are met.', 'Yay!', ['options'])); } else { - return redirect()->route('graveyard')->with(Toastr::error('Torrent Resurrection Failed! You cannot resurrect your own uploads.', 'Yay!', ['options'])); + return redirect()->route('graveyard')->with(Toastr::error('Torrent Resurrection Failed! You cannot resurrect your own uploads.', 'Whoops!', ['options'])); } } } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 73558dd433..d6068e0a6f 100755 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -98,7 +98,7 @@ public function contact() if (Request::getMethod() == 'POST') { $input = Request::all(); Mail::to($user->email, $user->username)->send(new Contact($input)); - Toastr::success('Your Message Was Succefully Sent!', 'Success', ['options']); + Toastr::success('Your Message Was Succefully Sent!', 'Yay!', ['options']); } return view('home.contact'); diff --git a/app/Http/Controllers/InviteController.php b/app/Http/Controllers/InviteController.php index e26c522429..81fca6e819 100644 --- a/app/Http/Controllers/InviteController.php +++ b/app/Http/Controllers/InviteController.php @@ -34,10 +34,10 @@ public function invite() { $user = Auth::user(); if (config('other.invite-only') == false) { - Toastr::warning('Invitations Are Disabled Due To Open Registration!', 'Error!', ['options']); + Toastr::error('Invitations Are Disabled Due To Open Registration!', 'Whoops!', ['options']); } if ($user->can_invite == 0) { - Toastr::warning('Your Invite Rights Have Been Revoked!!!', 'Error!', ['options']); + Toastr::error('Your Invite Rights Have Been Revoked!!!', 'Whoops!', ['options']); } return view('user.invite', ['user' => $user]); } @@ -49,7 +49,7 @@ public function process(Request $request) $exsist = Invite::where('email', '=', $request->get('email'))->first(); $member = User::where('email', '=', $request->get('email'))->first(); if ($exsist || $member) { - return redirect()->route('invite')->with(Toastr::error('The email address your trying to send a invite to has already been sent one or is a user already.', 'My Dude!', ['options'])); + return redirect()->route('invite')->with(Toastr::error('The email address your trying to send a invite to has already been sent one or is a user already.', 'Whoops!', ['options'])); } if ($user->invites > 0) { diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index ab9f2d44fe..4f1a4dfbcd 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -45,6 +45,6 @@ public function postReport() $report->solved = 0; $report->save(); - return redirect()->route('home')->with(Toastr::success('Your report has been successfully sent', 'Success!', ['options'])); + return redirect()->route('home')->with(Toastr::success('Your report has been successfully sent', 'Yay!', ['options'])); } } diff --git a/app/Http/Controllers/RequestController.php b/app/Http/Controllers/RequestController.php index 060c583f64..d2de76728a 100644 --- a/app/Http/Controllers/RequestController.php +++ b/app/Http/Controllers/RequestController.php @@ -189,15 +189,15 @@ public function addrequest() Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "User [url={$appurl}/" . $user->username . "." . $user->id . "]" . $user->username . "[/url] has created a new request [url={$appurl}/request/" . $requests->id . "]" . $requests->name . "[/url]"]); Cache::forget('shoutbox_messages'); - return redirect('/requests')->with(Toastr::success('Request Added.', 'Successful', ['options'])); + return redirect('/requests')->with(Toastr::success('Request Added.', 'Yay!', ['options'])); } else { - return redirect('/requests')->with(Toastr::error('Not all the required information was provided, please try again.', 'Add request failed', ['options'])); + return redirect('/requests')->with(Toastr::error('Not all the required information was provided, please try again.', 'Whoops!', ['options'])); } } else { if ($user->seedbonus >= 100) { return view('requests.add_request', ['categories' => Category::all(), 'types' => Type::all()->sortBy('position'), 'user' => $user]); } else { - return redirect('/requests')->with(Toastr::error('You dont have the minium of 100 BON to make a request!', 'Error!', ['options'])); + return redirect('/requests')->with(Toastr::error('You dont have the minium of 100 BON to make a request!', 'Whoops!', ['options'])); } } } @@ -236,12 +236,12 @@ public function editrequest($id) $request->description = $description; $request->save(); - return redirect()->route('requests', ['id' => $request->id])->with(Toastr::success('Request Edited.', 'Successful', ['options'])); + return redirect()->route('requests', ['id' => $request->id])->with(Toastr::success('Request Edited Successfuly.', 'Yay!', ['options'])); } else { return view('requests.edit_request', ['categories' => Category::all(), 'types' => Type::all(), 'user' => $user, 'request' => $request]); } } else { - return redirect()->route('requests', ['id' => $request->id])->with(Toastr::warning('You Dont Have Access To This Operation!', 'Error!', ['options'])); + return redirect()->route('requests', ['id' => $request->id])->with(Toastr::error('You Dont Have Access To This Operation!', 'Whoops!', ['options'])); } } @@ -294,14 +294,14 @@ public function addBonus($id) Cache::forget('shoutbox_messages'); PrivateMessage::create(['sender_id' => "1", 'reciever_id' => $requests->user_id, 'subject' => "Your Request " . $requests->name . " Has A New Bounty!", 'message' => $user->username . " Has Added A Bounty To " . "[url={$appurl}/request/" . $requests->id . "]" . $requests->name . "[/url]"]); - return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::success('Your bonus has been successfully added.', 'Bonus added', ['options'])); + return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::success('Your bonus has been successfully added.', 'Yay!', ['options'])); } else { - return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::error('You failed to adhere to the requirements.', 'Rookie Mistake', ['options'])); + return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::error('You failed to adhere to the requirements.', 'Whoops!', ['options'])); } } else { - return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::error('The server doesnt unserstand your request.', 'Try again later', ['options'])); + return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::error('The server doesnt unserstand your request.', 'Whoops!', ['options'])); } - return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::error('Something went horribly wrong', 'Try again later', ['options'])); + return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::error('Something went horribly wrong', 'Whoops!', ['options'])); } /** @@ -327,19 +327,19 @@ public function fillRequest($id) if ($user->id == $torrent->user_id) { $this->addRequestModeration(Request::get('request_id'), Request::get('info_hash')); - return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::success('Your request fill is pending approval by the Requestor.', 'Approval required', ['options'])); + return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::success('Your request fill is pending approval by the Requestor.', 'Yay!', ['options'])); } elseif ($user->id != $torrent->user_id && Carbon::now()->addDay() > $torrent->created_at) { $this->addRequestModeration(Request::get('request_id'), Request::get('info_hash')); - return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::success('Your request fill is pending approval by the Requestor.', 'Approval required', ['options'])); + return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::success('Your request fill is pending approval by the Requestor.', 'Yay!', ['options'])); } else { - return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::error('You cannot fill this request for some weird reason', 'The request filling system', ['options'])); + return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::error('You cannot fill this request for some weird reason', 'Whoops!', ['options'])); } } else { - return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::error('You failed to adhere to the requirements.', 'Rookie Mistake', ['options'])); + return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::error('You failed to adhere to the requirements.', 'Whoops!', ['options'])); } } else { - return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::error('The server doesnt understand your request.', 'Try again later', ['options'])); + return redirect()->route('request', ['id' => Request::get('request_id')])->with(Toastr::error('The server doesnt understand your request.', 'Whoops!', ['options'])); } } @@ -410,9 +410,9 @@ public function approveRequest($id) Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "User [url={$appurl}/" . $fill_user->username . "." . $fill_user->id . "]" . $fill_user->username . "[/url] has filled [url={$appurl}/request/" . $request->id . "]" . $request->name . "[/url] and was awarded " . $fill_amount . " BON "]); Cache::forget('shoutbox_messages'); PrivateMessage::create(['sender_id' => "1", 'reciever_id' => $request->filled_by, 'subject' => "Your Request Fullfill On " . $request->name . " Has Been Approved!", 'message' => $request->approved_by . " Has Approved Your Fullfillment On [url={$appurl}/request/" . $request->id . "]" . $request->name . "[/url] Enjoy The " . $request->bounty . " Bonus Points!"]); - return redirect()->route('request', ['id' => $id])->with(Toastr::success("You have approved {$request->name} and the bounty has been awarded to {$fill_user->username}", "Request completed!", ['options'])); + return redirect()->route('request', ['id' => $id])->with(Toastr::success("You have approved {$request->name} and the bounty has been awarded to {$fill_user->username}", "Yay!", ['options'])); } else { - return redirect()->route('request', ['id' => $id])->with(Toastr::error("You don't have access to approve this request", 'Permission denied', ['options'])); + return redirect()->route('request', ['id' => $id])->with(Toastr::error("You don't have access to approve this request", 'Whoops!', ['options'])); } } @@ -436,9 +436,9 @@ public function rejectRequest($id) $request->save(); - return redirect()->route('request', ['id' => $id])->with(Toastr::success("This request has been reset.", 'Request Reset', ['options'])); + return redirect()->route('request', ['id' => $id])->with(Toastr::success("This request has been reset.", 'Yay!', ['options'])); } else { - return redirect()->route('request', ['id' => $id])->with(Toastr::success("You don't have access to approve this request", 'Permission denied', ['options'])); + return redirect()->route('request', ['id' => $id])->with(Toastr::success("You don't have access to approve this request", 'Yay!', ['options'])); } } @@ -456,9 +456,9 @@ public function deleteRequest($id) $name = $request->name; $request->delete(); - return redirect()->route('requests')->with(Toastr::success("You have deleted {$name}", 'Request Deleted', ['options'])); + return redirect()->route('requests')->with(Toastr::success("You have deleted {$name}", 'Yay!', ['options'])); } else { - return redirect()->route('request', ['id' => $id])->with(Toastr::success("You don't have access to delete this request.", 'Permission denied', ['options'])); + return redirect()->route('request', ['id' => $id])->with(Toastr::error("You don't have access to delete this request.", 'Whoops!', ['options'])); } } @@ -483,7 +483,7 @@ public function claimRequest($id) $request->claimed = 1; $request->save(); - return redirect()->route('request', ['id' => $id])->with(Toastr::success("Request Successfuly Claimed", 'Request Claimed', ['options'])); + return redirect()->route('request', ['id' => $id])->with(Toastr::success("Request Successfuly Claimed", 'Yay!', ['options'])); } else { return redirect()->route('request', ['id' => $id])->with(Toastr::error("Someone else has already claimed this request buddy.", 'Whoops!', ['options'])); } @@ -508,7 +508,7 @@ public function unclaimRequest($id) $request->claimed = null; $request->save(); - return redirect()->route('request', ['id' => $id])->with(Toastr::success("Request Successfuly Un-Claimed", 'Request Claimed', ['options'])); + return redirect()->route('request', ['id' => $id])->with(Toastr::success("Request Successfuly Un-Claimed", 'Yay!', ['options'])); } else { return redirect()->route('request', ['id' => $id])->with(Toastr::error("Nothing To Unclaim.", 'Whoops!', ['options'])); } diff --git a/app/Http/Controllers/ShoutboxController.php b/app/Http/Controllers/ShoutboxController.php index f1c7ca7b4b..3328bbe756 100755 --- a/app/Http/Controllers/ShoutboxController.php +++ b/app/Http/Controllers/ShoutboxController.php @@ -46,7 +46,7 @@ public function send() 'message' => 'required|min:1|regex:/^[(a-zA-Z\-)]+$/u' ]); if ($v->fails()) { - Toastr::error('There was a error with your input!', 'Error!', ['options']); + Toastr::error('There was a error with your input!', 'Whoops!', ['options']); } if (Request::ajax()) { preg_match_all('/(@\w+)/', Request::get('message'), $mentions); @@ -185,7 +185,7 @@ public function deleteShout($id) Cache::forget('shoutbox_messages'); return redirect()->route('home')->with(Toastr::success('Shout Has Been Deleted.', 'Yay!', ['options'])); } else { - return redirect()->route('home')->with(Toastr::error('This is not your shout to delete.', 'Bro!', ['options'])); + return redirect()->route('home')->with(Toastr::error('This is not your shout to delete.', 'Whoops!', ['options'])); } } } diff --git a/app/Http/Controllers/Staff/ArticleController.php b/app/Http/Controllers/Staff/ArticleController.php index e340384e24..9c74a0211d 100755 --- a/app/Http/Controllers/Staff/ArticleController.php +++ b/app/Http/Controllers/Staff/ArticleController.php @@ -18,6 +18,7 @@ use Illuminate\Support\Facades\Request; use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\Validator; +use \Toastr; class ArticleController extends Controller { @@ -71,7 +72,7 @@ public function add() if (file_exists(Request::file('image')->move(getcwd() . '/files/img/' . $post->image))) { unlink(Request::file('image')->move(getcwd() . '/files/img/' . $post->image)); } - return redirect()->route('staff_article_index')->with(Toastr::error('Your article has failed to published!', 'Error!', ['options'])); + return redirect()->route('staff_article_index')->with(Toastr::error('Your article has failed to published!', 'Whoops!', ['options'])); } else { Auth::user()->articles()->save($post); return redirect()->route('staff_article_index')->with(Toastr::success('Your article has successfully published!', 'Yay!', ['options'])); @@ -116,7 +117,7 @@ public function edit($slug, $id) $v = Validator::make($post->toArray(), $post->rules); if ($v->fails()) { - return redirect()->route('staff_article_index')->with(Toastr::error('Your article changes have failed to publish!', 'Error!', ['options'])); + return redirect()->route('staff_article_index')->with(Toastr::error('Your article changes have failed to publish!', 'Whoops!', ['options'])); } else { $post->save(); return redirect()->route('staff_article_index')->with(Toastr::success('Your article changes have successfully published!', 'Yay!', ['options'])); @@ -137,6 +138,6 @@ public function delete($slug, $id) { $post = Article::findOrFail($id); $post->delete(); - return redirect()->route('staff_article_index')->with(Toastr::info('Article has successfully been deleted', 'Info!', ['options'])); + return redirect()->route('staff_article_index')->with(Toastr::success('Article has successfully been deleted', 'Yay!', ['options'])); } } diff --git a/app/Http/Controllers/Staff/BanController.php b/app/Http/Controllers/Staff/BanController.php index 56da7c281e..bfd6ef8e54 100644 --- a/app/Http/Controllers/Staff/BanController.php +++ b/app/Http/Controllers/Staff/BanController.php @@ -13,7 +13,6 @@ namespace App\Http\Controllers\Staff; use App\Http\Controllers\Controller; - use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Request; @@ -45,7 +44,7 @@ public function ban($username, $id) { $user = User::findOrFail($id); if ($user->group->is_modo || Auth::user()->id == $user->id) { - return redirect()->route('home')->with(Toastr::error('You Cannot Ban Yourself Or Other Staff', 'Alert', ['options'])); + return redirect()->route('home')->with(Toastr::error('You Cannot Ban Yourself Or Other Staff!', 'Whoops!', ['options'])); } else { $user->group_id = 5; $user->can_upload = 0; @@ -72,7 +71,7 @@ public function ban($username, $id) // Activity Log \LogActivity::addToLog("Staff Member " . $staff->username . " has banned member " . $user->username . "."); - return redirect()->route('home')->with(Toastr::success('User Is Now Banned!', 'Alert', ['options'])); + return redirect()->route('home')->with(Toastr::success('User Is Now Banned!', 'Yay!', ['options'])); } } @@ -89,7 +88,7 @@ public function unban($username, $id) { $user = User::findOrFail($id); if ($user->group->is_modo || Auth::user()->id == $user->id) { - return redirect()->route('home')->with(Toastr::error('You Cannot Unban Yourself Or Other Staff', 'Alert', ['options'])); + return redirect()->route('home')->with(Toastr::error('You Cannot Unban Yourself Or Other Staff!', 'Whoops!', ['options'])); } else { $user->group_id = Request::get('group_id'); $user->can_upload = 1; @@ -116,7 +115,7 @@ public function unban($username, $id) // Activity Log \LogActivity::addToLog("Staff Member " . $staff->username . " has unbanned member " . $user->username . "."); - return redirect()->route('home')->with(Toastr::success('User Is Now Relieved Of His Ban!', 'Alert', ['options'])); + return redirect()->route('home')->with(Toastr::success('User Is Now Relieved Of His Ban!', 'Yay!', ['options'])); } } } diff --git a/app/Http/Controllers/Staff/CatalogController.php b/app/Http/Controllers/Staff/CatalogController.php index 3ea2cfc5bf..eb39a14222 100644 --- a/app/Http/Controllers/Staff/CatalogController.php +++ b/app/Http/Controllers/Staff/CatalogController.php @@ -47,7 +47,7 @@ public function postCatalog() $catalog->name = Request::get('catalog'); $catalog->slug = str_slug(Request::get('catalog')); $catalog->save(); - return redirect()->route('getCatalog')->with(Toastr::success('Catalog ' . Request::get('catalog') . ' has been successfully added', 'Success!', ['options'])); + return redirect()->route('getCatalog')->with(Toastr::success('Catalog ' . Request::get('catalog') . ' has been successfully added', 'Yay!', ['options'])); } //Delete Catalog @@ -58,7 +58,7 @@ public function deleteCatalog($catalog_id) return redirect()->route('getCatalog')->with(Toastr::error('That Catalog Is Not In Our DB!', 'Whoops!', ['options'])); } $catalog->delete(); - return redirect()->route('getCatalog')->with(Toastr::success('Catalog ' . $catalog->name . ' has been successfully deleted', 'Success!', ['options'])); + return redirect()->route('getCatalog')->with(Toastr::success('Catalog ' . $catalog->name . ' has been successfully deleted', 'Yay!', ['options'])); } //Edit Catalog @@ -73,7 +73,7 @@ public function editCatalog($catalog_id) } $catalog->name = Request::get('catalog'); $catalog->save(); - return redirect()->route('getCatalog')->with(Toastr::success('Catalog ' . Request::get('catalog') . ' has been successfully edited', 'Success!', ['options'])); + return redirect()->route('getCatalog')->with(Toastr::success('Catalog ' . Request::get('catalog') . ' has been successfully edited', 'Yay!', ['options'])); } /** @@ -99,7 +99,7 @@ public function postCatalogTorrent() ]); $torrent = CatalogTorrent::where('imdb', '=', Request::get('imdb'))->first(); if ($torrent) { - return redirect()->route('getCatalogTorrent')->with(Toastr::error('IMDB# ' . $torrent->imdb . ' is already in database', 'Fail!', ['options'])); + return redirect()->route('getCatalogTorrent')->with(Toastr::error('IMDB# ' . $torrent->imdb . ' is already in database', 'Whoops!', ['options'])); } $torrent = new CatalogTorrent(); $torrent->imdb = Request::get('imdb'); @@ -108,7 +108,7 @@ public function postCatalogTorrent() // Count and save the torrent number in this catalog $catalog->num_torrent = CatalogTorrent::where('catalog_id', '=', $catalog->id)->count(); $catalog->save(); - return redirect()->route('getCatalogTorrent')->with(Toastr::success('IMDB# ' . Request::get('imdb') . ' has been successfully added', 'Success!', ['options'])); + return redirect()->route('getCatalogTorrent')->with(Toastr::success('IMDB# ' . Request::get('imdb') . ' has been successfully added', 'Yay!', ['options'])); } // Get Catalogs Records diff --git a/app/Http/Controllers/Staff/CategoryController.php b/app/Http/Controllers/Staff/CategoryController.php index 77a2f63e20..88a7acb19b 100755 --- a/app/Http/Controllers/Staff/CategoryController.php +++ b/app/Http/Controllers/Staff/CategoryController.php @@ -16,7 +16,6 @@ use App\Http\Controllers\Controller; use Illuminate\Support\Facades\Request; use Illuminate\Support\Facades\Validator; - use \Toastr; class CategoryController extends Controller @@ -52,7 +51,7 @@ public function add() Toastr::error('Something Went Wrong!', 'Error', ['options']); } else { $category->save(); - return redirect()->route('staff_category_index')->with(Toastr::info('Category Sucessfully Added', 'Yay!', ['options'])); + return redirect()->route('staff_category_index')->with(Toastr::success('Category Sucessfully Added', 'Yay!', ['options'])); } } return view('Staff.category.add'); @@ -76,7 +75,7 @@ public function edit($slug, $id) Toastr::error('Something Went Wrong!', 'Error', ['options']); } else { $category->save(); - return redirect()->route('staff_category_index')->with(Toastr::info('Category Sucessfully Modified', 'Yay!', ['options'])); + return redirect()->route('staff_category_index')->with(Toastr::success('Category Sucessfully Modified', 'Yay!', ['options'])); } } @@ -92,6 +91,6 @@ public function delete($slug, $id) { $category = Category::findOrFail($id); $category->delete(); - return redirect()->route('staff_category_index')->with(Toastr::warning('Category Sucessfully Deleted', 'Yay!', ['options'])); + return redirect()->route('staff_category_index')->with(Toastr::error('Category Sucessfully Deleted', 'Whoops!', ['options'])); } } diff --git a/app/Http/Controllers/Staff/FlushController.php b/app/Http/Controllers/Staff/FlushController.php index 8001d4f51c..c11f116f16 100644 --- a/app/Http/Controllers/Staff/FlushController.php +++ b/app/Http/Controllers/Staff/FlushController.php @@ -40,6 +40,6 @@ public function deleteOldPeers() $peer->delete(); } } - return redirect('staff_dashboard')->with(Toastr::success('Ghost Peers Have Been Flushed', 'Success!', ['options'])); + return redirect('staff_dashboard')->with(Toastr::success('Ghost Peers Have Been Flushed', 'Yay!', ['options'])); } } diff --git a/app/Http/Controllers/Staff/GiftController.php b/app/Http/Controllers/Staff/GiftController.php index 9c1f189b78..9d69c26197 100644 --- a/app/Http/Controllers/Staff/GiftController.php +++ b/app/Http/Controllers/Staff/GiftController.php @@ -55,7 +55,7 @@ public function gift() $recipient = User::where('username', 'LIKE', Request::get('username'))->first(); if (!$recipient) { - return redirect('/staff_dashboard/systemgift')->with(Toastr::error('Unable to find specified user', 'Gifting Failed', ['options'])); + return redirect('/staff_dashboard/systemgift')->with(Toastr::error('Unable to find specified user', 'Whoops!', ['options'])); } $bon = Request::get('bonus_points'); @@ -67,12 +67,12 @@ public function gift() // Activity Log \LogActivity::addToLog("Staff Member " . $user->username . " has sent a system gift to " . $recipient->username . " account."); - return redirect('/staff_dashboard/systemgift')->with(Toastr::info('Sent', 'Gift', ['options'])); + return redirect('/staff_dashboard/systemgift')->with(Toastr::success('Gift Sent', 'Yay!', ['options'])); } else { - return redirect('/staff_dashboard/systemgift')->with(Toastr::error('Failed', 'Gifting', ['options'])); + return redirect('/staff_dashboard/systemgift')->with(Toastr::error('Gift Failed', 'Whoops!', ['options'])); } } else { - return redirect('/staff_dashboard/systemgift')->with(Toastr::error('Unknown error occurred', 'Error!', ['options'])); + return redirect('/staff_dashboard/systemgift')->with(Toastr::error('Unknown error occurred', 'Whoops!', ['options'])); } } } diff --git a/app/Http/Controllers/Staff/GroupsController.php b/app/Http/Controllers/Staff/GroupsController.php index efaa175e20..6db59e11b5 100644 --- a/app/Http/Controllers/Staff/GroupsController.php +++ b/app/Http/Controllers/Staff/GroupsController.php @@ -59,7 +59,7 @@ public function add(Request $request) $group->autogroup = $request->get('autogroup'); $v = Validator::make($group->toArray(), $group->rules); if ($v->fails()) { - Toastr::error('Something Went Wrong!', 'Error', ['options']); + Toastr::error('Something Went Wrong!', 'Whoops!', ['options']); } else { $group->save(); return redirect()->route('Staff.groups.index')->with(Toastr::success('Group Was Created Successfully!', 'Yay!', ['options'])); @@ -92,7 +92,7 @@ public function edit(Request $request, $group, $id) $group->autogroup = $request->get('autogroup'); $v = Validator::make($group->toArray(), $group->rules); if ($v->fails()) { - Toastr::error('Something Went Wrong!', 'Error', ['options']); + Toastr::error('Something Went Wrong!', 'Whoops!', ['options']); } else { $group->save(); return redirect()->route('Staff.groups.index')->with(Toastr::success('Group Was Updated Successfully!', 'Yay!', ['options'])); diff --git a/app/Http/Controllers/Staff/MassPMController.php b/app/Http/Controllers/Staff/MassPMController.php index f262a8b4b5..2c0224bdf8 100644 --- a/app/Http/Controllers/Staff/MassPMController.php +++ b/app/Http/Controllers/Staff/MassPMController.php @@ -59,12 +59,12 @@ public function sendMassPM() // Activity Log \LogActivity::addToLog("Staff Member " . $staff->username . " has sent a MassPM."); - return redirect('/staff_dashboard/masspm')->with(Toastr::info('Sent', 'MassPM', ['options'])); + return redirect('/staff_dashboard/masspm')->with(Toastr::success('MassPM Sent', 'Yay!', ['options'])); } else { - return redirect('/staff_dashboard/masspm')->with(Toastr::error('Failed', 'MassPM', ['options'])); + return redirect('/staff_dashboard/masspm')->with(Toastr::error('MassPM Failed', 'Whoops!', ['options'])); } } else { - return redirect('/staff_dashboard/masspm')->with(Toastr::error('Unknown error occurred', 'Error!', ['options'])); + return redirect('/staff_dashboard/masspm')->with(Toastr::error('Unknown error occurred', 'Whoops!', ['options'])); } } } diff --git a/app/Http/Controllers/Staff/ModerationController.php b/app/Http/Controllers/Staff/ModerationController.php index 1b201cdd09..006204b70b 100644 --- a/app/Http/Controllers/Staff/ModerationController.php +++ b/app/Http/Controllers/Staff/ModerationController.php @@ -51,7 +51,7 @@ public function approve($slug, $id) { Torrent::approve($id); - return redirect()->route('moderation')->with(Toastr::success('Torrent Approved', 'Approve', ['options'])); + return redirect()->route('moderation')->with(Toastr::success('Torrent Approved', 'Yay!', ['options'])); } /** @@ -64,7 +64,7 @@ public function reject($slug, $id) { Torrent::reject($id); - return redirect()->route('moderation')->with(Toastr::error('Torrent Rejected', 'Reject', ['options'])); + return redirect()->route('moderation')->with(Toastr::error('Torrent Rejected', 'Whoops!', ['options'])); } /** @@ -86,10 +86,10 @@ public function resetRequest($id) $request->approved_when = null; $request->save(); - return redirect()->route('request', ['id' => $id])->with(Toastr::warning("The request has been reset!", 'Request reset!', ['options'])); + return redirect()->route('request', ['id' => $id])->with(Toastr::success("The request has been reset!", 'Yay!', ['options'])); } else { - return redirect()->route('request', ['id' => $id])->with(Toastr::warning("You don't have access to this operation!", 'Error!', ['options'])); + return redirect()->route('request', ['id' => $id])->with(Toastr::error("You don't have access to this operation!", 'Whoops!', ['options'])); } - return redirect()->route('requests')->with(Toastr::success("Unable to find request", 'Request not found', ['options'])); + return redirect()->route('requests')->with(Toastr::error("Unable to find request!", 'Whoops!', ['options'])); } } diff --git a/app/Http/Controllers/Staff/NoteController.php b/app/Http/Controllers/Staff/NoteController.php index dcb706d457..d9ca41aef2 100644 --- a/app/Http/Controllers/Staff/NoteController.php +++ b/app/Http/Controllers/Staff/NoteController.php @@ -47,7 +47,7 @@ public function postNote($username, $id) // Activity Log \LogActivity::addToLog("Staff Member " . $staff->username . " has added a note on " . $user->username . " account."); - return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Your Staff Note Has Successfully Posted', 'Success!', ['options'])); + return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Your Staff Note Has Successfully Posted', 'Yay!', ['options'])); } public function getNotes() diff --git a/app/Http/Controllers/Staff/PollController.php b/app/Http/Controllers/Staff/PollController.php index 611a264b55..4e5dbf52c2 100644 --- a/app/Http/Controllers/Staff/PollController.php +++ b/app/Http/Controllers/Staff/PollController.php @@ -21,7 +21,6 @@ use App\Option; use App\Shoutbox; use App\Http\Requests\StorePoll; - use Cache; use \Toastr; diff --git a/app/Http/Controllers/Staff/ReportController.php b/app/Http/Controllers/Staff/ReportController.php index 5a4e1bbf4c..5ab077ba27 100644 --- a/app/Http/Controllers/Staff/ReportController.php +++ b/app/Http/Controllers/Staff/ReportController.php @@ -65,6 +65,6 @@ public function solveReport($report_id) PrivateMessage::create(['sender_id' => $user->id, 'reciever_id' => $report->reporter_id, 'subject' => "Your Report Has A New Verdict", 'message' => $report->verdict]); // End insert recipient notification here - return redirect()->route('getReports')->with(Toastr::success('Report has been successfully resolved', 'Success!', ['options'])); + return redirect()->route('getReports')->with(Toastr::success('Report has been successfully resolved', 'Yay!', ['options'])); } } diff --git a/app/Http/Controllers/Staff/TypeController.php b/app/Http/Controllers/Staff/TypeController.php index 3d44839406..5878006e11 100644 --- a/app/Http/Controllers/Staff/TypeController.php +++ b/app/Http/Controllers/Staff/TypeController.php @@ -48,10 +48,10 @@ public function add() $type->position = Request::get('position'); $v = Validator::make($type->toArray(), $type->rules); if ($v->fails()) { - Toastr::error('Something Went Wrong!', 'Error', ['options']); + Toastr::error('Something Went Wrong!', 'Whoops!', ['options']); } else { $type->save(); - return redirect()->route('staff_type_index')->with(Toastr::info('Type Sucessfully Added', 'Yay!', ['options'])); + return redirect()->route('staff_type_index')->with(Toastr::success('Type Sucessfully Added', 'Yay!', ['options'])); } } return view('Staff.type.add'); @@ -71,10 +71,10 @@ public function edit($slug, $id) $type->position = Request::get('position'); $v = Validator::make($type->toArray(), $type->rules); if ($v->fails()) { - Toastr::error('Something Went Wrong!', 'Error', ['options']); + Toastr::error('Something Went Wrong!', 'Whoops!', ['options']); } else { $type->save(); - return redirect()->route('staff_type_index')->with(Toastr::info('Type Sucessfully Modified', 'Yay!', ['options'])); + return redirect()->route('staff_type_index')->with(Toastr::success('Type Sucessfully Modified', 'Yay!', ['options'])); } } @@ -90,6 +90,6 @@ public function delete($slug, $id) { $type = Type::findOrFail($id); $type->delete(); - return redirect()->route('staff_type_index')->with(Toastr::warning('Type Sucessfully Deleted', 'Yay!', ['options'])); + return redirect()->route('staff_type_index')->with(Toastr::success('Type Sucessfully Deleted', 'Yay!', ['options'])); } } diff --git a/app/Http/Controllers/Staff/UserController.php b/app/Http/Controllers/Staff/UserController.php index ac9fac1d0c..c2ecd32d6c 100755 --- a/app/Http/Controllers/Staff/UserController.php +++ b/app/Http/Controllers/Staff/UserController.php @@ -103,7 +103,7 @@ public function userEdit($username, $id) return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Account Was Updated Successfully!', 'Yay!', ['options'])); } else { - return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::warning('Something Went Wrong!', 'Error', ['options'])); + return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('Something Went Wrong!', 'Whoops!', ['options'])); } } @@ -131,7 +131,7 @@ public function userPermissions($username, $id) return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Account Permissions Succesfully Edited', 'Yay!', ['options'])); } else { - return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::warning('Something Went Wrong!', 'Error', ['options'])); + return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('Something Went Wrong!', 'Whoops!', ['options'])); } } @@ -155,7 +155,7 @@ protected function userPassword($username, $id) return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Account Password Was Updated Successfully!', 'Yay!', ['options'])); } else { - return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::warning('Something Went Wrong!', 'Error', ['options'])); + return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('Something Went Wrong!', 'Whoops!', ['options'])); } } @@ -171,7 +171,7 @@ protected function userDelete($username, $id) $user = User::findOrFail($id); $staff = Auth::user(); if ($user->group->is_modo || Auth::user()->id == $user->id) { - return redirect()->route('home')->with(Toastr::error('You Cannot Delete Yourself Or Other Staff', 'Alert', ['options'])); + return redirect()->route('home')->with(Toastr::error('You Cannot Delete Yourself Or Other Staff', 'Whoops!', ['options'])); } else { // Removes UserID from Torrents if any and replaces with System UserID (0) foreach (Torrent::where('user_id', '=', $user->id)->get() as $tor) { @@ -233,9 +233,9 @@ protected function userDelete($username, $id) \LogActivity::addToLog("Staff Member " . $staff->username . " has deleted " . $user->username . " account."); if ($user->delete()) { - return redirect('staff_dashboard')->with(Toastr::success('Account Has Been Removed', 'Success!', ['options'])); + return redirect('staff_dashboard')->with(Toastr::success('Account Has Been Removed', 'Yay!', ['options'])); } else { - return redirect('staff_dashboard')->with(Toastr::warning('Something Went Wrong!', 'Error', ['options'])); + return redirect('staff_dashboard')->with(Toastr::error('Something Went Wrong!', 'Whoops!', ['options'])); } } } diff --git a/app/Http/Controllers/TorrentController.php b/app/Http/Controllers/TorrentController.php index 9bf4836afc..8bdf86b3a4 100755 --- a/app/Http/Controllers/TorrentController.php +++ b/app/Http/Controllers/TorrentController.php @@ -118,7 +118,7 @@ public function bumpTorrent($slug, $id) // Activity Log \LogActivity::addToLog("Staff Member " . Auth::user()->username . " has bumped " . $torrent->name . " ."); - return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::info('Torrent Has Been Bumped To Top Successfully!', 'Info', ['options'])); + return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::success('Torrent Has Been Bumped To Top Successfully!', 'Yay!', ['options'])); } else { abort(403, 'Unauthorized action.'); } @@ -134,10 +134,10 @@ public function bookmark($id) { $torrent = Torrent::withAnyStatus()->findOrFail($id); if (Auth::user()->hasBookmarked($torrent->id)) { - return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::error('Torrent has already been bookmarked.', 'Error', ['options'])); + return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::error('Torrent has already been bookmarked.', 'Whoops!', ['options'])); } else { Auth::user()->bookmarks()->attach($torrent->id); - return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::success('Torrent Has Been Bookmarked Successfully!', 'Yay', ['options'])); + return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::success('Torrent Has Been Bookmarked Successfully!', 'Yay!', ['options'])); } } @@ -163,7 +163,7 @@ public function sticky($slug, $id) // Activity Log \LogActivity::addToLog("Staff Member " . Auth::user()->username . " has stickied " . $torrent->name . " ."); - return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::info('Torrent Sticky Status Has Been Adjusted!', 'Info', ['options'])); + return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::success('Torrent Sticky Status Has Been Adjusted!', 'Yay!', ['options'])); } else { abort(403, 'Unauthorized action.'); } @@ -215,10 +215,10 @@ public function upload() if (Request::getMethod() == 'POST' && Request::get('post') == true) { // No torrent file uploaded OR an Error has occurred if (Request::hasFile('torrent') == false) { - Toastr::warning('You Must Provide A Torrent File For Upload!', 'Error!', ['options']); + Toastr::error('You Must Provide A Torrent File For Upload!', 'Whoops!', ['options']); return view('torrent.upload', ['categories' => Category::all(), 'types' => Type::all()->sortBy('position'), 'user' => $user]); } elseif (Request::file('torrent')->getError() != 0 && Request::file('torrent')->getClientOriginalExtension() != 'torrent') { - Toastr::warning('A Error Has Occured!', 'Error!', ['options']); + Toastr::error('A Error Has Occured!', 'Whoops!', ['options']); return view('torrent.upload', ['categories' => Category::all(), 'types' => Type::all()->sortBy('position'), 'user' => $user]); } // Deplace and decode the torrent temporarily @@ -262,7 +262,7 @@ public function upload() if (file_exists(getcwd() . '/files/torrents/' . $fileName)) { unlink(getcwd() . '/files/torrents/' . $fileName); } - Toastr::warning('Did You Fill In All The Fields? If so then torrent hash is already on site. Dupe upload attempt was found.', 'Error!', ['options']); + Toastr::error('Did You Fill In All The Fields? If so then torrent hash is already on site. Dupe upload attempt was found.', 'Whoops!', ['options']); } else { // Save The Torrent $torrent->save(); @@ -590,7 +590,7 @@ public function grantFL($slug, $id) // Activity Log \LogActivity::addToLog("Staff Member " . Auth::user()->username . " has granted freeleech on " . $torrent->name . " ."); - return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::info('Torrent FL Has Been Adjusted!', 'Info', ['options'])); + return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::success('Torrent FL Has Been Adjusted!', 'Yay!', ['options'])); } else { abort(403, 'Unauthorized action.'); } @@ -622,14 +622,14 @@ public function grantFeatured($slug, $id) has been added to the Featured Torrents Slider by [url={$appurl}/" . Auth::user()->username . "." . Auth::user()->id . "]" . Auth::user()->username . "[/url]! Grab It While You Can! :fire:"]); Cache::forget('shoutbox_messages'); } else { - return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::error('Torrent Is Already Featured!', 'Ummm', ['options'])); + return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::error('Torrent Is Already Featured!', 'Whoops!', ['options'])); } $torrent->save(); // Activity Log \LogActivity::addToLog("Staff Member " . Auth::user()->username . " has featured " . $torrent->name . " ."); - return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::info('Torrent Is Now Featured!', 'Info', ['options'])); + return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::success('Torrent Is Now Featured!', 'Yay!', ['options'])); } else { abort(403, 'Unauthorized action.'); } @@ -662,7 +662,7 @@ public function grantDoubleUp($slug, $id) // Activity Log \LogActivity::addToLog("Staff Member " . Auth::user()->username . " has granted double upload on " . $torrent->name . " ."); - return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::info('Torrent DoubleUpload Has Been Adjusted!', 'Info', ['options'])); + return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::success('Torrent DoubleUpload Has Been Adjusted!', 'Yay!', ['options'])); } else { abort(403, 'Unauthorized action.'); } @@ -701,17 +701,17 @@ public function download($slug, $id) // User's ratio is too low if ($user->getRatio() < config('other.ratio')) { - return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::warning('Your Ratio Is To Low To Download!!!', 'Error!', ['options'])); + return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::error('Your Ratio Is To Low To Download!!!', 'Whoops!', ['options'])); } // User's download rights are revoked if ($user->can_download == 0) { - return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::warning('Your Download Rights Have Been Revoked!!!', 'Error!', ['options'])); + return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::error('Your Download Rights Have Been Revoked!!!', 'Whoops!', ['options'])); } // Torrent Status Is Rejected if ($torrent->isRejected()) { - return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::warning('This Torrent Has Been Rejected By Staff', 'Error!', ['options'])); + return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::error('This Torrent Has Been Rejected By Staff', 'Whoops!', ['options'])); } // Define the filename for the download @@ -720,7 +720,7 @@ public function download($slug, $id) // The torrent file exist ? if (!file_exists(getcwd() . '/files/torrents/' . $torrent->file_name)) { return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id]) - ->with(Toastr::warning('Torrent File Not Found! Please Report This Torrent!', 'Error!', ['options'])); + ->with(Toastr::error('Torrent File Not Found! Please Report This Torrent!', 'Error!', ['options'])); } else { // Delete the last torrent tmp file if (file_exists(getcwd() . '/files/tmp/' . $tmpFileName)) { @@ -769,7 +769,7 @@ public function reseedTorrent($slug, $id) [color=red][b]THIS IS AN AUTOMATED SYSTEM MESSAGE, PLEASE DO NOT REPLY![/b][/color]"; $pmuser->save(); } - return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::info('A PM has been sent to all users that downloaded this torrent along with original uploader!', 'Info', ['options'])); + return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::success('A PM has been sent to all users that downloaded this torrent along with original uploader!', 'Yay!', ['options'])); } else { return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::error('This torrent doesnt meet the requirments for a reseed request.', 'Whoops!', ['options'])); } @@ -865,7 +865,7 @@ public function deleteTorrent($id) // Activity Log \LogActivity::addToLog("Member " . $user->username . " has deleted torrent " . $torrent->name . " ."); - return redirect('/torrents')->with(Toastr::info('Torrent Has Been Deleted!', 'Attention!', ['options'])); + return redirect('/torrents')->with(Toastr::success('Torrent Has Been Deleted!', 'Yay!', ['options'])); } else { abort(403, 'Unauthorized action.'); } @@ -891,7 +891,7 @@ public function freeleechToken($slug, $id) $user->fl_tokens -= "1"; $user->save(); - return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::success('You Have Successfully Activated A Freeleech Token For This Torrent!', 'Yay', ['options'])); + return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::success('You Have Successfully Activated A Freeleech Token For This Torrent!', 'Yay!', ['options'])); } else { return redirect()->route('torrent', ['slug' => $torrent->slug, 'id' => $torrent->id])->with(Toastr::error('You Dont Have Enough Freeleech Tokens Or Already Have One Activated On This Torrent.', 'Whoops!', ['options'])); } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 76cfb15418..f50f15a546 100755 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -176,7 +176,7 @@ public function changeSettings($username, $id) $user->style = (int)Request::get('theme'); $css_url = Request::get('custom_css'); if (isset($css_url) && filter_var($css_url, FILTER_VALIDATE_URL) === false) { - return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::warning('The URL for the external CSS stylesheet is invalid, try it again with a valid URL.', 'Error', ['options'])); + return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('The URL for the external CSS stylesheet is invalid, try it again with a valid URL.', 'Whoops!', ['options'])); } else { $user->custom_css = $css_url; } @@ -197,7 +197,7 @@ public function changeSettings($username, $id) return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Your Account Was Updated Successfully!', 'Yay!', ['options'])); } else { - return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::warning('Something Went Wrong!', 'Error', ['options'])); + return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('Something Went Wrong!', 'Whoops!', ['options'])); } } @@ -219,9 +219,9 @@ protected function changePassword(IlluminateRequest $request) $usr->fill([ 'password' => Hash::make($request->new_password) ])->save(); - return redirect('/login')->with(Toastr::success('Your Password Has Been Reset', 'Success!', ['options'])); + return redirect('/login')->with(Toastr::success('Your Password Has Been Reset', 'Yay!', ['options'])); } else { - return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::warning('Your Password Was Incorrect!', 'Error', ['options'])); + return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('Your Password Was Incorrect!', 'Whoops!', ['options'])); } } @@ -248,7 +248,7 @@ protected function changeEmail($username, $id) return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Your Email Was Updated Successfully!', 'Yay!', ['options'])); } else { - return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::warning('Your Password Was Incorrect!', 'Error', ['options'])); + return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('Your Password Was Incorrect!', 'Whoops!', ['options'])); } } } @@ -267,7 +267,7 @@ public function changePID($username, $id) $user->save(); return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Your PID Was Changed Successfully!', 'Yay!', ['options'])); } else { - return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::warning('Something Went Wrong!', 'Error', ['options'])); + return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('Something Went Wrong!', 'Whoops!', ['options'])); } } @@ -298,7 +298,7 @@ protected function authorizeClient($username, $id) if ($v->passes()) { if (Hash::check(Request::get('password'), $user->password)) { if (Client::where('user_id', '=', $user->id)->get()->count() >= config('other.max_cli')) { - return redirect()->route('user_clients', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('Max Clients Reached!', 'Sorry', ['options'])); + return redirect()->route('user_clients', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('Max Clients Reached!', 'Whoops!', ['options'])); } $cli = new Client; $cli->user_id = $user->id; @@ -307,10 +307,10 @@ protected function authorizeClient($username, $id) $cli->save(); return redirect()->route('user_clients', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Client Has Been Added!', 'Yay', ['options'])); } else { - return redirect()->route('user_clients', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('Password Invalid!', 'Sorry', ['options'])); + return redirect()->route('user_clients', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('Password Invalid!', 'Whoops!', ['options'])); } } else { - return redirect()->route('user_clients', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('All required values not received or IP is already registered by a member.', 'Hmm!', ['options'])); + return redirect()->route('user_clients', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('All required values not received or IP is already registered by a member.', 'Whoops!', ['options'])); } } @@ -325,9 +325,9 @@ protected function removeClient($username, $id) if ($v->passes()) { $cli = Client::where('id', '=', Request::get('cliid')); $cli->delete(); - return redirect()->route('user_clients', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Client Has Been Removed!', 'Yay', ['options'])); + return redirect()->route('user_clients', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Client Has Been Removed!', 'Yay!', ['options'])); } else { - return redirect()->route('user_clients', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('Unable to remove this client.', 'Whoops, something went wrong', ['options'])); + return redirect()->route('user_clients', ['username' => $user->username, 'id' => $user->id])->with(Toastr::error('Unable to remove this client.', 'Whoops!', ['options'])); } }