Completed
Pull Request — master (#10)
by claudio
04:11
created
app/Caldav.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
     /**
17 17
      * @var array
18 18
      */
19
-    protected $touches = ['calendar'];
19
+    protected $touches = [ 'calendar' ];
20 20
 
21 21
     /**
22 22
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
Please login to merge, or discard this patch.
app/Calendar.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
      *
32 32
      * @var array
33 33
      */
34
-    protected $fillable = ['name'];
34
+    protected $fillable = [ 'name' ];
35 35
 
36 36
     /**
37 37
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
      */
55 55
     public function Caldav()
56 56
     {
57
-        if($this->type == 'caldav')
57
+        if ($this->type == 'caldav')
58 58
             return $this->hasOne(Caldav::class);
59 59
         return null;
60 60
     }
Please login to merge, or discard this patch.
app/Console/Commands/SyncCaldav/SyncCaldav.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
     {
54 54
         //
55 55
         $calendarId = $this->argument('calendarId');
56
-        if(is_numeric($calendarId))
56
+        if (is_numeric($calendarId))
57 57
             $this->makeForeground(Caldav::findOrFail($calendarId));
58 58
         else
59 59
             $this->syncAll();
@@ -62,15 +62,15 @@  discard block
 block discarded – undo
62 62
     private function syncAll()
63 63
     {
64 64
         $calendars = Caldav::all();
65
-        if($this->option('background')) {
65
+        if ($this->option('background')) {
66 66
             \Log::debug(self::BACKGROUND_MOD_MEX);
67 67
             $this->info(self::BACKGROUND_MOD_MEX);
68 68
             foreach ($calendars as $calendar)
69 69
                 $this->makeBackground($calendar);
70 70
             \Log::debug(self::BACKGROUND_COMPLETED_MEX);
71 71
             $this->info(self::BACKGROUND_COMPLETED_MEX);
72
-        }else
73
-            foreach($calendars as $calendar)
72
+        } else
73
+            foreach ($calendars as $calendar)
74 74
                 $this->makeForeground($calendar);
75 75
     }
76 76
 
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
     private function makeBackground(Caldav $calendar)
82 82
     {
83 83
         $event = $this->schedule->command('sync:caldav '.$calendar->calendar_id)->withoutOverlapping();
84
-        if($event->isDue($this->laravel))
84
+        if ($event->isDue($this->laravel))
85 85
              $event->run($this->laravel);
86 86
     }
87 87
 
@@ -91,8 +91,8 @@  discard block
 block discarded – undo
91 91
      */
92 92
     private function makeForeground(Caldav $calendar)
93 93
     {
94
-        $this->info('Sync calendar '. $calendar->calendar_id.' started');
94
+        $this->info('Sync calendar '.$calendar->calendar_id.' started');
95 95
         (new Sync($calendar))->sync();
96
-        $this->info('Sync calendar '. $calendar->calendar_id.' completed');
96
+        $this->info('Sync calendar '.$calendar->calendar_id.' completed');
97 97
     }
98 98
 }
Please login to merge, or discard this patch.
app/Console/Commands/SyncCaldav/Sync.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -73,12 +73,12 @@  discard block
 block discarded – undo
73 73
         $caldavClient = new SimpleCaldavAdapter();
74 74
         $caldavClient->connect($this->calendar->url, $this->calendar->username, \Crypt::decrypt($this->calendar->password));
75 75
         $calendars = $caldavClient->findCalendars();
76
-        $caldavClient->setCalendar($calendars[$this->calendar->calendar_name]);
76
+        $caldavClient->setCalendar($calendars[ $this->calendar->calendar_name ]);
77 77
         /**
78 78
          * 26 hours before to avoid tiemezone problems and dst problems
79 79
          * 30 days after
80 80
          */
81
-        return $caldavClient->getEvents(date('Ymd\THis\Z', time()-93600), date('Ymd\THis\Z', time()+2592000));
81
+        return $caldavClient->getEvents(date('Ymd\THis\Z', time() - 93600), date('Ymd\THis\Z', time() + 2592000));
82 82
     }
83 83
 
84 84
     /**
@@ -89,13 +89,13 @@  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
-            return ;
96
-        }catch(\Illuminate\Contracts\Encryption\DecryptException $e){
95
+            return;
96
+        } catch (\Illuminate\Contracts\Encryption\DecryptException $e) {
97 97
             \Event::fire(new CaldavErrorEvent($this->calendar, $e->getMessage()));
98
-            return ;
98
+            return;
99 99
         }
100 100
 
101 101
         /**
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
105 105
 
106 106
         //remove old timeslots
107 107
         $calendarMain->timeslots()->delete();
108
-        foreach($events as $event){
109
-            if(!($event = $this->parseEvent($event)))
108
+        foreach ($events as $event) {
109
+            if (!($event = $this->parseEvent($event)))
110 110
                 \Event::fire(new CaldavErrorEvent($this->calendar, 'problem during the parsing an event'));
111 111
             $calendarMain->timeslots()->create($event);
112 112
         }
@@ -119,16 +119,16 @@  discard block
 block discarded – undo
119 119
     private function parseEvent(EventInterface $event)
120 120
     {
121 121
         $pattern = "/^((DTSTART;)|(DTEND;))(.*)\$/m";
122
-        if(preg_match_all($pattern, $event->getData(), $matches)){
123
-            if(!isset($matches[4]) || count($matches[4]) != 2)
122
+        if (preg_match_all($pattern, $event->getData(), $matches)) {
123
+            if (!isset($matches[ 4 ]) || count($matches[ 4 ]) != 2)
124 124
                 return null;
125
-            $ret = [];
126
-            if($tmp = $this->parseDate($matches[4][0]))
127
-                $ret['time_start'] = $tmp;
125
+            $ret = [ ];
126
+            if ($tmp = $this->parseDate($matches[ 4 ][ 0 ]))
127
+                $ret[ 'time_start' ] = $tmp;
128 128
             else
129 129
                 return null;
130
-            if($tmp = $this->parseDate($matches[4][1]))
131
-                $ret['time_end'] = $tmp;
130
+            if ($tmp = $this->parseDate($matches[ 4 ][ 1 ]))
131
+                $ret[ 'time_end' ] = $tmp;
132 132
             else
133 133
                 return null;
134 134
             return $ret;
@@ -143,13 +143,13 @@  discard block
 block discarded – undo
143 143
     private function parseDate($date)
144 144
     {
145 145
         $pattern = "/^((TZID=)|(VALUE=))(.*):(.*)\$/m";
146
-        if(preg_match_all($pattern, $date, $matches)){
147
-            if($matches[1][0] == 'TZID=')
146
+        if (preg_match_all($pattern, $date, $matches)) {
147
+            if ($matches[ 1 ][ 0 ] == 'TZID=')
148 148
             {
149
-                return \DateTime::createFromFormat('Ymd\THis', $matches[5][0], new \DateTimeZone($matches[4][0]));
150
-            }else if($matches[1][0] == 'VALUE=' && $matches[4][0] == 'DATE')
149
+                return \DateTime::createFromFormat('Ymd\THis', $matches[ 5 ][ 0 ], new \DateTimeZone($matches[ 4 ][ 0 ]));
150
+            } else if ($matches[ 1 ][ 0 ] == 'VALUE=' && $matches[ 4 ][ 0 ] == 'DATE')
151 151
             {
152
-                return \DateTime::createFromFormat('Ymd\THis', $matches[5][0].'T000000');
152
+                return \DateTime::createFromFormat('Ymd\THis', $matches[ 5 ][ 0 ].'T000000');
153 153
             }
154 154
         }
155 155
         return null;
Please login to merge, or discard this patch.