misc changes for new config model

1 files changed, 13 insertions, 13 deletions

diff --git a/week.php b/week.php
index e1250c2..8767b21 100644
--- a/week.php
+++ b/week.php
@@ -15,8 +15,8 @@ $next_week 			= date("Ymd", strtotime("+1 week",  $unix_time));
 $prev_week 			= date("Ymd", strtotime("-1 week",  $unix_time));
 $next_day			= date('Ymd', strtotime("+1 day",  $unix_time));
 $prev_day 			= date('Ymd', strtotime("-1 day",  $unix_time));
-$start_week_time 	= strtotime(dateOfWeek($getdate, $week_start_day));
-$end_week_time 		= $start_week_time + (($week_length - 1) * 25 * 60 * 60);
+$start_week_time 	= strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
+$end_week_time 		= $start_week_time + (($phpiCal_config->week_length - 1) * 25 * 60 * 60);
 $start_week 		= localizeDate($dateFormat_week, $start_week_time);
 $end_week 			= localizeDate($dateFormat_week, $end_week_time);
 $display_date 		= "$start_week - $end_week";
@@ -39,18 +39,18 @@ $list_icals_pick = display_ical_list(availableCalendars($username, $password, $p
 
 // login/logout
 $is_logged_in = ($username != '' && !$invalid_login) ? true : false;
-$show_user_login = (!$is_logged_in && $allow_login == 'yes');
+$show_user_login = (!$is_logged_in && $phpiCal_config->allow_login == 'yes');
 $login_querys = login_querys();
 $logout_querys = logout_querys();
 
-$page = new Page(BASE.'templates/'.$template.'/week.tpl');
+$page = new Page(BASE.'templates/'.$phpiCal_config->template.'/week.tpl');
 
 $page->replace_files(array(
-	'header'			=> BASE.'templates/'.$template.'/header.tpl',
+	'header'			=> BASE.'templates/'.$phpiCal_config->template.'/header.tpl',
 	'event_js'			=> BASE.'functions/event.js',
-	'footer'			=> BASE.'templates/'.$template.'/footer.tpl',
-    'sidebar'           => BASE.'templates/'.$template.'/sidebar.tpl',
-    'search_box'        => BASE.'templates/'.$template.'/search_box.tpl'
+	'footer'			=> BASE.'templates/'.$phpiCal_config->template.'/footer.tpl',
+    'sidebar'           => BASE.'templates/'.$phpiCal_config->template.'/sidebar.tpl',
+    'search_box'        => BASE.'templates/'.$phpiCal_config->template.'/search_box.tpl'
 	));
 
 $page->replace_tags(array(
@@ -61,7 +61,7 @@ $page->replace_tags(array(
 	'cal'				=> $cal,
 	'getdate'			=> $getdate,
  	'getcpath'			=> "&cpath=$cpath",
-    'cpath'                 => $cpath,
+    'cpath'             => $cpath,
 	'calendar_name'		=> $cal_displayname,
 	'display_date'		=> $display_date,
 	'current_view'		=> $current_view,
@@ -69,7 +69,7 @@ $page->replace_tags(array(
 	'rss_powered'	 	=> $phpiCal_config->rss_powered,
 	'rss_available' 	=> '',
 	'rss_valid' 		=> '',
-    'show_search'           => $show_search,
+    'show_search'       => $show_search,
 	'next_day' 			=> $next_day,
 	'next_week' 		=> $next_week,
 	'prev_day'	 		=> $prev_day,
@@ -108,13 +108,13 @@ $page->replace_tags(array(
 	'l_this_site_is'	=> $lang['l_this_site_is']			
 	));
 	
-if ($allow_preferences != 'yes') {
+if ($phpiCal_config->allow_preferences != 'yes') {
 	$page->replace_tags(array(
 	'allow_preferences'	=> ''
 	));
 }	
 	
-if ($allow_login == 'yes') {
+if ($phpiCal_config->allow_login == 'yes') {
 	$page->replace_tags(array(
 	'l_invalid_login'	=> $lang['l_invalid_login'],
 	'l_password'		=> $lang['l_password'],
@@ -124,7 +124,7 @@ if ($allow_login == 'yes') {
 	));
 }
 
-if ($show_search != 'yes') {
+if ($phpiCal_config->show_search != 'yes') {
 	$page->nosearch($page);
 }