Fix bad key name

Revert "Apply fixes from StyleCI (pull request #6)"

.idea/hrm-mcserver.iml

@@ -2,16 +2,12 @@
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/database/factories" isTestSource="false" packagePrefix="Database\Factories\" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Tests\" />
-      <sourceFolder url="file://$MODULE_DIR$/database/seeders" isTestSource="false" packagePrefix="Database\Seeders\" />
       <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/app" isTestSource="false" packagePrefix="App\" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/almasaeed2010/adminlte" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/asm89/stack-cors" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/awssat/discord-notification-channel" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/barryvdh/laravel-debugbar" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/berkayk/onesignal-laravel" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/brick/math" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/clue/stream-filter" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
@@ -31,7 +27,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/filp/whoops" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/fruitcake/laravel-cors" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/fzaninotto/faker" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/graham-campbell/result-type" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/guzzle" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/promises" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/psr7" />
@@ -49,7 +44,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/mcamara/laravel-localization" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/mockery/mockery" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/monolog/monolog" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/mpociot/teamwork" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/myclabs/deep-copy" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/nesbot/carbon" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/nikic/php-parser" />
@@ -72,7 +66,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpspec/prophecy" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-code-coverage" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-file-iterator" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-invoker" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-text-template" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-timer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-token-stream" />
@@ -89,16 +82,12 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/ramsey/collection" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/ramsey/uuid" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/scrivo/highlight.php" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/cli-parser" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/code-unit" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/code-unit-reverse-lookup" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/comparator" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/complexity" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/diff" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/environment" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/exporter" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/global-state" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/lines-of-code" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/object-enumerator" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/object-reflector" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/recursion-context" />
@@ -117,8 +106,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/event-dispatcher" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/event-dispatcher-contracts" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/finder" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/http-client" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/http-client-contracts" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/http-foundation" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/http-kernel" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/mime" />
@@ -134,7 +121,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php80" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-uuid" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/process" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/psr-http-message-bridge" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/routing" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/service-contracts" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/string" />

.idea/php.xml

@@ -141,21 +141,9 @@
       <path value="$PROJECT_DIR$/vendor/graham-campbell/markdown" />
       <path value="$PROJECT_DIR$/vendor/league/mime-type-detection" />
       <path value="$PROJECT_DIR$/vendor/mcamara/laravel-localization" />
-      <path value="$PROJECT_DIR$/vendor/mpociot/teamwork" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/code-unit" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/cli-parser" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/complexity" />
-      <path value="$PROJECT_DIR$/vendor/sebastian/lines-of-code" />
-      <path value="$PROJECT_DIR$/vendor/graham-campbell/result-type" />
-      <path value="$PROJECT_DIR$/vendor/symfony/http-client" />
-      <path value="$PROJECT_DIR$/vendor/symfony/http-client-contracts" />
-      <path value="$PROJECT_DIR$/vendor/phpunit/php-invoker" />
-      <path value="$PROJECT_DIR$/vendor/awssat/discord-notification-channel" />
-      <path value="$PROJECT_DIR$/vendor/berkayk/onesignal-laravel" />
-      <path value="$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge" />
     </include_path>
   </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="7.3" />
+  <component name="PhpProjectSharedConfiguration" php_language_level="7.2" />
   <component name="PhpUnit">
     <phpunit_settings>
       <PhpUnitSettings configuration_file_path="$PROJECT_DIR$/phpunit.xml" custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" use_configuration_file="true" />

.styleci.yml

@@ -1,13 +1,13 @@
-risky: false
+php:
-version: 7
+  preset: laravel
-preset: recommended
+  disabled:
-finder:
+    - unused_use
-  exclude:
+  finder:
-    - "modules"
-    - "node_modules"
-    - "storage"
-    - "vendor"
-  name: "*.php"
     not-name:
-    - "*.blade.php"
+      - index.php
-    - "_ide_helper.php"
+      - server.php
+js:
+  finder:
+    not-name:
+      - webpack.mix.js
+css: true

.vscode/launch.json

@@ -4,15 +4,11 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-    
         {
             "name": "Listen for XDebug",
             "type": "php",
             "request": "launch",
-            "port": 9000,
+            "port": 9000
-            "ignore": [
-                "**/vendor/**/*.php"
-            ]
         },
         {
             "name": "Launch currently open script",

README.md

@@ -1,6 +1,6 @@
 
-# Raspberry Teams - The Simple Staff Application Manager v 0.6.2 [![Crowdin](https://badges.crowdin.net/raspberry-staff-manager/localized.svg)](https://crowdin.com/project/raspberry-staff-manager)  [![StyleCI](https://bitbucket.styleci.io/repos/2513833655827911319/shield?branch=develop)](https://bitbucket.styleci.io/repos/2513833655827911319?branch=develop)
+# RB Recruiter v 0.6.2 [![Crowdin](https://badges.crowdin.net/raspberry-staff-manager/localized.svg)](https://crowdin.com/project/raspberry-staff-manager)
-## The quick and pain-free staff application manager
+## The quick and pain-free form management solution for communities
 
 Have you ever gotten tired of managing your Minecraft server/network's applications through Discord (or anything else) and having to scroll through hundreds of new messages just to find that one applicant's username?
 

app/Application.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
@@ -29,10 +10,13 @@ class Application extends Model
 
         'applicantUserID',
         'applicantFormResponseID',
-        'applicationStatus',
+        'applicationStatus'
 
     ];
 
+
+
+
     public function user()
     {
         return $this->belongsTo('App\User', 'applicantUserID', 'id');
@@ -53,6 +37,7 @@ class Application extends Model
         return $this->belongsToMany('App\Vote', 'votes_has_application');
     }
 
+
     public function comments()
     {
         return $this->hasMany('App\Comment', 'applicationID', 'id');
@@ -61,7 +46,8 @@ class Application extends Model
     public function setStatus($status)
     {
         return $this->update([
-            'applicationStatus' => $status,
+            'applicationStatus' => $status
         ]);
+
     }
 }

app/Appointment.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
@@ -32,7 +13,7 @@ class Appointment extends Model
         'appointmentStatus',
         'appointmentLocation',
         'meetingNotes',
-        'userAccepted',
+        'userAccepted'
     ];
 
     public function application()
@@ -44,7 +25,7 @@ class Appointment extends Model
     public function setStatus($status)
     {
         $this->update([
-            'appointmentStatus' => $status,
+            'appointmentStatus' => $status
         ]);
     }
 }

app/Ban.php

@@ -1,46 +1,29 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
 class Ban extends Model
 {
+
     public $fillable = [
 
         'userID',
         'reason',
         'bannedUntil',
         'userAgent',
-        'authorUserID',
+        'authorUserID'
 
     ];
 
     public $dates = [
-        'bannedUntil',
+        'bannedUntil'
     ];
 
     public function user()
     {
         return $this->belongsTo('App\User', 'userID', 'id');
     }
+
 }

app/Comment.php

@@ -1,34 +1,16 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
 class Comment extends Model
 {
+    
     protected $fillable = [
         'authorID',
         'applicationID',
-        'text',
+        'text'
     ];
 
     public function application()
@@ -40,4 +22,5 @@ class Comment extends Model
     {
         return $this->belongsTo('App\User', 'authorID', 'id');
     }
+
 }

app/Console/Commands/CountVotes.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Console\Commands;
 
 use App\Application;
@@ -62,23 +43,28 @@ class CountVotes extends Command
         $eligibleApps = Application::where('applicationStatus', 'STAGE_PEERAPPROVAL')->get();
         $pbar = $this->output->createProgressBar($eligibleApps->count());
 
-        if ($eligibleApps->isEmpty()) {
+        if($eligibleApps->isEmpty())
+        {
             $this->error('𐄂 There are no applications that need to be processed.');
 
             return false;
         }
 
-        foreach ($eligibleApps as $application) {
+        foreach ($eligibleApps as $application)
+        {
             $votes = $application->votes;
             $voteCount = $application->votes->count();
 
             $positiveVotes = 0;
             $negativeVotes = 0;
 
-            if ($voteCount > 5) {
+            if ($voteCount > 5)
-                $this->info('Counting votes for application ID '.$application->id);
+            {
-                foreach ($votes as $vote) {
+                $this->info('Counting votes for application ID ' . $application->id);
-                    switch ($vote->allowedVoteType) {
+                foreach ($votes as $vote)
+                {
+                    switch ($vote->allowedVoteType)
+                    {
                         case 'VOTE_APPROVE':
                             $positiveVotes++;
                             break;
@@ -88,7 +74,7 @@ class CountVotes extends Command
                     }
                 }
 
-                $this->info('Total votes for application ID '.$application->id.': '.$voteCount);
+                $this->info('Total votes for application ID ' . $application->id . ': ' . $voteCount);
                 $this->info('Calculating criteria...');
                 $negativeVotePercent = floor(($negativeVotes / $voteCount) * 100);
                 $positiveVotePercent = floor(($positiveVotes / $voteCount) * 100);
@@ -97,43 +83,54 @@ class CountVotes extends Command
 
                 $this->table([
                     '% of approval votes',
-                    '% of denial votes',
+                    '% of denial votes'
                 ], [ // array of arrays, e.g. rows
                     [
-                        $positiveVotePercent.'%',
+                        $positiveVotePercent . "%",
-                        $negativeVotePercent.'%',
+                        $negativeVotePercent . "%"
-                    ],
+                    ]
                 ]);
 
-                if ($pollResult) {
+                if ($pollResult)
-                    $this->info('✓ Dispatched promotion event for applicant '.$application->user->name);
+                {
-                    if (! $this->option('dryrun')) {
+                    $this->info('✓ Dispatched promotion event for applicant ' . $application->user->name);
+                    if (!$this->option('dryrun'))
+                    {
                         $application->response->vacancy->vacancyCount -= 1;
                         $application->response->vacancy->save();
 
                         event(new ApplicationApprovedEvent(Application::find($application->id)));
-                    } else {
+                    }
+                    else
+                    {
                         $this->warn('Dry run: Event won\'t be dispatched');
                     }
 
                     $pbar->advance();
-                } else {
+
-                    if (! $this->option('dryrun')) {
+                }
+                else {
+
+                    if (!$this->option('dryrun'))
+                    {
                         event(new ApplicationDeniedEvent(Application::find($application->id)));
-                    } else {
+                    }
+                    else {
                         $this->warn('Dry run: Event won\'t be dispatched');
                     }
 
                     $pbar->advance();
-                    $this->error('𐄂 Applicant '.$application->user->name.' does not meet vote criteria (Majority)');
+                    $this->error('𐄂 Applicant ' . $application->user->name . ' does not meet vote criteria (Majority)');
                 }
-            } else {
-                $this->warn('Application ID'.$application->id.' did not have enough votes for processing (min 5)');
             }
+            else
+            {
+                $this->warn("Application ID" . $application->id . " did not have enough votes for processing (min 5)");
+            }
+
         }
 
         $pbar->finish();
-
         return true;
     }
 }

app/Console/Commands/CreateUser.php

@@ -1,140 +0,0 @@
-<?php
-
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-namespace App\Console\Commands;
-
-use App\Facades\UUID;
-use App\Profile;
-use App\User;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Hash;
-
-class CreateUser extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'users:create';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Creates an application user. Seeding the database is for testing environments, so use this command in production for your first admin user.';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle()
-    {
-        do {
-            if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-                system('cls');
-            } else {
-                system('clear');
-            }
-
-            $this->info('Welcome to the user account creation wizard. If you just installed the application, we recommend you create your first admin user here. If you don\'t, you won\'t gain admin privileges after creating an account in the web interface.');
-            $this->info('We\'ll ask some questions to get you started.');
-
-            $username = $this->ask('Username');
-            do {
-                $password = $this->secret('Password');
-                $password_confirm = $this->secret('Confirm Password');
-
-                if ($password === $password_confirm) {
-                    $password = Hash::make($password);
-                    $matches = true;
-                } else {
-                    $this->error('Password doesn\'t match. Please try again.');
-                    $matches = false;
-                }
-            } while (! $matches);
-
-            $email = $this->ask('E-mail address');
-            $name = $this->ask('First/Last Name');
-
-            do {
-                try {
-                    $uuid = UUID::toUUID($this->ask('Minecraft username (Must be a valid Premium account)'));
-                } catch (\InvalidArgumentException $e) {
-                    $this->error($e->getMessage());
-                    $hasError = true;
-                }
-
-                if (isset($hasError)) {
-                    $continue = true;
-                } else {
-                    $continue = false;
-                }
-                unset($hasError);
-            } while ($continue);
-
-            $this->info('Please check if these details are correct: ');
-            $this->info('Username: '.$username);
-            $this->info('Email: '.$email);
-            $this->info('Name: '.$name);
-        } while (! $this->confirm('Create user now? You can go back to correct any details.'));
-
-        $user = User::create([
-            'uuid' => $uuid,
-            'name' => $name,
-            'email' => $email,
-            'username' => $username,
-            'originalIP' => '127.0.0.1',
-            'password' => $password,
-        ]);
-
-        if ($user) {
-            $user->assignRole('admin', 'reviewer', 'user', 'hiringManager');
-            Profile::create([
-                'profileShortBio' => 'Random data '.rand(0, 1000),
-                'profileAboutMe' => 'Random data '.rand(0, 1000),
-                'socialLinks' => '[]',
-                'avatarPreference' => 'gravatar',
-                'userID' => $user->id,
-            ]);
-
-            $this->info('Account created! You may now login at '.route('login').'. Enjoy the app!');
-
-            return 0;
-        } else {
-            $this->error('There was an unknown problem creating the user. There might have been errors above. Please try again.');
-
-            return 1;
-        }
-    }
-}

app/Console/Commands/Install.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
@@ -58,14 +39,17 @@ class Install extends Command
     public function handle()
     {
         $basePath = base_path();
-        if (Storage::disk('local')->missing('INSTALLED')) {
+        if (Storage::disk('local')->missing('INSTALLED'))
+        {
+
+
            $this->info('[!! Welcome to Rasberry Teams !!]');
            $this->info('>> Installing...');
            $this->call('down', [
-                '--message' => 'Down for maintenance. We\'ll be right back!',
+             '--message' => 'Down for maintenance. We\'ll be right back!'
            ]);
 
-            copy($basePath.'/.env.example', $basePath.'/.env');
+           copy($basePath . '/.env.example', $basePath . '/.env');
            $this->call('key:generate');
 
            $this->info('>> Installing and preparing dependencies. This may take a while, depending on your computer.');
@@ -76,20 +60,25 @@ class Install extends Command
            $npmBuildOut = 0;
            $npmBuildMessages = [];
 
-            exec('cd '.$basePath.' && npm install --silent', $npmBuildOut, $npmOut);
+           exec('cd ' . $basePath . ' && npm install --silent', $npmBuildOut, $npmOut);
-            exec('cd '.$basePath.'&& npm run dev --silent', $npmBuildMessages, $npmBuildOut);
+           exec('cd ' . $basePath . '&& npm run dev --silent', $npmBuildMessages, $npmBuildOut);
 
-            if ($npmOut !== 0 && $npmBuildOut !== 0) {
+
+           if($npmOut !== 0 && $npmBuildOut !== 0)
+           {
              $this->error('[!] One or more errors have ocurred whilst attempting to install dependencies.');
              $this->error('[!] It is recommended to run this command again, and report a bug if it keeps happening.');
 
              return false;
            }
 
+
+
            $settings = [];
 
            $this->info('>> Configuring application - We\'re going to ask a few questions here!');
-            do {
+           do
+           {
                $this->info('== Database Settings (1/6) ==');
 
                $settings['DB_USERNAME'] = $this->ask('Database username');
@@ -110,7 +99,7 @@ class Install extends Command
                $settings['MAIL_PASSWORD'] = $this->secret('SMTP Password (Input won\'t be seen)');
                $settings['MAIL_PORT'] = $this->ask('SMTP Server Port');
                $settings['MAIL_HOST'] = $this->ask('SMTP Server Hostname');
-                $settings['MAIL_FROM'] = $this->ask('E-mail address to send from: ');
+               $settings['MAIL_FROM_ADDRESS'] = $this->ask('E-mail address to send from');
 
                $this->info('== Notification Settings (5/6) (Slack) ==');
                $settings['SLACK_INTEGRATION_WEBHOOK'] = $this->ask('Integration webhook URL');
@@ -119,12 +108,15 @@ class Install extends Command
                $settings['APP_URL'] = $this->ask('Application\'s URL (ex. https://where.you.installed.theapp.com): ');
                $settings['APP_LOGO'] = $this->ask('App logo (Link to an image): ');
                $settings['APP_SITEHOMEPAGE'] = $this->ask('Site homepage (appears in the main header): ');
-            } while (! $this->confirm('Are you sure you want to save these settings? You can always go back and try again.'));
 
-            foreach ($settings as $keyname => $value) {
+
+           } while(!$this->confirm('Are you sure you want to save these settings? You can always go back and try again.'));
+
+           foreach($settings as $keyname => $value)
+           {
               $this->call('environment:modify', [
                   'key' => $keyname,
-                    'value' => $value,
+                  'value' => $value
               ]);
            }
 
@@ -135,11 +127,14 @@ class Install extends Command
            $this->call('migrate');
            $this->call('db:seed');
 
-            touch($basePath.'/INSTALLED');
+           touch($basePath . '/INSTALLED');
 
            $this->call('up');
-            $this->info('>> All done! Visit '.$basePath.' to start using your brand new installation of Raspberry Teams!');
+           $this->info('>> All done! Visit ' . $basePath . ' to start using your brand new installation of Raspberry Teams!');
-        } else {
+
+        }
+        else
+        {
            $this->error('[!] The application is already installed!');
         }
     }

app/Console/Commands/MakeFile.php

@@ -1,82 +0,0 @@
-<?php
-
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-namespace App\Console\Commands;
-
-use Faker\Factory;
-use Faker\Generator;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Storage;
-
-class MakeFile extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'files:make {count : How many test files to generate}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Generates test files for the TeamFile model. Use in conjunction with it\'s factory.';
-
-    /**
-     * The faker instance used to obtain dummy text.
-     *
-     * @var Generator
-     */
-    private $faker;
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->faker = Factory::create();
-
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle()
-    {
-        $count = $this->argument('count');
-        $this->info('Creating '.$this->argument('count').' files!');
-
-        for ($max = 1; $max < $count; $max++) {
-            Storage::disk('local')->put('factory_files/testfile_'.rand(0, 5000).'.txt', $this->faker->paragraphs(40, true));
-        }
-
-        $this->info('Finished creating files! They will be randomly picked by the factory.');
-
-        return 0;
-    }
-}

app/Console/Commands/SetEnv.php

@@ -1,28 +1,9 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Console\Commands;
 
-use GeoSot\EnvEditor\Facades\EnvEditor;
 use Illuminate\Console\Command;
+use GeoSot\EnvEditor\Facades\EnvEditor;
 
 class SetEnv extends Command
 {
@@ -60,11 +41,15 @@ class SetEnv extends Command
       $key = $this->argument('key');
       $value = $this->argument('value');
 
-        if (file_exists($path)) {
-            EnvEditor::editKey($key, $value);
-        } else {
-            $this->error('Cannot update a file that doesn\'t exist! Please create .env first.');
 
+
+      if (file_exists($path))
+      {
+          EnvEditor::editKey($key, $value);
+      }
+      else
+      {
+        $this->error('Cannot update a file that doesn\'t exist! Please create .env first.');
         return false;
       }
     }

app/Console/Kernel.php

@@ -1,29 +1,10 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Console;
 
-use App\Jobs\CleanBans;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+use App\Jobs\CleanBans;
 
 class Kernel extends ConsoleKernel
 {

app/CustomFacades/IP.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\CustomFacades;
 
 use Illuminate\Support\Facades\Cache;
@@ -26,6 +7,7 @@ use Illuminate\Support\Facades\Http;
 
 class IP
 {
+
     /**
      * Looks up information on a specified IP address. Caches results automatically.
      * @param string $IP IP address to lookup
@@ -33,18 +15,23 @@ class IP
      */
     public function lookup(string $IP): object
     {
+
       $params = [
           'apiKey' => config('general.keys.ipapi.apikey'),
-            'ip' => $IP,
+          'ip' => $IP
       ];
 
       // TODO: Maybe unwrap this?  Methods are chained here
 
-        return json_decode(Cache::remember($IP, 3600, function () use ($IP) {
+      return json_decode(Cache::remember($IP, 3600, function() use ($IP)
+      {
           return Http::get(config('general.urls.ipapi.ipcheck'), [
             'apiKey' => config('general.keys.ipapi.apikey'),
-                'ip' => $IP,
+            'ip' => $IP
           ])->body();
       }));
+
+
     }
+
 }

app/Events/ApplicationApprovedEvent.php

@@ -1,28 +1,13 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Events;
 
 use App\Application;
+use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PresenceChannel;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
@@ -41,4 +26,6 @@ class ApplicationApprovedEvent
     {
         $this->application = $application;
     }
+
+
 }

app/Events/ApplicationDeniedEvent.php

@@ -1,28 +1,13 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Events;
 
 use App\Application;
+use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PresenceChannel;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
@@ -41,4 +26,5 @@ class ApplicationDeniedEvent
     {
         $this->application = $application;
     }
+
 }

app/Events/NewApplicationEvent.php

@@ -1,28 +1,12 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Events;
 
+use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PresenceChannel;
 use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 

app/Events/UserBannedEvent.php

@@ -1,36 +1,23 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Events;
 
-use App\Ban;
+use Illuminate\Broadcasting\Channel;
-use App\User;
 use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PresenceChannel;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
+use App\User;
+use App\Ban;
+
 class UserBannedEvent
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
+
     public $user;
 
     public $ban;
@@ -45,4 +32,5 @@ class UserBannedEvent
         $this->user = $user;
         $this->ban = $ban;
     }
+
 }

app/Exceptions/Handler.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Exceptions;
 
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;

app/Facades/ContextAwareValidation.php

@@ -1,32 +1,14 @@
 <?php
-
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Facades;
 
 use Illuminate\Support\Facades\Facade;
 
 class ContextAwareValidation extends Facade
 {
+
    protected static function getFacadeAccessor()
    {
      return 'contextAwareValidator';
    }
+
 }

app/Facades/IP.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Facades;
 
 use Illuminate\Support\Facades\Facade;

app/Facades/Options.php

@@ -1,27 +1,8 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
 
 namespace App\Facades;
-
+use \Illuminate\Support\Facades\Facade;
-use Illuminate\Support\Facades\Facade;
 
 class Options extends Facade
 {

app/Facades/UUID.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Facades;
 
 use Illuminate\Support\Facades\Facade;

app/Form.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
@@ -29,7 +10,7 @@ class Form extends Model
 
         'formName',
         'formStructure',
-        'formStatus',
+        'formStatus'
 
     ];
 

app/Helpers/ContextAwareValidator.php

@@ -1,31 +1,13 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Helpers;
 
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Collection;
 
 class ContextAwareValidator
 {
+
     /**
     * The excludedNames array will make the validator ignore any of these names when including names into the rules.
     * @var array
@@ -33,16 +15,17 @@ class ContextAwareValidator
     private $excludedNames = [
       '_token',
       '_method',
-        'formName',
+      'formName'
     ];
 
+
     /**
     * Utility wrapper for json_encode.
     *
     * @param array $value The array to be converted.
     * @return string The JSON representation of $value
     */
-    private function encode(array $value): string
+    private function encode(array $value) : string
     {
       return json_encode($value);
     }
@@ -70,19 +53,24 @@ class ContextAwareValidator
         $formStructure = [];
         $validator = [];
 
-        if ($includeFormName) {
+          if ($includeFormName)
+          {
             $validator['formName'] = 'required|string|max:100';
           }
 
-        foreach ($fields as $fieldName => $field) {
+          foreach ($fields as $fieldName => $field)
-            if (! in_array($fieldName, $this->excludedNames)) {
+          {
-                $validator[$fieldName.'.0'] = 'required|string';
+              if(!in_array($fieldName, $this->excludedNames))
-                $validator[$fieldName.'.1'] = 'required|string';
+              {
+                  $validator[$fieldName . ".0"] = 'required|string';
+                  $validator[$fieldName . ".1"] = 'required|string';
 
-                if ($generateStructure) {
+                  if ($generateStructure)
+                  {
                     $formStructure['fields'][$fieldName]['title'] = $field[0];
                     $formStructure['fields'][$fieldName]['type'] = $field[1];
                   }
+
               }
           }
 
@@ -91,9 +79,11 @@ class ContextAwareValidator
           return ($generateStructure) ?
             collect([
               'validator' => $validatorInstance,
-                'structure' => $this->encode($formStructure),
+              'structure' => $this->encode($formStructure)
             ])
             : $validatorInstance;
+
+
     }
 
     /**
@@ -110,18 +100,23 @@ class ContextAwareValidator
     */
     public function getResponseValidator(array $fields, array $formStructure = [], bool $generateResponseStructure = true)
     {
+
       $responseStructure = [];
       $validator = [];
 
-        if (empty($formStructure) && $generateResponseStructure) {
+      if (empty($formStructure) && $generateResponseStructure)
+      {
         throw new \InvalidArgumentException('Illegal combination of arguments supplied! Please check the method\'s documentation.');
       }
 
-        foreach ($fields as $fieldName => $value) {
+      foreach($fields as $fieldName => $value)
-            if (! in_array($fieldName, $this->excludedNames)) {
+      {
+          if(!in_array($fieldName, $this->excludedNames))
+          {
               $validator[$fieldName] = 'required|string';
 
-                if ($generateResponseStructure) {
+              if ($generateResponseStructure)
+              {
                 $responseStructure['responses'][$fieldName]['type'] = $formStructure['fields'][$fieldName]['type'] ?? 'Unavailable';
                 $responseStructure['responses'][$fieldName]['title'] = $formStructure['fields'][$fieldName]['title'];
                 $responseStructure['responses'][$fieldName]['response'] = $value;
@@ -134,8 +129,10 @@ class ContextAwareValidator
       return ($generateResponseStructure) ?
         collect([
           'validator' => $validatorInstance,
-            'responseStructure' => $this->encode($responseStructure),
+          'responseStructure' => $this->encode($responseStructure)
         ])
         : $validatorInstance;
+
     }
+
 }

app/Helpers/Options.php

@@ -1,23 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
 
 namespace App\Helpers;
 
@@ -27,18 +9,20 @@ use Illuminate\Support\Facades\Log;
 
 class Options
 {
+
     public function getOption(string $option): string
     {
         $value = Cache::get($option);
 
-        if (is_null($value)) {
+        if (is_null($value))
-            Log::debug('Option '.$option.'not found in cache, refreshing from database');
+        {
+            Log::debug('Option ' . $option . 'not found in cache, refreshing from database');
             $value = Option::where('option_name', $option)->first();
-            if (is_null($value)) {
+            if (is_null($value))
                 throw new \Exception('This option does not exist.');
-            }
+
             Cache::put($option, $value);
-            Cache::put($option.'_desc', 'Undefined description');
+            Cache::put($option . '_desc', 'Undefined description');
         }
 
         return $value->option_value;
@@ -49,11 +33,11 @@ class Options
        Option::create([
            'option_name' => $option,
            'option_value' => $value,
-            'friendly_name' => $description,
+           'friendly_name' => $description
        ]);
 
        Cache::put($option, $value, now()->addDay());
-        Cache::put($option.'_desc', $description, now()->addDay());
+       Cache::put($option . '_desc', $description, now()->addDay());
     }
 
     public function pullOption($option): array
@@ -64,7 +48,7 @@ class Options
         // putMany is overkill here
         return [
             Cache::pull($option),
-            Cache::pull($option.'_desc'),
+            Cache::pull($option . '_desc')
         ];
     }
 
@@ -72,13 +56,14 @@ class Options
     {
         $dbOption = Option::where('option_name', $option);
 
-        if ($dbOption->first()) {
+        if ($dbOption->first())
+        {
             $dbOptionInstance = Option::find($dbOption->first()->id);
             Cache::forget($option);
 
             Log::debug('Changing db configuration option', [
                 'old_value' => $dbOptionInstance->option_value,
-                'new_value' => $newValue,
+                'new_value' => $newValue
             ]);
 
             $dbOptionInstance->option_value = $newValue;
@@ -86,20 +71,24 @@ class Options
 
             Log::debug('New db configuration option saved',
             [
-                'option' => $dbOptionInstance->option_value,
+                'option' => $dbOptionInstance->option_value
             ]);
 
             Cache::put('option_name', $newValue, now()->addDay());
-        } else {
+        }
+        else
+        {
             throw new \Exception('This option does not exist.');
         }
     }
 
+
     public function optionExists(string $option): bool
     {
         $dbOption = Option::where('option_name', $option)->first();
         $locallyCachedOption = Cache::get($option);
 
-        return ! is_null($dbOption) || ! is_null($locallyCachedOption);
+        return !is_null($dbOption) || !is_null($locallyCachedOption);
     }
+
 }

app/Http/Controllers/ApplicationController.php

@@ -1,46 +1,36 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers;
 
 use App\Application;
-use App\Events\ApplicationDeniedEvent;
+
-use App\Notifications\ApplicationMoved;
-use App\Notifications\NewApplicant;
 use App\Response;
-use App\User;
 use App\Vacancy;
-use ContextAwareValidator;
+use App\User;
+
+use App\Events\ApplicationDeniedEvent;
+use App\Notifications\NewApplicant;
+use App\Notifications\ApplicationMoved;
+
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Log;
 
+use ContextAwareValidator;
+
 class ApplicationController extends Controller
 {
+
     private function canVote($votes)
     {
         $allvotes = collect([]);
 
-        foreach ($votes as $vote) {
+        foreach ($votes as $vote)
-            if ($vote->userID == Auth::user()->id) {
+        {
+            if ($vote->userID == Auth::user()->id)
+            {
                 $allvotes->push($vote);
             }
         }
@@ -48,17 +38,22 @@ class ApplicationController extends Controller
         return ($allvotes->count() == 1) ? false : true;
     }
 
+
+
     public function showUserApps()
     {
+
         return view('dashboard.user.applications')
             ->with('applications', Auth::user()->applications);
     }
 
+
     public function showUserApp(Request $request, Application $application)
     {
         $this->authorize('view', $application);
 
-        if (! is_null($application)) {
+        if (!is_null($application))
+        {
             return view('dashboard.user.viewapp')
                 ->with(
                     [
@@ -67,16 +62,20 @@ class ApplicationController extends Controller
                         'structuredResponses' => json_decode($application->response->responseData, true),
                         'formStructure' => $application->response->form,
                         'vacancy' => $application->response->vacancy,
-                        'canVote'  => $this->canVote($application->votes),
+                        'canVote'  => $this->canVote($application->votes)
                     ]
                 );
-        } else {
+        }
+        else
+        {
             $request->session()->flash('error', 'The application you requested could not be found.');
         }
 
         return redirect()->back();
     }
 
+
+
     public function showAllApps()
     {
         $this->authorize('viewAny', Application::class);
@@ -85,6 +84,7 @@ class ApplicationController extends Controller
           ->with('applications', Application::paginate(6));
     }
 
+
     public function showAllPendingApps()
     {
         $this->authorize('viewAny', Application::class);
@@ -93,6 +93,7 @@ class ApplicationController extends Controller
             ->with('applications', Application::where('applicationStatus', 'STAGE_SUBMITTED')->get());
     }
 
+
     public function showPendingInterview()
     {
         $this->authorize('viewAny', Application::class);
@@ -102,12 +103,16 @@ class ApplicationController extends Controller
         $pendingInterviews = collect([]);
         $upcomingInterviews = collect([]);
 
-        foreach ($applications as $application) {
+
-            if (! is_null($application->appointment) && $application->appointment->appointmentStatus == 'CONCLUDED') {
+        foreach ($applications as $application)
-                $count = +1;
+        {
+            if (!is_null($application->appointment) && $application->appointment->appointmentStatus == 'CONCLUDED')
+            {
+                $count =+ 1;
             }
 
-            switch ($application->applicationStatus) {
+            switch ($application->applicationStatus)
+            {
                 case 'STAGE_INTERVIEW':
                     $upcomingInterviews->push($application);
 
@@ -118,24 +123,29 @@ class ApplicationController extends Controller
 
                     break;
             }
+
         }
 
         return view('dashboard.appmanagement.interview')
             ->with([
                 'finishedCount' => $count,
                 'applications' => $pendingInterviews,
-                'upcomingApplications' => $upcomingInterviews,
+                'upcomingApplications' => $upcomingInterviews
             ]);
     }
 
+
+
     public function showPeerReview()
     {
         $this->authorize('viewAny', Application::class);
-
         return view('dashboard.appmanagement.peerreview')
             ->with('applications', Application::where('applicationStatus', 'STAGE_PEERAPPROVAL')->get());
+
     }
 
+
+
     public function renderApplicationForm(Request $request, $vacancySlug)
     {
         // FIXME: Get rid of references to first(), this is a wonky query
@@ -143,27 +153,36 @@ class ApplicationController extends Controller
 
         $firstVacancy = $vacancyWithForm->first();
 
-        if (! $vacancyWithForm->isEmpty() && $firstVacancy->vacancyCount !== 0 && $firstVacancy->vacancyStatus == 'OPEN') {
+        if (!$vacancyWithForm->isEmpty() && $firstVacancy->vacancyCount !== 0 && $firstVacancy->vacancyStatus == 'OPEN')
+        {
+
             return view('dashboard.application-rendering.apply')
                 ->with([
 
                     'vacancy' => $vacancyWithForm->first(),
-                    'preprocessedForm' => json_decode($vacancyWithForm->first()->forms->formStructure, true),
+                    'preprocessedForm' => json_decode($vacancyWithForm->first()->forms->formStructure, true)
 
                 ]);
-        } else {
+        }
+        else
+        {
             abort(404, 'The application you\'re looking for could not be found or it is currently unavailable.');
         }
+
     }
 
+
+
     public function saveApplicationAnswers(Request $request, $vacancySlug)
     {
         $vacancy = Vacancy::with('forms')->where('vacancySlug', $vacancySlug)->get();
 
-        if ($vacancy->first()->vacancyCount == 0 || $vacancy->first()->vacancyStatus !== 'OPEN') {
+        if ($vacancy->first()->vacancyCount == 0 || $vacancy->first()->vacancyStatus !== 'OPEN')
-            $request->session()->flash('error', 'This application is unavailable.');
+        {
 
+          $request->session()->flash('error', 'This application is unavailable.');
           return redirect()->back();
+
         }
 
         Log::info('Processing new application!');
@@ -173,14 +192,15 @@ class ApplicationController extends Controller
 
         Log::info('Built response & validator structure!');
 
-        if (! $responseValidation->get('validator')->fails()) {
+        if (!$responseValidation->get('validator')->fails())
+        {
             $response = Response::create([
                 'responseFormID' => $vacancy->first()->forms->id,
                 'associatedVacancyID' => $vacancy->first()->id, // Since a form can be used by multiple vacancies, we can only know which specific vacancy this response ties to by using a vacancy ID
-                'responseData' => $responseValidation->get('responseStructure'),
+                'responseData' => $responseValidation->get('responseStructure')
             ]);
 
-            Log::info('Registered form response for user '.Auth::user()->name.' for vacancy '.$vacancy->first()->vacancyName);
+            Log::info('Registered form response for user ' . Auth::user()->name . ' for vacancy ' . $vacancy->first()->vacancyName);
 
             $application = Application::create([
                 'applicantUserID' => Auth::user()->id,
@@ -188,20 +208,24 @@ class ApplicationController extends Controller
                 'applicationStatus' => 'STAGE_SUBMITTED',
             ]);
 
-            Log::info('Submitted application for user '.Auth::user()->name.' with response ID'.$response->id);
+            Log::info('Submitted application for user ' . Auth::user()->name . ' with response ID' . $response->id);
 
-            foreach (User::all() as $user) {
+            foreach(User::all() as $user)
-                if ($user->hasRole('admin')) {
+            {
+              if ($user->hasRole('admin'))
+              {
                 $user->notify((new NewApplicant($application, $vacancy->first()))->delay(now()->addSeconds(10)));
               }
             }
 
             $request->session()->flash('success', 'Thank you for your application! It will be reviewed as soon as possible.');
-
             return redirect()->to(route('showUserApps'));
-        } else {
+        }
-            Log::warning('Application form for '.Auth::user()->name.' contained errors, resetting!');
+        else
+        {
+            Log::warning('Application form for ' . Auth::user()->name . ' contained errors, resetting!');
             $request->session()->flash('error', 'There are one or more errors in your application. Please make sure none of your fields are empty, since they are all required.');
+
         }
 
         return redirect()->back();
@@ -211,14 +235,15 @@ class ApplicationController extends Controller
     {
         $this->authorize('update', Application::class);
 
-        switch ($newStatus) {
+        switch ($newStatus)
+        {
             case 'deny':
 
                 event(new ApplicationDeniedEvent($application));
                 break;
 
             case 'interview':
-                Log::info('User '.Auth::user()->name.' has moved application ID '.$application->id.'to interview stage');
+                Log::info('User ' . Auth::user()->name . ' has moved application ID ' . $application->id . 'to interview stage');
                 $request->session()->flash('success', 'Application moved to interview stage! (:');
                 $application->setStatus('STAGE_INTERVIEW');
 
@@ -234,11 +259,13 @@ class ApplicationController extends Controller
 
     public function delete(Request $request, Application $application)
     {
+
       $this->authorize('delete', $application);
       $application->delete(); // observers will run, cleaning it up
 
       $request->session()->flash('success', 'Application deleted. Comments, appointments and responses have also been deleted.');
-
       return redirect()->back();
+
     }
+
 }

app/Http/Controllers/AppointmentController.php

@@ -1,33 +1,14 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers;
 
 use App\Application;
-use App\Appointment;
 use App\Http\Requests\SaveNotesRequest;
-use App\Notifications\ApplicationMoved;
-use App\Notifications\AppointmentScheduled;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
+use App\Appointment;
+use App\Notifications\ApplicationMoved;
+use App\Notifications\AppointmentScheduled;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 
@@ -39,7 +20,7 @@ class AppointmentController extends Controller
         'DISCORD',
         'SKYPE',
         'MEET',
-        'TEAMSPEAK',
+        'TEAMSPEAK'
 
     ];
 
@@ -56,13 +37,15 @@ class AppointmentController extends Controller
         ]);
         $application->setStatus('STAGE_INTERVIEW_SCHEDULED');
 
-        Log::info('User '.Auth::user()->name.' has scheduled an appointment with '.$application->user->name.' for application ID'.$application->id, [
+
+        Log::info('User ' . Auth::user()->name . ' has scheduled an appointment with ' . $application->user->name . ' for application ID' . $application->id, [
             'datetime' => $appointmentDate->toDateTimeString(),
-            'scheduled' => now(),
+            'scheduled' => now()
         ]);
 
         $application->user->notify(new AppointmentScheduled($appointment));
-        $request->session()->flash('success', 'Appointment successfully scheduled @ '.$appointmentDate->toDateTimeString());
+        $request->session()->flash('success', 'Appointment successfully scheduled @ ' . $appointmentDate->toDateTimeString());
+
 
         return redirect()->back();
     }
@@ -73,7 +56,7 @@ class AppointmentController extends Controller
 
         $validStatuses = [
           'SCHEDULED',
-            'CONCLUDED',
+          'CONCLUDED'
         ];
 
         // NOTE: This is a little confusing, refactor
@@ -83,25 +66,29 @@ class AppointmentController extends Controller
         $application->setStatus('STAGE_PEERAPPROVAL');
         $application->user->notify(new ApplicationMoved());
 
-        $request->session()->flash('success', 'Interview finished! Staff members can now vote on it.');
 
+        $request->session()->flash('success', 'Interview finished! Staff members can now vote on it.');
         return redirect()->back();
     }
 
     // also updates
     public function saveNotes(SaveNotesRequest $request, Application $application)
     {
-        if (! is_null($application)) {
+        if (!is_null($application))
+        {
             $application->load('appointment');
 
             $application->appointment->meetingNotes = $request->noteText;
             $application->appointment->save();
 
             $request->session()->flash('success', 'Meeting notes have been saved.');
-        } else {
+        }
+        else
+        {
             $request->session()->flash('error', 'There\'s no appointment to save notes to!');
         }
 
         return redirect()->back();
     }
+
 }

app/Http/Controllers/Auth/ConfirmPasswordController.php

@@ -1,27 +1,9 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\ConfirmsPasswords;
 
 class ConfirmPasswordController extends Controller

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;

app/Http/Controllers/Auth/LoginController.php

@@ -1,28 +1,10 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
 use App\User;
+use App\Http\Controllers\Controller;
+use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 
@@ -66,15 +48,22 @@ class LoginController extends Controller
     {
         $user = User::where('email', $request->email)->first();
 
-        if ($user) {
+        if ($user)
+        {
             $isBanned = $user->isBanned();
-            if ($isBanned) {
+            if ($isBanned)
+            {
                 return false;
-            } else {
+            }
+            else
+            {
                 return $this->originalAttemptLogin($request);
             }
         }
 
         return $this->originalAttemptLogin($request);
+
     }
+
+
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -1,32 +1,15 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
 use App\Profile;
+use App\Providers\RouteServiceProvider;
 use App\User;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
+use function GuzzleHttp\Psr7\str;
 
 class RegisterController extends Controller
 {
@@ -64,8 +47,10 @@ class RegisterController extends Controller
     {
         $users = User::where('originalIP', \request()->ip())->get();
 
-        foreach ($users as $user) {
+        foreach($users as $user)
-            if ($user && $user->isBanned()) {
+        {
+            if ($user && $user->isBanned())
+            {
                 abort(403, 'You do not have permission to access this page.');
             }
         }
@@ -87,7 +72,7 @@ class RegisterController extends Controller
             'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
             'password' => ['required', 'string', 'min:10', 'confirmed', 'regex:/^.*(?=.{3,})(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[\d\x])(?=.*[!$#%]).*$/'],
         ], [
-            'uuid.required' => 'Please enter a valid (and Premium) Minecraft username! We do not support cracked users.',
+            'uuid.required' => 'Please enter a valid (and Premium) Minecraft username! We do not support cracked users.'
         ]);
     }
 
@@ -99,19 +84,19 @@ class RegisterController extends Controller
      */
     protected function create(array $data)
     {
+
         $user = User::create([
             'uuid' => $data['uuid'],
             'name' => $data['name'],
             'email' => $data['email'],
             'password' => Hash::make($data['password']),
-            'originalIP' => request()->ip(),
+            'originalIP' => request()->ip()
         ]);
 
         // It's not the registration controller's concern to create a profile for the user,
         // so this code has been moved to it's respective observer, following the separation of concerns pattern.
 
         $user->assignRole('user');
-
         return $user;
     }
 }

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -1,27 +1,9 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 
 class ResetPasswordController extends Controller

app/Http/Controllers/Auth/TwofaController.php

@@ -1,26 +1,8 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers\Auth;
 
+use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Traits\AuthenticatesTwoFactor;
 
@@ -28,5 +10,7 @@ class TwofaController extends Controller
 {
   use AuthenticatesTwoFactor;
 
+
   protected $redirectTo = '/dashboard';
+
 }

app/Http/Controllers/Auth/VerificationController.php

@@ -1,27 +1,9 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\VerifiesEmails;
 
 class VerificationController extends Controller

app/Http/Controllers/BanController.php

@@ -1,48 +1,35 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers;
 
-use App\Ban;
-use App\Events\UserBannedEvent;
-use App\Http\Requests\BanUserRequest;
-use App\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use App\Ban;
+use App\User;
+use App\Events\UserBannedEvent;
+use App\Http\Requests\BanUserRequest;
 
 class BanController extends Controller
 {
+
     public function insert(BanUserRequest $request, User $user)
     {
+
         $this->authorize('create', [Ban::class, $user]);
 
-        if (is_null($user->bans)) {
+        if (is_null($user->bans))
+        {
+
             $reason = $request->reason;
             $duration = strtolower($request->durationOperator);
             $durationOperand = $request->durationOperand;
 
             $expiryDate = now();
 
-            if (! empty($duration)) {
+            if (!empty($duration))
-                switch ($duration) {
+            {
+                switch($duration)
+                {
                     case 'days':
                         $expiryDate->addDays($durationOperand);
                         break;
@@ -59,7 +46,9 @@ class BanController extends Controller
                         $expiryDate->addYears($durationOperand);
                         break;
                 }
-            } else {
+            }
+            else
+            {
                 // Essentially permanent
                 $expiryDate->addYears(5);
             }
@@ -68,27 +57,35 @@ class BanController extends Controller
                 'userID' => $user->id,
                 'reason' => $reason,
                 'bannedUntil' => $expiryDate->format('Y-m-d H:i:s'),
-                'userAgent' => 'Unknown',
+                'userAgent' => "Unknown",
-                'authorUserID' => Auth::user()->id,
+                'authorUserID' => Auth::user()->id
             ]);
 
             event(new UserBannedEvent($user, $ban));
-            $request->session()->flash('success', 'User banned successfully! Ban ID:  #'.$ban->id);
+            $request->session()->flash('success', 'User banned successfully! Ban ID:  #' . $ban->id);
-        } else {
+
+        }
+        else
+        {
             $request->session()->flash('error', 'User already banned!');
         }
 
         return redirect()->back();
     }
 
+
     public function delete(Request $request, User $user)
     {
+
         $this->authorize('delete', $user->bans);
 
-        if (! is_null($user->bans)) {
+        if (!is_null($user->bans))
+        {
             $user->bans->delete();
             $request->session()->flash('success', 'User unbanned successfully!');
-        } else {
+        }
+        else
+        {
             $request->session()->flash('error', 'This user isn\'t banned!');
         }
 

app/Http/Controllers/CommentController.php

@@ -1,34 +1,19 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers;
 
-use App\Application;
-use App\Comment;
-use App\Http\Requests\NewCommentRequest;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use App\Http\Requests\NewCommentRequest;
+
+use App\Comment;
+use App\Application;
+use App\Notifications\NewComment;
+use App\User;
 
 class CommentController extends Controller
 {
+
     public function index()
     {
         //
@@ -41,16 +26,21 @@ class CommentController extends Controller
         $comment = Comment::create([
             'authorID' => Auth::user()->id,
             'applicationID' => $application->id,
-            'text' => $request->comment,
+            'text' => $request->comment
         ]);
 
-        if ($comment) {
+        if ($comment)
+        {
+
             $request->session()->flash('success', 'Comment posted! (:');
-        } else {
+        }
+        else
+        {
             $request->session()->flash('error', 'Something went wrong while posting your comment!');
         }
 
         return redirect()->back();
+
     }
 
     public function delete(Request $request, Comment $comment)
@@ -61,5 +51,7 @@ class CommentController extends Controller
         $request->session()->flash('success', 'Comment deleted!');
 
         return redirect()->back();
+
     }
+
 }

app/Http/Controllers/ContactController.php

@@ -1,40 +1,26 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers;
 
-use App\Notifications\NewContact;
-use App\User;
 use Illuminate\Http\Request;
+use GuzzleHttp;
+use App\Notifications\NewContact;
 use Illuminate\Support\Facades\Http;
 
+use App\User;
+
 class ContactController extends Controller
 {
+
     protected $users;
 
+
     public function __construct(User $users)
     {
         $this->users = $users;
     }
 
+
     public function create(Request $request)
     {
         $name = $request->name;
@@ -48,29 +34,32 @@ class ContactController extends Controller
         $verifyrequest = Http::asForm()->post(config('recaptcha.verify.apiurl'), [
             'secret' => config('recaptcha.keys.secret'),
             'response' => $challenge,
-            'remoteip' => $request->ip(),
+            'remoteip' => $request->ip()
         ]);
 
+
         $response = json_decode($verifyrequest->getBody(), true);
 
-        if (! $response['success']) {
+        if (!$response['success'])
+        {
             $request->session()->flash('error', 'Beep beep boop... Robot? Submission failed.');
-
             return redirect()->back();
         }
 
-        foreach (User::all() as $user) {
+
-            if ($user->hasRole('admin')) {
+        foreach(User::all() as $user)
+        {
+          if ($user->hasRole('admin'))
+          {
             $user->notify(new NewContact(collect([
               'message' => $msg,
               'ip' => $request->ip(),
-                    'email' => $email,
+              'email' => $email
             ])));
           }
         }
 
         $request->session()->flash('success', 'Message sent successfully! We usually respond within 48 hours.');
-
         return redirect()->back();
     }
 }

app/Http/Controllers/Controller.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;

app/Http/Controllers/DashboardController.php

@@ -1,32 +1,16 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers;
 
-use App\Application;
+use Illuminate\Http\Request;
-use App\User;
 use App\Vacancy;
+use App\User;
+use App\Ban;
+use App\Application;
 
 class DashboardController extends Controller
 {
+
     public function index()
     {
         $totalPeerReview = Application::where('applicationStatus', 'STAGE_PEERAPPROVAL')->get()->count();
@@ -39,7 +23,9 @@ class DashboardController extends Controller
               'totalUserCount' => User::all()->count(),
               'totalDenied' => $totalDenied,
               'totalPeerReview' => $totalPeerReview,
-                'totalNewApplications' => $totalNewApplications,
+              'totalNewApplications' => $totalNewApplications
             ]);
+
     }
+
 }

app/Http/Controllers/DevToolsController.php

@@ -1,37 +1,21 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers;
 
 use App\Application;
 use App\Events\ApplicationApprovedEvent;
 use Illuminate\Http\Request;
+
 use Illuminate\Support\Facades\Auth;
 
 class DevToolsController extends Controller
 {
+
     // The use case for Laravel's gate and/or validation Requests is so tiny here that a full-blown policy would be overkill.
     protected function isolatedAuthorise()
     {
-        if (! Auth::user()->can('admin.developertools.use')) {
+      if (!Auth::user()->can('admin.developertools.use'))
+      {
         abort(403, 'You\'re not authorized to access this page.');
       }
     }
@@ -39,7 +23,6 @@ class DevToolsController extends Controller
     public function index()
     {
         $this->isolatedAuthorise();
-
         return view('dashboard.administration.devtools')
             ->with('applications', Application::where('applicationStatus', 'STAGE_PEERAPPROVAL')->get());
     }
@@ -49,11 +32,14 @@ class DevToolsController extends Controller
         $this->isolatedAuthorise();
         $application = Application::find($request->application);
 
-        if (! is_null($application)) {
+        if (!is_null($application))
+        {
             event(new ApplicationApprovedEvent($application));
 
             $request->session()->flash('success', 'Event dispatched! Please check the debug logs for more info');
-        } else {
+        }
+        else
+        {
             $request->session()->flash('error', 'Application doesn\'t exist!');
         }
 

app/Http/Controllers/FormController.php

@@ -1,32 +1,17 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers;
 
 use App\Form;
-use ContextAwareValidator;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Facades\Auth;
+
+use ContextAwareValidator;
 
 class FormController extends Controller
 {
+
     public function index()
     {
         $forms = Form::all();
@@ -39,43 +24,34 @@ class FormController extends Controller
     public function showFormBuilder()
     {
         $this->authorize('viewFormbuilder', Form::class);
-
         return view('dashboard.administration.formbuilder');
     }
 
     public function saveForm(Request $request)
     {
+
         $this->authorize('create', Form::class);
         $fields = $request->all();
 
-        if (count($fields) == 2) {
-            // form is probably empty, since forms with fields will alawys have more than 2 items
-
-            $request->session()->flash('error', 'Sorry, but you may not create empty forms.');
-
-            return redirect()->to(route('showForms'));
-        }
-
         $contextValidation = ContextAwareValidator::getValidator($fields, true, true);
 
-        if (! $contextValidation->get('validator')->fails()) {
+        if (!$contextValidation->get('validator')->fails())
+        {
             $storableFormStructure = $contextValidation->get('structure');
 
             Form::create(
                 [
                     'formName' => $fields['formName'],
                     'formStructure' => $storableFormStructure,
-                    'formStatus' => 'ACTIVE',
+                    'formStatus' => 'ACTIVE'
                 ]
             );
 
             $request->session()->flash('success', 'Form created! You can now link this form to a vacancy.');
-
             return redirect()->to(route('showForms'));
         }
 
         $request->session()->flash('errors', $contextValidation->get('validator')->errors()->getMessages());
-
         return redirect()->back();
     }
 
@@ -84,19 +60,25 @@ class FormController extends Controller
         $this->authorize('delete', $form);
         $deletable = true;
 
-        if (! is_null($form) && ! is_null($form->vacancies) && $form->vacancies->count() !== 0 || ! is_null($form->responses)) {
+
+        if (!is_null($form) && !is_null($form->vacancies) && $form->vacancies->count() !== 0 || !is_null($form->responses))
+        {
            $deletable = false;
         }
 
-        if ($deletable) {
+        if ($deletable)
+        {
           $form->delete();
 
           $request->session()->flash('success', 'Form deleted successfully.');
-        } else {
+        }
+        else
+        {
           $request->session()->flash('error', 'You cannot delete this form because it\'s tied to one or more applications and ranks, or because it doesn\'t exist.');
         }
 
         return redirect()->back();
+
     }
 
     public function preview(Request $request, Form $form)
@@ -126,7 +108,9 @@ class FormController extends Controller
       $contextValidation = ContextAwareValidator::getValidator($request->all(), true);
       $this->authorize('update', $form);
 
-        if (! $contextValidation->get('validator')->fails()) {
+
+      if (!$contextValidation->get('validator')->fails())
+      {
           // Add the new structure into the form. New, subsquent fields will be identified by the "new" prefix
           // This prefix doesn't actually change the app's behavior when it receives applications.
           // Additionally, old applications won't of course display new and updated fields, because we can't travel into the past and get data for them
@@ -134,10 +118,14 @@ class FormController extends Controller
           $form->save();
 
           $request->session()->flash('success', 'Hooray! Your form was updated. New applications for it\'s vacancy will use it.');
-        } else {
+      }
+      else
+      {
         $request->session()->flash('errors', $contextValidation->get('validator')->errors()->getMessages());
       }
 
       return redirect()->to(route('previewForm', ['form' => $form->id]));
+
     }
+
 }

app/Http/Controllers/HomeController.php

@@ -1,27 +1,10 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers;
 
 use App\Vacancy;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 
 class HomeController extends Controller
 {
@@ -32,10 +15,12 @@ class HomeController extends Controller
      */
     public function index()
     {
+
         $positions = Vacancy::where('vacancyStatus', 'OPEN')
                             ->where('vacancyCount', '<>', 0)
                             ->get();
 
+      
         return view('home')
             ->with('positions', $positions);
     }

app/Http/Controllers/OptionsController.php

@@ -1,28 +1,10 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers;
 
 use App\Facades\Options;
 use App\Options as Option;
+
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
@@ -39,44 +21,54 @@ class OptionsController extends Controller
         // TODO: Obtain this from the facade
         $options = Option::all();
 
+
         return view('dashboard.administration.settings')
             ->with('options', $options);
     }
 
    public function saveSettings(Request $request)
    {
-        if (Auth::user()->can('admin.settings.edit')) {
+       if (Auth::user()->can('admin.settings.edit'))
+       {
            Log::debug('Updating application options', [
                'ip' => $request->ip(),
                'ua' => $request->userAgent(),
-                'username' => Auth::user()->username,
+               'username' => Auth::user()->username
            ]);
-            foreach ($request->all() as $optionName => $option) {
+           foreach($request->all() as $optionName => $option)
-                try {
+           {
-                    Log::debug('Going through option '.$optionName);
+               try
-                    if (Options::optionExists($optionName)) {
+               {
+                   Log::debug('Going through option ' . $optionName);
+                   if (Options::optionExists($optionName))
+                   {
                        Log::debug('Option exists, updating to new values', [
                            'opt' => $optionName,
-                            'new_value' => $option,
+                           'new_value' => $option
                        ]);
                        Options::changeOption($optionName, $option);
                    }
-                } catch (\Exception $ex) {
+               }
+               catch(\Exception $ex)
+               {
                    Log::error('Unable to update options!', [
                        'msg' => $ex->getMessage(),
-                        'trace' => $ex->getTraceAsString(),
+                       'trace' => $ex->getTraceAsString()
                    ]);
                    report($ex);
 
                    $errorCond = true;
-                    $request->session()->flash('error', 'An error occurred while trying to save settings: '.$ex->getMessage());
+                   $request->session()->flash('error', 'An error occurred while trying to save settings: ' . $ex->getMessage());
                }
            }
 
-            if (! isset($errorCond)) {
+           if (!isset($errorCond))
+           {
                $request->session()->flash('success', 'Settings saved successfully!');
            }
-        } else {
+       }
+       else
+       {
            $request->session()->flash('error', 'You do not have permission to update this resource.');
        }
 

app/Http/Controllers/ProfileController.php

@@ -1,29 +1,12 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers;
 
-use App\Facades\IP;
 use App\Http\Requests\ProfileSave;
+use Illuminate\Support\Facades\Log;
+use App\Profile;
 use App\User;
+use App\Facades\IP;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -31,15 +14,18 @@ use Spatie\Permission\Models\Role;
 
 class ProfileController extends Controller
 {
+
   public function index()
   {
+
     return view('dashboard.user.directory')
           ->with('users', User::with('profile', 'bans')->paginate(9));
   }
 
     public function showProfile()
     {
-        $socialLinks = Auth::user()->profile->socialLinks ?? '[]';
+
+        $socialLinks = Auth::user()->profile->socialLinks ?? "[]";
         $socialMediaProfiles = json_decode($socialLinks, true);
 
         return view('dashboard.user.profile.userprofile')
@@ -50,11 +36,13 @@ class ProfileController extends Controller
                 'insta' => $socialMediaProfiles['links']['insta'] ?? 'UpdateMe',
                 'discord' => $socialMediaProfiles['links']['discord'] ?? 'UpdateMe#12345',
             ]);
+
     }
 
     // Route model binding
     public function showSingleProfile(Request $request, User $user)
     {
+
         $socialMediaProfiles = json_decode($user->profile->socialLinks, true);
         $createdDate = Carbon::parse($user->created_at);
 
@@ -63,15 +51,21 @@ class ProfileController extends Controller
 
         $roleList = [];
 
-        foreach ($systemRoles as $role) {
+
-            if (in_array($role, $userRoles)) {
+        foreach($systemRoles as $role)
+        {
+          if (in_array($role, $userRoles))
+          {
             $roleList[$role] = true;
-            } else {
+          }
+          else
+          {
             $roleList[$role] = false;
           }
         }
 
-        if (Auth::user()->is($user) || Auth::user()->can('profiles.view.others')) {
+        if (Auth::user()->is($user) || Auth::user()->can('profiles.view.others'))
+        {
             return view('dashboard.user.profile.displayprofile')
                 ->with([
                     'profile' => $user->profile,
@@ -79,13 +73,16 @@ class ProfileController extends Controller
                     'twitter' => $socialMediaProfiles['links']['twitter'] ?? 'UpdateMe',
                     'insta' => $socialMediaProfiles['links']['insta'] ?? 'UpdateMe',
                     'discord' => $socialMediaProfiles['links']['discord'] ?? 'UpdateMe#12345',
-                    'since' => $createdDate->englishMonth.' '.$createdDate->year,
+                    'since' => $createdDate->englishMonth . " " . $createdDate->year,
                     'ipInfo' => IP::lookup($user->originalIP),
-                    'roles' => $roleList,
+                    'roles' => $roleList
                 ]);
-        } else {
+        }
+        else
+        {
             abort(403, 'You cannot view someone else\'s profile.');
         }
+
     }
 
     public function saveProfile(ProfileSave $request)
@@ -93,8 +90,10 @@ class ProfileController extends Controller
         $profile = User::find(Auth::user()->id)->profile;
         $social = [];
 
-        if (! is_null($profile)) {
+        if (!is_null($profile))
-            switch ($request->avatarPref) {
+        {
+            switch ($request->avatarPref)
+            {
                 case 'MOJANG':
                     $avatarPref = 'crafatar';
 
@@ -118,8 +117,11 @@ class ProfileController extends Controller
             $newProfile = $profile->save();
 
             $request->session()->flash('success', 'Profile settings saved successfully.');
+
         }
 
         return redirect()->back();
+
     }
+
 }

app/Http/Controllers/ResponseController.php

@@ -1,26 +1,9 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers;
 
+use Illuminate\Http\Request;
+
 class ResponseController extends Controller
 {
     //

app/Http/Controllers/StaffProfileController.php

@@ -1,26 +1,9 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers;
 
+use Illuminate\Http\Request;
+
 class StaffProfileController extends Controller
 {
     //

app/Http/Controllers/TeamController.php

@@ -1,249 +0,0 @@
-<?php
-
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-namespace App\Http\Controllers;
-
-use App\Http\Requests\EditTeamRequest;
-use App\Http\Requests\NewTeamRequest;
-use App\Http\Requests\SendInviteRequest;
-use App\Mail\InviteToTeam;
-use App\Team;
-use App\User;
-use App\Vacancy;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Mail;
-use Mpociot\Teamwork\Exceptions\UserNotInTeamException;
-use Mpociot\Teamwork\Facades\Teamwork;
-use Mpociot\Teamwork\TeamInvite;
-
-class TeamController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        $teams = Team::with('users.roles')->get();
-
-        return view('dashboard.teams.teams')
-            ->with('teams', $teams);
-    }
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(NewTeamRequest $request)
-    {
-        $team = Team::create([
-            'name' => $request->teamName,
-            'owner_id' => Auth::user()->id,
-        ]);
-
-        Auth::user()->teams()->attach($team->id);
-
-        $request->session()->flash('success', 'Team successfully created.');
-
-        return redirect()->back();
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function show($id)
-    {
-        //
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function edit(Team $team)
-    {
-        return view('dashboard.teams.edit-team')
-              ->with('team', $team)
-              ->with('users', User::all())
-              ->with('vacancies', Vacancy::with('teams')->get()->all());
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(EditTeamRequest $request, Team $team)
-    {
-        $team->description = $request->teamDescription;
-        $team->openJoin = $request->joinType;
-
-        $team->save();
-
-        $request->session()->flash('success', 'Team edited successfully.');
-
-        return redirect()->to(route('teams.index'));
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy($id)
-    {
-        //
-    }
-
-    public function invite(SendInviteRequest $request, Team $team)
-    {
-        $user = User::findOrFail($request->user);
-
-        if (! $team->openJoin) {
-            if (! Teamwork::hasPendingInvite($user->email, $team)) {
-                Teamwork::inviteToTeam($user, $team, function (TeamInvite $invite) use ($user) {
-                    Mail::to($user)->send(new InviteToTeam($invite));
-                });
-
-                $request->session()->flash('success', 'Invite sent! They can now accept or deny it.');
-            } else {
-                $request->session()->flash('error', 'This user has already been invited.');
-            }
-        } else {
-            $request->session()->flash('error', 'You can\'t invite users to public teams.');
-        }
-
-        return redirect()->back();
-    }
-
-    public function processInviteAction(Request $request, $action, $token)
-    {
-        switch ($action) {
-            case 'accept':
-
-                $invite = Teamwork::getInviteFromAcceptToken($token);
-
-                if ($invite && $invite->user->is(Auth::user())) {
-                    Teamwork::acceptInvite($invite);
-                    $request->session()->flash('success', 'Invite accepted! You have now joined '.$invite->team->name.'.');
-                } else {
-                    $request->session()->flash('error', 'Invalid or expired invite URL.');
-                }
-
-               break;
-
-            case 'deny':
-
-                $invite = Teamwork::getInviteFromDenyToken($token);
-
-                if ($invite && $invite->user->is(Auth::user())) {
-                    Teamwork::denyInvite($invite);
-                    $request->session()->flash('success', 'Invite denied! Ask for another invite if this isn\'t what you meant.');
-                } else {
-                    $request->session()->flash('error', 'Invalid or expired invite URL.');
-                }
-
-                break;
-
-            default:
-                $request->session()->flash('error', 'Sorry, but the invite URL you followed was malformed. Try asking for another invite, or submit a bug report.');
-
-        }
-
-        // This page will show the user's current teams
-        return redirect()->to(route('teams.index'));
-    }
-
-    public function switchTeam(Request $request, Team $team)
-    {
-        try {
-            Auth::user()->switchTeam($team);
-
-            $request->session()->flash('success', 'Switched teams! Your team dashboard will now use this context.');
-        } catch (UserNotInTeamException $ex) {
-            $request->session()->flash('error', 'You can\'t switch to a team you don\'t belong to.');
-        }
-
-        return redirect()->back();
-    }
-
-    // Since it's a separate form, we shouldn't use the same update method
-    public function assignVacancies(Request $request, Team $team)
-    {
-        // P.S. To future developers
-        // This method gave me a lot of trouble lol. It's hard to write code when you're half asleep.
-        // There may be an n+1 query in the view and I don't think there's a way to avoid that without writing a lot of extra code.
-
-        $requestVacancies = $request->assocVacancies;
-        $currentVacancies = $team->vacancies->pluck('id')->all();
-
-        if (is_null($requestVacancies)) {
-            foreach ($team->vacancies as $vacancy) {
-                $team->vacancies()->detach($vacancy->id);
-            }
-
-            $request->session()->flash('success', 'Removed all vacancy associations.');
-
-            return redirect()->back();
-        }
-
-        $vacancyDiff = array_diff($requestVacancies, $currentVacancies);
-        $deselectedDiff = array_diff($currentVacancies, $requestVacancies);
-
-        if (! empty($vacancyDiff) || ! empty($deselectedDiff)) {
-            foreach ($vacancyDiff as $selectedVacancy) {
-                $team->vacancies()->attach($selectedVacancy);
-            }
-
-            foreach ($deselectedDiff as $deselectedVacancy) {
-                $team->vacancies()->detach($deselectedVacancy);
-            }
-        } else {
-            $team->vacancies()->attach($requestVacancies);
-        }
-
-        $request->session()->flash('success', 'Assignments changed successfully.');
-
-        return redirect()->back();
-    }
-}

app/Http/Controllers/TeamFileController.php

@@ -1,126 +0,0 @@
-<?php
-
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-namespace App\Http\Controllers;
-
-use App\TeamFile;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Storage;
-use League\Flysystem\FileNotFoundException;
-
-class TeamFileController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @param Request $request
-     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|\Illuminate\Http\Response
-     */
-    public function index(Request $request)
-    {
-        if (is_null(Auth::user()->currentTeam)) {
-            $request->session()->flash('error', 'Please choose a team before viewing it\'s files.');
-
-            return redirect()->to(route('teams.index'));
-        }
-
-        return view('dashboard.teams.team-files')
-            ->with('files', TeamFile::with('team', 'uploader')->paginate(20));
-    }
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        //
-    }
-
-    public function download(Request $request, TeamFile $teamFile)
-    {
-        try {
-            return Storage::download('uploads/'.$teamFile->name);
-        } catch (FileNotFoundException $ex) {
-            $request->session()->flash('error', 'Sorry, but the requested file could not be found in storage. Sometimes, files may be physically deleted by admins, but not from the app\'s database.');
-
-            return redirect()->back();
-        }
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  \App\TeamFile  $teamFile
-     * @return \Illuminate\Http\Response
-     */
-    public function show(TeamFile $teamFile)
-    {
-        //
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  \App\TeamFile  $teamFile
-     * @return \Illuminate\Http\Response
-     */
-    public function edit(TeamFile $teamFile)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \App\TeamFile  $teamFile
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, TeamFile $teamFile)
-    {
-        //
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  \App\TeamFile  $teamFile
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy(TeamFile $teamFile)
-    {
-        //
-    }
-}

app/Http/Controllers/UserController.php

@@ -1,49 +1,33 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers;
 
-use App\Ban;
-use App\Http\Requests\Add2FASecretRequest;
 use App\Http\Requests\ChangeEmailRequest;
 use App\Http\Requests\ChangePasswordRequest;
-use App\Http\Requests\DeleteUserRequest;
 use App\Http\Requests\FlushSessionsRequest;
-use App\Http\Requests\Remove2FASecretRequest;
+use App\Http\Requests\DeleteUserRequest;
 use App\Http\Requests\SearchPlayerRequest;
 use App\Http\Requests\UpdateUserRequest;
-use App\Notifications\ChangedPassword;
+use App\Http\Requests\Add2FASecretRequest;
-use App\Notifications\EmailChanged;
+use App\Http\Requests\Remove2FASecretRequest;
-use App\Traits\ReceivesAccountTokens;
+
 use App\User;
-use Google2FA;
+use App\Ban;
+
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
+use App\Facades\UUID;
+use App\Notifications\EmailChanged;
+use App\Notifications\ChangedPassword;
 use Spatie\Permission\Models\Role;
 
+use Google2FA;
+
 class UserController extends Controller
 {
-    use ReceivesAccountTokens;
+
 
     public function showStaffMembers()
     {
@@ -52,20 +36,24 @@ class UserController extends Controller
         $staffRoles = [
             'reviewer',
             'hiringManager',
-            'admin',
+            'admin'
         ]; // TODO: Un-hardcode this, move to config/roles.php
         $users = User::with('roles')->get();
         $staffMembers = collect([]);
 
-        foreach ($users as $user) {
+        foreach($users as $user)
-            if (empty($user->roles)) {
+        {
+            if (empty($user->roles))
+            {
                 Log::debug($user->role->name);
                 Log::debug('Staff list: User without role detected; Ignoring');
                 continue;
             }
 
-            foreach ($user->roles as $role) {
+            foreach($user->roles as $role)
-                if (in_array($role->name, $staffRoles)) {
+            {
+                if (in_array($role->name, $staffRoles))
+                {
                     $staffMembers->push($user);
                     continue 2; // Skip directly to the next user instead of comparing more roles for the current user
                 }
@@ -74,7 +62,7 @@ class UserController extends Controller
 
         return view('dashboard.administration.staff-members')
             ->with([
-                'users' => $staffMembers,
+                'users' => $staffMembers
             ]);
     }
 
@@ -85,9 +73,11 @@ class UserController extends Controller
         $users = User::with('roles')->get();
         $players = collect([]);
 
-        foreach ($users as $user) {
+        foreach($users as $user)
+        {
             // TODO: Might be problematic if we don't check if the role is user
-            if (count($user->roles) == 1) {
+            if (count($user->roles) == 1)
+            {
                 $players->push($user);
             }
         }
@@ -95,10 +85,11 @@ class UserController extends Controller
         return view('dashboard.administration.players')
             ->with([
                 'users' => $players,
-                'bannedUserCount' => Ban::all()->count(),
+                'bannedUserCount' => Ban::all()->count()
             ]);
     }
 
+
     public function showPlayersLike(SearchPlayerRequest $request)
     {
         $this->authorize('viewPlayers', User::class);
@@ -109,17 +100,18 @@ class UserController extends Controller
             ->orWhere('email', 'LIKE', "%{$searchTerm}%")
             ->get();
 
-        if (! $matchingUsers->isEmpty()) {
+        if (!$matchingUsers->isEmpty())
-            $request->session()->flash('success', 'There were '.$matchingUsers->count().' user(s) matching your search.');
+        {   $request->session()->flash('success', 'There were ' . $matchingUsers->count() . ' user(s) matching your search.');
 
             return view('dashboard.administration.players')
             ->with([
                 'users' => $matchingUsers,
-                'bannedUserCount' => Ban::all()->count(),
+                'bannedUserCount' => Ban::all()->count()
             ]);
-        } else {
+        }
+        else
+        {
             $request->session()->flash('error', 'Your search term did not return any results.');
-
             return redirect(route('registeredPlayerList'));
         }
     }
@@ -128,10 +120,14 @@ class UserController extends Controller
     {
         $QRCode = null;
 
-        if (! $request->user()->has2FA()) {
+        if (!$request->user()->has2FA())
-            if ($request->session()->has('twofaAttemptFailed')) {
+        {
+            if ($request->session()->has('twofaAttemptFailed'))
+            {
                 $twoFactorSecret = $request->session()->get('current2FA');
-            } else {
+            }
+            else
+            {
                 $twoFactorSecret = Google2FA::generateSecretKey(32, '');
                 $request->session()->put('current2FA', $twoFactorSecret);
             }
@@ -148,21 +144,21 @@ class UserController extends Controller
             ->with('twofaQRCode', $QRCode);
     }
 
+
     public function flushSessions(FlushSessionsRequest $request)
     {
         // TODO: Move all log calls to a listener, which binds to an event fired by each significant event, such as this one
         // This will allow for other actions to be performed on certain events (like login failed event)
 
         Auth::logoutOtherDevices($request->currentPasswordFlush);
-        Log::notice('User '.Auth::user()->name.' has logged out other devices in their account',
+        Log::notice('User ' . Auth::user()->name . ' has logged out other devices in their account',
         [
             'originIPAddress' => $request->ip(),
             'userID' => Auth::user()->id,
-            'timestamp' => now(),
+            'timestamp' => now()
         ]);
 
         $request->session()->flash('success', 'Successfully logged out other devices. Remember to change your password if you think you\'ve been compromised.');
-
         return redirect()->back();
     }
 
@@ -170,62 +166,75 @@ class UserController extends Controller
     {
         $user = User::find(Auth::user()->id);
 
-        if (! is_null($user)) {
+        if (!is_null($user))
+        {
             $user->password = Hash::make($request->newPassword);
             $user->save();
 
-            Log::info('User '.$user->name.' has changed their password', [
+            Log::info('User ' . $user->name . ' has changed their password', [
                 'originIPAddress' => $request->ip(),
                 'userID' => $user->id,
-                'timestamp' => now(),
+                'timestamp' => now()
             ]);
             $user->notify(new ChangedPassword());
 
             Auth::logout();
-
             return redirect()->back();
         }
+
     }
 
     public function changeEmail(ChangeEmailRequest $request)
     {
         $user = User::find(Auth::user()->id);
 
-        if (! is_null($user)) {
+        if (!is_null($user))
+        {
             $user->email = $request->newEmail;
             $user->save();
 
-            Log::notice('User '.$user->name.' has just changed their contact email address', [
+            Log::notice('User ' . $user->name . ' has just changed their contact email address', [
                 'originIPAddress' => $request->ip(),
                 'userID' => $user->id,
-                'timestamp' => now(),
+                'timestamp' => now()
             ]);
             $user->notify(new EmailChanged());
 
             $request->session()->flash('success', 'Your email address has been changed!');
-        } else {
+        }
+        else
+        {
             $request->session()->flash('error', 'There has been an error whilst trying to update your account. Please contact administrators.');
         }
 
         return redirect()->back();
+
     }
 
+
+
     public function delete(DeleteUserRequest $request, User $user)
     {
+
         $this->authorize('delete', $user);
 
-        if ($request->confirmPrompt == 'DELETE ACCOUNT') {
+        if ($request->confirmPrompt == 'DELETE ACCOUNT')
-            $user->forceDelete();
+        {
-            $request->session()->flash('success', 'User deleted successfully. PII has been erased.');
+            $user->delete();
-        } else {
+            $request->session()->flash('success','User deleted successfully. PII has been erased.');
+        }
+        else
+        {
             $request->session()->flash('error', 'Wrong confirmation text! Try again.');
         }
 
+
         return redirect()->route('registeredPlayerList');
     }
 
     public function update(UpdateUserRequest $request, User $user)
     {
+
       $this->authorize('adminEdit', $user);
 
       // Mass update would not be possible here without extra code, making route model binding useless
@@ -240,22 +249,28 @@ class UserController extends Controller
       $roleDiff = array_diff($existingRoles, $request->roles);
 
       // Adds roles that were selected. Removes roles that aren't selected if the user has them.
-        foreach ($roleDiff as $deselectedRole) {
+      foreach($roleDiff as $deselectedRole)
-            if ($user->hasRole($deselectedRole) && $deselectedRole !== 'user') {
+      {
+        if ($user->hasRole($deselectedRole) && $deselectedRole !== 'user')
+        {
           $user->removeRole($deselectedRole);
         }
       }
 
-        foreach ($request->roles as $role) {
+      foreach($request->roles as $role)
-            if (! $user->hasRole($role)) {
+      {
+        if (!$user->hasRole($role))
+        {
           $user->assignRole($role);
         }
+
       }
 
       $user->save();
       $request->session()->flash('success', 'User updated successfully!');
 
       return redirect()->back();
+
     }
 
     public function add2FASecret(Add2FASecretRequest $request)
@@ -263,30 +278,33 @@ class UserController extends Controller
         $currentSecret = $request->session()->get('current2FA');
         $isValid = Google2FA::verifyKey($currentSecret, $request->otp);
 
-        if ($isValid) {
+        if ($isValid)
+        {
            $request->user()->twofa_secret = $currentSecret;
            $request->user()->save();
 
            Log::warning('SECURITY: User activated two-factor authentication', [
              'initiator' => $request->user()->email,
-                'ip' => $request->ip(),
+             'ip' => $request->ip()
            ]);
 
            Google2FA::login();
 
            Log::warning('SECURITY: Started two factor session automatically', [
              'initiator' => $request->user()->email,
-                'ip' => $request->ip(),
+             'ip' => $request->ip()
            ]);
 
            $request->session()->forget('current2FA');
 
-            if ($request->session()->has('twofaAttemptFailed')) {
+           if ($request->session()->has('twofaAttemptFailed'))
               $request->session()->forget('twofaAttemptFailed');
-            }
+
 
            $request->session()->flash('success', '2FA succesfully enabled! You\'ll now be prompted for an OTP each time you log in.');
-        } else {
+        }
+        else
+        {
           $request->session()->flash('error', 'Incorrect code. Please reopen the 2FA settings panel and try again.');
           $request->session()->put('twofaAttemptFailed', true);
         }
@@ -298,37 +316,41 @@ class UserController extends Controller
     {
         Log::warning('SECURITY: Disabling two factor authentication (user initiated)', [
           'initiator' => $request->user()->email,
-            'ip' => $request->ip(),
+          'ip' => $request->ip()
         ]);
 
         $request->user()->twofa_secret = null;
         $request->user()->save();
 
         $request->session()->flash('success', 'Two-factor authentication disabled.');
-
         return redirect()->back();
     }
 
+
+
+
     public function terminate(Request $request, User $user)
     {
         $this->authorize('terminate', User::class);
 
         // TODO: move logic to policy
-        if (! $user->isStaffMember() || $user->is(Auth::user())) {
+        if (!$user->isStaffMember() || $user->is(Auth::user()))
+        {
             $request->session()->flash('error', 'You cannot terminate this user.');
-
             return redirect()->back();
         }
 
-        foreach ($user->roles as $role) {
+        foreach ($user->roles as $role)
-            if ($role->name == 'user') {
+        {
+          if ($role->name == 'user')
+          {
             continue;
           }
 
           $user->removeRole($role->name);
         }
 
-        Log::info('User '.$user->name.' has just been demoted.');
+        Log::info('User ' . $user->name . ' has just been demoted.');
         $request->session()->flash('success', 'User terminated successfully.');
 
         //TODO: Dispatch event

app/Http/Controllers/VacancyController.php

@@ -1,45 +1,30 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers;
 
-use App\Form;
-use App\Http\Requests\VacancyEditRequest;
 use App\Http\Requests\VacancyRequest;
-use App\Notifications\VacancyClosed;
+use App\Http\Requests\VacancyEditRequest;
-use App\User;
+
 use App\Vacancy;
+use App\User;
+use App\Form;
+
+use App\Notifications\VacancyClosed;
+
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Auth;
+
 
 class VacancyController extends Controller
 {
     public function index()
     {
       $this->authorize('viewAny', Vacancy::class);
-
         return view('dashboard.administration.positions')
             ->with([
                 'forms' => Form::all(),
-                'vacancies' => Vacancy::all(),
+                'vacancies' => Vacancy::all()
             ]);
     }
 
@@ -48,7 +33,8 @@ class VacancyController extends Controller
         $this->authorize('create', Vacancy::class);
         $form = Form::find($request->vacancyFormID);
 
-        if (! is_null($form)) {
+        if (!is_null($form))
+        {
           /* note: since we can't convert HTML back to Markdown, we'll have to do the converting when the user requests a page,
           * and leave the database with Markdown only so it can be used and edited everywhere.
           * for several vacancies, this would require looping through all of them and replacing MD with HTML, which is obviously not the most clean solution;
@@ -63,38 +49,46 @@ class VacancyController extends Controller
                 'permissionGroupName' => $request->permissionGroup,
                 'discordRoleID' => $request->discordRole,
                 'vacancyFormID' => $request->vacancyFormID,
-                'vacancyCount' => $request->vacancyCount,
+                'vacancyCount' => $request->vacancyCount
 
             ]);
 
             $request->session()->flash('success', 'Vacancy successfully opened. It will now show in the home page.');
-        } else {
+        }
+        else
+        {
             $request->session()->flash('error', 'You cannot create a vacancy without a valid form.');
         }
 
         return redirect()->back();
+
     }
 
     public function updatePositionAvailability(Request $request, $status, Vacancy $vacancy)
     {
+
         $this->authorize('update', $vacancy);
 
-        if (! is_null($vacancy)) {
+        if (!is_null($vacancy))
+        {
             $type = 'success';
 
-            switch ($status) {
+            switch ($status)
+            {
                 case 'open':
                     $vacancy->open();
-                    $message = 'Position successfully opened!';
+                    $message = "Position successfully opened!";
 
                     break;
 
                 case 'close':
                     $vacancy->close();
-                    $message = 'Position successfully closed!';
+                    $message = "Position successfully closed!";
 
-                    foreach (User::all() as $user) {
+                    foreach(User::all() as $user)
-                        if ($user->isStaffMember()) {
+                    {
+                      if ($user->isStaffMember())
+                      {
                         $user->notify(new VacancyClosed($vacancy));
                       }
                     }
@@ -105,24 +99,27 @@ class VacancyController extends Controller
                     $type = 'error';
 
             }
-        } else {
+        }
+        else
+        {
             $message = "The position you're trying to update doesn't exist!";
-            $type = 'error';
+            $type = "error";
         }
 
         $request->session()->flash($type, $message);
-
         return redirect()->back();
     }
 
+
     public function edit(Request $request, Vacancy $vacancy)
     {
        $this->authorize('update', $vacancy);
-
         return view('dashboard.administration.editposition')
                ->with('vacancy', $vacancy);
     }
 
+
+
     public function update(VacancyEditRequest $request, Vacancy $vacancy)
     {
       $this->authorize('update', $vacancy);
@@ -134,7 +131,8 @@ class VacancyController extends Controller
       $vacancy->save();
 
       $request->session()->flash('success', 'Vacancy successfully updated.');
-
       return redirect()->back();
+
     }
+
 }

app/Http/Controllers/VoteController.php

@@ -1,34 +1,18 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Controllers;
 
 use App\Application;
 use App\Http\Requests\VoteRequest;
+use App\Jobs\ProcessVoteList;
 use App\Vote;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 
 class VoteController extends Controller
 {
+
     public function vote(VoteRequest $voteRequest, Application $application)
     {
         $this->authorize('create', Vote::class);
@@ -39,8 +23,9 @@ class VoteController extends Controller
         ]);
         $vote->application()->attach($application->id);
 
-        Log::info('User '.Auth::user()->name.' has voted in applicant '.$application->user->name.'\'s application', [
+
-            'voteType' => $voteRequest->voteType,
+        Log::info('User ' . Auth::user()->name . ' has voted in applicant ' . $application->user->name . '\'s application', [
+            'voteType' => $voteRequest->voteType
         ]);
         $voteRequest->session()->flash('success', 'Your vote has been registered!');
 

app/Http/Kernel.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http;
 
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
@@ -89,6 +70,6 @@ class Kernel extends HttpKernel
         'localizationRedirect'    => \Mcamara\LaravelLocalization\Middleware\LaravelLocalizationRedirectFilter::class,
         'localeSessionRedirect'   => \Mcamara\LaravelLocalization\Middleware\LocaleSessionRedirect::class,
         'localeCookieRedirect'    => \Mcamara\LaravelLocalization\Middleware\LocaleCookieRedirect::class,
-        'localeViewPath'          => \Mcamara\LaravelLocalization\Middleware\LaravelLocalizationViewPath::class,
+        'localeViewPath'          => \Mcamara\LaravelLocalization\Middleware\LaravelLocalizationViewPath::class
     ];
 }

app/Http/Middleware/ApplicationEligibility.php

@@ -1,31 +1,12 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Middleware;
 
 use App\Application;
+use Illuminate\Support\Facades\Log;
 use Carbon\Carbon;
 use Closure;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\View;
 
 class ApplicationEligibility
@@ -42,29 +23,37 @@ class ApplicationEligibility
     {
         $curtime = new Carbon(now());
 
-        if (Auth::check()) {
+
+        if (Auth::check())
+        {
             $applications = Application::where('applicantUserID', Auth::user()->id)->get();
             $eligible = true;
 
             $daysRemaining = 0;
 
-            if (! $applications->isEmpty()) {
+            if (!$applications->isEmpty())
-                foreach ($applications as $application) {
+            {
+                foreach ($applications as $application)
+                {
                     $appTime = Carbon::parse($application->created_at);
-                    if ($appTime->isSameMonth($curtime)) {
+                    if ($appTime->isSameMonth($curtime))
-                        Log::warning('Notice: Application ID '.$application->id.' was found to be in the same month as today\'s time, making the user '.Auth::user()->name.' ineligible for application');
+                    {
+
+                        Log::warning('Notice: Application ID ' . $application->id . ' was found to be in the same month as today\'s time, making the user ' . Auth::user()->name . ' ineligible for application');
                         $eligible = false;
                     }
                 }
 
                 $allowedTime = Carbon::parse($applications->last()->created_at)->addMonth();
                 $daysRemaining = $allowedTime->diffInDays(now());
+
             }
 
             View::share('isEligibleForApplication', $eligible);
             View::share('eligibilityDaysRemaining', $daysRemaining);
         }
 
+
         return $next($request);
     }
 }

app/Http/Middleware/Authenticate.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Middleware;
 
 use Illuminate\Auth\Middleware\Authenticate as Middleware;

app/Http/Middleware/Bancheck.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Middleware;
 
 use Closure;
@@ -39,11 +20,17 @@ class Bancheck
         $userIP = $request->ip();
         $anonymousUser = User::where('ipAddress', $userIP)->get();
 
-        if (Auth::check() && Auth::user()->isBanned()) {
+        
+        if (Auth::check() && Auth::user()->isBanned())
+        {
             View::share('isBanned', true);
-        } elseif (! $anonymousUser->isEmpty() && User::find($anonymousUser->id)->isBanned()) {
+        }
+        elseif(!$anonymousUser->isEmpty() && User::find($anonymousUser->id)->isBanned())
+        {
             View::share('isBanned', true);
-        } else {
+        }
+        else
+        {
             View::share('isBanned', false);
         }
 

app/Http/Middleware/CheckForMaintenanceMode.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Middleware;
 
 use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as Middleware;

app/Http/Middleware/EncryptCookies.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Middleware;
 
 use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;

app/Http/Middleware/ForceLogoutMiddleware.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Middleware;
 
 use Closure;
@@ -35,11 +16,11 @@ class ForceLogoutMiddleware
      */
     public function handle($request, Closure $next)
     {
-        if (Auth::user()->isBanned()) {
+        if (Auth::user()->isBanned())
+        {
             Auth::logout();
 
             $request->session()->flash('error', 'Error: Your session has been forcefully terminated. Please try again in a few days.');
-
             return redirect('/');
         }
 

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Middleware;
 
 use App\Providers\RouteServiceProvider;

app/Http/Middleware/TrimStrings.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Middleware;
 
 use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;

app/Http/Middleware/TrustProxies.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Middleware;
 
 use Fideloper\Proxy\TrustProxies as Middleware;
@@ -31,7 +12,7 @@ class TrustProxies extends Middleware
      *
      * @var array|string
      */
-    protected $proxies = '*';
+    protected $proxies = "*";
 
     /**
      * The headers that should be used to detect proxies.

app/Http/Middleware/UsernameUUID.php

@@ -1,33 +1,15 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Middleware;
 
-use App\Facades\UUID;
 use Closure;
+use App\Facades\UUID;
+use Illuminate\Support\Facades\Http;
 
 class UsernameUUID
 {
     /**
-     * Converts a Minecraft username found in the request body to a UUID.
+     * Converts a Minecraft username found in the request body to a UUID
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Closure  $next
@@ -36,21 +18,23 @@ class UsernameUUID
     public function handle($request, Closure $next)
     {
         $input = $request->all();
-        if (isset($input['uuid'])) {
+        if (isset($input['uuid']))
-            try {
+        {
+            try
+            {
               $username = $input['uuid'];
               $input['uuid'] = UUID::toUUID($username);
-            } catch (\InvalidArgumentException $iae) {
+            }
+            catch(\InvalidArgumentException $iae)
+            {
                 report($iae);
 
                 $request->session()->flash('error', $iae->getMessage());
-
                 return redirect(route('register'));
             }
 
             $request->replace($input);
         }
-
         return $next($request);
     }
 }

app/Http/Middleware/VerifyCsrfToken.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Middleware;
 
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;

app/Http/Requests/Add2FASecretRequest.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
@@ -44,7 +25,7 @@ class Add2FASecretRequest extends FormRequest
     public function rules()
     {
         return [
-            'otp' => 'required|string|min:6|max:6',
+            'otp' => 'required|string|min:6|max:6'
         ];
     }
 }

app/Http/Requests/BanUserRequest.php

@@ -1,29 +1,11 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Auth;
 
+
 class BanUserRequest extends FormRequest
 {
     /**
@@ -46,7 +28,7 @@ class BanUserRequest extends FormRequest
         return [
             'reason' => 'required|string',
             'durationOperand' => 'nullable|string',
-            'durationOperator' => 'nullable|string',
+            'durationOperator' => 'nullable|string'
         ];
     }
 }

app/Http/Requests/ChangeEmailRequest.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
@@ -44,7 +25,7 @@ class ChangeEmailRequest extends FormRequest
     {
         return [
             'currentPassword' => 'required|password',
-            'newEmail' => 'required|email|unique:users,email',
+            'newEmail' => 'required|email|unique:users,email'
         ];
     }
 }

app/Http/Requests/ChangePasswordRequest.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
@@ -44,7 +25,7 @@ class ChangePasswordRequest extends FormRequest
     {
         return [
             'newPassword' => 'required|string|confirmed',
-            'oldPassword' => 'required|string|password',
+            'oldPassword' => 'required|string|password'
         ];
     }
 }

app/Http/Requests/DeleteUserRequest.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
@@ -44,7 +25,7 @@ class DeleteUserRequest extends FormRequest
     public function rules()
     {
         return [
-            'confirmPrompt' => 'required|string',
+            'confirmPrompt' => 'required|string'
         ];
     }
 }

app/Http/Requests/EditTeamRequest.php

@@ -1,50 +0,0 @@
-<?php
-
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class EditTeamRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'teamDescription' => 'required|string|max:200',
-            'joinType' => 'required|boolean',
-        ];
-    }
-}

app/Http/Requests/FlushSessionsRequest.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
@@ -43,7 +24,7 @@ class FlushSessionsRequest extends FormRequest
     public function rules()
     {
         return [
-            'currentPasswordFlush' => 'required|password',
+            'currentPasswordFlush' => 'required|password'
         ];
     }
 }

app/Http/Requests/NewCommentRequest.php

@@ -1,29 +1,11 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Auth;
 
+
 class NewCommentRequest extends FormRequest
 {
     /**
@@ -45,7 +27,7 @@ class NewCommentRequest extends FormRequest
     public function rules()
     {
         return [
-            'comment' => 'required|string|max:600|min:20',
+            'comment' => 'required|string|max:600|min:20'
         ];
     }
 }

app/Http/Requests/NewTeamRequest.php

@@ -1,49 +0,0 @@
-<?php
-
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class NewTeamRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'teamName' => 'required|max:200|string',
-        ];
-    }
-}

app/Http/Requests/ProfileSave.php

@@ -1,28 +1,10 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Requests;
 
 use App\Profile;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Auth;
 
 class ProfileSave extends FormRequest
 {
@@ -51,7 +33,7 @@ class ProfileSave extends FormRequest
             'socialInsta' => 'nullable|string',
             'socialTwitter' => 'nullable|string',
             'socialDiscord' => 'nullable|string',
-            'socialGithub' => 'nullable|string',
+            'socialGithub' => 'nullable|string'
         ];
     }
 }

app/Http/Requests/Remove2FASecretRequest.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
@@ -44,7 +25,7 @@ class Remove2FASecretRequest extends FormRequest
     {
         return [
             'currentPassword' => 'required|password',
-            'consent' => 'required|accepted',
+            'consent' => 'required|accepted'
         ];
     }
 }

app/Http/Requests/SaveNotesRequest.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
@@ -43,7 +24,7 @@ class SaveNotesRequest extends FormRequest
     public function rules()
     {
         return [
-            'noteText' => 'required|string',
+            'noteText' => 'required|string'
         ];
     }
 }

app/Http/Requests/SearchPlayerRequest.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
@@ -44,7 +25,7 @@ class SearchPlayerRequest extends FormRequest
     public function rules()
     {
         return [
-            'searchTerm' => 'required|string|max:17', // max user char limit set by Mojang
+            'searchTerm' => 'required|string|max:17' // max user char limit set by Mojang
         ];
     }
 }

app/Http/Requests/SendInviteRequest.php

@@ -1,49 +0,0 @@
-<?php
-
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class SendInviteRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'user' => 'required|integer',
-        ];
-    }
-}

app/Http/Requests/UpdateUserRequest.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
@@ -47,7 +28,7 @@ class UpdateUserRequest extends FormRequest
             'email' => 'required|email',
             'name' => 'required|string',
             'uuid' => 'required|max:32|min:32',
-            'roles' => 'required_without_all',
+            'roles' => 'required_without_all'
         ];
     }
 }

app/Http/Requests/UserDeleteRequest.php

@@ -1,57 +0,0 @@
-<?php
-
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-
-class UserDeleteRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        if (Auth::user()->has2FA()) {
-            return [
-                'currentPassword' => 'required|password:web',
-                'otp' => 'required|integer|max:6',
-            ];
-        }
-
-        return [
-            'currentPassword' => 'required|password:web',
-        ];
-    }
-}

app/Http/Requests/VacancyEditRequest.php

@@ -1,29 +1,11 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Auth;
 
+
 class VacancyEditRequest extends FormRequest
 {
     /**
@@ -46,7 +28,7 @@ class VacancyEditRequest extends FormRequest
         return [
             'vacancyDescription' => 'required|string',
             'vacancyFullDescription' => 'nullable|string',
-            'vacancyCount' => 'required|integer|min:1',
+            'vacancyCount' => 'required|integer|min:1'
         ];
     }
 }

app/Http/Requests/VacancyRequest.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
@@ -49,7 +30,7 @@ class VacancyRequest extends FormRequest
             'permissionGroup' => 'required|string',
             'discordRole' => 'required|string',
             'vacancyCount' => 'required|integer',
-            'vacancyFormID' => 'required|integer',
+            'vacancyFormID' => 'required|integer'
         ];
     }
 }

app/Http/Requests/VoteRequest.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
@@ -43,7 +24,7 @@ class VoteRequest extends FormRequest
     public function rules()
     {
         return [
-            'voteType' => 'required|string|in:VOTE_DENY,VOTE_APPROVE',
+            'voteType' => 'required|string|in:VOTE_DENY,VOTE_APPROVE'
         ];
     }
 }

app/Jobs/CleanBans.php

@@ -1,28 +1,7 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Jobs;
 
-use App\Ban;
-use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -30,12 +9,15 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Log;
 
+use App\Ban;
+use Carbon\Carbon;
+
 class CleanBans implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public $bans;
 
+    public $bans;
     /**
      * Create a new job instance.
      *
@@ -52,18 +34,23 @@ class CleanBans implements ShouldQueue
      */
     public function handle()
     {
+
         Log::debug('Running automatic ban cleaner...');
         $bans = Ban::all();
 
-        if (! is_null($bans)) {
+        if (!is_null($bans))
-            foreach ($this->bans as $ban) {
+        {
+          foreach($this->bans as $ban)
+          {
               $bannedUntil = Carbon::parse($ban->bannedUntil);
 
-                if ($bannedUntil->equalTo(now())) {
+              if ($bannedUntil->equalTo(now()))
-                    Log::debug('Deleted ban '.$ban->id.' belonging to '.$ban->user->name);
+              {
+                  Log::debug('Deleted ban ' . $ban->id . ' belonging to ' . $ban->user->name);
                   $ban->delete();
               }
           }
         }
+
     }
 }

app/Listeners/DenyUser.php

@@ -1,28 +1,11 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Listeners;
 
 use App\Events\ApplicationDeniedEvent;
 use App\Notifications\ApplicationDenied;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Support\Facades\Log;
 
 class DenyUser
@@ -46,8 +29,9 @@ class DenyUser
     public function handle(ApplicationDeniedEvent $event)
     {
         $event->application->setStatus('DENIED');
-        Log::info('User '.$event->application->user->name.' just had their application denied.');
+        Log::info('User ' . $event->application->user->name . ' just had their application denied.');
 
         $event->application->user->notify(new ApplicationDenied($event->application));
+
     }
 }

app/Listeners/LogAuthenticationFailure.php

@@ -1,26 +1,9 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Listeners;
 
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Support\Facades\Log;
 
 class LogAuthenticationFailure
@@ -44,9 +27,10 @@ class LogAuthenticationFailure
     public function handle($event)
     {
         $targetAccountID = 0;
-        $originalIP = '0.0.0.0';
+        $originalIP = "0.0.0.0";
 
-        if (isset($event->user->id)) {
+        if (isset($event->user->id))
+        {
             $targetAccountID = $event->user->id;
         }
 

app/Listeners/LogAuthenticationSuccess.php

@@ -1,26 +1,9 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Listeners;
 
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Support\Facades\Log;
 
 class LogAuthenticationSuccess

app/Listeners/OnUserBanned.php

@@ -1,31 +1,16 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Listeners;
 
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
 use App\Events\UserBannedEvent;
 use App\Notifications\UserBanned;
-use App\User;
+
 use Illuminate\Support\Facades\Log;
 
+use App\User;
+
 class OnUserBanned
 {
     /**
@@ -46,12 +31,16 @@ class OnUserBanned
      */
     public function handle(UserBannedEvent $event)
     {
-        Log::warning('User '.$event->user->name.' has just been banned from the site!');
 
-        foreach (User::all() as $user) {
+        Log::warning("User " . $event->user->name . " has just been banned from the site!");
-            if ($user->isStaffMember()) {
+
+        foreach(User::all() as $user)
+        {
+          if ($user->isStaffMember())
+          {
             $user->notify((new UserBanned($event->user, $event->ban))->delay(now()->addSeconds(10)));
           }
         }
+
     }
 }

app/Listeners/OnUserRegistration.php

@@ -1,30 +1,14 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Listeners;
 
-use App\Notifications\NewUser;
-use App\User;
-use Illuminate\Auth\Events\Registered;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Auth\Events\Registered;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
+
+use App\User;
+use App\Notifications\NewUser;
 
 class OnUserRegistration
 {
@@ -47,10 +31,12 @@ class OnUserRegistration
     public function handle(Registered $event)
     {
         // TODO: Send push notification to online admins via browser (w/ pusher)
-        Log::info('User '.$event->user->name.' has just registered for an account.');
+        Log::info('User ' . $event->user->name . ' has just registered for an account.');
 
-        foreach (User::all() as $user) {
+        foreach(User::all() as $user)
-            if ($user->hasRole('admin')) {
+        {
+            if ($user->hasRole('admin'))
+            {
                 $user->notify(new NewUser($event->user));
             }
         }

app/Listeners/PromoteUser.php

@@ -1,29 +1,13 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Listeners;
 
 use App\Events\ApplicationApprovedEvent;
-use App\Notifications\ApplicationApproved;
 use App\StaffProfile;
+use App\Notifications\ApplicationApproved;
+use Carbon\Carbon;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Support\Facades\Log;
 
 class PromoteUser
@@ -51,18 +35,19 @@ class PromoteUser
         $staffProfile = StaffProfile::create([
             'userID' => $event->application->user->id,
             'approvalDate' => now()->toDateTimeString(),
-            'memberNotes' => 'Approved by staff members. Welcome them to the team!',
+            'memberNotes' => 'Approved by staff members. Welcome them to the team!'
         ]);
 
         $event->application->user->assignRole('reviewer');
 
-        Log::info('User '.$event->application->user->name.' has just been promoted!', [
+        Log::info('User ' . $event->application->user->name . ' has just been promoted!', [
             'newRank' => $event->application->response->vacancy->permissionGroupName,
-            'staffProfileID' => $staffProfile->id,
+            'staffProfileID' => $staffProfile->id
         ]);
 
         $event->application->user->notify(new ApplicationApproved($event->application));
         // note: Also notify staff
         // TODO: Also assign new app role based on the permission group name
+
     }
 }

app/Mail/InviteToTeam.php

@@ -1,68 +0,0 @@
-<?php
-
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-namespace App\Mail;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Mail\Mailable;
-use Illuminate\Queue\SerializesModels;
-use Mpociot\Teamwork\TeamInvite;
-
-class InviteToTeam extends Mailable
-{
-    use Queueable, SerializesModels;
-
-    public $teamName;
-
-    public $name;
-
-    public $inviterName;
-
-    public $denyToken;
-
-    public $acceptToken;
-
-    /**
-     * Create a new message instance.
-     *
-     * @return void
-     */
-    public function __construct(TeamInvite $invite)
-    {
-        $this->teamName = $invite->team->name;
-        $this->name = $invite->user->name;
-        $this->inviterName = $invite->inviter->name;
-        $this->acceptToken = $invite->accept_token;
-        $this->denyToken = $invite->deny_token;
-    }
-
-    /**
-     * Build the message.
-     *
-     * @return $this
-     */
-    public function build()
-    {
-        return $this
-                ->subject('You have just been invited to '.$this->teamName)
-                ->view('mail.invited-to-team');
-    }
-}

app/Mail/NewContactSubmission.php

@@ -1,27 +1,9 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Mail;
 
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 

app/Mail/UserAccountDeleteConfirmation.php

@@ -1,67 +0,0 @@
-<?php
-
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-namespace App\Mail;
-
-use App\User;
-use Illuminate\Bus\Queueable;
-use Illuminate\Mail\Mailable;
-use Illuminate\Queue\SerializesModels;
-
-class UserAccountDeleteConfirmation extends Mailable
-{
-    use Queueable, SerializesModels;
-
-    public $deleteToken;
-
-    public $cancelToken;
-
-    public $originalIP;
-
-    public $name;
-
-    public $userID;
-
-    /**
-     * Create a new message instance.
-     *
-     * @return void
-     */
-    public function __construct(User $user, array $tokens, string $originalIP)
-    {
-        $this->deleteToken = $tokens['delete'];
-        $this->cancelToken = $tokens['cancel'];
-
-        $this->originalIP = $originalIP;
-        $this->name = $user->name;
-        $this->userID = $user->id;
-    }
-
-    /**
-     * Build the message.
-     *
-     * @return $this
-     */
-    public function build()
-    {
-        return $this->view('mail.deleted-account');
-    }
-}

app/Notifications/ApplicationApproved.php

@@ -1,27 +1,7 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Notifications;
 
-use App\Application;
 use App\Facades\Options;
 use App\Traits\Cancellable;
 use Illuminate\Bus\Queueable;
@@ -29,6 +9,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
+use App\Application;
 
 class ApplicationApproved extends Notification implements ShouldQueue
 {
@@ -64,9 +45,10 @@ class ApplicationApproved extends Notification implements ShouldQueue
      */
     public function toMail($notifiable)
     {
+
         return (new MailMessage)
                     ->from(config('notification.sender.address'), config('notification.sender.name'))
-                    ->subject(config('app.name').' - '.$this->application->response->vacancy->vacancyName.' application approved')
+                    ->subject(config('app.name') . ' - ' . $this->application->response->vacancy->vacancyName . ' application approved')
                     ->line('<br />')
                     ->line('Congratulations! Our Staff team has reviewed your application today, and your application has been approved.')
                     ->line('You have just received the Reviewer role, which allows you to view and vote on other applications.')
@@ -80,18 +62,19 @@ class ApplicationApproved extends Notification implements ShouldQueue
 
     public function toSlack($notifiable)
     {
+
         $url = route('showSingleProfile', ['user' => $notifiable->id]);
         $roles = implode(', ', $notifiable->roles->pluck('name')->all());
 
         return (new SlackMessage)
               ->success()
               ->content('A user has been approved on the team. Welcome aboard!')
-              ->attachment(function ($attachment) use ($notifiable, $url, $roles) {
+              ->attachment(function($attachment) use ($notifiable, $url, $roles){
                   $attachment->title('New staff member')
                               ->fields([
                                   'Name' => $notifiable->name,
                                   'Email' => $notifiable->email,
-                                  'Roles' => $roles,
+                                  'Roles' => $roles
                               ])
                               ->action('View profile', $url);
               });

app/Notifications/ApplicationDenied.php

@@ -1,37 +1,19 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Notifications;
 
-use App\Application;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notification;
+use App\Application;
 
 class ApplicationDenied extends Notification implements ShouldQueue
 {
     use Queueable;
 
+
     public $application;
 
     /**
@@ -63,9 +45,10 @@ class ApplicationDenied extends Notification implements ShouldQueue
      */
     public function toMail($notifiable)
     {
+
         return (new MailMessage)
                     ->from(config('notification.sender.address'), config('notification.sender.name'))
-                    ->subject(config('app.name').' - '.$this->application->response->vacancy->vacancyName.' application denied')
+                    ->subject(config('app.name') . ' - ' . $this->application->response->vacancy->vacancyName . ' application denied')
                     ->line('Your most recent application has been denied.')
                     ->line('Our review team denies applications for several reasons, including poor answers.')
                     ->line('Please review your application and try again in 30 days.')
@@ -73,6 +56,7 @@ class ApplicationDenied extends Notification implements ShouldQueue
                     ->line('Better luck next time!');
     }
 
+
     public function toSlack($notifiable)
     {
       $notifiableName = $notifiable->name;
@@ -80,12 +64,12 @@ class ApplicationDenied extends Notification implements ShouldQueue
       return (new SlackMessage)
               ->error()
               ->content('An application has just been denied.')
-              ->attachment(function ($attachment) use ($notifiableName) {
+              ->attachment(function($attachment) use ($notifiableName){
                   $attachment->title('Application denied!')
-                             ->content($notifiableName.'\'s application has just been denied. They can try again in 30 days.');
+                             ->content($notifiableName . '\'s application has just been denied. They can try again in 30 days.');
               });
-    }
 
+    }
     /**
      * Get the array representation of the notification.
      *

app/Notifications/ApplicationMoved.php

@@ -1,32 +1,13 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Notifications;
 
-use App\Facades\Options;
-use App\Traits\Cancellable;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
+use App\Traits\Cancellable;
+use App\Facades\Options;
 
 class ApplicationMoved extends Notification implements ShouldQueue
 {
@@ -57,7 +38,7 @@ class ApplicationMoved extends Notification implements ShouldQueue
     {
         return (new MailMessage)
                     ->from(config('notification.sender.address'), config('notification.sender.name'))
-                    ->subject(config('app.name').' - Application Updated')
+                    ->subject(config('app.name') . ' - Application Updated')
                     ->line('Your most recent application has been moved up a stage.')
                     ->line('This means our team has reviewed it and an interview will be scheduled ASAP.')
                     ->action('Sign in', url(route('login')))

app/Notifications/AppointmentFinished.php

@@ -1,24 +1,5 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Notifications;
 
 use Illuminate\Bus\Queueable;
@@ -61,7 +42,7 @@ class AppointmentFinished extends Notification implements ShouldQueue
     {
         return (new MailMessage)
                     ->from(config('notification.sender.address'), config('notification.sender.name'))
-                    ->subject(config('app.name').' - Appointment completed')
+                    ->subject(config('app.name') . ' - Appointment completed')
                     ->line('Your appointment has been marked as completed!')
                     ->line('Please allow an additional day for your application to be fully processed.')
                     ->action('View applications', url(route('showUserApps')))

app/Notifications/AppointmentScheduled.php

@@ -1,36 +1,19 @@
 <?php
 
-/*
- * Copyright © 2020 Miguel Nogueira
- *
- *   This file is part of Raspberry Staff Manager.
- *
- *     Raspberry Staff Manager is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     Raspberry Staff Manager is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with Raspberry Staff Manager.  If not, see <https://www.gnu.org/licenses/>.
- */
-
 namespace App\Notifications;
 
-use App\Appointment;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
 
+use App\Appointment;
+
 class AppointmentScheduled extends Notification implements ShouldQueue
 {
     use Queueable;
 
+
     protected $appointment;
 
     /**
@@ -64,10 +47,10 @@ class AppointmentScheduled extends Notification implements ShouldQueue
     {
         return (new MailMessage)
                     ->from(config('notification.sender.address'), config('notification.sender.name'))
-                    ->subject(config('app.name').' - Interview scheduled')
+                    ->subject(config('app.name') . ' - Interview scheduled')
-                    ->line('A voice interview has been scheduled for you @ '.$this->appointment->appointmentDate.'.')
+                    ->line('A voice interview has been scheduled for you @ ' . $this->appointment->appointmentDate . '.')
-                    ->line('With the following details: '.$this->appointment->appointmentDescription)
+                    ->line('With the following details: ' . $this->appointment->appointmentDescription)
-                    ->line('This meeting will take place @ '.$this->appointment->appointmentLocation.'. You will receive an email soon with details on how to join this meeting.')
+                    ->line('This meeting will take place @ ' . $this->appointment->appointmentLocation . '. You will receive an email soon with details on how to join this meeting.')
                     ->line('You are expected to show up at least 5 minutes before the scheduled date.')
                     ->action('Sign in', url(route('login')))
                     ->line('Thank you!');