Completed
Push — master ( bc4e81...14a953 )
by claudio
04:04
created
app/Calendar.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -54,8 +54,9 @@
 block discarded – undo
54 54
      */
55 55
     public function Caldav()
56 56
     {
57
-        if($this->type == 'caldav')
58
-            return $this->hasOne(Caldav::class);
57
+        if($this->type == 'caldav') {
58
+                    return $this->hasOne(Caldav::class);
59
+        }
59 60
         return null;
60 61
     }
61 62
 }
Please login to merge, or discard this patch.
app/Console/Commands/SyncCaldav/SyncCaldav.php 1 patch
Braces   +14 added lines, -10 removed lines patch added patch discarded remove patch
@@ -53,10 +53,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     /**
Please login to merge, or discard this patch.
app/Console/Commands/SyncCaldav/Sync.php 1 patch
Braces   +21 added lines, -17 removed lines patch added patch discarded remove patch
@@ -89,11 +89,11 @@  discard block
 block discarded – undo
89 89
         try
90 90
         {
91 91
             $events = $this->getEvents();
92
-        }catch (\it\thecsea\caldav_client_adapter\CaldavException $e)
92
+        } catch (\it\thecsea\caldav_client_adapter\CaldavException $e)
93 93
         {
94 94
             \Event::fire(new CaldavErrorEvent($this->calendar, $e->getMessage()));
95 95
             return ;
96
-        }catch(\Illuminate\Contracts\Encryption\DecryptException $e){
96
+        } catch(\Illuminate\Contracts\Encryption\DecryptException $e){
97 97
             \Event::fire(new CaldavErrorEvent($this->calendar, $e->getMessage()));
98 98
             return ;
99 99
         }
@@ -106,10 +106,11 @@  discard block
 block discarded – undo
106 106
         //remove old timeslots
107 107
         $calendarMain->timeslots()->delete();
108 108
         foreach($events as $event){
109
-            if(!($event = $this->parseEvent($event)))
110
-                \Event::fire(new CaldavErrorEvent($this->calendar, 'problem during the parsing an event'));
111
-            else
112
-                $calendarMain->timeslots()->create($event);
109
+            if(!($event = $this->parseEvent($event))) {
110
+                            \Event::fire(new CaldavErrorEvent($this->calendar, 'problem during the parsing an event'));
111
+            } else {
112
+                            $calendarMain->timeslots()->create($event);
113
+            }
113 114
         }
114 115
     }
115 116
 
@@ -121,17 +122,20 @@  discard block
 block discarded – undo
121 122
     {
122 123
         $pattern = "/^((DTSTART;)|(DTEND;))(.*)\$/m";
123 124
         if(preg_match_all($pattern, $event->getData(), $matches)){
124
-            if(!isset($matches[4]) || count($matches[4]) != 2)
125
-                return null;
125
+            if(!isset($matches[4]) || count($matches[4]) != 2) {
126
+                            return null;
127
+            }
126 128
             $ret = [];
127
-            if($tmp = $this->parseDate($matches[4][0]))
128
-                $ret['time_start'] = $tmp;
129
-            else
130
-                return null;
131
-            if($tmp = $this->parseDate($matches[4][1]))
132
-                $ret['time_end'] = $tmp;
133
-            else
134
-                return null;
129
+            if($tmp = $this->parseDate($matches[4][0])) {
130
+                            $ret['time_start'] = $tmp;
131
+            } else {
132
+                            return null;
133
+            }
134
+            if($tmp = $this->parseDate($matches[4][1])) {
135
+                            $ret['time_end'] = $tmp;
136
+            } else {
137
+                            return null;
138
+            }
135 139
             return $ret;
136 140
         }
137 141
         return null;
@@ -148,7 +152,7 @@  discard block
 block discarded – undo
148 152
             if($matches[1][0] == 'TZID=')
149 153
             {
150 154
                 return \DateTime::createFromFormat('Ymd\THis', $matches[5][0], new \DateTimeZone($matches[4][0]));
151
-            }else if($matches[1][0] == 'VALUE=' && $matches[4][0] == 'DATE')
155
+            } else if($matches[1][0] == 'VALUE=' && $matches[4][0] == 'DATE')
152 156
             {
153 157
                 return \DateTime::createFromFormat('Ymd\THis', $matches[5][0].'T000000');
154 158
             }
Please login to merge, or discard this patch.