misc changes for new config model

1 files changed, 8 insertions, 8 deletions

diff --git a/month.php b/month.php
index 0a018aa..8498db8 100644
--- a/month.php
+++ b/month.php
@@ -46,14 +46,14 @@ $list_jumps 	= list_jumps();
 $list_calcolors = list_calcolors();
 $list_icals_pick = display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED), TRUE);
 
-$page = new Page(BASE.'templates/'.$template.'/month.tpl');
+$page = new Page(BASE.'templates/'.$phpiCal_config->template.'/month.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',
-    'calendar_nav'      => BASE.'templates/'.$template.'/calendar_nav.tpl',
-    'search_box'        => BASE.'templates/'.$template.'/search_box.tpl'
+	'footer'			=> BASE.'templates/'.$phpiCal_config->template.'/footer.tpl',
+    'calendar_nav'      => BASE.'templates/'.$phpiCal_config->template.'/calendar_nav.tpl',
+    'search_box'        => BASE.'templates/'.$phpiCal_config->template.'/search_box.tpl'
 	));
 
 $page->replace_tags(array(
@@ -105,13 +105,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'],
@@ -121,7 +121,7 @@ if ($allow_login == 'yes') {
 	));
 }
 
-if ($show_search != 'yes') {
+if ($phpiCal_config->show_search != 'yes') {
 	$page->nosearch($page);
 }