roll back experimental feature

4 files changed, 5 insertions, 8 deletions

diff --git a/README b/README
index b6deb32..a245b06 100644
--- a/README
+++ b/README
@@ -82,6 +82,9 @@ COPYING for more information about our license.
 Changes:
 --------
 cvs
+	Fix parsing of timezones to accommodate extra text from Mozilla and other calendars
+	Bug fixes
+		Fixed error in german language file
 2.22
 	template.php will look in templates/default if a file is missing from templates/$template
 	add support for WKST and BYPOS tags
diff --git a/functions/date_functions.php b/functions/date_functions.php
index 9c9bc30..83e51af 100644
--- a/functions/date_functions.php
+++ b/functions/date_functions.php
@@ -244,7 +244,7 @@ function extractDateTime($data, $property, $field) {
 		// Pull out the timezone, or use GMT if zulu time was indicated.
 		if (preg_match('/^'.$property.';TZID=/i', $field)) {
 			$tz_tmp = explode('=', $field);
-			$tz_dt = $tz_tmp[1];
+			$tz_dt = parse_tz($tz_tmp[1]);
 			unset($tz_tmp);
 		} elseif ($zulu_time) {
 			$tz_dt = 'GMT';
diff --git a/functions/init.inc.php b/functions/init.inc.php
index c554f81..83b540e 100644
--- a/functions/init.inc.php
+++ b/functions/init.inc.php
@@ -13,7 +13,6 @@ $ALL_CALENDARS_COMBINED = 'all_calendars_combined971';
 
 // Pull in the configuration and some functions.
 if (!defined('BASE')) define('BASE', './');
-include_once(BASE.'default_config.inc.php');
 include_once(BASE.'config.inc.php');
 
 $cookie_name = 'phpicalendar_'.basename($default_path);
diff --git a/index.php b/index.php
index aee10ea..a63454b 100644
--- a/index.php
+++ b/index.php
@@ -1,12 +1,7 @@
 <?php
 
 if (!isset($ALL_CALENDARS_COMBINED))  $ALL_CALENDARS_COMBINED = 'all_calendars_combined971';
-if (is_file("./config.inc.php")){
-	include "./config.inc.php";
-}else{
-	header ( "Location:./admin/new.php");
-	exit;
-}
+include "./config.inc.php";
 if (isset($_COOKIE['phpicalendar'])) {
 	$phpicalendar 		= unserialize(stripslashes($_COOKIE['phpicalendar']));
 	$default_view 		= $phpicalendar['cookie_view'];