aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChad Little <clittle@users.sourceforge.net>2004-07-22 02:25:41 +0000
committerChad Little <clittle@users.sourceforge.net>2004-07-22 02:25:41 +0000
commitff1aa0c968c745ec980f56bc0164c42e9ec49fb6 (patch)
tree6d0b8837a24b19c1b8f9ae07ba57eb57bfb61178
parentb254d095fd02666b87d124e78063665b4ae55330 (diff)
downloadphpicalendar-ff1aa0c968c745ec980f56bc0164c42e9ec49fb6.tar.gz
phpicalendar-ff1aa0c968c745ec980f56bc0164c42e9ec49fb6.tar.bz2
phpicalendar-ff1aa0c968c745ec980f56bc0164c42e9ec49fb6.zip
Changes.
-rw-r--r--README1
-rw-r--r--config.inc.php2
-rw-r--r--functions/ical_parser.php7
-rw-r--r--functions/userauth_functions.php2
-rw-r--r--templates/default/footer.tpl2
5 files changed, 7 insertions, 7 deletions
diff --git a/README b/README
index 4ae1cdf..a5e4e2f 100644
--- a/README
+++ b/README
@@ -101,6 +101,7 @@ Changes:
-RSS respects $calendar_path.
-YEARLY repeating events display better.
-All Calendars Combined can now be cached for greater performance.
+ -Parsing engine now twice as fast.
-Various bug fixes.
1.1
diff --git a/config.inc.php b/config.inc.php
index f563595..511c92b 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -29,7 +29,7 @@ $download_uri = ''; // The HTTP URL to your calendars directory, ie. http:
$default_path = 'http://www.example.com/phpicalendar'; // The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar
// Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
-$save_parsed_cals = 'yes'; // Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
+$save_parsed_cals = 'no'; // Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
$display_custom_goto = 'no'; // In the 'Jump To' box, display the custom 'go to day' box.
$display_ical_list = 'yes'; // In the 'Jump To' box, display the pop-up menu with the list of all calendars in the $calendar_path directory.
$allow_webcals = 'no'; // Allow http:// and webcal:// prefixed URLs to be used as the $cal for remote viewing of "subscribe-able" calendars. This does not have to be enabled to allow specific ones below.
diff --git a/functions/ical_parser.php b/functions/ical_parser.php
index 3a85726..d12ee38 100644
--- a/functions/ical_parser.php
+++ b/functions/ical_parser.php
@@ -283,7 +283,7 @@ foreach ($cal_filelist as $filename) {
$end = strtotime('+1 day', $start);
}
// Changed for 1.0, basically write out the entire event if it starts while the array is written.
- if ($start < $mArray_end) {
+ if (($start < $mArray_end) && ($start < $end)) {
while (($start != $end) && ($start < $mArray_end)) {
$start_date2 = date('Ymd', $start);
$master_array[($start_date2)][('-1')][$uid]= array ('event_text' => $summary, 'description' => $description, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname, 'url' => $url, 'status' => $status, 'class' => $class );
@@ -572,8 +572,7 @@ foreach ($cal_filelist as $filename) {
}
break;
case 'YEARLY':
-
- if (!isset($bymonth)) {
+ if ((!isset($bymonth)) || (sizeof($bymonth) == 0)) {
$m = date('m', $start_date_time);
$bymonth = array("$m");
}
@@ -606,7 +605,7 @@ foreach ($cal_filelist as $filename) {
} else {
$day = date('d', $start_date_time);
$next_date_time = mktime(0,0,0,$month,$day,$year);
- //echo date('Ymd',$next_range_time).$summary.'<br>';
+ //echo date('Ymd',$next_date_time).$summary.'<br>';
}
$recur_data[] = $next_date_time;
}
diff --git a/functions/userauth_functions.php b/functions/userauth_functions.php
index 403076d..4fe04fb 100644
--- a/functions/userauth_functions.php
+++ b/functions/userauth_functions.php
@@ -96,7 +96,7 @@ function user_login() {
}
// Check to make sure the username and password is valid.
- if (!key_exists("$username:$password", $locked_map)) {
+ if (!array_key_exists("$username:$password", $locked_map)) {
// Remember the invalid login, because we may want to display
// a message elsewhere or check validity.
return array($username, $password, true);
diff --git a/templates/default/footer.tpl b/templates/default/footer.tpl
index 23a6ae3..aacf6d7 100644
--- a/templates/default/footer.tpl
+++ b/templates/default/footer.tpl
@@ -1,4 +1,4 @@
-<center class="V9"><br />{L_POWERED_BY} <a class="psf" href="http://phpicalendar.sourceforge.net/nuke/">PHP iCalendar 2.0</a><br />
+<center class="V9"><br />{L_POWERED_BY} <a class="psf" href="http://phpicalendar.net/">PHP iCalendar 2.0</a><br />
<!-- switch rss_valid on -->
<p>
<a style="color:gray" href="http://feeds.archive.org/validator/check?url={FOOTER_CHECK}">

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