dsd-meetme / backend

app/PolicyCheckable.php

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Claudio Cardinale <cardi@thecsea.it>
- * Date: 24/11/15
- * Time: 21.58
- * 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: 24/11/15
+     * Time: 21.58
+     * 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;
 

app/Group.php

Braces +3 added lines, -2 removed lines

@@ -51,8 +51,9 @@
 
     public function getPlannerNameAttribute()
     {
-        if(is_object($this->planner) && $this->planner->exists)
-            return $this->planner->name;
+        if(is_object($this->planner) && $this->planner->exists) {
+                    return $this->planner->name;
+        }
     }
 
     /**

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

Braces +3 added lines, -2 removed lines

@@ -71,8 +71,9 @@
         $employee = Employee::findOrFail($employeeId);
         $this->authorize($employee);
         $group = Group::findOrFail($groupId);
-        if(!$employee->belongsToGroup($group))
-            return Response::json(['error' => 'employId <> groupId'],404);
+        if(!$employee->belongsToGroup($group)) {
+                    return Response::json(['error' => 'employId <> groupId'],404);
+        }
         $employee->groups()->detach($groupId);
         return $group->employees;
     }

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

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/Employee.php

Braces +11 added lines, -8 removed lines

@@ -109,14 +109,16 @@ 
     public function getEmailForPasswordReset()
     {
         list(, $caller) = debug_backtrace(false);
-        if(isset($caller['class']))
-            $caller = explode('\\', $caller['class']);
-        else
-            $caller = '';
+        if(isset($caller['class'])) {
+                    $caller = explode('\\', $caller['class']);
+        } else {
+                    $caller = '';
+        }
 
         //check if this function is called by email sender
-        if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == ''))
-            return $this->email;
+        if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == '')) {
+                    return $this->email;
+        }
         //return unique identify for token repository
         return $this->email . $this->company->id;
     }
@@ -128,8 +130,9 @@ 
     public function belongsToGroup(Group $group)
     {
         $group = $this->groups()->where('id', $group->id)->first();
-        if(is_object($group) && $group->exists)
-            return true;
+        if(is_object($group) && $group->exists) {
+                    return true;
+        }
         return false;
     }
 

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;
 

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);
     }
 
     /**

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/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);
         }

app/Console/Commands/Optimise/Optimise.php

Indentation +8 added lines, -8 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * Created by PhpStorm.
- * User: claudio
- * Date: 12/12/15
- * Time: 15.41
- */
+     * Created by PhpStorm.
+     * User: claudio
+     * Date: 12/12/15
+     * Time: 15.41
+     */
 
 namespace plunner\Console\Commands\Optimise;
 
@@ -45,8 +45,8 @@ 
     private $company;
 
     /**
-    * @var Schedule laravel schedule object needed to perform command in background
-    */
+     * @var Schedule laravel schedule object needed to perform command in background
+     */
     private $schedule;
 
     /**
@@ -413,7 +413,7 @@ 
         $diff = explode(':',$diff->format('%R:%d:%h:%i:%s'));
         $diff = $diff[1]*86400 + $diff[2]*3600 + $diff[3]*60 + $diff[4];
         //if($diff[0] != '-' && $diff != 0)
-          //  throw new OptimiseException('timeslot time <= startTime');
+            //  throw new OptimiseException('timeslot time <= startTime');
         //TODO fix check
         //TODO check if diff makes sense
         //TODO check upper limit

Braces +12 added lines, -9 removed lines

@@ -156,7 +156,7 @@ 
             $solver = $this->setData($solver);
             $solver = $solver->solve();
             $this->solver = $solver;
-        }catch(\Exception $e)
+        } catch(\Exception $e)
         {
             \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
             throw new OptimiseException('Optimising error', 0, $e);
@@ -180,7 +180,7 @@ 
         try {
             $this->saveMeetings($this->solver);
             $this->saveEmployeesMeetings($this->solver);
-        }catch(\Exception $e)
+        } catch(\Exception $e)
         {
             \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
             throw new OptimiseException('Optimising error', 0, $e);
@@ -327,7 +327,7 @@ 
             foreach($meetings as $meeting){
                 if($usersMeetingsTmp->contains('meeting_id', $meeting)){
                     $ret[$user][$meeting] = 1;
-                }else{
+                } else{
                     $ret[$user][$meeting] = 0;
                 }
             }
@@ -373,8 +373,9 @@ 
     static private function fillTimeSlots(array $array, $id, \Illuminate\Support\Collection $timeSlots, $fill = '0')
     {
         foreach($timeSlots as $timeSlot) {
-            if(!isset($array[$id]))
-                $array[$id] = [];
+            if(!isset($array[$id])) {
+                            $array[$id] = [];
+            }
             $array[$id] = self::arrayPadInterval($array[$id], $timeSlot->time_start, $timeSlot->time_end, $fill);
         }
         return $array;
@@ -389,8 +390,9 @@ 
     static private function fillRow(array $array, $id, $until, $fill = '0')
     {
         for($i = 1; $i <= $until; $i++){
-            if(!isset($array[$id][$i]))
-                $array[$id][$i] = $fill;
+            if(!isset($array[$id][$i])) {
+                            $array[$id][$i] = $fill;
+            }
         }
 
         return $array;
@@ -405,8 +407,9 @@ 
      */
     static private function arrayPadInterval(array $array, $from, $to, $pad = '0')
     {
-        for($i = $from; $i<$to; $i++)
-            $array[$i] = $pad;
+        for($i = $from; $i<$to; $i++) {
+                    $array[$i] = $pad;
+        }
         return $array;
     }