@@ -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 | } |
@@ -66,8 +66,9 @@ 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 | 72 | $calendar->caldav()->create($input); |
72 | 73 | //TODO test |
73 | 74 | //TODO validator |
@@ -120,15 +121,17 @@ discard block |
||
120 | 121 | if ($caldav) { |
121 | 122 | $this->validateCaldav($request); |
122 | 123 | } |
123 | - if (isset($input['password'])) |
|
124 | - $input['password'] = \Crypt::encrypt($input['password']); |
|
124 | + if (isset($input['password'])) { |
|
125 | + $input['password'] = \Crypt::encrypt($input['password']); |
|
126 | + } |
|
125 | 127 | $calendar->update($input); |
126 | 128 | //TODO test |
127 | 129 | //TODO validator |
128 | 130 | //TODO check if caldav exists? |
129 | 131 | |
130 | - if ($caldav) |
|
131 | - $caldav->update($input); |
|
132 | + if ($caldav) { |
|
133 | + $caldav->update($input); |
|
134 | + } |
|
132 | 135 | return $calendar; |
133 | 136 | } |
134 | 137 |
@@ -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 | } |
@@ -24,7 +24,7 @@ |
||
24 | 24 | public function rules() |
25 | 25 | { |
26 | 26 | return [ |
27 | - 'name' => 'sometimes|required|min:1|max:255|unique:companies,name,' . $this->user()->id, |
|
27 | + 'name' => 'sometimes|required|min:1|max:255|unique:companies,name,'.$this->user()->id, |
|
28 | 28 | 'password' => 'sometimes|required|confirmed|min:6', |
29 | 29 | ]; |
30 | 30 | } |
@@ -32,8 +32,8 @@ |
||
32 | 32 | { |
33 | 33 | return [ |
34 | 34 | 'name' => 'required|min:1|max:255', |
35 | - 'email' => 'required|email|max:255|unique:employees,email,' . $this->route('employees') . ',id,company_id,' . $this->user()->id, |
|
36 | - 'password' => ((\Route::current()->getName() == 'companies.employees.store') ? '' : 'sometimes|') . 'required|confirmed|min:6', |
|
35 | + 'email' => 'required|email|max:255|unique:employees,email,'.$this->route('employees').',id,company_id,'.$this->user()->id, |
|
36 | + 'password' => ((\Route::current()->getName() == 'companies.employees.store') ? '' : 'sometimes|').'required|confirmed|min:6', |
|
37 | 37 | ]; |
38 | 38 | } |
39 | 39 | } |
@@ -31,7 +31,7 @@ |
||
31 | 31 | public function rules() |
32 | 32 | { |
33 | 33 | return [ |
34 | - 'id' => 'required|array|exists:employees,id,company_id,' . $this->user()->id, |
|
34 | + 'id' => 'required|array|exists:employees,id,company_id,'.$this->user()->id, |
|
35 | 35 | ]; |
36 | 36 | } |
37 | 37 | } |
@@ -31,9 +31,9 @@ |
||
31 | 31 | public function rules() |
32 | 32 | { |
33 | 33 | return [ |
34 | - 'name' => 'required|max:255|unique:groups,name,' . $this->route('groups') . ',id,company_id,' . $this->user()->id, |
|
34 | + 'name' => 'required|max:255|unique:groups,name,'.$this->route('groups').',id,company_id,'.$this->user()->id, |
|
35 | 35 | 'description' => 'sometimes|required|max:255', |
36 | - 'planner_id' => 'required|exists:employees,id,company_id,' . $this->user()->id, |
|
36 | + 'planner_id' => 'required|exists:employees,id,company_id,'.$this->user()->id, |
|
37 | 37 | ]; |
38 | 38 | } |
39 | 39 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | public function handle(ErrorEvent $event) |
27 | 27 | { |
28 | 28 | // |
29 | - \Log::info('problems during caldav (calendar id = ' . $event->getCalendar()->calendar_id . ') sync: ' . $event->getError()); |
|
29 | + \Log::info('problems during caldav (calendar id = '.$event->getCalendar()->calendar_id.') sync: '.$event->getError()); |
|
30 | 30 | $calendar = $event->getCalendar(); |
31 | 31 | //$calendar = $event->getCalendar()->fresh(); |
32 | 32 | $calendar->sync_errors = $event->getError(); |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | public function handle(ErrorEvent $event) |
26 | 26 | { |
27 | 27 | // |
28 | - \Log::info('problems during optimise (company id = ' . $event->getCompany()->id . '): ' . $event->getError()); |
|
28 | + \Log::info('problems during optimise (company id = '.$event->getCompany()->id.'): '.$event->getError()); |
|
29 | 29 | $company = $event->getCompany(); |
30 | 30 | //$company = $event->getCompany()->fresh(); |
31 | 31 | self::sendEmail($company->email, $event->getError()); |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | */ |
38 | 38 | static private function sendEmail($email, $error) |
39 | 39 | { |
40 | - \Mail::queue('emails.optimise.error', ['error' => $error], function ($message) use ($email) { |
|
40 | + \Mail::queue('emails.optimise.error', [ 'error' => $error ], function($message) use ($email) { |
|
41 | 41 | $message->from(config('mail.from.address'), config('mail.from.name')); |
42 | 42 | $message->to($email)->subject('Problems during optimisation'); |
43 | 43 | }); |