@@ -15,11 +15,11 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | class Calendar extends AbstractCalendar { |
| 17 | 17 | |
| 18 | - /** |
|
| 19 | - * @param $units |
|
| 20 | - * @param $store |
|
| 21 | - * @param $default_value |
|
| 22 | - */ |
|
| 18 | + /** |
|
| 19 | + * @param $units |
|
| 20 | + * @param $store |
|
| 21 | + * @param $default_value |
|
| 22 | + */ |
|
| 23 | 23 | public function __construct($units, $store, $default_value = 0) { |
| 24 | 24 | $this->units = $units; |
| 25 | 25 | $this->store = $store; |
@@ -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 | |
@@ -127,8 +127,7 @@ discard block |
||
| 127 | 127 | // Unit is in a state that is within the set of valid states so add to result set |
| 128 | 128 | $units[$unit] = $unit; |
| 129 | 129 | $response->addMatch($keyed_units[$unit], CalendarResponse::VALID_STATE); |
| 130 | - } |
|
| 131 | - else { |
|
| 130 | + } else { |
|
| 132 | 131 | $response->addMiss($keyed_units[$unit], CalendarResponse::INVALID_STATE); |
| 133 | 132 | } |
| 134 | 133 | |
@@ -178,8 +177,7 @@ discard block |
||
| 178 | 177 | foreach ($days as $day => $value) { |
| 179 | 178 | $events[$unit][Event::BAT_DAY][$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]); |
| 180 | 179 | } |
| 181 | - } |
|
| 182 | - else { |
|
| 180 | + } else { |
|
| 183 | 181 | foreach ($days as $day => $value) { |
| 184 | 182 | $events[$unit][Event::BAT_DAY][$year][$month][$day] = $keyed_units[$unit]->getDefaultValue(); |
| 185 | 183 | } |
@@ -196,8 +194,7 @@ discard block |
||
| 196 | 194 | foreach ($hours as $hour => $value) { |
| 197 | 195 | if (isset($db_events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour])) { |
| 198 | 196 | $events[$unit][Event::BAT_HOUR][$year][$month]['d' . $day][$hour] = ((int)$db_events[$unit][Event::BAT_DAY][$year][$month][$day][$hour] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour]); |
| 199 | - } |
|
| 200 | - else { |
|
| 197 | + } else { |
|
| 201 | 198 | // If nothing from db - then revert to the defaults |
| 202 | 199 | $events[$unit][Event::BAT_HOUR][$year][$month][$day][$hour] = (int)$keyed_units[$unit]->getDefaultValue(); |
| 203 | 200 | } |
@@ -227,8 +224,7 @@ discard block |
||
| 227 | 224 | foreach ($minutes as $minute => $value) { |
| 228 | 225 | if (isset($db_events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute])) { |
| 229 | 226 | $events[$unit][Event::BAT_MINUTE][$year][$month]['d' .$day]['h'.$hour][$minute] = ((int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute] == 0 ? $keyed_units[$unit]->getDefaultValue() : (int)$db_events[$unit][BAT_DAY][$year][$month][$day][$hour][$minute]); |
| 230 | - } |
|
| 231 | - else { |
|
| 227 | + } else { |
|
| 232 | 228 | // If nothing from db - then revert to the defaults |
| 233 | 229 | $events[$unit][Event::BAT_MINUTE][$year][$month][$day][$hour][$minute] = (int)$keyed_units[$unit]->getDefaultValue(); |
| 234 | 230 | } |
@@ -311,8 +307,7 @@ discard block |
||
| 311 | 307 | if ($current_value === $minute_value) { |
| 312 | 308 | // We are still in minutes and going through so add a minute |
| 313 | 309 | $end_event->add(new \DateInterval('PT1M')); |
| 314 | - } |
|
| 315 | - elseif (($current_value != $minute_value) && ($current_value !== NULL)) { |
|
| 310 | + } elseif (($current_value != $minute_value) && ($current_value !== NULL)) { |
|
| 316 | 311 | // Value just switched - let us wrap up with current event and start a new one |
| 317 | 312 | $normalized_events[$unit][] = new Event($start_event, $end_event, $unit, $current_value); |
| 318 | 313 | $start_event = clone($end_event->add(new \DateInterval('PT1M'))); |
@@ -326,12 +321,10 @@ discard block |
||
| 326 | 321 | } |
| 327 | 322 | $current_value = $minute_value; |
| 328 | 323 | } |
| 329 | - } |
|
| 330 | - elseif ($current_value === $hour_value) { |
|
| 324 | + } elseif ($current_value === $hour_value) { |
|
| 331 | 325 | // We are in hours and can add something |
| 332 | 326 | $end_event->add(new \DateInterval('PT1H')); |
| 333 | - } |
|
| 334 | - elseif (($current_value != $hour_value) && ($current_value !== NULL)) { |
|
| 327 | + } elseif (($current_value != $hour_value) && ($current_value !== NULL)) { |
|
| 335 | 328 | // Value just switched - let us wrap up with current event and start a new one |
| 336 | 329 | $normalized_events[$unit][] = new Event($start_event, $end_event, $unit, $current_value); |
| 337 | 330 | // Start event becomes the end event with a minute added |
@@ -348,12 +341,10 @@ discard block |
||
| 348 | 341 | $current_value = $hour_value; |
| 349 | 342 | } |
| 350 | 343 | } |
| 351 | - } |
|
| 352 | - elseif ($current_value === $value) { |
|
| 344 | + } elseif ($current_value === $value) { |
|
| 353 | 345 | // We are adding a whole day so the end event gets moved to the end of the day we are adding |
| 354 | 346 | $end_event = new \DateTime($year . '-' . $month . '-' . substr($day, 1) . ' ' . '23:59'); |
| 355 | - } |
|
| 356 | - elseif (($current_value !== $value) && ($current_value !== NULL)) { |
|
| 347 | + } elseif (($current_value !== $value) && ($current_value !== NULL)) { |
|
| 357 | 348 | // Value just switched - let us wrap up with current event and start a new one |
| 358 | 349 | $normalized_events[$unit][] = new Event($start_event, $end_event, $unit, $current_value); |
| 359 | 350 | // Start event becomes the end event with a minute added |
@@ -388,8 +379,7 @@ discard block |
||
| 388 | 379 | if ($event->endsLater($end_date)) { |
| 389 | 380 | $event->setEndDate($end_date); |
| 390 | 381 | } |
| 391 | - } |
|
| 392 | - else { |
|
| 382 | + } else { |
|
| 393 | 383 | // Event completely not in range so unset it |
| 394 | 384 | unset($normalized_events[$unit][$key]); |
| 395 | 385 | } |
@@ -420,8 +410,7 @@ discard block |
||
| 420 | 410 | $e++; |
| 421 | 411 | $flipped[$e][$value][$datum] = $datum; |
| 422 | 412 | $old_value = $value; |
| 423 | - } |
|
| 424 | - else { |
|
| 413 | + } else { |
|
| 425 | 414 | $flipped[$e][$value][$datum] = $datum; |
| 426 | 415 | } |
| 427 | 416 | } |
@@ -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 | |
@@ -337,8 +337,7 @@ discard block |
||
| 337 | 337 | if ($this->dateIsEarlier($start) && |
| 338 | 338 | ($this->dateIsInRange($end) || $this->dateIsLater($end))) { |
| 339 | 339 | $overlaps = TRUE; |
| 340 | - } |
|
| 341 | - elseif ($this->dateIsInRange($start) && |
|
| 340 | + } elseif ($this->dateIsInRange($start) && |
|
| 342 | 341 | ($this->dateIsInRange($end) || $this->dateIsLater($end))) { |
| 343 | 342 | $overlaps = TRUE; |
| 344 | 343 | } |
@@ -473,8 +472,7 @@ discard block |
||
| 473 | 472 | $itemized[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_same_day[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd]; |
| 474 | 473 | $itemized[AbstractEvent::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_same_day[AbstractEvent::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
| 475 | 474 | } |
| 476 | - } |
|
| 477 | - else { |
|
| 475 | + } else { |
|
| 478 | 476 | // Deal with the start day unless it starts on midnight precisely at which point the whole day is booked |
| 479 | 477 | if (!($this->start_date->format('H:i') == '00:00')) { |
| 480 | 478 | $start_period = new \DatePeriod($start_date, $interval, new \DateTime($start_date->format("Y-n-j 23:59:59"))); |
@@ -482,8 +480,7 @@ discard block |
||
| 482 | 480 | $itemized[AbstractEvent::BAT_DAY][$sy][$sm]['d' . $sd] = -1; |
| 483 | 481 | $itemized[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd] = $itemized_start[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd]; |
| 484 | 482 | $itemized[AbstractEvent::BAT_MINUTE][$sy][$sm]['d' . $sd] = $itemized_start[AbstractEvent::BAT_MINUTE][$sy][$sm]['d' . $sd]; |
| 485 | - } |
|
| 486 | - else { |
|
| 483 | + } else { |
|
| 487 | 484 | // Just set an empty hour and minute |
| 488 | 485 | $itemized[AbstractEvent::BAT_HOUR][$sy][$sm]['d' . $sd] = array(); |
| 489 | 486 | $itemized[AbstractEvent::BAT_MINUTE][$sy][$sm]['d' . $sd] = array(); |
@@ -529,8 +526,7 @@ discard block |
||
| 529 | 526 | // Not a real hour - leave as is and move on |
| 530 | 527 | $counter = 0; |
| 531 | 528 | $start_minute = 0; |
| 532 | - } |
|
| 533 | - elseif ($counter == 60 && $start_minute == 0) { |
|
| 529 | + } elseif ($counter == 60 && $start_minute == 0) { |
|
| 534 | 530 | // Did a real whole hour so initialize the hour |
| 535 | 531 | $itemized[AbstractEvent::BAT_HOUR][$minute->format('Y')][$minute->format('n')]['d' . $minute->format('j')]['h' . $minute->format('G')] = $this->getValue(); |
| 536 | 532 | // We have a whole hour so get rid of the minute info |
@@ -571,8 +567,7 @@ discard block |
||
| 571 | 567 | // If we are in the same month the end date is the end date of the event |
| 572 | 568 | if ($this->isSameMonth()) { |
| 573 | 569 | $dayrange = new \DatePeriod($this->start_date, $dayinterval, new \DateTime($this->end_date->format("Y-n-j 23:59:59"))); |
| 574 | - } |
|
| 575 | - else { // alternatively it is the last day of the start month |
|
| 570 | + } else { // alternatively it is the last day of the start month |
|
| 576 | 571 | $dayrange = new \DatePeriod($this->start_date, $dayinterval, $this->endMonthDate($this->start_date)); |
| 577 | 572 | } |
| 578 | 573 | foreach ($dayrange as $day) { |