WIP: Next major version - AthenaHR v2 #1

Draft
miguel456 wants to merge 46 commits from develop into main
788 changed files with 5221 additions and 3842 deletions
Showing only changes of commit 9e77205820 - Show all commits

View File

@@ -22,6 +22,8 @@
namespace App\Http\Middleware; namespace App\Http\Middleware;
use App\Facades\UUID; use App\Facades\UUID;
use App\Options;
use Closure; use Closure;
class UsernameUUID class UsernameUUID
@@ -35,6 +37,10 @@ class UsernameUUID
*/ */
public function handle($request, Closure $next) public function handle($request, Closure $next)
{ {
if (!\App\Facades\Options::getOption('requireGameLicense')) {
return $next($request);
}
$input = $request->all(); $input = $request->all();
if (isset($input['uuid'])) { if (isset($input['uuid'])) {
try { try {

View File

@@ -82,7 +82,7 @@ class NewUser extends Notification implements ShouldQueue
$user['name'] = $this->user->name; $user['name'] = $this->user->name;
$user['email'] = $this->user->email; $user['email'] = $this->user->email;
$user['username'] = UUID::toUsername($this->user->uuid); $user['username'] = Options::getOption('requireGameLicense') ? UUID::toUsername($this->user->uuid) : $this->user->username;
$date = \Carbon\Carbon::parse($this->user->created_at); $date = \Carbon\Carbon::parse($this->user->created_at);
$user['created_at'] = $date->englishMonth.' '.$date->day.' '.$date->year; $user['created_at'] = $date->englishMonth.' '.$date->day.' '.$date->year;