[PHPiCalendar-Commits] phpicalendar config.inc.php, 1.188, 1.189 default_config.php, 1.5, 1.6 preferences.php, 1.65, 1.66

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

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

Modified Files:
	config.inc.php default_config.php preferences.php 
Log Message:
new rss icons;allow subweek calendars

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.188
retrieving revision 1.189
diff -C2 -d -r1.188 -r1.189
*** config.inc.php	27 Dec 2008 11:42:41 -0000	1.188
--- config.inc.php	27 Dec 2008 23:18:07 -0000	1.189
***************
*** 3,54 ****
  
  phpicalendar 2.3 should work with no additional configuration. This file can be changed to customize the behavior of phpicalendar.
! In version 2.3, there has been a change in the way configuration works in order to reduce the number of confusing global variables.  Unfortunately, this means that config.inc.php files from older installations will have to be translated to the new format.  The conversion is simple: use the old variable names as array keys for the $configs array below:
  */
! $secs = 6*60*60;
  $configs = array(
! #	'calendar_path'	=>	'/Library/WebServer/Documents/phpicalendar/calendars',
! #	'timezone'	=> 'US/Central', 
! #	'allow_admin'	=> 'yes', 
! #	'allow_login'	=> 'yes', 
! 	'allow_preferences'	=> 'yes', 
! 	'show_search'	=> 'yes',
! #	'show_todos'	=> 'no',
! 	'show_completed'	=> 'no',
! 	'timezone'	=> 'US/Central',
! #	'timezone'	=> 'America/Bogota',
! #	'timezone'	=> 'Europe/Paris',
! #	'gridLength' => 5,
! #	'second_offset'	=> $secs,
! #	'cookie_uri'	=> '' 
  );
  
! $blacklisted_cals[] = '';					// Fill in between the quotes the name of the calendars 
! $blacklisted_cals[] = '';					// you wish to 'blacklist' or that you don't want to show up in your calendar
! $blacklisted_cals[] = '';					// list. This should be the exact calendar filename without .ics
! $blacklisted_cals[] = '';					// the parser will *not* parse any cal that is in this list (it will not be Web accessible)
  // add more lines as necessary
  
! $list_webcals[] = '';						// Fill in between the quotes exact URL of a calendar that you wish
! $list_webcals[] = '';						// to show up in your calendar list. You must prefix the URL with http://
! $list_webcals[] = '';						// or webcal:// and the filename should contain the .ics suffix
! $list_webcals[] = '';						// $allow_webcals does *not* need to be "yes" for these to show up and work
  // add more lines as necessary
  
! #$more_webcals['cpath'][] = ''				//add webcals that will show up only for a particular cpath.
  
! $locked_cals[] = '';						// Fill in-between the quotes the names of the calendars you wish to hide
! $locked_cals[] = '';						// unless unlocked by a username/password login. This should be the
! $locked_cals[] = '';						// exact calendar filename without the .ics suffix.
! $locked_cals[] = '';						//
  // add more lines as necessary
  
! $locked_map['user1:pass'] = array('');		// Map username:password accounts to locked calendars that should be
! $locked_map['user2:pass'] = array('');		// unlocked if logged in. Calendar names should be the same as what is
! $locked_map['user3:pass'] = array('');		// listed in the $locked_cals, again without the .ics suffix.
! $locked_map['user4:pass'] = array('');		// Example: $locked_map['username:password'] = array('Locked1', 'Locked2');
  // add more lines as necessary
  
! $apache_map['user1'] = array('');			// Map HTTP authenticated users to specific calendars. Users listed here and
! $apache_map['user2'] = array('');			// authenticated via HTTP will not see the public calendars, and will not be
! $apache_map['user3'] = array('');			// given any login/logout options. Calendar names not include the .ics suffix.
! $apache_map['user4'] = array('');			// Example: $apache_map['username'] = array('Calendar1', 'Calendar2');
--- 3,93 ----
  
  phpicalendar 2.3 should work with no additional configuration. This file can be changed to customize the behavior of phpicalendar.
! In version 2.3, there has been a change in the way configuration works in order to reduce the number of confusing global variables.  Unfortunately, this means that config.inc.php files from older installations will have to be translated to the new format.  The conversion is simple: use the old variable names as array keys for the $configs array below.
! 
! To change basic settings, uncomment (remove the first '#') from the desired line and adjust the value.  For setting blacklists, autmatic webcals, locked calendars, and HTTP authorized calendars modify the arrays below the basic configuration section.
! 
! The commented out lines below include alternatives to the default settings.  Additional settings that can be overridden are in default_config.php
! 
! For more info and help, go to http://phpicalendar.net or email php...@gm...
  */
! 
  $configs = array(
! 
! /*     ========= BASIC CONFIGURATION =========
!        ** Server configuration **
! 
! As noted, phpicalendar should work without adjusting the default settings.  Change these if you are having problems or want to change where things are found.  For example, it is often useful to have calendar_path in a different location.
! 
!        calendar_path is a FILE path
!        default_path, cookie_uri, and download_uri are a URL paths, e.g. http://www.example.com/phpicalendar; set these if you are having problems.
! */
! #     'calendar_path'        => '/Library/WebServer/Documents/phpicalendar/calendars/recur_tests',
! #     'default_path'         => '', 	
! #     'save_parsed_cals'     => 'yes', 
! #     'cookie_uri'           => '', 
! #     'download_uri'         => '', 	
! 
! /*     ** Timezones **
! If timezone is not set, all events show in the local time of the source calendar.  This isn't a problem if all your calendars are in the same timezone.  If you set a timezone for the server, events in other timezones are shown when they occur at the server's time.
! */
! #     'timezone'             => 'US/Central',
! #     'second_offset'        => $secs,
! 
! /*     ** Appearance **      
! In this section you can set how phpicalendar will display calendar views.
! 
! phpicalendar currently supports about 30 language variants.  For a list of supported languages, see the languages folder.
! 
! 
! */
! 
! #     'language'             => 'Spanish',
! #     'default_cal'          => 'US Holidays',	   // Exact filename of calendar without .ics. Or set to 'ALL_CALENDARS_COMBINED to open all calenders combined into one.
! #     'template'             => 'green';           // Template support: change this to have a different "skin" for your installation.     
! #     'default_view'         => 'month',           // Default view for calendars'     => 'day', 'week', 'month', 'year'
! #     'gridLength'           => 10,                // Grid size in day and week views. Allowed values are 1,2,3,4,10,12,15,20,30,60. Default is 15
! #     'minical_view'         => 'current',	       // Where do the mini-calendars go when clicked?'     => 'day', 'week', 'month', 'current'
! #     'allow_preferences'    => 'no', 
! #     'show_search'          => 'yes',
! #     'show_todos'           => 'no',
! #     'show_completed'       => 'no',
! #     'allow_admin'          => 'yes', 
!      'week_start_day'       => 'Monday',          // Day of the week your week starts on
!      'week_length'          => '5',	           // 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
  );
  
! /*     ========= SPECIAL CALENDARS =========
! 
! */
! $blacklisted_cals[] = '';                          // Fill in between the quotes the name of the calendars 
! $blacklisted_cals[] = '';                          // you wish to 'blacklist' or that you don't want to show up in your calendar
! $blacklisted_cals[] = '';                          // list. This should be the exact calendar filename without .ics
! $blacklisted_cals[] = '';                          // the parser will *not* parse any cal that is in this list (it will not be Web accessible)
  // add more lines as necessary
  
! $list_webcals[] = '';                              // Fill in between the quotes exact URL of a calendar that you wish
! $list_webcals[] = '';                              // to show up in your calendar list. You must prefix the URL with http://
! $list_webcals[] = '';                              // or webcal:// and the filename should contain the .ics suffix
! $list_webcals[] = '';                              // $allow_webcals does *not* need to be "yes" for these to show up and work
  // add more lines as necessary
  
! #$more_webcals['cpath'][] = ''                     //add webcals that will show up only for a particular cpath.
  
! $locked_cals[] = '';                               // Fill in-between the quotes the names of the calendars you wish to hide
! $locked_cals[] = '';                               // unless unlocked by a username/password login. This should be the
! $locked_cals[] = '';                               // exact calendar filename without the .ics suffix.
! $locked_cals[] = '';                               //
  // add more lines as necessary
  
! $locked_map['user1:pass'] = array('');             // Map username:password accounts to locked calendars that should be
! $locked_map['user2:pass'] = array('');             // unlocked if logged in. Calendar names should be the same as what is
! $locked_map['user3:pass'] = array('');             // listed in the $locked_cals, again without the .ics suffix.
! $locked_map['user4:pass'] = array('');             // Example: $locked_map['username:password'] = array('Locked1', 'Locked2');
  // add more lines as necessary
  
! $apache_map['user1'] = array('');                  // Map HTTP authenticated users to specific calendars. Users listed here and
! $apache_map['user2'] = array('');                  // authenticated via HTTP will not see the public calendars, and will not be
! $apache_map['user3'] = array('');                  // given any login/logout options. Calendar names not include the .ics suffix.
! $apache_map['user4'] = array('');                  // Example: $apache_map['username'] = array('Calendar1', 'Calendar2');

Index: default_config.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** default_config.php	27 Dec 2008 10:58:50 -0000	1.5
--- default_config.php	27 Dec 2008 23:18:07 -0000	1.6
***************
*** 3,7 ****
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.3rc1.2';
  	// Configuration file for PHP iCalendar 2.25rc1
  	//
--- 3,7 ----
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.3rc1.3';
  	// Configuration file for PHP iCalendar 2.25rc1
  	//
***************
*** 42,46 ****
  		$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.
--- 42,46 ----
  		$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		= 'yes';			// 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.

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** preferences.php	24 Dec 2008 21:09:31 -0000	1.65
--- preferences.php	27 Dec 2008 23:18:07 -0000	1.66
***************
*** 32,36 ****
  	$cookie_endtime		= $_POST['cookie_endtime'];
  	$cookie_unset		= @$_POST['unset'];
! 	$the_cookie = array ("cookie_language" => "$cookie_language", "cookie_calendar" => "$cookie_calendar", "cookie_view" => "$cookie_view", "cookie_startday" => "$cookie_startday", "cookie_style" => "$cookie_style", "cookie_time" => "$cookie_time","cookie_endtime" => "$cookie_endtime", "cookie_cpath"=>"$cookie_cpath");
  	$the_cookie 		= serialize($the_cookie);
  	if ($cookie_unset) { 
--- 32,36 ----
  	$cookie_endtime		= $_POST['cookie_endtime'];
  	$cookie_unset		= @$_POST['unset'];
! 	$the_cookie = array ("cookie_language" => "$cookie_language", "cookie_calendar" => "$cookie_calendar", "cookie_view" => "$cookie_view", "cookie_startday" => "$cookie_startday", "cookie_style" => "$cookie_style", "cookie_time" => "$cookie_time","cookie_endtime" => "$cookie_endtime", "cookie_cpath"=>"$cookie_cpath", "cookie_timezone"=>"$cookie_timezone");
  	$the_cookie 		= serialize($the_cookie);
  	if ($cookie_unset) { 
***************
*** 59,62 ****
--- 59,63 ----
  	$cookie_time		= $phpicalendar['cookie_time'];
  	$cookie_endtime		= $phpicalendar['cookie_endtime'];
+ 	$cookie_endtime		= $phpicalendar['cookie_timezone'];
  	if ($cookie_unset) { 
  		unset ($cookie_language, $cookie_calendar, $cookie_view, $cookie_style,$cookie_startday);
***************
*** 73,76 ****
--- 74,78 ----
  	$cookie_time = $phpiCal_config->day_start;
  	$cookie_endtime = $phpiCal_config->day_end;
+ 	$cookie_timezone = $phpiCal_config->timezone;
  }
  
***************
*** 180,183 ****
--- 182,186 ----
  	'event_js' 			=> '',
  	'language_select' 	=> $language_select,
+ 	'timezone_select' 	=> $timezone_select,
  	'calendar_select' 	=> $calendar_select,
  	'view_select' 		=> $view_select,
***************
*** 194,197 ****
--- 197,201 ----
  	'l_select_view'		=> $lang['l_select_view'],
  	'l_select_time'		=> $lang['l_select_time'],
+ 	'l_select_timezone'	=> $lang['l_select_timezone'],
  	'l_select_endtime'	=> $lang['l_select_endtime'],
  	'l_select_day'		=> $lang['l_select_day'],