@@ -79,8 +79,9 @@ |
||
79 | 79 | if ($request->input('remember', false)) { |
80 | 80 | config(['jwt.ttl' => '43200']); //30 days |
81 | 81 | $this->custom = array_merge($this->custom, ['remember' => 'true']); |
82 | - } else |
|
83 | - $this->custom = array_merge($this->custom, ['remember' => 'false']); |
|
82 | + } else { |
|
83 | + $this->custom = array_merge($this->custom, ['remember' => 'false']); |
|
84 | + } |
|
84 | 85 | |
85 | 86 | return $this->postLoginOriginal($request); |
86 | 87 | } |
@@ -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 |
@@ -31,8 +31,9 @@ |
||
31 | 31 | self::sendCompanyEmail($company->email); |
32 | 32 | //send emails to employees |
33 | 33 | $employees = $company->employees()->with('meetings')->get(); |
34 | - foreach ($employees as $employee) |
|
35 | - self::sendEmployeeEmail($employee->email, $employee->meetings); |
|
34 | + foreach ($employees as $employee) { |
|
35 | + self::sendEmployeeEmail($employee->email, $employee->meetings); |
|
36 | + } |
|
36 | 37 | } |
37 | 38 | |
38 | 39 | /** |
@@ -79,8 +79,9 @@ |
||
79 | 79 | if ($request->input('remember', false)) { |
80 | 80 | config(['jwt.ttl' => '43200']); //30 days |
81 | 81 | $this->custom = array_merge($this->custom, ['remember' => 'true']); |
82 | - } else |
|
83 | - $this->custom = array_merge($this->custom, ['remember' => 'false']); |
|
82 | + } else { |
|
83 | + $this->custom = array_merge($this->custom, ['remember' => 'false']); |
|
84 | + } |
|
84 | 85 | |
85 | 86 | return $this->postLoginOriginal($request); |
86 | 87 | } |
@@ -31,9 +31,11 @@ |
||
31 | 31 | $group = Group::findOrFail($groupId); |
32 | 32 | $this->authorize($group); |
33 | 33 | $meetings = $group->meetings(); |
34 | - if ($request->query('current')) |
|
35 | - $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)... |
|
36 | - $query->where('start_time', '=', NULL);//to be planned |
|
34 | + if ($request->query('current')) { |
|
35 | + $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)... |
|
36 | + $query->where('start_time', '=', NULL); |
|
37 | + } |
|
38 | + //to be planned |
|
37 | 39 | //datetime to consider timezone, don't use mysql NOW() |
38 | 40 | $query->orWhere('start_time', '>=', new \DateTime());//planned |
39 | 41 | }); |
@@ -31,16 +31,19 @@ |
||
31 | 31 | */ |
32 | 32 | $planner = \Auth::user(); |
33 | 33 | $groups = $planner->groupsManaged(); |
34 | - if ($request->query('current')) |
|
35 | - $groups->with(['meetings' => function ($query) { |
|
34 | + if ($request->query('current')) { |
|
35 | + $groups->with(['meetings' => function ($query) { |
|
36 | 36 | $query->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)... |
37 | - $query->where('start_time', '=', NULL);//to be planned |
|
37 | + $query->where('start_time', '=', NULL); |
|
38 | + } |
|
39 | + //to be planned |
|
38 | 40 | //datetime to consider timezone, don't use mysql NOW() |
39 | 41 | $query->orWhere('start_time', '>=', new \DateTime());//planned |
40 | 42 | }); |
41 | 43 | }]); |
42 | - else |
|
43 | - $groups->with('meetings'); |
|
44 | + else { |
|
45 | + $groups->with('meetings'); |
|
46 | + } |
|
44 | 47 | return $groups->get();//both planed and to be planned |
45 | 48 | } |
46 | 49 |
@@ -31,9 +31,11 @@ |
||
31 | 31 | $group = Group::findOrFail($groupId); |
32 | 32 | $this->authorize($group); |
33 | 33 | $meetings = $group->meetings(); |
34 | - if ($request->query('current')) |
|
35 | - $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)... |
|
36 | - $query->where('start_time', '=', NULL);//to be planned |
|
34 | + if ($request->query('current')) { |
|
35 | + $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)... |
|
36 | + $query->where('start_time', '=', NULL); |
|
37 | + } |
|
38 | + //to be planned |
|
37 | 39 | //datetime to consider timezone, don't use mysql NOW() |
38 | 40 | $query->orWhere('start_time', '>=', new \DateTime());//planned |
39 | 41 | }); |
@@ -36,8 +36,9 @@ |
||
36 | 36 | $calendar = Calendar::findOrFail($calendarId); |
37 | 37 | $this->authorize($calendar); |
38 | 38 | $timeslots = $calendar->timeslots(); |
39 | - if ($request->query('current')) |
|
40 | - $timeslots->where('time_start', '>=', new \DateTime()); |
|
39 | + if ($request->query('current')) { |
|
40 | + $timeslots->where('time_start', '>=', new \DateTime()); |
|
41 | + } |
|
41 | 42 | return $timeslots->get(); |
42 | 43 | } |
43 | 44 |
@@ -33,8 +33,9 @@ discard block |
||
33 | 33 | $meeting = Meeting::findOrFail($meetingId); |
34 | 34 | $this->authorize($meeting); |
35 | 35 | |
36 | - if ($meeting->group_id == $groupId) |
|
37 | - return $meeting->timeslots; |
|
36 | + if ($meeting->group_id == $groupId) { |
|
37 | + return $meeting->timeslots; |
|
38 | + } |
|
38 | 39 | return Response::json(['error' => 'meeting->group_id <> groupId'], 403); |
39 | 40 | } |
40 | 41 | |
@@ -55,8 +56,9 @@ discard block |
||
55 | 56 | $timeslot = MeetingTimeslot::findOrFail($timeslotId); |
56 | 57 | $this->authorize($timeslot); |
57 | 58 | |
58 | - if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId) |
|
59 | - return $timeslot; |
|
59 | + if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId) { |
|
60 | + return $timeslot; |
|
61 | + } |
|
60 | 62 | return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403); |
61 | 63 | } |
62 | 64 | |
@@ -72,8 +74,9 @@ discard block |
||
72 | 74 | $this->authorize($group); |
73 | 75 | $meeting = Meeting::findOrFail($meetingId); |
74 | 76 | $this->authorize($meeting); |
75 | - if ($meeting->start_time != NULL) |
|
76 | - return Response::json(['error' => 'the meeting is already planned'], 422); |
|
77 | + if ($meeting->start_time != NULL) { |
|
78 | + return Response::json(['error' => 'the meeting is already planned'], 422); |
|
79 | + } |
|
77 | 80 | |
78 | 81 | $input = $request->all(); |
79 | 82 | |
@@ -96,8 +99,9 @@ discard block |
||
96 | 99 | $this->authorize($group); |
97 | 100 | $meeting = Meeting::findOrFail($meetingId); |
98 | 101 | $this->authorize($meeting); |
99 | - if ($meeting->start_time != NULL) |
|
100 | - return Response::json(['error' => 'the meeting is already planned'], 422); |
|
102 | + if ($meeting->start_time != NULL) { |
|
103 | + return Response::json(['error' => 'the meeting is already planned'], 422); |
|
104 | + } |
|
101 | 105 | $timeslot = MeetingTimeslot::findOrFail($timeslotId); |
102 | 106 | $this->authorize($timeslot); |
103 | 107 | |
@@ -124,8 +128,9 @@ discard block |
||
124 | 128 | $this->authorize($group); |
125 | 129 | $meeting = Meeting::findOrFail($meetingId); |
126 | 130 | $this->authorize($meeting); |
127 | - if ($meeting->start_time != NULL) |
|
128 | - return Response::json(['error' => 'the meeting is already planned'], 422); |
|
131 | + if ($meeting->start_time != NULL) { |
|
132 | + return Response::json(['error' => 'the meeting is already planned'], 422); |
|
133 | + } |
|
129 | 134 | $timeslot = MeetingTimeslot::findOrFail($timeslotId); |
130 | 135 | $this->authorize($timeslot); |
131 | 136 |