aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README1
-rw-r--r--footer.inc.php2
-rw-r--r--functions/ical_parser.php13
-rw-r--r--images/valid-rss.pngbin0 -> 1523 bytes
-rw-r--r--rss/index.php1
5 files changed, 11 insertions, 6 deletions
diff --git a/README b/README
index 63a201c..af9a889 100644
--- a/README
+++ b/README
@@ -64,6 +64,7 @@ Changes:
--------
0.9
-Added VTODO support
+ -Added STATUS support for VEVENT and VTODO
-Added Preferences page (uses cookies).
-Select defualt language
-Select default calendar
diff --git a/footer.inc.php b/footer.inc.php
index 9d39f65..4055c13 100644
--- a/footer.inc.php
+++ b/footer.inc.php
@@ -1 +1 @@
-<?php echo "<center><font class=\"V9\"><br>$powered_by_lang <a class=\"psf\" href=\"http://phpicalendar.sourceforge.net/\">PHP iCalendar 0.8.1</a>"; if ($enable_rss == 'yes') { echo "<br>\n"; echo $this_site_is_lang.' <a class="psf" href="'.BASE.'rss/">RSS-Enabled</a></font></center>'; } echo '</font></center>'; ?> \ No newline at end of file
+<?php echo "<center><font class=\"V9\"><br>$powered_by_lang <a class=\"psf\" href=\"http://phpicalendar.sourceforge.net/\">PHP iCalendar 0.9 CVS</a>"; if ($enable_rss == 'yes') { echo "<br>\n"; if ($current_view == 'rssindex') { echo '<a style="color:gray" href="http://feeds.archive.org/validator/check?url='.$footer_check.'"><img src="../images/valid-rss.png" alt="[Valid RSS]" title="Validate my RSS feed" width="88" height="31" border="1" vspace="3" />'; } else { echo $this_site_is_lang.' <a class="psf" href="'.BASE.'rss/">RSS-Enabled</a></font></center>'; } } echo '</font></center>'; ?> \ No newline at end of file
diff --git a/functions/ical_parser.php b/functions/ical_parser.php
index 8f0550d..14ab165 100644
--- a/functions/ical_parser.php
+++ b/functions/ical_parser.php
@@ -187,7 +187,7 @@ if ($parse_file) {
// Handling regular events
if ((isset($start_time) && $start_time != '') && (!isset($allday_start) || $allday_start == '')) {
$nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time);
- $master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_text' => $summary, 'event_end' => $end_time, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status);
+ $master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_text' => $summary, 'event_end' => $end_time, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class);
if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true;
}
@@ -452,7 +452,7 @@ if ($parse_file) {
}
} else {
$nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time);
- $master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_text' => $summary, 'event_end' => $end_time, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status);
+ $master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_text' => $summary, 'event_end' => $end_time, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class);
}
}
}
@@ -466,8 +466,8 @@ if ($parse_file) {
// Begin VTODO Support
} elseif ($line == 'END:VTODO') {
- $master_array['-2'][][$uid] = array ('start_date' => $start_date, 'start_time' => $start_time, 'event_text' => $summary, 'due_date'=> $due_date, 'due_time'=> $due_time, 'completed_date' => $completed_date, 'completed_time' => $completed_time, 'priority' => $vtodo_priority, 'status' => $status, 'class' => $vtodo_class, 'categories' => $vtodo_categories);
- unset ($due_date, $due_time, $completed_date, $completed_time, $vtodo_priority, $vtodo_status, $vtodo_class, $vtodo_categories, $summary);
+ $master_array['-2'][][$uid] = array ('start_date' => $start_date, 'start_time' => $start_time, 'event_text' => $summary, 'due_date'=> $due_date, 'due_time'=> $due_time, 'completed_date' => $completed_date, 'completed_time' => $completed_time, 'priority' => $vtodo_priority, 'status' => $status, 'class' => $class, 'categories' => $vtodo_categories);
+ unset ($due_date, $due_time, $completed_date, $completed_time, $vtodo_priority, $status, $class, $vtodo_categories, $summary);
$vtodo_set = FALSE;
} elseif ($line == 'BEGIN:VTODO') {
$vtodo_set = TRUE;
@@ -588,11 +588,14 @@ if ($parse_file) {
break;
case 'STATUS':
+ // VEVENT: TENTATIVE, CONFIRMED, CANCELLED
+ // VTODO: NEEDS-ACTION, COMPLETED, IN-PROCESS, CANCELLED
$status = "$data";
break;
case 'CLASS':
- $vtodo_class = "$data";
+ // VEVENT, VTODO: PUBLIC, PRIVATE, CONFIDENTIAL
+ $class = "$data";
break;
case 'CATEGORIES':
diff --git a/images/valid-rss.png b/images/valid-rss.png
new file mode 100644
index 0000000..7ece284
--- /dev/null
+++ b/images/valid-rss.png
Binary files differ
diff --git a/rss/index.php b/rss/index.php
index bf2e645..965a7d0 100644
--- a/rss/index.php
+++ b/rss/index.php
@@ -83,6 +83,7 @@ if (isset($HTTP_SERVER_VARS['HTTP_REFERER']) && $HTTP_SERVER_VARS['HTTP_REFERER'
echo $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=day<br>';
echo $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=week<br>';
echo $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=month<br>';
+ $footer_check = $default_path.'/rss/rss.php?cal='.$default_cal.'&rssview='.$default_view;
echo '<br><br>';
}
}

© 2014-2024 Faster IT GmbH | imprint | privacy policy