aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hu <jimhu@users.sourceforge.net>2009-01-26 03:27:29 +0000
committerJim Hu <jimhu@users.sourceforge.net>2009-01-26 03:27:29 +0000
commit9c1ad1c80dbdf3cfa73477437c33fb821a0424b8 (patch)
tree785f2fc14fa7d60efb39864ea16309e927d2ab8b
parentcecd608ffaea0d25f182fb9e2e0883c3d17186de (diff)
downloadphpicalendar-9c1ad1c80dbdf3cfa73477437c33fb821a0424b8.tar.gz
phpicalendar-9c1ad1c80dbdf3cfa73477437c33fb821a0424b8.tar.bz2
phpicalendar-9c1ad1c80dbdf3cfa73477437c33fb821a0424b8.zip
misc changes for 2.31
-rw-r--r--default_config.php2
-rw-r--r--functions/calendar_functions.php2
-rw-r--r--functions/ical_parser.php2
-rw-r--r--functions/init/set_error_reporting.php4
-rw-r--r--includes/event.php2
5 files changed, 7 insertions, 5 deletions
diff --git a/default_config.php b/default_config.php
index e46d13a..9792ebb 100644
--- a/default_config.php
+++ b/default_config.php
@@ -2,7 +2,7 @@
class Configs{
private static $instance;
private function __construct(){
- $this->phpicalendar_version = '2.31rc4';
+ $this->phpicalendar_version = '2.31';
// Configuration file for PHP iCalendar 2.31
//
// To set values, change the text between the single quotes
diff --git a/functions/calendar_functions.php b/functions/calendar_functions.php
index 2362686..25ec8ed 100644
--- a/functions/calendar_functions.php
+++ b/functions/calendar_functions.php
@@ -101,6 +101,8 @@ function availableCalendars($username, $password, $cal_filename, $admin = false)
if (!is_file($file)) continue;
// Remove any php files.
if (preg_match("/^.*\.php$/i", $file)) continue;
+ # remove publish log file
+ if ($file == 'publish_log.txt') continue;
// Make sure this is not a blacklisted calendar.
$cal_name = getCalendarName($file);
if (in_array($cal_name, $blacklisted_cals)) continue;
diff --git a/functions/ical_parser.php b/functions/ical_parser.php
index 70f3593..3776e55 100644
--- a/functions/ical_parser.php
+++ b/functions/ical_parser.php
@@ -19,7 +19,7 @@ if ($phpiCal_config->save_parsed_cals == 'yes') {
$master_array = unserialize($contents);
$z=1;
$y=0;
- $webcal_mtime = time() - ($webcal_hours * 3600);
+ $webcal_mtime = time() - ($phpiCal_config->webcal_hours * 3600);
if (sizeof($master_array['-4']) == (sizeof($cal_filelist))) {
foreach ($master_array['-4'] as $temp_array) {
$mtime = $master_array['-4'][$z]['mtime'];
diff --git a/functions/init/set_error_reporting.php b/functions/init/set_error_reporting.php
index b57040e..9265c86 100644
--- a/functions/init/set_error_reporting.php
+++ b/functions/init/set_error_reporting.php
@@ -4,7 +4,7 @@ config boolean $verbose_errors = false by default
*/
// uncomment when developing, comment for shipping version
-error_reporting (E_ALL);
+#error_reporting (E_ALL);
#error_reporting (E_ERROR | E_WARNING | E_PARSE);
-#error_reporting(0);
+error_reporting(0);
// Older versions of PHP do not define $_SERVER. Define it here instead.
diff --git a/includes/event.php b/includes/event.php
index 7cafa8a..c250e8d 100644
--- a/includes/event.php
+++ b/includes/event.php
@@ -108,7 +108,7 @@ $page->replace_tags(array(
'cal' => $event['calname'],
'event_text' => $event['event_text'],
'event_times' => $event_times,
- 'description' => $event['description'],
+ 'description' => nl2br($event['description']),
'organizer' => $organizer,
'attendee' => $attendee,
'status' => $event['status'],

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