From d9553d59693225821f04152ae638f22f379e9136 Mon Sep 17 00:00:00 2001
From: mgalgoci <mgalgoci@alumni.egroupware.org>
Date: Fri, 15 Oct 2004 17:33:03 +0000
Subject: [PATCH] - Spelling fixes: recure -> recur

---
 calendar/inc/class.bocalendar.inc.php      |  2 +-
 calendar/inc/class.bocustom_fields.inc.php |  2 +-
 calendar/inc/class.boicalendar.inc.php     |  4 +++-
 calendar/inc/class.uicalendar.inc.php      | 20 ++++++++++----------
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/calendar/inc/class.bocalendar.inc.php b/calendar/inc/class.bocalendar.inc.php
index 669900315e..8420caabf1 100755
--- a/calendar/inc/class.bocalendar.inc.php
+++ b/calendar/inc/class.bocalendar.inc.php
@@ -3176,7 +3176,7 @@
 					$str .= ' ('.implode(', ',$str_extra).')';
 				}
 
-				$var['recure_type'] = Array(
+				$var['recur_type'] = Array(
 					'field'	=> lang('Repetition'),
 					'data'	=> $str,
 				);
diff --git a/calendar/inc/class.bocustom_fields.inc.php b/calendar/inc/class.bocustom_fields.inc.php
index c3e7221344..cd0717dc48 100644
--- a/calendar/inc/class.bocustom_fields.inc.php
+++ b/calendar/inc/class.bocustom_fields.inc.php
@@ -34,7 +34,7 @@
 			'owner'       => 'Created By',
 			'updated'     => 'Updated',
 			'alarm'       => 'Alarm',
-			'recure_type' => 'Repetition'
+			'recur_type'  => 'Repetition'
 		);
 
 		function bocustom_fields()
diff --git a/calendar/inc/class.boicalendar.inc.php b/calendar/inc/class.boicalendar.inc.php
index d680f7cbeb..5c69585fd2 100755
--- a/calendar/inc/class.boicalendar.inc.php
+++ b/calendar/inc/class.boicalendar.inc.php
@@ -3128,6 +3128,9 @@
 							$recur_enddate['year']  = (int)($ical['event'][$i]['rrule']['until']['year']);
 							$recur_enddate['month'] = (int)($ical['event'][$i]['rrule']['until']['month']);
 							$recur_enddate['mday']  = (int)($ical['event'][$i]['rrule']['until']['mday']);
+							$recur_enddate['hour']  = (int)($ical['event'][$i]['rrule']['until']['hour']);
+							$recur_enddate['min']  = (int)($ical['event'][$i]['rrule']['until']['min']);
+							$recur_enddate['sec']  = (int)($ical['event'][$i]['rrule']['until']['sec']);
 						}
 						elseif( isset($ical['event'][$i]['duration']) )
 						{
@@ -3206,7 +3209,6 @@
 								$recur_enddate['min'],
 								$recur_enddate['sec']
 							);
-
 						}
 						else
 						{
diff --git a/calendar/inc/class.uicalendar.inc.php b/calendar/inc/class.uicalendar.inc.php
index 56b327e7f3..7c797de79b 100755
--- a/calendar/inc/class.uicalendar.inc.php
+++ b/calendar/inc/class.uicalendar.inc.php
@@ -4372,7 +4372,7 @@ return;
 			{
 				$str .= '<option value="'.$type.'"'.($event['recur_type']==$type?' selected':'').'>'.lang($label).'</option>';
 			}
-			$var['recure_type'] = Array(
+			$var['recur_type'] = Array(
 				'field'	=> lang('Repeat Type'),
 				'data'	=> '<select name="cal[recur_type]">'."\n".$str.'</select>'."\n"
 			);
@@ -4388,7 +4388,7 @@ return;
 				$recur_end = $this->bo->maketime($event['start']) + 86400 - $GLOBALS['phpgw']->datetime->tz_offset;
 			}
 
-			$var['recure_enddate'] = Array(
+			$var['recur_enddate'] = Array(
 				'field'	=> lang('Repeat End Date'),
 				'data'	=> '<input type="checkbox" name="cal[rpt_use_end]" value="y"'.$checked.'>'.lang('Use End Date').'  '.
 /*
@@ -4407,12 +4407,12 @@ return;
 				$boxes .= '<input type="checkbox" name="cal[rpt_day][]" value="'.$mask.'"'.($event['recur_data'] & $mask ? ' checked' : '').'>&nbsp;'.lang($name)."\n";
 				if (++$i == 5) $boxes .= '<br>';
 			}
-			$var['recure_day'] = Array(
+			$var['recur_day'] = Array(
 				'field'	=> lang('Repeat Day').'<br>'.lang('(for weekly)'),
 				'data'	=> $boxes
 			);
 
-			$var['recure_interval'] = Array(
+			$var['recur_interval'] = Array(
 				'field'	=> lang('Interval'),
 				'data'	=> '<input name="cal[recur_interval]" size="4" maxlength="4" value="'.$event['recur_interval'].'">'
 			);
@@ -4446,14 +4446,14 @@ return;
 								$this->output_template_array($p,'row','list',$var['enddate']);
 								$this->output_template_array($p,'row','list',$var['endtime']);
 								break;
-							case 'recure_type':
+							case 'recur_type':
 								$p->set_var('tr_color',$this->theme['th_bg']);
 								$p->set_var('hr_text','<center><b>'.lang('Repeating Event Information').'</b></center>');
 								$p->parse('row','hr',True);
-								$this->output_template_array($p,'row','list',$var['recure_type']);
-								$this->output_template_array($p,'row','list',$var['recure_enddate']);
-								$this->output_template_array($p,'row','list',$var['recure_day']);
-								$this->output_template_array($p,'row','list',$var['recure_interval']);
+								$this->output_template_array($p,'row','list',$var['recur_type']);
+								$this->output_template_array($p,'row','list',$var['recur_enddate']);
+								$this->output_template_array($p,'row','list',$var['recur_day']);
+								$this->output_template_array($p,'row','list',$var['recur_interval']);
 								break;
 							default:
 								$this->output_template_array($p,'row','list',$var[$field]);
@@ -4491,7 +4491,7 @@ return;
 						case 'owner':
 							$preserved[$field] = $event['id'] ? $event['participants'][$event['owner']] : 'A';
 							break;
-						case 'recure_type':
+						case 'recur_type':
 							foreach(array('recur_type','recur_enddate','recur_data','recur_interval') as $field)
 							{
 								$preserved[$field] = $event[$field];