From fb1fa4e8eeb2accaf71675dbf9810ec5af47bc79 Mon Sep 17 00:00:00 2001
From: Jim Hu <jimhu@users.sourceforge.net>
Date: Sat, 27 Dec 2008 23:18:07 +0000
Subject: new rss icons;allow subweek calendars

---
 functions/init/configs.php    | 20 ++++++++++++++++++++
 functions/init/date_range.php |  5 +++++
 2 files changed, 25 insertions(+)

(limited to 'functions/init')

diff --git a/functions/init/configs.php b/functions/init/configs.php
index f94c47b..17921ba 100644
--- a/functions/init/configs.php
+++ b/functions/init/configs.php
@@ -5,6 +5,25 @@ if (is_file(BASE.'config.inc.php')){
 	include(BASE.'config.inc.php');
 	foreach($configs as $key=>$value) $phpiCal_config->setProperty($key, $value);
 }
+
+# adjust gridlength to allowed values
+$g = $phpiCal_config->gridLength;
+if (!in_array($g,array(1,2,3,4,10,12,15,20,30,60)) && $g < 11){
+	$g = 10;
+}elseif($g < 13){
+	$g = 12;
+}elseif($g < 17){
+	$g = 15;
+}elseif($g < 25){
+	$g = 20;
+}elseif($g < 45){
+	$g = 30;
+}else{
+	$g = 60;
+}
+$phpiCal_config->setProperty('gridLength', $g);
+
+
 if ($phpiCal_config->cookie_uri == '') {
 	$phpiCal_config->setProperty('cookie_uri', $_SERVER['SERVER_NAME'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'], '/')) );
 	if ($phpiCal_config->cookie_uri == 'localhost')	$phpiCal_config->setProperty('cookie_uri', '');
@@ -23,6 +42,7 @@ if (isset($_COOKIE[$cookie_name]) && !isset($_POST['unset'])) {
 	if (isset($phpicalendar['cookie_startday'])) 	$phpiCal_config->setProperty('week_start_day', 		$phpicalendar['cookie_startday']);
 	if (isset($phpicalendar['cookie_time']))		$phpiCal_config->setProperty('day_start', 			$phpicalendar['cookie_time']); 
 	if (isset($phpicalendar['cookie_endtime']))		$phpiCal_config->setProperty('day_end', 			$phpicalendar['cookie_endtime']); 
+	if (isset($phpicalendar['cookie_timezone']))	$phpiCal_config->setProperty('timezone', 			$phpicalendar['timezone']); 
 }
 
 # language support
diff --git a/functions/init/date_range.php b/functions/init/date_range.php
index 7a51b47..d9f7b54 100644
--- a/functions/init/date_range.php
+++ b/functions/init/date_range.php
@@ -33,6 +33,7 @@ switch ($current_view){
 		$mArray_begin = mktime (0,0,0,$start_month,1,($start_year));
 		$mArray_end = mktime (0,0,0,$end_month,31,($end_year));
 		break;
+	case 'error':
 	case 'preferences':
 		$mArray_begin = time();
 		$mArray_end = time();
@@ -45,3 +46,7 @@ switch ($current_view){
 		$mArray_begin = mktime (0,0,0,12,21,($this_year - 1));
 		$mArray_end = mktime (0,0,0,1,31,($this_year + 1));
 }
+if ($phpiCal_config->save_parsed_cals == 'yes') {	
+	$mArray_begin = mktime (0,0,0,12,21,($this_year - 1));
+	$mArray_end = mktime (0,0,0,1,31,($this_year + 1));
+}
\ No newline at end of file
-- 
cgit v1.2.3