From 68873878883466c212b61fe51789eaead52f6553 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Mon, 15 Aug 2016 08:28:05 -0400 Subject: [PATCH] Fix for white space Add white spacing for readability and for wordpress coding standands. --- models/front/events/icalFeedImport.php | 27 +++++++++++--------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/models/front/events/icalFeedImport.php b/models/front/events/icalFeedImport.php index c4cfb11..31a6173 100644 --- a/models/front/events/icalFeedImport.php +++ b/models/front/events/icalFeedImport.php @@ -275,7 +275,6 @@ class GlmMembersFront_events_icalFeedImport if ( isset( $event['RRULE'] ) ) { $recurring_event = 1; $rrule_data = explode( ';', $event['RRULE'] ); - //echo '
$rrule_data: ' . print_r( $rrule_data, true ) . '
'; if ( $rrule_data ) { foreach ( $rrule_data as $rule ) { if ( preg_match( '%FREQ=(.*)%', $rule, $matches ) ) { @@ -289,39 +288,37 @@ class GlmMembersFront_events_icalFeedImport } } } - if ( $freq === 'WEEKLY' && $byday ) { + if ( ( $freq === 'WEEKLY' || $freq === 'MONTHLY' ) && $byday ) { // separated by commas - $days = explode( ',',$byday ); - //echo '
$days: ' . print_r( $days, true ) . '
'; + $days = explode( ',', $byday ); if ( $days ) { $day_of_week = 0; foreach ( $days as $day ) { - if ( preg_match( '%([0-9])?([A-Z]{2})%', $day, $d_matches ) ) { - //echo '
$d_matches: ' . print_r( $d_matches, true ) . '
'; + if ( preg_match( '%([0-9]*)?([A-Z]{2})%', $day, $d_matches ) ) { if ( $d_matches[1] ) { - $week_of_month = pow(2, $d_matches[1] ); + $week_of_month = pow( 2, (int)$d_matches[1] ); } switch ( $d_matches[2] ) { case "SU": - $day_of_week += pow(2, 0); + $day_of_week += pow( 2, 0 ); break; case "MO": - $day_of_week += pow(2, 1); + $day_of_week += pow( 2, 1 ); break; case "TU": - $day_of_week += pow(2, 2); + $day_of_week += pow( 2, 2 ); break; case "WE": - $day_of_week += pow(2, 3); + $day_of_week += pow( 2, 3 ); break; case "TH": - $day_of_week += pow(2, 4); + $day_of_week += pow( 2, 4 ); break; case "FR": - $day_of_week += pow(2, 5); + $day_of_week += pow( 2, 5 ); break; case "SA": - $day_of_week += pow(2, 6); + $day_of_week += pow( 2, 6 ); break; } } @@ -329,12 +326,10 @@ class GlmMembersFront_events_icalFeedImport } } if ( $until != '' ) { - //echo '
$until: ' . print_r( $until, true ) . '
'; $test_date = $ical->iCalDateToUnixTimestamp( $until ); if ( $test_date ) { $to_date = date( 'Y-m-d', $test_date ); } - //echo '
$test_date: ' . print_r( date( 'm/d/Y', $test_date), true ) . '
'; } } if ( $btime === $etime ) { -- 2.17.1