More validation fixes, basic attendee parsing added.

5 files changed, 15 insertions, 6 deletions

diff --git a/functions/ical_parser.php b/functions/ical_parser.php
index c30dfd7..29ffb5d 100644
--- a/functions/ical_parser.php
+++ b/functions/ical_parser.php
@@ -91,7 +91,7 @@ if ($parse_file) {
 				$allday_start, $allday_end, $start, $end, $the_duration, 
 				$beginning, $rrule_array, $start_of_vevent, $description, 
 				$valarm_description, $start_unixtime, $end_unixtime,
-				$recurrence_id, $uid
+				$recurrence_id, $uid, $class, $attendee, $location, $organizer
 			);
 				
 			$except_dates = array();
@@ -890,8 +890,17 @@ if ($parse_file) {
 						$rrule_array[$regs[1]] = $regs[2];
 					}
 					break;
+				// Attendee support only testing in Apple iCal 1.0.2	
 				case 'ATTENDEE':
-					$attendee = $data;
+					$field = ereg_replace("ATTENDEE;CN=", "", $field);
+					$data = ereg_replace ("mailto:", "", $data);
+					$attendee[] = array ('name' => $field, 'email' => $data);
+					#print_r($attendee);
+					break;
+				case 'ORGANIZER':
+					$field = ereg_replace("ORGANIZER;CN=", "", $field);
+					$data = ereg_replace ("mailto:", "", $data);
+					$organizer[] = array ('name' => $field, 'email' => $data);
 					break;
 			}
 		}
diff --git a/functions/list_icals.php b/functions/list_icals.php
index f06edb3..8c21c3d 100644
--- a/functions/list_icals.php
+++ b/functions/list_icals.php
@@ -7,7 +7,7 @@ if ($display_ical_list == "yes") {
 	} else {
 		$query="";
 	}
-	print "<form>\n<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">\n";
+	print "<form action=\"day.php\" method=\"GET\">\n<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">\n";
 	
 	// open file
 	$dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename));
diff --git a/functions/list_months.php b/functions/list_months.php
index e7e1a2a..baaccb4 100644
--- a/functions/list_months.php
+++ b/functions/list_months.php
@@ -1,5 +1,5 @@
 <?php
-print "<form>\n<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">\n";
+print "<form action=\"day.php\" method=\"GET\">\n<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">\n";
 $month_time = strtotime("$this_year-01-01");
 $getdate_month = date("m", strtotime($getdate));
 
diff --git a/functions/list_weeks.php b/functions/list_weeks.php
index f9301e8..6f5410b 100644
--- a/functions/list_weeks.php
+++ b/functions/list_weeks.php
@@ -11,7 +11,7 @@ $check_week = strtotime($getdate);
 $start_week_time = strtotime(dateOfWeek(date("Ymd", strtotime("$this_year-01-01")), $week_start_day));
 $end_week_time = $start_week_time + (6 * 25 * 60 * 60);
 
-print "<form>\n<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">\n";
+print "<form action=\"day.php\" method=\"GET\">\n<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">\n";
 
 // build the <option> tags
 do {
diff --git a/functions/list_years.php b/functions/list_years.php
index 4a8c213..07e43f8 100644
--- a/functions/list_years.php
+++ b/functions/list_years.php
@@ -4,7 +4,7 @@ $year_time = strtotime("$getdate");
 $getdate_year = date("Y", strtotime($getdate));
 $num_years2 = $num_years;
 //echo "$num_years2";
-print "<form>\n<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">\n";
+print "<form action=\"day.php\" method=\"GET\">\n<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">\n";
 // build the <option> tags
 for ($i=0; $i < ($num_years2 +2); $i++) {
 	$year_time2 = strtotime ("-$num_years2 year", $year_time);