@@ -50,12 +50,16 @@ discard block |
||
| 50 | 50 | { |
| 51 | 51 | $path = new Path(tempnam(sys_get_temp_dir(), 'OPT')); //TODO check the return in case of errors this return false on failure |
| 52 | 52 | unlink($path->getPath()); //remove file to create a dir |
| 53 | - if (file_exists($path->getPath())) |
|
| 54 | - throw new OptimiseException('problem during creation of tmp dir (the directory already exists)'); |
|
| 55 | - if (!@mkdir($path->getPath())) |
|
| 56 | - throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');; |
|
| 57 | - if (!is_dir($path->getPath())) |
|
| 58 | - throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)'); |
|
| 53 | + if (file_exists($path->getPath())) { |
|
| 54 | + throw new OptimiseException('problem during creation of tmp dir (the directory already exists)'); |
|
| 55 | + } |
|
| 56 | + if (!@mkdir($path->getPath())) { |
|
| 57 | + throw new OptimiseException('problem during creation of tmp dir (mkdir problem)'); |
|
| 58 | + } |
|
| 59 | + ; |
|
| 60 | + if (!is_dir($path->getPath())) { |
|
| 61 | + throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)'); |
|
| 62 | + } |
|
| 59 | 63 | return $path; |
| 60 | 64 | } |
| 61 | 65 | |
@@ -80,8 +84,9 @@ discard block |
||
| 80 | 84 | */ |
| 81 | 85 | public function __destruct() |
| 82 | 86 | { |
| 83 | - if ($this->path && is_dir($this->path) && !self::delTree($this->path)) |
|
| 84 | - throw new OptimiseException('problems during removing of path directory'); |
|
| 87 | + if ($this->path && is_dir($this->path) && !self::delTree($this->path)) { |
|
| 88 | + throw new OptimiseException('problems during removing of path directory'); |
|
| 89 | + } |
|
| 85 | 90 | } |
| 86 | 91 | |
| 87 | 92 | /** |
@@ -59,10 +59,11 @@ discard block |
||
| 59 | 59 | { |
| 60 | 60 | // |
| 61 | 61 | $calendarId = $this->argument('calendarId'); |
| 62 | - if (is_numeric($calendarId)) |
|
| 63 | - $this->makeForeground(Caldav::findOrFail($calendarId)); |
|
| 64 | - else |
|
| 65 | - $this->syncAll(); |
|
| 62 | + if (is_numeric($calendarId)) { |
|
| 63 | + $this->makeForeground(Caldav::findOrFail($calendarId)); |
|
| 64 | + } else { |
|
| 65 | + $this->syncAll(); |
|
| 66 | + } |
|
| 66 | 67 | } |
| 67 | 68 | |
| 68 | 69 | /** |
@@ -82,13 +83,15 @@ discard block |
||
| 82 | 83 | if ($this->option('background')) { |
| 83 | 84 | \Log::debug(self::BACKGROUND_MOD_MEX); |
| 84 | 85 | $this->info(self::BACKGROUND_MOD_MEX); |
| 85 | - foreach ($calendars as $calendar) |
|
| 86 | - $this->makeBackground($calendar); |
|
| 86 | + foreach ($calendars as $calendar) { |
|
| 87 | + $this->makeBackground($calendar); |
|
| 88 | + } |
|
| 87 | 89 | \Log::debug(self::BACKGROUND_COMPLETED_MEX); |
| 88 | 90 | $this->info(self::BACKGROUND_COMPLETED_MEX); |
| 89 | - } else |
|
| 90 | - foreach ($calendars as $calendar) |
|
| 91 | + } else { |
|
| 92 | + foreach ($calendars as $calendar) |
|
| 91 | 93 | $this->makeForeground($calendar); |
| 94 | + } |
|
| 92 | 95 | } |
| 93 | 96 | |
| 94 | 97 | /** |
@@ -98,7 +101,8 @@ discard block |
||
| 98 | 101 | private function makeBackground(Caldav $calendar) |
| 99 | 102 | { |
| 100 | 103 | $event = $this->schedule->command('sync:caldav ' . $calendar->calendar_id)->withoutOverlapping(); |
| 101 | - if ($event->isDue($this->laravel)) |
|
| 102 | - $event->run($this->laravel); |
|
| 104 | + if ($event->isDue($this->laravel)) { |
|
| 105 | + $event->run($this->laravel); |
|
| 106 | + } |
|
| 103 | 107 | } |
| 104 | 108 | } |
@@ -97,14 +97,16 @@ |
||
| 97 | 97 | public function getEmailForPasswordReset() |
| 98 | 98 | { |
| 99 | 99 | list(, $caller) = debug_backtrace(false); |
| 100 | - if (isset($caller['class'])) |
|
| 101 | - $caller = explode('\\', $caller['class']); |
|
| 102 | - else |
|
| 103 | - $caller = ''; |
|
| 100 | + if (isset($caller['class'])) { |
|
| 101 | + $caller = explode('\\', $caller['class']); |
|
| 102 | + } else { |
|
| 103 | + $caller = ''; |
|
| 104 | + } |
|
| 104 | 105 | |
| 105 | 106 | //check if this function is called by email sender |
| 106 | - if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == '')) |
|
| 107 | - return $this->email; |
|
| 107 | + if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == '')) { |
|
| 108 | + return $this->email; |
|
| 109 | + } |
|
| 108 | 110 | //return unique identify for token repository |
| 109 | 111 | return $this->email . $this->company->id; |
| 110 | 112 | } |
@@ -45,8 +45,9 @@ |
||
| 45 | 45 | |
| 46 | 46 | public function getPlannerNameAttribute() |
| 47 | 47 | { |
| 48 | - if (is_object($this->planner) && $this->planner->exists) |
|
| 49 | - return $this->planner->name; |
|
| 48 | + if (is_object($this->planner) && $this->planner->exists) { |
|
| 49 | + return $this->planner->name; |
|
| 50 | + } |
|
| 50 | 51 | return null; |
| 51 | 52 | } |
| 52 | 53 | |
@@ -50,8 +50,9 @@ 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 | 56 | $employee = $company->employees()->create($input); |
| 56 | 57 | return $employee; |
| 57 | 58 | } |
@@ -83,8 +84,9 @@ discard block |
||
| 83 | 84 | $employee = Employee::findOrFail($id); |
| 84 | 85 | $this->authorize($employee); |
| 85 | 86 | $input = $request->all(); |
| 86 | - if (isset($input['password'])) |
|
| 87 | - $input['password'] = bcrypt($input['password']); |
|
| 87 | + if (isset($input['password'])) { |
|
| 88 | + $input['password'] = bcrypt($input['password']); |
|
| 89 | + } |
|
| 88 | 90 | $employee->update($input); |
| 89 | 91 | return $employee; |
| 90 | 92 | } |
@@ -69,8 +69,9 @@ |
||
| 69 | 69 | $employee = Employee::findOrFail($employeeId); |
| 70 | 70 | $this->authorize($employee); |
| 71 | 71 | $group = Group::findOrFail($groupId); |
| 72 | - if (!$employee->belongsToGroup($group)) |
|
| 73 | - return Response::json(['error' => 'employId <> groupId'], 404); |
|
| 72 | + if (!$employee->belongsToGroup($group)) { |
|
| 73 | + return Response::json(['error' => 'employId <> groupId'], 404); |
|
| 74 | + } |
|
| 74 | 75 | $employee->groups()->detach($groupId); |
| 75 | 76 | return $group->employees; |
| 76 | 77 | } |
@@ -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 | /** |