dsd-meetme / backend

app/Http/Controllers/Companies/Employees/EmployeesController.php

Spacing +6 added lines, -6 removed lines

@@ -21,8 +21,8 @@ 
      */
     public function __construct()
     {
-        config(['auth.model' => \plunner\Company::class]);
-        config(['jwt.user' => \plunner\Company::class]);
+        config([ 'auth.model' => \plunner\Company::class ]);
+        config([ 'jwt.user' => \plunner\Company::class ]);
         $this->middleware('jwt.authandrefresh:mode-cn');
     }
 
@@ -53,8 +53,8 @@ 
         //
         $company = \Auth::user();
         $input = $request->all();
-        if(isset($input['password']))
-            $input['password'] = bcrypt($input['password']);
+        if (isset($input[ 'password' ]))
+            $input[ 'password' ] = bcrypt($input[ 'password' ]);
         $employee = $company->employees()->create($input);
         return $employee;
     }
@@ -86,8 +86,8 @@ 
         $employee = Employee::findOrFail($id);
         $this->authorize($employee);
         $input = $request->all();
-        if(isset($input['password']))
-            $input['password'] = bcrypt($input['password']);
+        if (isset($input[ 'password' ]))
+            $input[ 'password' ] = bcrypt($input[ 'password' ]);
         $employee->update($input);
         return $employee;
     }

Braces +6 added lines, -4 removed lines

@@ -53,8 +53,9 @@ 
         //
         $company = \Auth::user();
         $input = $request->all();
-        if(isset($input['password']))
-            $input['password'] = bcrypt($input['password']);
+        if(isset($input['password'])) {
+                    $input['password'] = bcrypt($input['password']);
+        }
         $employee = $company->employees()->create($input);
         return $employee;
     }
@@ -86,8 +87,9 @@ 
         $employee = Employee::findOrFail($id);
         $this->authorize($employee);
         $input = $request->all();
-        if(isset($input['password']))
-            $input['password'] = bcrypt($input['password']);
+        if(isset($input['password'])) {
+                    $input['password'] = bcrypt($input['password']);
+        }
         $employee->update($input);
         return $employee;
     }

app/Http/Controllers/Companies/Auth/PasswordController.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
      * cn = company normal
      * @var array
      */
-    protected $custom = ['mode'=>'cn'];
+    protected $custom = [ 'mode'=>'cn' ];
 
 
     /**
@@ -41,8 +41,8 @@ 
      */
     public function __construct()
     {
-        config(['auth.model' => \plunner\Company::class]);
-        config(['jwt.user' => \plunner\Company::class]);
-        config(['auth.password.table' => 'password_resets_companies', 'auth.password.email' => 'emails.companies.password']);
+        config([ 'auth.model' => \plunner\Company::class ]);
+        config([ 'jwt.user' => \plunner\Company::class ]);
+        config([ 'auth.password.table' => 'password_resets_companies', 'auth.password.email' => 'emails.companies.password' ]);
     }
 }

app/Http/Middleware/VerifyCsrfToken.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     {
 
         // Don't validate CSRF when testing.
-        if(env('APP_ENV') === 'testing') {
+        if (env('APP_ENV') === 'testing') {
             return true;
         }
 

app/Console/Commands/SyncCaldav/Sync.php

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Claudio Cardinale <cardi@thecsea.it>
- * Date: 03/12/15
- * Time: 2.33
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
+     * Created by PhpStorm.
+     * User: Claudio Cardinale <cardi@thecsea.it>
+     * Date: 03/12/15
+     * Time: 2.33
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 2
+     * of the License, or (at your option) any later version.
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+     */
 
 namespace plunner\Console\Commands\SyncCaldav;
 

Spacing +20 added lines, -20 removed lines

@@ -73,12 +73,12 @@ 
         $caldavClient = new SimpleCaldavAdapter();
         $caldavClient->connect($this->calendar->url, $this->calendar->username, \Crypt::decrypt($this->calendar->password));
         $calendars = $caldavClient->findCalendars();
-        $caldavClient->setCalendar($calendars[$this->calendar->calendar_name]);//TODO error if the calendar name is wrong
+        $caldavClient->setCalendar($calendars[ $this->calendar->calendar_name ]); //TODO error if the calendar name is wrong
         /**
          * 26 hours before to avoid tiemezone problems and dst problems
          * 30 days after
          */
-        return $caldavClient->getEvents(date('Ymd\THis\Z', time()-93600), date('Ymd\THis\Z', time()+2592000));
+        return $caldavClient->getEvents(date('Ymd\THis\Z', time() - 93600), date('Ymd\THis\Z', time() + 2592000));
     }
 
     /**
@@ -89,13 +89,13 @@ 
         try
         {
             $events = $this->getEvents();
-        }catch (\it\thecsea\caldav_client_adapter\CaldavException $e)
+        } catch (\it\thecsea\caldav_client_adapter\CaldavException $e)
         {
             \Event::fire(new CaldavErrorEvent($this->calendar, $e->getMessage()));
-            return ;
-        }catch(\Illuminate\Contracts\Encryption\DecryptException $e){
+            return;
+        } catch (\Illuminate\Contracts\Encryption\DecryptException $e) {
             \Event::fire(new CaldavErrorEvent($this->calendar, $e->getMessage()));
-            return ;
+            return;
         }
 
         /**
@@ -105,8 +105,8 @@ 
 
         //remove old timeslots
         $calendarMain->timeslots()->delete();
-        foreach($events as $event){
-            if(!($event = $this->parseEvent($event)))
+        foreach ($events as $event) {
+            if (!($event = $this->parseEvent($event)))
                 \Event::fire(new CaldavErrorEvent($this->calendar, 'problem during the parsing an event'));
             else
                 $calendarMain->timeslots()->create($event);
@@ -120,16 +120,16 @@ 
     private function parseEvent(EventInterface $event)
     {
         $pattern = "/^((DTSTART;)|(DTEND;))(.*)\$/m";
-        if(preg_match_all($pattern, $event->getData(), $matches)){
-            if(!isset($matches[4]) || count($matches[4]) != 2)
+        if (preg_match_all($pattern, $event->getData(), $matches)) {
+            if (!isset($matches[ 4 ]) || count($matches[ 4 ]) != 2)
                 return null;
-            $ret = [];
-            if($tmp = $this->parseDate($matches[4][0]))
-                $ret['time_start'] = $tmp;
+            $ret = [ ];
+            if ($tmp = $this->parseDate($matches[ 4 ][ 0 ]))
+                $ret[ 'time_start' ] = $tmp;
             else
                 return null;
-            if($tmp = $this->parseDate($matches[4][1]))
-                $ret['time_end'] = $tmp;
+            if ($tmp = $this->parseDate($matches[ 4 ][ 1 ]))
+                $ret[ 'time_end' ] = $tmp;
             else
                 return null;
             return $ret;
@@ -144,13 +144,13 @@ 
     private function parseDate($date)
     {
         $pattern = "/^((TZID=)|(VALUE=))(.*):(.*)\$/m";
-        if(preg_match_all($pattern, $date, $matches)){
-            if($matches[1][0] == 'TZID=')
+        if (preg_match_all($pattern, $date, $matches)) {
+            if ($matches[ 1 ][ 0 ] == 'TZID=')
             {
-                return \DateTime::createFromFormat('Ymd\THis', $matches[5][0], new \DateTimeZone($matches[4][0]));
-            }else if($matches[1][0] == 'VALUE=' && $matches[4][0] == 'DATE')
+                return \DateTime::createFromFormat('Ymd\THis', $matches[ 5 ][ 0 ], new \DateTimeZone($matches[ 4 ][ 0 ]));
+            } else if ($matches[ 1 ][ 0 ] == 'VALUE=' && $matches[ 4 ][ 0 ] == 'DATE')
             {
-                return \DateTime::createFromFormat('Ymd\THis', $matches[5][0].'T000000');
+                return \DateTime::createFromFormat('Ymd\THis', $matches[ 5 ][ 0 ].'T000000');
             }
         }
         return null;

Braces +21 added lines, -17 removed lines

@@ -91,11 +91,11 @@ 
         try
         {
             $events = $this->getEvents();
-        }catch (\it\thecsea\caldav_client_adapter\CaldavException $e)
+        } catch (\it\thecsea\caldav_client_adapter\CaldavException $e)
         {
             \Event::fire(new ErrorEvent($this->calendar, $e->getMessage()));
             return ;
-        }catch(\Illuminate\Contracts\Encryption\DecryptException $e){
+        } catch(\Illuminate\Contracts\Encryption\DecryptException $e){
             \Event::fire(new ErrorEvent($this->calendar, $e->getMessage()));
             return ;
         }
@@ -110,10 +110,11 @@ 
 
         //insert new timeslots
         foreach($events as $event){
-            if(!($event = $this->parseEvent($event)))
-                \Event::fire(new ErrorEvent($this->calendar, 'problem during the parsing an event'));
-            else
-                $calendarMain->timeslots()->create($event);
+            if(!($event = $this->parseEvent($event))) {
+                            \Event::fire(new ErrorEvent($this->calendar, 'problem during the parsing an event'));
+            } else {
+                            $calendarMain->timeslots()->create($event);
+            }
         }
         \Event::fire(new OkEvent($this->calendar));
     }
@@ -126,17 +127,20 @@ 
     {
         $pattern = "/^((DTSTART;)|(DTEND;))(.*)\$/m";
         if(preg_match_all($pattern, $event->getData(), $matches)){
-            if(!isset($matches[4]) || count($matches[4]) != 2)
-                return null;
+            if(!isset($matches[4]) || count($matches[4]) != 2) {
+                            return null;
+            }
             $ret = [];
-            if($tmp = $this->parseDate($matches[4][0]))
-                $ret['time_start'] = $tmp;
-            else
-                return null;
-            if($tmp = $this->parseDate($matches[4][1]))
-                $ret['time_end'] = $tmp;
-            else
-                return null;
+            if($tmp = $this->parseDate($matches[4][0])) {
+                            $ret['time_start'] = $tmp;
+            } else {
+                            return null;
+            }
+            if($tmp = $this->parseDate($matches[4][1])) {
+                            $ret['time_end'] = $tmp;
+            } else {
+                            return null;
+            }
             return $ret;
         }
         return null;
@@ -153,7 +157,7 @@ 
             if($matches[1][0] == 'TZID=')
             {
                 return \DateTime::createFromFormat('Ymd\THis', $matches[5][0], new \DateTimeZone($matches[4][0]));
-            }else if($matches[1][0] == 'VALUE=' && $matches[4][0] == 'DATE')
+            } else if($matches[1][0] == 'VALUE=' && $matches[4][0] == 'DATE')
             {
                 return \DateTime::createFromFormat('Ymd\THis', $matches[5][0].'T000000');
             }

app/Console/Commands/SyncCaldav/SyncCaldav.php

Indentation +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
     {
         $event = $this->schedule->command('sync:caldav '.$calendar->calendar_id)->withoutOverlapping();
         if($event->isDue($this->laravel))
-             $event->run($this->laravel);
+                $event->run($this->laravel);
     }
 
     /**

Spacing +7 added lines, -7 removed lines

@@ -53,7 +53,7 @@ 
     {
         //
         $calendarId = $this->argument('calendarId');
-        if(is_numeric($calendarId))
+        if (is_numeric($calendarId))
             $this->makeForeground(Caldav::findOrFail($calendarId));
         else
             $this->syncAll();
@@ -62,15 +62,15 @@ 
     private function syncAll()
     {
         $calendars = Caldav::all();
-        if($this->option('background')) {
+        if ($this->option('background')) {
             \Log::debug(self::BACKGROUND_MOD_MEX);
             $this->info(self::BACKGROUND_MOD_MEX);
             foreach ($calendars as $calendar)
                 $this->makeBackground($calendar);
             \Log::debug(self::BACKGROUND_COMPLETED_MEX);
             $this->info(self::BACKGROUND_COMPLETED_MEX);
-        }else
-            foreach($calendars as $calendar)
+        } else
+            foreach ($calendars as $calendar)
                 $this->makeForeground($calendar);
     }
 
@@ -81,7 +81,7 @@ 
     private function makeBackground(Caldav $calendar)
     {
         $event = $this->schedule->command('sync:caldav '.$calendar->calendar_id)->withoutOverlapping();
-        if($event->isDue($this->laravel))
+        if ($event->isDue($this->laravel))
              $event->run($this->laravel);
     }
 
@@ -91,8 +91,8 @@ 
      */
     private function makeForeground(Caldav $calendar)
     {
-        $this->info('Sync calendar '. $calendar->calendar_id.' started');
+        $this->info('Sync calendar '.$calendar->calendar_id.' started');
         (new Sync($calendar))->sync();
-        $this->info('Sync calendar '. $calendar->calendar_id.' completed');
+        $this->info('Sync calendar '.$calendar->calendar_id.' completed');
     }
 }

Braces +14 added lines, -10 removed lines

@@ -53,10 +53,11 @@ 
     {
         //
         $calendarId = $this->argument('calendarId');
-        if(is_numeric($calendarId))
-            $this->makeForeground(Caldav::findOrFail($calendarId));
-        else
-            $this->syncAll();
+        if(is_numeric($calendarId)) {
+                    $this->makeForeground(Caldav::findOrFail($calendarId));
+        } else {
+                    $this->syncAll();
+        }
     }
 
     private function syncAll()
@@ -65,13 +66,15 @@ 
         if($this->option('background')) {
             \Log::debug(self::BACKGROUND_MOD_MEX);
             $this->info(self::BACKGROUND_MOD_MEX);
-            foreach ($calendars as $calendar)
-                $this->makeBackground($calendar);
+            foreach ($calendars as $calendar) {
+                            $this->makeBackground($calendar);
+            }
             \Log::debug(self::BACKGROUND_COMPLETED_MEX);
             $this->info(self::BACKGROUND_COMPLETED_MEX);
-        }else
-            foreach($calendars as $calendar)
+        } else {
+                    foreach($calendars as $calendar)
                 $this->makeForeground($calendar);
+        }
     }
 
     /**
@@ -81,8 +84,9 @@ 
     private function makeBackground(Caldav $calendar)
     {
         $event = $this->schedule->command('sync:caldav '.$calendar->calendar_id)->withoutOverlapping();
-        if($event->isDue($this->laravel))
-             $event->run($this->laravel);
+        if($event->isDue($this->laravel)) {
+                     $event->run($this->laravel);
+        }
     }
 
     /**

app/Caldav.php

Spacing +3 added lines, -3 removed lines

@@ -37,19 +37,19 @@
     /**
      * @var array
      */
-    protected $touches = ['calendar'];
+    protected $touches = [ 'calendar' ];
 
     /**
      * @var array
      */
-    protected $fillable = ['url', 'username', 'password', 'calendar_name'];
+    protected $fillable = [ 'url', 'username', 'password', 'calendar_name' ];
 
     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
-    protected $hidden = ['password'];
+    protected $hidden = [ 'password' ];
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo

app/Http/Controllers/Employees/Planners/GroupsController.php

Spacing +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
      */
     public function __construct()
     {
-        config(['auth.model' => Planner::class]);
-        config(['jwt.user' => Planner::class]);
+        config([ 'auth.model' => Planner::class ]);
+        config([ 'jwt.user' => Planner::class ]);
         $this->middleware('jwt.authandrefresh:mode-en');
     }
 

app/Calendar.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      *
      * @var array
      */
-    protected $fillable = ['name', 'enabled'];
+    protected $fillable = [ 'name', 'enabled' ];
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo

app/Http/Controllers/Employees/Calendars/CalendarsController.php

Braces +10 added lines, -7 removed lines

@@ -66,8 +66,9 @@ 
         $employee = \Auth::user();
         $input = $request->all();
         $calendar = $employee->calendars()->create($input);
-        if(isset($input['password']))
-            $input['password'] = \Crypt::encrypt($input['password']);
+        if(isset($input['password'])) {
+                    $input['password'] = \Crypt::encrypt($input['password']);
+        }
         $calendar->caldav()->create($input);
         //TODO test
         //TODO validator
@@ -107,15 +108,17 @@ 
         if($caldav){
             $this->validateCaldav($request);
         }
-        if(isset($input['password']))
-            $input['password'] = \Crypt::encrypt($input['password']);
+        if(isset($input['password'])) {
+                    $input['password'] = \Crypt::encrypt($input['password']);
+        }
         $calendar->update($input);
         //TODO test
         //TODO validator
         //TODO check if caldav exists?
 
-        if($caldav)
-            $caldav->update($input);
+        if($caldav) {
+                    $caldav->update($input);
+        }
         return $calendar;
     }
 
@@ -148,7 +151,7 @@ 
             $caldavClient->connect($request->input('url'), $request->input('username'), $request->input('password'));
             $calendars = $caldavClient->findCalendars();
             return array_keys($calendars);
-        }catch (\it\thecsea\caldav_client_adapter\CaldavException $e)
+        } catch (\it\thecsea\caldav_client_adapter\CaldavException $e)
         {
             return Response::json(['error' => $e->getMessage()],422);
         }

Spacing +11 added lines, -11 removed lines

@@ -17,8 +17,8 @@ 
      */
     public function __construct()
     {
-        config(['auth.model' => \plunner\Employee::class]);
-        config(['jwt.user' => \plunner\Employee::class]);
+        config([ 'auth.model' => \plunner\Employee::class ]);
+        config([ 'jwt.user' => \plunner\Employee::class ]);
         $this->middleware('jwt.authandrefresh:mode-en');
     }
 
@@ -67,8 +67,8 @@ 
         $employee = \Auth::user();
         $input = $request->all();
         $calendar = $employee->calendars()->create($input);
-        if(isset($input['password']))
-            $input['password'] = \Crypt::encrypt($input['password']);
+        if (isset($input[ 'password' ]))
+            $input[ 'password' ] = \Crypt::encrypt($input[ 'password' ]);
         $calendar->caldav()->create($input);
         //TODO test
         //TODO validator
@@ -105,17 +105,17 @@ 
         $this->authorize($calendar);
         $input = $request->all();
         $caldav = $calendar->caldav;
-        if($caldav){
+        if ($caldav) {
             $this->validateCaldav($request);
         }
-        if(isset($input['password']))
-            $input['password'] = \Crypt::encrypt($input['password']);
+        if (isset($input[ 'password' ]))
+            $input[ 'password' ] = \Crypt::encrypt($input[ 'password' ]);
         $calendar->update($input);
         //TODO test
         //TODO validator
         //TODO check if caldav exists?
 
-        if($caldav)
+        if ($caldav)
             $caldav->update($input);
         return $calendar;
     }
@@ -149,9 +149,9 @@ 
             $caldavClient->connect($request->input('url'), $request->input('username'), $request->input('password'));
             $calendars = $caldavClient->findCalendars();
             return array_keys($calendars);
-        }catch (\it\thecsea\caldav_client_adapter\CaldavException $e)
+        } catch (\it\thecsea\caldav_client_adapter\CaldavException $e)
         {
-            return Response::json(['error' => $e->getMessage()],422);
+            return Response::json([ 'error' => $e->getMessage() ], 422);
         }
     }
 
@@ -163,7 +163,7 @@ 
         $this->validate($request, [
             'url' => 'required|max:255',
             'username' => 'required|max:255',
-            'password' => ((\Route::current()->getName() == 'employees.calendars.caldav')?'':'sometimes|'). 'required',
+            'password' => ((\Route::current()->getName() == 'employees.calendars.caldav') ? '' : 'sometimes|').'required',
             'calendar_name' => 'required|max:255',
         ]);
     }