@@ -43,19 +43,19 @@ discard block |
||
| 43 | 43 | * |
| 44 | 44 | * @var array |
| 45 | 45 | */ |
| 46 | - protected $fillable = ['name', 'email', 'password']; |
|
| 46 | + protected $fillable = [ 'name', 'email', 'password' ]; |
|
| 47 | 47 | |
| 48 | 48 | /** |
| 49 | 49 | * The attributes excluded from the model's JSON form. |
| 50 | 50 | * |
| 51 | 51 | * @var array |
| 52 | 52 | */ |
| 53 | - protected $hidden = ['password', 'remember_token', 'pivot']; |
|
| 53 | + protected $hidden = [ 'password', 'remember_token', 'pivot' ]; |
|
| 54 | 54 | |
| 55 | 55 | /** |
| 56 | 56 | * @var array |
| 57 | 57 | */ |
| 58 | - protected $appends = ['is_planner']; |
|
| 58 | + protected $appends = [ 'is_planner' ]; |
|
| 59 | 59 | |
| 60 | 60 | public function getIsPlannerAttribute() |
| 61 | 61 | { |
@@ -97,16 +97,16 @@ discard block |
||
| 97 | 97 | public function getEmailForPasswordReset() |
| 98 | 98 | { |
| 99 | 99 | list(, $caller) = debug_backtrace(false); |
| 100 | - if (isset($caller['class'])) |
|
| 101 | - $caller = explode('\\', $caller['class']); |
|
| 100 | + if (isset($caller[ 'class' ])) |
|
| 101 | + $caller = explode('\\', $caller[ 'class' ]); |
|
| 102 | 102 | else |
| 103 | 103 | $caller = ''; |
| 104 | 104 | |
| 105 | 105 | //check if this function is called by email sender |
| 106 | - if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == '')) |
|
| 106 | + if ((count($caller) && $caller[ count($caller) - 1 ] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == '')) |
|
| 107 | 107 | return $this->email; |
| 108 | 108 | //return unique identify for token repository |
| 109 | - return $this->email . $this->company->id; |
|
| 109 | + return $this->email.$this->company->id; |
|
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | /** |
@@ -31,17 +31,17 @@ |
||
| 31 | 31 | * |
| 32 | 32 | * @var array |
| 33 | 33 | */ |
| 34 | - protected $fillable = ['name', 'description', 'planner_id']; |
|
| 34 | + protected $fillable = [ 'name', 'description', 'planner_id' ]; |
|
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | 37 | * @var array |
| 38 | 38 | */ |
| 39 | - protected $hidden = ['planner', 'pivot']; |
|
| 39 | + protected $hidden = [ 'planner', 'pivot' ]; |
|
| 40 | 40 | |
| 41 | 41 | /** |
| 42 | 42 | * @var array |
| 43 | 43 | */ |
| 44 | - protected $appends = ['planner_name']; |
|
| 44 | + protected $appends = [ 'planner_name' ]; |
|
| 45 | 45 | |
| 46 | 46 | public function getPlannerNameAttribute() |
| 47 | 47 | { |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | * cn = company normal |
| 32 | 32 | * @var array |
| 33 | 33 | */ |
| 34 | - protected $custom = ['mode' => 'cn']; |
|
| 34 | + protected $custom = [ 'mode' => 'cn' ]; |
|
| 35 | 35 | |
| 36 | 36 | |
| 37 | 37 | /** |
@@ -40,8 +40,8 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function __construct() |
| 42 | 42 | { |
| 43 | - config(['auth.model' => \plunner\Company::class]); |
|
| 44 | - config(['jwt.user' => \plunner\Company::class]); |
|
| 45 | - config(['auth.password.table' => 'password_resets_companies', 'auth.password.email' => 'emails.companies.password']); |
|
| 43 | + config([ 'auth.model' => \plunner\Company::class ]); |
|
| 44 | + config([ 'jwt.user' => \plunner\Company::class ]); |
|
| 45 | + config([ 'auth.password.table' => 'password_resets_companies', 'auth.password.email' => 'emails.companies.password' ]); |
|
| 46 | 46 | } |
| 47 | 47 | } |
@@ -18,8 +18,8 @@ discard block |
||
| 18 | 18 | { |
| 19 | 19 | public function __construct() |
| 20 | 20 | { |
| 21 | - config(['auth.model' => \plunner\Company::class]); |
|
| 22 | - config(['jwt.user' => \plunner\Company::class]); |
|
| 21 | + config([ 'auth.model' => \plunner\Company::class ]); |
|
| 22 | + config([ 'jwt.user' => \plunner\Company::class ]); |
|
| 23 | 23 | $this->middleware('jwt.authandrefresh:mode-cn'); |
| 24 | 24 | } |
| 25 | 25 | |
@@ -50,8 +50,8 @@ discard block |
||
| 50 | 50 | // |
| 51 | 51 | $company = \Auth::user(); |
| 52 | 52 | $input = $request->all(); |
| 53 | - if (isset($input['password'])) |
|
| 54 | - $input['password'] = bcrypt($input['password']); |
|
| 53 | + if (isset($input[ 'password' ])) |
|
| 54 | + $input[ 'password' ] = bcrypt($input[ 'password' ]); |
|
| 55 | 55 | $employee = $company->employees()->create($input); |
| 56 | 56 | return $employee; |
| 57 | 57 | } |
@@ -83,8 +83,8 @@ discard block |
||
| 83 | 83 | $employee = Employee::findOrFail($id); |
| 84 | 84 | $this->authorize($employee); |
| 85 | 85 | $input = $request->all(); |
| 86 | - if (isset($input['password'])) |
|
| 87 | - $input['password'] = bcrypt($input['password']); |
|
| 86 | + if (isset($input[ 'password' ])) |
|
| 87 | + $input[ 'password' ] = bcrypt($input[ 'password' ]); |
|
| 88 | 88 | $employee->update($input); |
| 89 | 89 | return $employee; |
| 90 | 90 | } |
@@ -19,8 +19,8 @@ discard block |
||
| 19 | 19 | { |
| 20 | 20 | public function __construct() |
| 21 | 21 | { |
| 22 | - config(['auth.model' => \plunner\Company::class]); |
|
| 23 | - config(['jwt.user' => \plunner\Company::class]); |
|
| 22 | + config([ 'auth.model' => \plunner\Company::class ]); |
|
| 23 | + config([ 'jwt.user' => \plunner\Company::class ]); |
|
| 24 | 24 | $this->middleware('jwt.authandrefresh:mode-cn'); |
| 25 | 25 | } |
| 26 | 26 | |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | // |
| 52 | 52 | $group = Group::findOrFail($groupId); |
| 53 | 53 | $this->authorize($group); |
| 54 | - $id = $request->all()['id']; |
|
| 54 | + $id = $request->all()[ 'id' ]; |
|
| 55 | 55 | $group->employees()->attach($id); |
| 56 | 56 | return $group->employees; |
| 57 | 57 | } |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $this->authorize($employee); |
| 71 | 71 | $group = Group::findOrFail($groupId); |
| 72 | 72 | if (!$employee->belongsToGroup($group)) |
| 73 | - return Response::json(['error' => 'employId <> groupId'], 404); |
|
| 73 | + return Response::json([ 'error' => 'employId <> groupId' ], 404); |
|
| 74 | 74 | $employee->groups()->detach($groupId); |
| 75 | 75 | return $group->employees; |
| 76 | 76 | } |
@@ -36,12 +36,12 @@ discard block |
||
| 36 | 36 | * en = employee normal |
| 37 | 37 | * @var array |
| 38 | 38 | */ |
| 39 | - protected $custom = ['mode' => 'en']; |
|
| 39 | + protected $custom = [ 'mode' => 'en' ]; |
|
| 40 | 40 | |
| 41 | 41 | /** |
| 42 | 42 | * @var array |
| 43 | 43 | */ |
| 44 | - protected $username = ['email', 'company_id']; |
|
| 44 | + protected $username = [ 'email', 'company_id' ]; |
|
| 45 | 45 | |
| 46 | 46 | /** |
| 47 | 47 | * @var company |
@@ -54,24 +54,24 @@ discard block |
||
| 54 | 54 | */ |
| 55 | 55 | public function __construct() |
| 56 | 56 | { |
| 57 | - config(['auth.model' => \plunner\Employee::class]); |
|
| 58 | - config(['jwt.user' => \plunner\Employee::class]); |
|
| 59 | - config(['auth.password.table' => 'password_resets_employees', 'auth.password.email' => 'emails.employees.password']); |
|
| 57 | + config([ 'auth.model' => \plunner\Employee::class ]); |
|
| 58 | + config([ 'jwt.user' => \plunner\Employee::class ]); |
|
| 59 | + config([ 'auth.password.table' => 'password_resets_employees', 'auth.password.email' => 'emails.employees.password' ]); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | public function postEmail(Request $request) |
| 63 | 63 | { |
| 64 | - $this->validate($request, ['company' => 'required|exists:companies,name']); |
|
| 64 | + $this->validate($request, [ 'company' => 'required|exists:companies,name' ]); |
|
| 65 | 65 | $this->company = Company::whereName($request->input('company'))->firstOrFail(); |
| 66 | - $request->merge(['company_id' => $this->company->id]); |
|
| 66 | + $request->merge([ 'company_id' => $this->company->id ]); |
|
| 67 | 67 | return $this->postEmailOriginal($request); |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | public function postReset(Request $request) |
| 71 | 71 | { |
| 72 | - $this->validate($request, ['company' => 'required|exists:companies,name']); |
|
| 72 | + $this->validate($request, [ 'company' => 'required|exists:companies,name' ]); |
|
| 73 | 73 | $this->company = Company::whereName($request->input('company'))->firstOrFail(); |
| 74 | - $request->merge(['company_id' => $this->company->id]); |
|
| 74 | + $request->merge([ 'company_id' => $this->company->id ]); |
|
| 75 | 75 | return $this->postResetOriginal($request); |
| 76 | 76 | } |
| 77 | 77 | |
@@ -16,8 +16,8 @@ discard block |
||
| 16 | 16 | { |
| 17 | 17 | public function __construct() |
| 18 | 18 | { |
| 19 | - config(['auth.model' => \plunner\Employee::class]); |
|
| 20 | - config(['jwt.user' => \plunner\Employee::class]); |
|
| 19 | + config([ 'auth.model' => \plunner\Employee::class ]); |
|
| 20 | + config([ 'jwt.user' => \plunner\Employee::class ]); |
|
| 21 | 21 | $this->middleware('jwt.authandrefresh:mode-en'); |
| 22 | 22 | } |
| 23 | 23 | |
@@ -66,8 +66,8 @@ discard block |
||
| 66 | 66 | $employee = \Auth::user(); |
| 67 | 67 | $input = $request->all(); |
| 68 | 68 | $calendar = $employee->calendars()->create($input); |
| 69 | - if (isset($input['password'])) |
|
| 70 | - $input['password'] = \Crypt::encrypt($input['password']); |
|
| 69 | + if (isset($input[ 'password' ])) |
|
| 70 | + $input[ 'password' ] = \Crypt::encrypt($input[ 'password' ]); |
|
| 71 | 71 | $calendar->caldav()->create($input); |
| 72 | 72 | //TODO test |
| 73 | 73 | //TODO validator |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | $this->validate($request, [ |
| 85 | 85 | 'url' => 'required|max:255', |
| 86 | 86 | 'username' => 'required|max:255', |
| 87 | - 'password' => ((\Route::current()->getName() == 'employees.calendars.caldav') ? '' : 'sometimes|') . 'required', |
|
| 87 | + 'password' => ((\Route::current()->getName() == 'employees.calendars.caldav') ? '' : 'sometimes|').'required', |
|
| 88 | 88 | 'calendar_name' => 'required|max:255', |
| 89 | 89 | ]); |
| 90 | 90 | } |
@@ -120,8 +120,8 @@ discard block |
||
| 120 | 120 | if ($caldav) { |
| 121 | 121 | $this->validateCaldav($request); |
| 122 | 122 | } |
| 123 | - if (isset($input['password'])) |
|
| 124 | - $input['password'] = \Crypt::encrypt($input['password']); |
|
| 123 | + if (isset($input[ 'password' ])) |
|
| 124 | + $input[ 'password' ] = \Crypt::encrypt($input[ 'password' ]); |
|
| 125 | 125 | $calendar->update($input); |
| 126 | 126 | //TODO test |
| 127 | 127 | //TODO validator |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | $calendars = $caldavClient->findCalendars(); |
| 163 | 163 | return array_keys($calendars); |
| 164 | 164 | } catch (\it\thecsea\caldav_client_adapter\CaldavException $e) { |
| 165 | - return Response::json(['error' => $e->getMessage()], 422); |
|
| 165 | + return Response::json([ 'error' => $e->getMessage() ], 422); |
|
| 166 | 166 | } |
| 167 | 167 | } |
| 168 | 168 | } |
@@ -11,8 +11,8 @@ discard block |
||
| 11 | 11 | { |
| 12 | 12 | public function __construct() |
| 13 | 13 | { |
| 14 | - config(['auth.model' => \plunner\Employee::class]); |
|
| 15 | - config(['jwt.user' => \plunner\Employee::class]); |
|
| 14 | + config([ 'auth.model' => \plunner\Employee::class ]); |
|
| 15 | + config([ 'jwt.user' => \plunner\Employee::class ]); |
|
| 16 | 16 | $this->middleware('jwt.authandrefresh:mode-en'); |
| 17 | 17 | } |
| 18 | 18 | |
@@ -24,9 +24,9 @@ discard block |
||
| 24 | 24 | public function index() |
| 25 | 25 | { |
| 26 | 26 | $employee = \Auth::user(); |
| 27 | - return $employee->groups()->with(['meetings' => function ($query) { |
|
| 27 | + return $employee->groups()->with([ 'meetings' => function($query) { |
|
| 28 | 28 | $query->where('start_time', '=', NULL); |
| 29 | - }])->get(); |
|
| 29 | + } ])->get(); |
|
| 30 | 30 | //TODO get only current meetings via a query |
| 31 | 31 | } |
| 32 | 32 | |
@@ -30,6 +30,6 @@ |
||
| 30 | 30 | 'auth' => \plunner\Http\Middleware\Authenticate::class, |
| 31 | 31 | 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, |
| 32 | 32 | 'guest' => \plunner\Http\Middleware\RedirectIfAuthenticated::class, |
| 33 | - 'jwt.authandrefresh' => \plunner\Http\Middleware\GetUserAndRefresh::class,//'Tymon\JWTAuth\Middleware\GetUserAndRefresh', |
|
| 33 | + 'jwt.authandrefresh' => \plunner\Http\Middleware\GetUserAndRefresh::class, //'Tymon\JWTAuth\Middleware\GetUserAndRefresh', |
|
| 34 | 34 | ]; |
| 35 | 35 | } |