@@ -126,8 +126,7 @@ |
||
126 | 126 | unset($this->included_set[$unit->getUnitId()]); |
127 | 127 | $this->addMiss($unit, $reason, $constraint); |
128 | 128 | return TRUE; |
129 | - } |
|
130 | - else { |
|
129 | + } else { |
|
131 | 130 | return FALSE; |
132 | 131 | } |
133 | 132 | } |
@@ -110,8 +110,7 @@ discard block |
||
110 | 110 | for ($i = 0; $i<=59; $i++) { |
111 | 111 | if ($i <= 9) { |
112 | 112 | $index = 'm0'.$i; |
113 | - } |
|
114 | - else { |
|
113 | + } else { |
|
115 | 114 | $index = 'm'.$i; |
116 | 115 | } |
117 | 116 | $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']][$data['day']][$data['hour']][$index] = $data[$index]; |
@@ -190,8 +189,7 @@ discard block |
||
190 | 189 | } |
191 | 190 | } |
192 | 191 | } |
193 | - } |
|
194 | - catch (\Exception $e) { |
|
192 | + } catch (\Exception $e) { |
|
195 | 193 | $saved = FALSE; |
196 | 194 | $transaction->rollback(); |
197 | 195 | watchdog_exception('BAT Event Save Exception', $e); |
@@ -70,8 +70,7 @@ discard block |
||
70 | 70 | $calendar_response->removeFromMatched($included_set[$unit_id]['unit'], CalendarResponse::CONSTRAINT, $this); |
71 | 71 | |
72 | 72 | $this->affected_units[$unit_id] = $included_set[$unit_id]['unit']; |
73 | - } |
|
74 | - elseif (is_numeric($this->max_days) && $diff > $this->max_days) { |
|
73 | + } elseif (is_numeric($this->max_days) && $diff > $this->max_days) { |
|
75 | 74 | $calendar_response->removeFromMatched($included_set[$unit_id]['unit'], CalendarResponse::CONSTRAINT, $this); |
76 | 75 | |
77 | 76 | $this->affected_units[$unit_id] = $included_set[$unit_id]['unit']; |
@@ -122,8 +121,7 @@ discard block |
||
122 | 121 | if ($day_of_the_week) { |
123 | 122 | if ($start_date && $end_date) { |
124 | 123 | $text = t('From @start_date to @end_date, if booking starts on @day_of_the_week', $args); |
125 | - } |
|
126 | - else { |
|
124 | + } else { |
|
127 | 125 | $text = t('If booking starts on @day_of_the_week', $args); |
128 | 126 | } |
129 | 127 | } |
@@ -132,8 +130,7 @@ discard block |
||
132 | 130 | if ($minimum_stay || $maximum_stay) { |
133 | 131 | if (empty($text)) { |
134 | 132 | $text = t('The stay') . ' '; |
135 | - } |
|
136 | - else { |
|
133 | + } else { |
|
137 | 134 | $text .= ' ' . t('the stay') . ' '; |
138 | 135 | } |
139 | 136 | } |
@@ -141,15 +138,12 @@ discard block |
||
141 | 138 | // Special case when min stay and max stay are the same. |
142 | 139 | if ($minimum_stay == $maximum_stay) { |
143 | 140 | $text .= t('must be for @minimum_stay', $args); |
144 | - } |
|
145 | - else { |
|
141 | + } else { |
|
146 | 142 | $text .= t('must be at least @minimum_stay and at most @maximum_stay', $args); |
147 | 143 | } |
148 | - } |
|
149 | - elseif ($minimum_stay) { |
|
144 | + } elseif ($minimum_stay) { |
|
150 | 145 | $text .= t('must be for at least @minimum_stay', $args); |
151 | - } |
|
152 | - elseif ($maximum_stay) { |
|
146 | + } elseif ($maximum_stay) { |
|
153 | 147 | $text .= t('cannot be more than @maximum_stay', $args); |
154 | 148 | } |
155 | 149 |
@@ -110,8 +110,7 @@ discard block |
||
110 | 110 | for ($i = 0; $i<=59; $i++) { |
111 | 111 | if ($i <= 9) { |
112 | 112 | $index = 'm0'.$i; |
113 | - } |
|
114 | - else { |
|
113 | + } else { |
|
115 | 114 | $index = 'm'.$i; |
116 | 115 | } |
117 | 116 | $db_events[$data['unit_id']][Event::BAT_MINUTE][$data['year']][$data['month']][$data['day']][$data['hour']][$index] = $data[$index]; |
@@ -190,8 +189,7 @@ discard block |
||
190 | 189 | } |
191 | 190 | } |
192 | 191 | } |
193 | - } |
|
194 | - catch (\Exception $e) { |
|
192 | + } catch (\Exception $e) { |
|
195 | 193 | $saved = FALSE; |
196 | 194 | $transaction->rollback(); |
197 | 195 | watchdog_exception('BAT Event Save Exception', $e); |
@@ -102,8 +102,7 @@ |
||
102 | 102 | if ($day_of_the_week) { |
103 | 103 | if ($start_date && $end_date) { |
104 | 104 | $text = 'From @start_date to @end_date, if booking starts on @day_of_the_week'; |
105 | - } |
|
106 | - else { |
|
105 | + } else { |
|
107 | 106 | $text = 'If booking starts on @day_of_the_week'; |
108 | 107 | } |
109 | 108 |
@@ -147,8 +147,7 @@ discard block |
||
147 | 147 | // If we are in the same month the end date is the end date of the event |
148 | 148 | if ($this->event->isSameMonth()) { |
149 | 149 | $dayrange = new \DatePeriod($this->event->getStartDate(), $dayinterval, new \DateTime($this->event->getEndDate()->format("Y-n-j 23:59:59"))); |
150 | - } |
|
151 | - else { // alternatively it is the last day of the start month |
|
150 | + } else { // alternatively it is the last day of the start month |
|
152 | 151 | $dayrange = new \DatePeriod($this->event->getStartDate(), $dayinterval, $this->event->endMonthDate($this->event->getStartDate())); |
153 | 152 | } |
154 | 153 | foreach ($dayrange as $day) { |
@@ -214,8 +213,7 @@ discard block |
||
214 | 213 | $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_same_day[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd]; |
215 | 214 | $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_same_day[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
216 | 215 | } |
217 | - } |
|
218 | - else { |
|
216 | + } else { |
|
219 | 217 | // Deal with the start day unless it starts on midnight precisely at which point the whole day is booked |
220 | 218 | if (!($this->event->getStartDate()->format('H:i') == '00:00')) { |
221 | 219 | $start_period = new \DatePeriod($start_date, $interval, new \DateTime($start_date->format("Y-n-j 23:59:59"))); |
@@ -223,8 +221,7 @@ discard block |
||
223 | 221 | $itemized[EventItemizer::BAT_DAY][$sy][$sm]['d' . $sd] = -1; |
224 | 222 | $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd]; |
225 | 223 | $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_start[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
226 | - } |
|
227 | - else { |
|
224 | + } else { |
|
228 | 225 | // Just set an empty hour and minute |
229 | 226 | $itemized[EventItemizer::BAT_HOUR][$sy][$sm]['d' . $sd] = array(); |
230 | 227 | $itemized[EventItemizer::BAT_MINUTE][$sy][$sm]['d' . $sd] = array(); |
@@ -270,8 +267,7 @@ discard block |
||
270 | 267 | // Not a real hour - leave as is and move on |
271 | 268 | $counter = 0; |
272 | 269 | $start_minute = 0; |
273 | - } |
|
274 | - elseif ($counter == 60 && $start_minute == 0) { |
|
270 | + } elseif ($counter == 60 && $start_minute == 0) { |
|
275 | 271 | // Did a real whole hour so initialize the hour |
276 | 272 | $itemized[EventItemizer::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = $this->event->getValue(); |
277 | 273 | // We have a whole hour so get rid of the minute info |
@@ -342,8 +342,7 @@ |
||
342 | 342 | if ($this->dateIsEarlier($start) && |
343 | 343 | ($this->dateIsInRange($end) || $this->dateIsLater($end))) { |
344 | 344 | $overlaps = TRUE; |
345 | - } |
|
346 | - elseif ($this->dateIsInRange($start) && |
|
345 | + } elseif ($this->dateIsInRange($start) && |
|
347 | 346 | ($this->dateIsInRange($end) || $this->dateIsLater($end))) { |
348 | 347 | $overlaps = TRUE; |
349 | 348 | } |
@@ -129,8 +129,7 @@ discard block |
||
129 | 129 | // Unit is in a state that is within the set of valid states so add to result set |
130 | 130 | $units[$unit] = $unit; |
131 | 131 | $response->addMatch($keyed_units[$unit], CalendarResponse::VALID_STATE); |
132 | - } |
|
133 | - else { |
|
132 | + } else { |
|
134 | 133 | $response->addMiss($keyed_units[$unit], CalendarResponse::INVALID_STATE); |
135 | 134 | } |
136 | 135 | |
@@ -224,8 +223,7 @@ discard block |
||
224 | 223 | foreach ($days as $day => $value) { |
225 | 224 | $result[$year][$month][$day] = ((int)$db_events[$unit][Event::BAT_DAY][$year][$month][$day] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][Event::BAT_DAY][$year][$month][$day]); |
226 | 225 | } |
227 | - } |
|
228 | - else { |
|
226 | + } else { |
|
229 | 227 | foreach ($days as $day => $value) { |
230 | 228 | $result[$year][$month][$day] = $keyed_units[$unit]->getDefaultValue(); |
231 | 229 | } |
@@ -256,8 +254,7 @@ discard block |
||
256 | 254 | foreach ($hours as $hour => $value) { |
257 | 255 | if (isset($db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour])) { |
258 | 256 | $result[$year][$month][$day][$hour] = ((int) $db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour]); |
259 | - } |
|
260 | - else { |
|
257 | + } else { |
|
261 | 258 | // If nothing from db - then revert to the defaults |
262 | 259 | $result[$year][$month][$day][$hour] = (int) $keyed_units[$unit]->getDefaultValue(); |
263 | 260 | } |
@@ -305,8 +302,7 @@ discard block |
||
305 | 302 | foreach ($minutes as $minute => $value) { |
306 | 303 | if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) { |
307 | 304 | $result[$year][$month][$day][$hour][$minute] = ((int) $db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int) $db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute]); |
308 | - } |
|
309 | - else { |
|
305 | + } else { |
|
310 | 306 | // If nothing from db - then revert to the defaults |
311 | 307 | $result[$year][$month][$day][$hour][$minute] = (int) $keyed_units[$unit]->getDefaultValue(); |
312 | 308 | } |
@@ -381,8 +377,7 @@ discard block |
||
381 | 377 | if ($current_value === $minute_value) { |
382 | 378 | // We are still in minutes and going through so add a minute |
383 | 379 | $end_event->add(new \DateInterval('PT1M')); |
384 | - } |
|
385 | - elseif (($current_value != $minute_value) && ($current_value !== NULL)) { |
|
380 | + } elseif (($current_value != $minute_value) && ($current_value !== NULL)) { |
|
386 | 381 | // Value just switched - let us wrap up with current event and start a new one |
387 | 382 | $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value); |
388 | 383 | $start_event = clone($end_event->add(new \DateInterval('PT1M'))); |
@@ -396,12 +391,10 @@ discard block |
||
396 | 391 | } |
397 | 392 | $current_value = $minute_value; |
398 | 393 | } |
399 | - } |
|
400 | - elseif ($current_value === $hour_value) { |
|
394 | + } elseif ($current_value === $hour_value) { |
|
401 | 395 | // We are in hours and can add something |
402 | 396 | $end_event->add(new \DateInterval('PT1H')); |
403 | - } |
|
404 | - elseif (($current_value != $hour_value) && ($current_value !== NULL)) { |
|
397 | + } elseif (($current_value != $hour_value) && ($current_value !== NULL)) { |
|
405 | 398 | // Value just switched - let us wrap up with current event and start a new one |
406 | 399 | $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value); |
407 | 400 | // Start event becomes the end event with a minute added |
@@ -418,12 +411,10 @@ discard block |
||
418 | 411 | $current_value = $hour_value; |
419 | 412 | } |
420 | 413 | } |
421 | - } |
|
422 | - elseif ($current_value === $value) { |
|
414 | + } elseif ($current_value === $value) { |
|
423 | 415 | // We are adding a whole day so the end event gets moved to the end of the day we are adding |
424 | 416 | $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '23:59'); |
425 | - } |
|
426 | - elseif (($current_value !== $value) && ($current_value !== NULL)) { |
|
417 | + } elseif (($current_value !== $value) && ($current_value !== NULL)) { |
|
427 | 418 | // Value just switched - let us wrap up with current event and start a new one |
428 | 419 | $normalized_events[$unit_id][] = new Event($start_event, $end_event, $this->getUnit($unit_id), $current_value); |
429 | 420 | // Start event becomes the end event with a minute added |
@@ -458,8 +449,7 @@ discard block |
||
458 | 449 | if ($event->endsLater($end_date)) { |
459 | 450 | $event->setEndDate($end_date); |
460 | 451 | } |
461 | - } |
|
462 | - else { |
|
452 | + } else { |
|
463 | 453 | // Event completely not in range so unset it |
464 | 454 | unset($normalized_events[$unit_id][$key]); |
465 | 455 | } |
@@ -490,8 +480,7 @@ discard block |
||
490 | 480 | $e++; |
491 | 481 | $flipped[$e][$value][$datum] = $datum; |
492 | 482 | $old_value = $value; |
493 | - } |
|
494 | - else { |
|
483 | + } else { |
|
495 | 484 | $flipped[$e][$value][$datum] = $datum; |
496 | 485 | } |
497 | 486 | } |