@@ -2,11 +2,11 @@ |
||
2 | 2 | |
3 | 3 | namespace plunner\Http\Controllers\Companies\Auth; |
4 | 4 | |
5 | -use plunner\Company; |
|
6 | -use Validator; |
|
7 | -use plunner\Http\Controllers\Controller; |
|
8 | 5 | use Tymon\JWTAuth\Support\auth\AuthenticatesAndRegistersUsers; |
9 | 6 | use Tymon\JWTAuth\Support\auth\ThrottlesLogins; |
7 | +use Validator; |
|
8 | +use plunner\Company; |
|
9 | +use plunner\Http\Controllers\Controller; |
|
10 | 10 | |
11 | 11 | class AuthController extends Controller |
12 | 12 | { |
@@ -90,8 +90,9 @@ |
||
90 | 90 | { |
91 | 91 | config(['jwt.ttl' =>'43200']); //30 days |
92 | 92 | $this->custom = array_merge($this->custom, ['remember'=>'true']); |
93 | - }else |
|
94 | - $this->custom = array_merge($this->custom, ['remember'=>'false']); |
|
93 | + } else { |
|
94 | + $this->custom = array_merge($this->custom, ['remember'=>'false']); |
|
95 | + } |
|
95 | 96 | return $this->postLoginOriginal($request); |
96 | 97 | } |
97 | 98 |
@@ -3,13 +3,12 @@ |
||
3 | 3 | namespace plunner\Http\Controllers\Employees\Auth; |
4 | 4 | |
5 | 5 | use Illuminate\Http\Request; |
6 | -use plunner\Company; |
|
7 | -use plunner\employee; |
|
8 | -use Validator; |
|
9 | -use plunner\Http\Controllers\Controller; |
|
10 | 6 | use Tymon\JWTAuth\Support\auth\AuthenticatesAndRegistersUsers; |
11 | 7 | use Tymon\JWTAuth\Support\auth\ThrottlesLogins; |
12 | -use Log; |
|
8 | +use Validator; |
|
9 | +use plunner\Company; |
|
10 | +use plunner\Http\Controllers\Controller; |
|
11 | +use plunner\employee; |
|
13 | 12 | |
14 | 13 | class AuthController extends Controller |
15 | 14 | { |
@@ -90,8 +90,9 @@ |
||
90 | 90 | { |
91 | 91 | config(['jwt.ttl' =>'43200']); //30 days |
92 | 92 | $this->custom = array_merge($this->custom, ['remember'=>'true']); |
93 | - }else |
|
94 | - $this->custom = array_merge($this->custom, ['remember'=>'false']); |
|
93 | + } else { |
|
94 | + $this->custom = array_merge($this->custom, ['remember'=>'false']); |
|
95 | + } |
|
95 | 96 | return $this->postLoginOriginal($request); |
96 | 97 | } |
97 | 98 |
@@ -51,8 +51,9 @@ |
||
51 | 51 | |
52 | 52 | public function getPlannerNameAttribute() |
53 | 53 | { |
54 | - if(is_object($this->planner) && $this->planner->exists) |
|
55 | - return $this->planner->name; |
|
54 | + if(is_object($this->planner) && $this->planner->exists) { |
|
55 | + return $this->planner->name; |
|
56 | + } |
|
56 | 57 | } |
57 | 58 | |
58 | 59 | /** |
@@ -3,8 +3,8 @@ |
||
3 | 3 | namespace plunner\Http\Controllers\Companies\Groups; |
4 | 4 | |
5 | 5 | use Illuminate\Support\Facades\Response; |
6 | -use plunner\Group; |
|
7 | 6 | use plunner\Employee; |
7 | +use plunner\Group; |
|
8 | 8 | use plunner\Http\Controllers\Controller; |
9 | 9 | use plunner\Http\Requests\Companies\Groups\EmployeeRequest; |
10 | 10 |
@@ -71,8 +71,9 @@ |
||
71 | 71 | $employee = Employee::findOrFail($employeeId); |
72 | 72 | $this->authorize($employee); |
73 | 73 | $group = Group::findOrFail($groupId); |
74 | - if(!$employee->belongsToGroup($group)) |
|
75 | - return Response::json(['error' => 'employId <> groupId'],404); |
|
74 | + if(!$employee->belongsToGroup($group)) { |
|
75 | + return Response::json(['error' => 'employId <> groupId'],404); |
|
76 | + } |
|
76 | 77 | $employee->groups()->detach($groupId); |
77 | 78 | return $group->employees; |
78 | 79 | } |
@@ -53,8 +53,9 @@ discard block |
||
53 | 53 | // |
54 | 54 | $company = \Auth::user(); |
55 | 55 | $input = $request->all(); |
56 | - if(isset($input['password'])) |
|
57 | - $input['password'] = bcrypt($input['password']); |
|
56 | + if(isset($input['password'])) { |
|
57 | + $input['password'] = bcrypt($input['password']); |
|
58 | + } |
|
58 | 59 | $employee = $company->employees()->create($input); |
59 | 60 | return $employee; |
60 | 61 | } |
@@ -86,8 +87,9 @@ discard block |
||
86 | 87 | $employee = Employee::findOrFail($id); |
87 | 88 | $this->authorize($employee); |
88 | 89 | $input = $request->all(); |
89 | - if(isset($input['password'])) |
|
90 | - $input['password'] = bcrypt($input['password']); |
|
90 | + if(isset($input['password'])) { |
|
91 | + $input['password'] = bcrypt($input['password']); |
|
92 | + } |
|
91 | 93 | $employee->update($input); |
92 | 94 | return $employee; |
93 | 95 | } |
@@ -53,10 +53,11 @@ discard block |
||
53 | 53 | { |
54 | 54 | // |
55 | 55 | $calendarId = $this->argument('calendarId'); |
56 | - if(is_numeric($calendarId)) |
|
57 | - $this->makeForeground(Caldav::findOrFail($calendarId)); |
|
58 | - else |
|
59 | - $this->syncAll(); |
|
56 | + if(is_numeric($calendarId)) { |
|
57 | + $this->makeForeground(Caldav::findOrFail($calendarId)); |
|
58 | + } else { |
|
59 | + $this->syncAll(); |
|
60 | + } |
|
60 | 61 | } |
61 | 62 | |
62 | 63 | private function syncAll() |
@@ -65,13 +66,15 @@ discard block |
||
65 | 66 | if($this->option('background')) { |
66 | 67 | \Log::debug(self::BACKGROUND_MOD_MEX); |
67 | 68 | $this->info(self::BACKGROUND_MOD_MEX); |
68 | - foreach ($calendars as $calendar) |
|
69 | - $this->makeBackground($calendar); |
|
69 | + foreach ($calendars as $calendar) { |
|
70 | + $this->makeBackground($calendar); |
|
71 | + } |
|
70 | 72 | \Log::debug(self::BACKGROUND_COMPLETED_MEX); |
71 | 73 | $this->info(self::BACKGROUND_COMPLETED_MEX); |
72 | - }else |
|
73 | - foreach($calendars as $calendar) |
|
74 | + } else { |
|
75 | + foreach($calendars as $calendar) |
|
74 | 76 | $this->makeForeground($calendar); |
77 | + } |
|
75 | 78 | } |
76 | 79 | |
77 | 80 | /** |
@@ -81,8 +84,9 @@ discard block |
||
81 | 84 | private function makeBackground(Caldav $calendar) |
82 | 85 | { |
83 | 86 | $event = $this->schedule->command('sync:caldav '.$calendar->calendar_id)->withoutOverlapping(); |
84 | - if($event->isDue($this->laravel)) |
|
85 | - $event->run($this->laravel); |
|
87 | + if($event->isDue($this->laravel)) { |
|
88 | + $event->run($this->laravel); |
|
89 | + } |
|
86 | 90 | } |
87 | 91 | |
88 | 92 | /** |
@@ -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 |
@@ -107,15 +108,17 @@ discard block |
||
107 | 108 | if($caldav){ |
108 | 109 | $this->validateCaldav($request); |
109 | 110 | } |
110 | - if(isset($input['password'])) |
|
111 | - $input['password'] = \Crypt::encrypt($input['password']); |
|
111 | + if(isset($input['password'])) { |
|
112 | + $input['password'] = \Crypt::encrypt($input['password']); |
|
113 | + } |
|
112 | 114 | $calendar->update($input); |
113 | 115 | //TODO test |
114 | 116 | //TODO validator |
115 | 117 | //TODO check if caldav exists? |
116 | 118 | |
117 | - if($caldav) |
|
118 | - $caldav->update($input); |
|
119 | + if($caldav) { |
|
120 | + $caldav->update($input); |
|
121 | + } |
|
119 | 122 | return $calendar; |
120 | 123 | } |
121 | 124 | |
@@ -148,7 +151,7 @@ discard block |
||
148 | 151 | $caldavClient->connect($request->input('url'), $request->input('username'), $request->input('password')); |
149 | 152 | $calendars = $caldavClient->findCalendars(); |
150 | 153 | return array_keys($calendars); |
151 | - }catch (\it\thecsea\caldav_client_adapter\CaldavException $e) |
|
154 | + } catch (\it\thecsea\caldav_client_adapter\CaldavException $e) |
|
152 | 155 | { |
153 | 156 | return Response::json(['error' => $e->getMessage()],422); |
154 | 157 | } |
@@ -3,8 +3,6 @@ |
||
3 | 3 | namespace plunner\Listeners; |
4 | 4 | |
5 | 5 | use plunner\Events\CaldavErrorEvent; |
6 | -use Illuminate\Queue\InteractsWithQueue; |
|
7 | -use Illuminate\Contracts\Queue\ShouldQueue; |
|
8 | 6 | |
9 | 7 | class CaldavErrorListener |
10 | 8 | { |
@@ -91,11 +91,11 @@ discard block |
||
91 | 91 | try |
92 | 92 | { |
93 | 93 | $events = $this->getEvents(); |
94 | - }catch (\it\thecsea\caldav_client_adapter\CaldavException $e) |
|
94 | + } catch (\it\thecsea\caldav_client_adapter\CaldavException $e) |
|
95 | 95 | { |
96 | 96 | \Event::fire(new ErrorEvent($this->calendar, $e->getMessage())); |
97 | 97 | return ; |
98 | - }catch(\Illuminate\Contracts\Encryption\DecryptException $e){ |
|
98 | + } catch(\Illuminate\Contracts\Encryption\DecryptException $e){ |
|
99 | 99 | \Event::fire(new ErrorEvent($this->calendar, $e->getMessage())); |
100 | 100 | return ; |
101 | 101 | } |
@@ -110,10 +110,11 @@ discard block |
||
110 | 110 | |
111 | 111 | //insert new timeslots |
112 | 112 | foreach($events as $event){ |
113 | - if(!($event = $this->parseEvent($event))) |
|
114 | - \Event::fire(new ErrorEvent($this->calendar, 'problem during the parsing an event')); |
|
115 | - else |
|
116 | - $calendarMain->timeslots()->create($event); |
|
113 | + if(!($event = $this->parseEvent($event))) { |
|
114 | + \Event::fire(new ErrorEvent($this->calendar, 'problem during the parsing an event')); |
|
115 | + } else { |
|
116 | + $calendarMain->timeslots()->create($event); |
|
117 | + } |
|
117 | 118 | } |
118 | 119 | \Event::fire(new OkEvent($this->calendar)); |
119 | 120 | } |
@@ -126,17 +127,20 @@ discard block |
||
126 | 127 | { |
127 | 128 | $pattern = "/^((DTSTART;)|(DTEND;))(.*)\$/m"; |
128 | 129 | if(preg_match_all($pattern, $event->getData(), $matches)){ |
129 | - if(!isset($matches[4]) || count($matches[4]) != 2) |
|
130 | - return null; |
|
130 | + if(!isset($matches[4]) || count($matches[4]) != 2) { |
|
131 | + return null; |
|
132 | + } |
|
131 | 133 | $ret = []; |
132 | - if($tmp = $this->parseDate($matches[4][0])) |
|
133 | - $ret['time_start'] = $tmp; |
|
134 | - else |
|
135 | - return null; |
|
136 | - if($tmp = $this->parseDate($matches[4][1])) |
|
137 | - $ret['time_end'] = $tmp; |
|
138 | - else |
|
139 | - return null; |
|
134 | + if($tmp = $this->parseDate($matches[4][0])) { |
|
135 | + $ret['time_start'] = $tmp; |
|
136 | + } else { |
|
137 | + return null; |
|
138 | + } |
|
139 | + if($tmp = $this->parseDate($matches[4][1])) { |
|
140 | + $ret['time_end'] = $tmp; |
|
141 | + } else { |
|
142 | + return null; |
|
143 | + } |
|
140 | 144 | return $ret; |
141 | 145 | } |
142 | 146 | return null; |
@@ -153,7 +157,7 @@ discard block |
||
153 | 157 | if($matches[1][0] == 'TZID=') |
154 | 158 | { |
155 | 159 | return \DateTime::createFromFormat('Ymd\THis', $matches[5][0], new \DateTimeZone($matches[4][0])); |
156 | - }else if($matches[1][0] == 'VALUE=' && $matches[4][0] == 'DATE') |
|
160 | + } else if($matches[1][0] == 'VALUE=' && $matches[4][0] == 'DATE') |
|
157 | 161 | { |
158 | 162 | return \DateTime::createFromFormat('Ymd\THis', $matches[5][0].'T000000'); |
159 | 163 | } |