[PHPiCalendar-Commits] phpicalendar day.php, 1.131, 1.132 default_config.php, 1.2, 1.3 error.php, 1.4, 1.5 index.php, 1.16, 1.17 month.php, 1.140, 1.141 week.php, 1.131, 1.132 year.php, 1.46, 1.47

[<ji...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1548

Modified Files:
	day.php default_config.php error.php index.php month.php 
	week.php year.php 
Log Message:
update lots of files

Index: day.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** day.php	10 Apr 2006 02:21:07 -0000	1.131
--- day.php	11 Dec 2008 21:54:52 -0000	1.132
***************
*** 8,13 ****
  	}
  }
- define('BASE', './');
  $current_view = 'day';
  require_once(BASE.'functions/ical_parser.php');
  require_once(BASE.'functions/list_functions.php');
--- 8,13 ----
  	}
  }
  $current_view = 'day';
+ if (!defined('BASE')) define('BASE', './');
  require_once(BASE.'functions/ical_parser.php');
  require_once(BASE.'functions/list_functions.php');
***************
*** 29,33 ****
  
  // select for calendars
! $list_icals 	= display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED));
  $list_years 	= list_years();
  $list_months 	= list_months();
--- 29,33 ----
  
  // select for calendars
! $list_icals 	= display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED));
  $list_years 	= list_years();
  $list_months 	= list_months();
***************
*** 35,39 ****
  $list_jumps 	= list_jumps();
  $list_calcolors = list_calcolors();
! $list_icals_pick = display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED), TRUE);
  
  // login/logout
--- 35,39 ----
  $list_jumps 	= list_jumps();
  $list_calcolors = list_calcolors();
! $list_icals_pick = display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED), TRUE);
  
  // login/logout
***************
*** 43,47 ****
  $logout_querys = logout_querys();
  
! $page = new Page(BASE.'templates/'.$template.'/day.tpl');
  
  $page->replace_files(array(
--- 43,47 ----
  $logout_querys = logout_querys();
  
! $page = new Page(BASE.'templates/'.$phpiCal_config->template.'/day.tpl'); 
  
  $page->replace_files(array(
***************
*** 54,61 ****
  
  $page->replace_tags(array(
! 	'version'			=> $phpicalendar_version,
! 	'charset'			=> $charset,
  	'default_path'		=> '',
! 	'template'			=> $template,
  	'cal'				=> $cal,
  	'getdate'			=> $getdate,
--- 54,61 ----
  
  $page->replace_tags(array(
! 	'version'			=> $phpiCal_config->phpicalendar_version,
! 	'charset'			=> $phpiCal_config->charset,
  	'default_path'		=> '',
! 	'template'			=> $phpiCal_config->template,
  	'cal'				=> $cal,
  	'getdate'			=> $getdate,

Index: default_config.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** default_config.php	22 May 2007 01:31:34 -0000	1.2
--- default_config.php	11 Dec 2008 21:54:52 -0000	1.3
***************
*** 1,77 ****
  <?php
  
! // Configuration file for PHP iCalendar 2.23rc1
! //
! // To set values, change the text between the single quotes
! // Follow instructions to the right for detailed information
! 
! $template 				= 'default';		// Template support
! $default_view 			= 'day';			// Default view for calendars = 'day', 'week', 'month', 'year'
! $minical_view 			= 'current';		// Where do the mini-calendars go when clicked? = 'day', 'week', 'month', 'current'
! $default_cal 			= "$ALL_CALENDARS_COMBINED";		// Exact filename of calendar without .ics. Or set to $ALL_CALENDARS_COMBINED to open all calenders combined into one.
! #$default_cal 			= 'Other_racing';		// Exact filename of calendar without .ics. Or set to $ALL_CALENDARS_COMBINED to open all calenders combined into one.
! $language 				= 'English';		// Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto', 'Korean'
! $week_start_day 		= 'Sunday';			// Day of the week your week starts on
! $week_length			= '7';				// Number of days to display in the week view
! $day_start 				= '0600';			// Start time for day grid
! $day_end				= '2000';			// End time for day grid
! $gridLength 			= '15';				// Grid distance in minutes for day view, multiples of 15 preferred
! $num_years 				= '1';				// Number of years (up and back) to display in 'Jump to'
! $month_event_lines 		= '1';				// Number of lines to wrap each event title in month view, 0 means display all lines.
! $tomorrows_events_lines = '1';				// Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines.
! $allday_week_lines 		= '1';				// Number of lines to wrap each event title in all-day events in week view, 0 means display all lines.
! $week_events_lines 		= '1';				// Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines.
! $timezone 				= '';				// Set timezone. Read TIMEZONES file for more information
! $calendar_path 			= '';				// Leave this blank on most installs, place your full FILE SYSTEM PATH to calendars if they are outside the phpicalendar folder.
! $second_offset			= '';				// The time in seconds between your time and your server's time.
! $bleed_time				= '-1';				// This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359', or '-1' for no bleed time.
! $cookie_uri				= ''; 				// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar -- AUTO SETTING -- Only set if you are having cookie issues.
! $download_uri			= ''; 				// The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars -- AUTO SETTING -- Only set if you are having subscribe issues.
! $default_path			= ''; 				// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar
! $charset				= 'UTF-8';			// Character set your calendar is in, suggested UTF-8, or iso-8859-1 for most languages.
! 
! // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
! $allow_webcals 			= 'no';				// Allow http:// and webcal:// prefixed URLs to be used as the $cal for remote viewing of "subscribe-able" calendars. This does not have to be enabled to allow specific ones below.
! $this_months_events 	= 'yes';			// Display "This month's events" at the bottom off the month page.
! $enable_rss				= 'yes';			// Enable RSS access to your calendars (good thing).
! $rss_link_to_event		= '';				// Set to yes to have links in the feed popup an event window.  Default is to link to day.php
! $show_search			= 'no';			// Show the search box in the sidebar.
! $allow_preferences		= 'no';			// Allow visitors to change various preferences via cookies.
! $printview_default		= 'no';				// Set print view as the default view. day, week, and month only supported views for $default_view (listed well above).
! $show_todos				= 'yes';			// Show your todo list on the side of day and week view.
! $show_completed			= 'yes';				// Show completed todos on your todo list.
! $allow_login			= 'no';				// Set to yes to prompt for login to unlock calendars.
! $login_cookies			= 'no';			// Set to yes to store authentication information via (unencrypted) cookies. Set to no to use sessions.
! $support_ical			= 'no';			// Set to yes to support the Apple iCal calendar database structure.
! $recursive_path			= 'no';			// Set to yes to recurse into subdirectories of the calendar path.
! 
! // Calendar Caching (decreases page load times)
! $save_parsed_cals 		= 'no';				// Saves a copy of the cal in /tmp after it's been parsed. Improves performance.
! $tmp_dir				= '/tmp';			// The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X). Any php-writable folder works.
! $webcal_hours			= '24';				// Number of hours to cache webcals. Setting to '0' will always re-parse webcals.
! 
! // Webdav style publishing
! $phpicalendar_publishing = '0';				// Set to '1' to enable remote webdav style publish. See 'calendars/publish.php' for complete information;
! 
! // Administration settings (/admin/)
! $allow_admin			= 'no';			// Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $auth_method			
! $auth_method			= 'internal';			// Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $auth_internal_username and $auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic.
! $auth_internal_username	= 'admin';			// Only used if $auth_method='internal'. The username for the administrator.
! $auth_internal_password	= 'admin';			// Only used if $auth_method='internal'. The password for the administrator.
! $ftp_server				= 'localhost';		// Only used if $auth_method='ftp'. The ftp server name. 'localhost' will work for most servers.
! $ftp_port				= '21';				// Only used if $auth_method='ftp'. The ftp port. '21' is the default for ftp servers.
! $ftp_calendar_path		= '';				// Only used if $auth_method='ftp'. The full path to the calendar directory on the ftp server. If = '', will attempt to deduce the path based on $calendar_path, but may not be accurate depending on ftp server config.
! 
! // Calendar colors
! //
! // You can increase the number of unique colors by adding additional images (monthdot_n.gif) 
! // and in the css file (default.css) classes .alldaybg_n, .eventbg_n and .eventbg2_n
! // Colors will repeat from the beginning for calendars past $unique_colors (7 by default), with no limit.
! $unique_colors			= '7';	
! 
! $blacklisted_cals = array();
! $list_webcals = array();
! $locked_cals = array();
! $locked_map = array();
  
  ?>
--- 1,104 ----
  <?php
+ class Configs{
+ 	private static $instance;
+ 	private function __construct(){
+ 		$this->phpicalendar_version = '2.3rc1';
+ 	// Configuration file for PHP iCalendar 2.25rc1
+ 	//
+ 	// To set values, change the text between the single quotes
+ 	// Follow instructions to the right for detailed information
+ #=================Initialize global variables=================================
+ // Define some magic strings.
+ 		$this->ALL_CALENDARS_COMBINED = 'all_calendars_combined971';	
+ 		$this->template 				= 'default';		// Template support
+ 		$this->default_view 			= 'day';			// Default view for calendars = 'day', 'week', 'month', 'year'
+ 		$this->minical_view 			= 'current';		// Where do the mini-calendars go when clicked? = 'day', 'week', 'month', 'current'
+ 		$this->default_cal 				= $this->ALL_CALENDARS_COMBINED;		// Exact filename of calendar without .ics. Or set to $this->ALL_CALENDARS_COMBINED to open all calenders combined into one.
+ 		#$this->default_cal 			= 'Other_racing';		// Exact filename of calendar without .ics. Or set to $this->ALL_CALENDARS_COMBINED to open all calenders combined into one.
+ 		$this->language 				= 'English';		// Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto', 'Korean'
+ 		$this->week_start_day 			= 'Sunday';			// Day of the week your week starts on
+ 		$this->week_length				= '7';				// Number of days to display in the week view
+ 		$this->day_start 				= '0600';			// Start time for day grid
+ 		$this->day_end					= '2000';			// End time for day grid
+ 		$this->gridLength 				= '15';				// Grid distance in minutes for day view, multiples of 15 preferred
+ 		$this->num_years 				= '1';				// Number of years (up and back) to display in 'Jump to'
+ 		$this->month_event_lines 		= '1';				// Number of lines to wrap each event title in month view, 0 means display all lines.
+ 		$this->tomorrows_events_lines 	= '1';				// Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines.
+ 		$this->allday_week_lines 		= '1';				// Number of lines to wrap each event title in all-day events in week view, 0 means display all lines.
+ 		$this->week_events_lines 		= '1';				// Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines.
+ 		$this->timezone 				= '';				// Set timezone. Read TIMEZONES file for more information
+ 		$this->calendar_path 			= '';				// Leave this blank on most installs, place your full FILE SYSTEM PATH to calendars if they are outside the phpicalendar folder.
+ 		$this->second_offset			= '';				// The time in seconds between your time and your server's time.
+ 		$this->bleed_time				= '-1';				// This allows events past midnight to just be displayed on the starting date, only good up to 24 hours. Range from '0000' to '2359', or '-1' for no bleed time.
+ 		$this->cookie_uri				= ''; 				// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar -- AUTO SETTING -- Only set if you are having cookie issues.
+ 		$this->download_uri				= ''; 				// The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars -- AUTO SETTING -- Only set if you are having subscribe issues.
+ 		$this->default_path				= ''; 				// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar
+ 		$this->charset					= 'UTF-8';			// Character set your calendar is in, suggested UTF-8, or iso-8859-1 for most languages.
+ 		
+ 		// Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
+ 		$this->allow_webcals 			= 'no';				// Allow http:// and webcal:// prefixed URLs to be used as the $this->cal for remote viewing of "subscribe-able" calendars. This does not have to be enabled to allow specific ones below.
+ 		$this->this_months_events 		= 'yes';			// Display "This month's events" at the bottom off the month page.
+ 		$this->enable_rss				= 'yes';			// Enable RSS access to your calendars (good thing).
+ 		$this->rss_link_to_event		= '';				// Set to yes to have links in the feed popup an event window.  Default is to link to day.php
+ 		$this->show_search				= 'no';			// Show the search box in the sidebar.
+ 		$this->allow_preferences		= 'no';			// Allow visitors to change various preferences via cookies.
+ 		$this->printview_default		= 'no';				// Set print view as the default view. day, week, and month only supported views for $this->default_view (listed well above).
+ 		$this->show_todos				= 'yes';			// Show your todo list on the side of day and week view.
+ 		$this->show_completed			= 'yes';				// Show completed todos on your todo list.
+ 		$this->allow_login				= 'no';				// Set to yes to prompt for login to unlock calendars.
+ 		$this->login_cookies			= 'no';			// Set to yes to store authentication information via (unencrypted) cookies. Set to no to use sessions.
+ 		$this->support_ical				= 'no';			// Set to yes to support the Apple iCal calendar database structure.
+ 		$this->recursive_path			= 'no';			// Set to yes to recurse into subdirectories of the calendar path.
+ 		
+ 		// Calendar Caching (decreases page load times)
+ 		$this->save_parsed_cals 		= 'no';				// Saves a copy of the cal in /tmp after it's been parsed. Improves performance.
+ 		$this->tmp_dir					= '/tmp';			// The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X). Any php-writable folder works.
+ 		$this->webcal_hours				= '24';				// Number of hours to cache webcals. Setting to '0' will always re-parse webcals.
+ 		
+ 		// Webdav style publishing
+ 		$this->phpicalendar_publishing 	= '0';				// Set to '1' to enable remote webdav style publish. See 'calendars/publish.php' for complete information;
+ 		
+ 		// Administration settings (/admin/)
+ 		$this->allow_admin				= 'no';			// Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $this->auth_method			
+ 		$this->auth_method				= 'internal';			// Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $this->auth_internal_username and $this->auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic.
+ 		$this->auth_internal_username	= 'admin';			// Only used if $this->auth_method='internal'. The username for the administrator.
+ 		$this->auth_internal_password	= 'admin';			// Only used if $this->auth_method='internal'. The password for the administrator.
+ 		$this->ftp_server				= 'localhost';		// Only used if $this->auth_method='ftp'. The ftp server name. 'localhost' will work for most servers.
+ 		$this->ftp_port					= '21';				// Only used if $this->auth_method='ftp'. The ftp port. '21' is the default for ftp servers.
+ 		$this->ftp_calendar_path		= '';				// Only used if $this->auth_method='ftp'. The full path to the calendar directory on the ftp server. If = '', will attempt to deduce the path based on $this->calendar_path, but may not be accurate depending on ftp server config.
+ 		
+ 		// Calendar colors
+ 		//
+ 		// You can increase the number of unique colors by adding additional images (monthdot_n.gif) 
+ 		// and in the css file (default.css) classes .alldaybg_n, .eventbg_n and .eventbg2_n
+ 		// Colors will repeat from the beginning for calendars past $this->unique_colors (7 by default), with no limit.
+ 		$this->unique_colors			= '7';	
+ 		
+ 		$this->blacklisted_cals = array();
+ 		$this->list_webcals = array();
+ 		$this->locked_cals = array();
+ 		$this->locked_map = array();
+ 		$this->verbose_errors = false;
+ 		return true;
+ 	}	
+ 	
+ 	public static function getInstance(){
+ 		if (empty(self::$instance)){
+ 			self::$instance = new Configs;
+ 		}
+ 		return self::$instance;
+ 	}
+ 	
+ 	# val can be an array
+ 	public function setProperty($key,$val){
+ 		$this->$key = $val;
+ 		return;
+ 	}
+ 	public function getProperty($key){
+ 		return $this->$key;
+ 	}
+ }
  
! $phpiCal_config = Configs::getInstance();
  
  ?>

Index: error.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/error.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** error.php	10 Apr 2006 02:21:07 -0000	1.4
--- error.php	11 Dec 2008 21:54:52 -0000	1.5
***************
*** 5,10 ****
  
  function error($error_msg='There was an error processing the request.', $file='NONE', $error_base='./') {
! 	global $template, $language, $enable_rss, $lang, $charset, $default_path;
! 	if (!isset($template))					$template = 'default';
  	if (!isset($lang['l_powered_by']))		$lang['l_powered_by'] = 'Powered by';
  	if (!isset($lang['l_error_title']))		$lang['l_error_title'] = 'Error!';
--- 5,10 ----
  
  function error($error_msg='There was an error processing the request.', $file='NONE', $error_base='./') {
! 	global $language, $enable_rss, $lang, $charset, $phpiCal_config;
! 	if (!isset($template))					$template = $phpiCal_config->template;
  	if (!isset($lang['l_powered_by']))		$lang['l_powered_by'] = 'Powered by';
  	if (!isset($lang['l_error_title']))		$lang['l_error_title'] = 'Error!';
***************
*** 20,24 ****
  	$calendar_name 		= $lang['l_error_title'];
  	
! 	if (empty($default_path)) {
  		if (isset($_SERVER['HTTPS']) || strtolower($_SERVER['HTTPS']) == 'on' ) {
  			$default_path = 'https://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/rss/'));
--- 20,25 ----
  	$calendar_name 		= $lang['l_error_title'];
  	
! 	$default_path = $phpiCal_config->default_path;
! 	if (empty($phpiCal_config->default_path)) {
  		if (isset($_SERVER['HTTPS']) || strtolower($_SERVER['HTTPS']) == 'on' ) {
  			$default_path = 'https://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/rss/'));

Index: index.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/index.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** index.php	23 May 2007 18:19:36 -0000	1.16
--- index.php	11 Dec 2008 21:54:52 -0000	1.17
***************
*** 1,27 ****
  <?php
- 
- if (!isset($ALL_CALENDARS_COMBINED))  $ALL_CALENDARS_COMBINED = 'all_calendars_combined971';
  if (!defined('BASE')) define('BASE', './');
! include_once(BASE.'default_config.php');
! if (is_file(BASE.'config.inc.php')) include_once(BASE.'config.inc.php');
! if (isset($_COOKIE['phpicalendar'])) {
! 	$phpicalendar 		= unserialize(stripslashes($_COOKIE['phpicalendar']));
! 	$default_view 		= $phpicalendar['cookie_view'];
! }
! if ($printview_default == 'yes') {
! 	$printview = $default_view;
! 	$default_view = "print.php";
  } else {
  	$check = array ('day', 'week', 'month', 'year');
! 	if (in_array($default_view, $check)) {
! 		$default_view = $default_view . '.php';
  	} else {
! 		die;
  	}
  }
  if(isset($_GET['cpath'])){
! 	$default_view .= '?cpath='.$_GET['cpath'];
  }
! header("Location: $default_view");
  
  ?>
--- 1,21 ----
  <?php
  if (!defined('BASE')) define('BASE', './');
! include_once(BASE.'functions/init.inc.php');
! 
! if ($phpiCal_config->printview_default == 'yes') {
! 	$printview = $phpiCal_config->default_view;
! 	$phpiCal_config->setProperty('default_view', "print.php");
  } else {
  	$check = array ('day', 'week', 'month', 'year');
! 	if (in_array($phpiCal_config->default_view, $check)) {
! 		$phpiCal_config->setProperty('default_view', $phpiCal_config->default_view . '.php');
  	} else {
! 		die('illegal view');
  	}
  }
  if(isset($_GET['cpath'])){
! 	$phpiCal_config->default_view .= '?cpath='.$_GET['cpath'];
  }
! header("Location: $phpiCal_config->default_view");
  
  ?>

Index: month.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -d -r1.140 -r1.141
*** month.php	12 Oct 2007 06:42:32 -0000	1.140
--- month.php	11 Dec 2008 21:54:52 -0000	1.141
***************
*** 39,43 ****
  
  // select for calendars
! $list_icals 	= display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED));
  $list_years 	= list_years();
  $list_months 	= list_months();
--- 39,43 ----
  
  // select for calendars
! $list_icals 	= display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED));
  $list_years 	= list_years();
  $list_months 	= list_months();
***************
*** 45,49 ****
  $list_jumps 	= list_jumps();
  $list_calcolors = list_calcolors();
! $list_icals_pick = display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED), TRUE);
  
  $page = new Page(BASE.'templates/'.$template.'/month.tpl');
--- 45,49 ----
  $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');
***************
*** 58,64 ****
  
  $page->replace_tags(array(
! 	'version'			=> $phpicalendar_version,
! 	'charset'			=> $charset,
! 	'template'			=> $template,
  	'cal'				=> $cal,
  	'getdate'			=> $getdate,
--- 58,64 ----
  
  $page->replace_tags(array(
! 	'version'			=> $phpiCal_config->phpicalendar_version,
! 	'charset'			=> $phpiCal_config->charset,
! 	'template'			=> $phpiCal_config->template,
  	'cal'				=> $cal,
  	'getdate'			=> $getdate,
***************
*** 67,71 ****
  	'calendar_name'		=> $cal_displayname,
  	'display_date'		=> $display_date,
! 	'rss_powered'	 	=> $rss_powered,
  	'default_path'		=> '',
  	'rss_available' 	=> '',
--- 67,71 ----
  	'calendar_name'		=> $cal_displayname,
  	'display_date'		=> $display_date,
! 	'rss_powered'	 	=> $phpiCal_config->rss_powered,
  	'default_path'		=> '',
  	'rss_available' 	=> '',

Index: week.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** week.php	12 Oct 2007 06:41:33 -0000	1.131
--- week.php	11 Dec 2008 21:54:52 -0000	1.132
***************
*** 30,34 ****
  
  // select for calendars
! $list_icals 	= display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED));
  $list_years 	= list_years();
  $list_months 	= list_months();
--- 30,34 ----
  
  // select for calendars
! $list_icals 	= display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED));
  $list_years 	= list_years();
  $list_months 	= list_months();
***************
*** 36,40 ****
  $list_jumps 	= list_jumps();
  $list_calcolors = list_calcolors();
! $list_icals_pick = display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED), TRUE);
  
  // login/logout
--- 36,40 ----
  $list_jumps 	= list_jumps();
  $list_calcolors = list_calcolors();
! $list_icals_pick = display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED), TRUE);
  
  // login/logout
***************
*** 55,62 ****
  
  $page->replace_tags(array(
! 	'version'			=> $phpicalendar_version,
! 	'charset'			=> $charset,
  	'default_path'		=> '',
! 	'template'			=> $template,
  	'cal'				=> $cal,
  	'getdate'			=> $getdate,
--- 55,62 ----
  
  $page->replace_tags(array(
! 	'version'			=> $phpiCal_config->phpicalendar_version,
! 	'charset'			=> $phpiCal_config->charset,
  	'default_path'		=> '',
! 	'template'			=> $phpiCal_config->template,
  	'cal'				=> $cal,
  	'getdate'			=> $getdate,
***************
*** 67,71 ****
  	'current_view'		=> $current_view,
  	'sidebar_date'		=> $sidebar_date,
! 	'rss_powered'	 	=> $rss_powered,
  	'rss_available' 	=> '',
  	'rss_valid' 		=> '',
--- 67,71 ----
  	'current_view'		=> $current_view,
  	'sidebar_date'		=> $sidebar_date,
! 	'rss_powered'	 	=> $phpiCal_config->rss_powered,
  	'rss_available' 	=> '',
  	'rss_valid' 		=> '',

Index: year.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/year.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** year.php	12 Oct 2007 06:41:33 -0000	1.46
--- year.php	11 Dec 2008 21:54:52 -0000	1.47
***************
*** 25,29 ****
  
  // select for calendars
! $list_icals 	= display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED));
  $list_years 	= list_years();
  $list_months 	= list_months();
--- 25,29 ----
  
  // select for calendars
! $list_icals 	= display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED));
  $list_years 	= list_years();
  $list_months 	= list_months();
***************
*** 33,37 ****
  <img src="templates/'.$template.'/images/event_dot.gif" alt=" " width="11" height="10" border="0" />'.$lang['l_event']."<br>"; 
  ;
! $list_icals_pick = display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED), TRUE);
  
  // login/logout
--- 33,37 ----
  <img src="templates/'.$template.'/images/event_dot.gif" alt=" " width="11" height="10" border="0" />'.$lang['l_event']."<br>"; 
  ;
! $list_icals_pick = display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED), TRUE);
  
  // login/logout
***************
*** 53,61 ****
  
  $page->replace_tags(array(
! 	'version'			=> $phpicalendar_version,
  	'event_js'			=> '',
  	'current_view'		=> $current_view,
! 	'template'			=> $template,
! 	'charset'			=> $charset,
  	'default_path'		=> '',
  	'cal'				=> $cal,
--- 53,61 ----
  
  $page->replace_tags(array(
! 	'version'			=> $phpiCal_config->phpicalendar_version,
  	'event_js'			=> '',
  	'current_view'		=> $current_view,
! 	'template'			=> $phpiCal_config->template,
! 	'charset'			=> $phpiCal_config->charset,
  	'default_path'		=> '',
  	'cal'				=> $cal,
***************
*** 66,70 ****
  	'display_date'		=> $this_year,
  	'sidebar_date'		=> $sidebar_date,
! 	'rss_powered'	 	=> $rss_powered,
  	'rss_available' 	=> '',
  	'rss_valid' 		=> '',
--- 66,70 ----
  	'display_date'		=> $this_year,
  	'sidebar_date'		=> $sidebar_date,
! 	'rss_powered'	 	=> $phpiCal_config->rss_powered,
  	'rss_available' 	=> '',
  	'rss_valid' 		=> '',