From 6ad794eae62ecb23195efa05eec4fedfd7b223d4 Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Sat, 10 Dec 2022 01:48:29 +1300 Subject: [PATCH] freq_name is only used locally This doesn't need to be an object field. --- inc/RRule.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/inc/RRule.php b/inc/RRule.php index a3432a68..61610c01 100644 --- a/inc/RRule.php +++ b/inc/RRule.php @@ -674,18 +674,20 @@ class RepeatRule { if ( preg_match('{BYHOUR=([0-9,]+)(;|$)}', $rrule, $m) ) $this->byhour = explode(',',$m[1]); if ( !isset($this->interval) ) $this->interval = 1; + + $freq_name = null; switch( $this->freq ) { - case 'SECONDLY': $this->freq_name = 'second'; break; - case 'MINUTELY': $this->freq_name = 'minute'; break; - case 'HOURLY': $this->freq_name = 'hour'; break; - case 'DAILY': $this->freq_name = 'day'; break; - case 'WEEKLY': $this->freq_name = 'week'; break; - case 'MONTHLY': $this->freq_name = 'month'; break; - case 'YEARLY': $this->freq_name = 'year'; break; + case 'SECONDLY': $freq_name = 'second'; break; + case 'MINUTELY': $freq_name = 'minute'; break; + case 'HOURLY': $freq_name = 'hour'; break; + case 'DAILY': $freq_name = 'day'; break; + case 'WEEKLY': $freq_name = 'week'; break; + case 'MONTHLY': $freq_name = 'month'; break; + case 'YEARLY': $freq_name = 'year'; break; default: /** need to handle the error, but FREQ is mandatory so unlikely */ } - $this->frequency_string = sprintf('+%d %s', $this->interval, $this->freq_name ); + $this->frequency_string = sprintf('+%d %s', $this->interval, $freq_name ); if ( DEBUG_RRULE ) printf( "Frequency modify string is: '%s', base is: '%s', TZ: %s\n", $this->frequency_string, $this->base->format('c'), $this->base->getTimeZone() ); $this->Start($return_floating_times); }