[PHPiCalendar-Commits] phpicalendar default_config.php,1.23,1.24

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/phpicalendar/phpicalendar
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv28381

Modified Files:
	default_config.php 
Log Message:
Version number 2.4alpha -> 2.4

Index: default_config.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** default_config.php	7 Jul 2009 14:48:28 -0000	1.23
--- default_config.php	25 Jan 2010 18:13:51 -0000	1.24
***************
*** 3,7 ****
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.4alpha';
  	// Configuration file for PHP iCalendar 2.4
  	//
--- 3,7 ----
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.4';
  	// Configuration file for PHP iCalendar 2.4
  	//
***************
*** 10,14 ****
  #=================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'
--- 10,14 ----
  #=================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'
***************
*** 35,39 ****
  		$this->cpath	     			= ''; 				// optional subdirectory
  		$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.
--- 35,39 ----
  		$this->cpath	     			= ''; 				// optional subdirectory
  		$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.
***************
*** 52,65 ****
  		$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.
! 		
  		// 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.
--- 52,65 ----
  		$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.
! 
  		// 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.
***************
*** 71,82 ****
  		// 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';	
! 		
  		return true;
! 	}	
! 	
  	public static function getInstance(){
  		if (empty(self::$instance)){
--- 71,82 ----
  		// 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';
! 
  		return true;
! 	}
! 
  	public static function getInstance(){
  		if (empty(self::$instance)){
***************
*** 85,89 ****
  		return self::$instance;
  	}
! 	
  	# val can be an array
  	public function setProperty($key,$val){
--- 85,89 ----
  		return self::$instance;
  	}
! 
  	# val can be an array
  	public function setProperty($key,$val){