phpicalendar-commits — Mailing list ONLY for CVS commits. This is a listen-only list.

[PHPiCalendar-Commits] phpicalendar/functions/parse parse_tzs.php, 1.7, 1.8

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

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

Modified Files:
	parse_tzs.php 
Log Message:
kill admin.php; misc other changes; bump rc num

Index: parse_tzs.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/parse_tzs.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** parse_tzs.php	28 Dec 2008 10:50:58 -0000	1.7
--- parse_tzs.php	28 Dec 2008 10:51:49 -0000	1.8
***************
*** 3,7 ****
  if ($ifile == FALSE) exit(error($lang['l_error_cantopen']." parse_tz", $filename));
  $nextline = fgets($ifile);
! if (trim($nextline) != 'BEGIN:VCALENDAR') exit(error($lang['l_error_invalidcal']." parse_tz", $filename));
  
  // read file in line by line
--- 3,7 ----
  if ($ifile == FALSE) exit(error($lang['l_error_cantopen']." parse_tz", $filename));
  $nextline = fgets($ifile);
! if (trim($nextline) != 'BEGIN:VCALENDAR') exit(error($lang['l_error_invalidcal'], $filename));
  
  // read file in line by line

[PHPiCalendar-Commits] phpicalendar/functions admin_functions.php, 1.9, 1.10 calendar_functions.php, 1.30, 1.31 ical_parser.php, 1.236, 1.237 init.inc.php, 1.116, 1.117 template.php, 1.106, 1.107

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

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

Modified Files:
	admin_functions.php calendar_functions.php ical_parser.php 
	init.inc.php template.php 
Log Message:
kill admin.php; misc other changes; bump rc num

Index: admin_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/admin_functions.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** admin_functions.php	11 Dec 2008 21:54:52 -0000	1.9
--- admin_functions.php	28 Dec 2008 10:50:58 -0000	1.10
***************
*** 48,55 ****
  // returns boolean was login successful
  function login_ftp ($username, $password) {
! 	global $ftp_server, $ftp_port;
  	
  	// set up basic connection
! 	$conn_id = @ftp_connect($ftp_server, $ftp_port); 
  	if (!$conn_id) exit(error('Cannot connect to FTP server', $filename));
  	// login with username and password
--- 48,55 ----
  // returns boolean was login successful
  function login_ftp ($username, $password) {
! 	global $phpiCal_config;
  	
  	// set up basic connection
! 	$conn_id = @ftp_connect($phpiCal_config->ftp_server, $phpiCal_config->ftp_port); 
  	if (!$conn_id) exit(error('Cannot connect to FTP server', $filename));
  	// login with username and password
***************
*** 89,92 ****
--- 89,93 ----
  	global $phpiCal_config;
  	global $calendar_path;
+ 	echo $filename;
  	
  	if ($phpiCal_config->auth_method == 'ftp') {
***************
*** 116,125 ****
  	} else {
  		#$filename = $calendar_path . "/" . $filename;
- 	
  		$delete = unlink($filename); 
  		clearstatcache();
  		if (@file_exists($filename)) { 
  			$filesys = eregi_replace("/","\\", $filename); 
! 			$delete = system("del $filesys");
  			clearstatcache();
  			if (@file_exists($filename)) { 
--- 117,125 ----
  	} else {
  		#$filename = $calendar_path . "/" . $filename;
  		$delete = unlink($filename); 
  		clearstatcache();
  		if (@file_exists($filename)) { 
  			$filesys = eregi_replace("/","\\", $filename); 
! 			$delete = system("rm -f $filesys");
  			clearstatcache();
  			if (@file_exists($filename)) { 

Index: calendar_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** calendar_functions.php	28 Dec 2008 03:20:29 -0000	1.30
--- calendar_functions.php	28 Dec 2008 10:50:58 -0000	1.31
***************
*** 42,46 ****
  	// This array keeps track of paths we need to search.
  	$search_paths = array($phpiCal_config->calendar_path);
- 		
  	// Add web calendars.
  	if ($cal_filename_local[0] == $phpiCal_config->ALL_CALENDARS_COMBINED || $admin)	{
--- 42,45 ----
***************
*** 48,58 ****
  			foreach ($list_webcals as $file) {
  				// Make sure the URL ends with .ics.
! 				if (!preg_match("/.ics$/i", $file)) continue;			
  				// Add this calendar.
  				array_push($calendars, $file);
  			}
  		}
! 	}
! 	
  	// Set some booleans that will dictate our search.
  	$find_all = ($cal_filename_local[0] == $phpiCal_config->ALL_CALENDARS_COMBINED || $admin);
--- 47,56 ----
  			foreach ($list_webcals as $file) {
  				// Make sure the URL ends with .ics.
! 				if (!is_string($file)) continue;			
  				// Add this calendar.
  				array_push($calendars, $file);
  			}
  		}
! 	}	
  	// Set some booleans that will dictate our search.
  	$find_all = ($cal_filename_local[0] == $phpiCal_config->ALL_CALENDARS_COMBINED || $admin);
***************
*** 75,82 ****
  		if ($find_all || $phpiCal_config->recursive_path == 'yes' || $phpiCal_config->support_ical == 'yes') {
  			// Open the directory.
! 			$dir_handle = @opendir($search_path)
! 				or die(error(sprintf($lang['l_error_path'], $search_path), implode(',', $cal_filename)));
  			if ($dir_handle === false)
! 				die(error(sprintf($lang['l_error_path'], $search_path), implode(',', $cal_filename)));
  				
  			// Add each file in the directory that does not begin with a dot.
--- 73,80 ----
  		if ($find_all || $phpiCal_config->recursive_path == 'yes' || $phpiCal_config->support_ical == 'yes') {
  			// Open the directory.
! 			$dir_handle = opendir($search_path)
! 				or die(error("cal fn 78:".sprintf($lang['l_error_path'], $search_path), implode(',', $cal_filename)));
  			if ($dir_handle === false)
! 				die(error(" cal fn 80:".sprintf($lang['l_error_path'], $search_path), implode(',', $cal_filename)));
  				
  			// Add each file in the directory that does not begin with a dot.
***************
*** 111,115 ****
  			// If HTTP authenticated, make sure this calendar is available
  			// to the user.
! 			if (isset($http_user) && !in_array($cal_name, $apache_map[$http_user])) continue;
  
  			// Make sure this calendar is not locked.
--- 109,113 ----
  			// If HTTP authenticated, make sure this calendar is available
  			// to the user.
! 			if (isset($http_user) && isset($apache_map[$http_user]) && !in_array($cal_name, $apache_map[$http_user])) continue;
  
  			// Make sure this calendar is not locked.
***************
*** 158,165 ****
  // $cal_path	= The path to the calendar file.
  function getCalendarName($cal_path) {
! 	global $support_ical;
  		
  	// If iCal is supported, check the directory for an Info.plist.
! 	if ($support_ical == 'yes') {
  		// Look for the Info.plist file.
  		$plist_filename = dirname($cal_path)."/Info.plist";
--- 156,163 ----
  // $cal_path	= The path to the calendar file.
  function getCalendarName($cal_path) {
! 	global $phpiCal_config;
  		
  	// If iCal is supported, check the directory for an Info.plist.
! 	if ($phpiCal_config->support_ical == 'yes') {
  		// Look for the Info.plist file.
  		$plist_filename = dirname($cal_path)."/Info.plist";
***************
*** 187,191 ****
  // $cals	= The calendars (entire path, e.g. from availableCalendars).
  function display_ical_list($cals, $pick=FALSE) {
! 	global $cal, $current_view, $getdate, $calendar_lang, $all_cal_comb_lang, $cal_filelist, $cal_displaynames, $phpiCal_config;
  	// Print each calendar option.
  	$return = '';
--- 185,189 ----
  // $cals	= The calendars (entire path, e.g. from availableCalendars).
  function display_ical_list($cals, $pick=FALSE) {
! 	global $cal, $current_view, $getdate, $lang, $calendar_lang, $all_cal_comb_lang, $cal_filelist, $cal_displaynames, $phpiCal_config;
  	// Print each calendar option.
  	$return = '';
***************
*** 217,221 ****
  					$property = strtoupper($property);
  					if ($property == "X-WR-CALNAME"){
! 						$cal_displayname_tmp = $data;
  						break;
  					}
--- 215,219 ----
  					$property = strtoupper($property);
  					if ($property == "X-WR-CALNAME"){
! 						$cal_displayname_tmp = stripslashes($data);
  						break;
  					}

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.236
retrieving revision 1.237
diff -C2 -d -r1.236 -r1.237
*** ical_parser.php	28 Dec 2008 02:07:53 -0000	1.236
--- ical_parser.php	28 Dec 2008 10:50:58 -0000	1.237
***************
*** 129,132 ****
--- 129,133 ----
  			
  			switch ($line) {
+ 				case 'BEGIN:VFREEBUSY':
  				case 'BEGIN:VEVENT':
  					// each of these vars were being set to an empty string
***************
*** 166,170 ****
  					
  					break;
! 				
  				case 'END:VEVENT':
  					include BASE."functions/parse/end_vevent.php";			
--- 167,171 ----
  					
  					break;
! 				case 'END:VFREEBUSY':
  				case 'END:VEVENT':
  					include BASE."functions/parse/end_vevent.php";			

Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** init.inc.php	28 Dec 2008 02:31:59 -0000	1.116
--- init.inc.php	28 Dec 2008 10:50:58 -0000	1.117
***************
*** 76,80 ****
  	{
  		#jump sends cal url without .ics extension.  Add it if needed.
! 		if (substr($cal_filename, -4) != ".ics") $cal_filename .= ".ics";
  		$web_cals[] = $cal_filename;
  	}
--- 76,80 ----
  	{
  		#jump sends cal url without .ics extension.  Add it if needed.
! 	#	if (substr($cal_filename, -4) != ".ics") $cal_filename .= ".ics";
  		$web_cals[] = $cal_filename;
  	}
***************
*** 83,87 ****
  	else {
  		// Check blacklisted.
! 		if (in_array($cal_filename, $phpiCal_config->blacklisted_cals)  && $cal_filename !='') {
  			exit(error($lang['l_error_restrictedcal'], $cal_filename));
  		}
--- 83,87 ----
  	else {
  		// Check blacklisted.
! 		if (in_array($cal_filename, $blacklisted_cals)  && $cal_filename !='') {
  			exit(error($lang['l_error_restrictedcal'], $cal_filename));
  		}

Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** template.php	27 Dec 2008 23:18:07 -0000	1.106
--- template.php	28 Dec 2008 10:50:58 -0000	1.107
***************
*** 17,21 ****
  	function draw_admin() {
  		global $phpiCal_config, $getdate, $cal, $master_array, $is_loged_in;
! 		
  		if ($is_loged_in == TRUE) { 
  			// Print Calendar Checkboxes
--- 17,21 ----
  	function draw_admin() {
  		global $phpiCal_config, $getdate, $cal, $master_array, $is_loged_in;
! 		$delete_table = '';
  		if ($is_loged_in == TRUE) { 
  			// Print Calendar Checkboxes
***************
*** 1063,1067 ****
  			}
  			if (!is_file($file)){
! 				exit(error($lang['l_error_path'], $file));
  			}
  			ob_start();
--- 1063,1067 ----
  			}
  			if (!is_file($file)){
! 				exit(error($lang['l_error_path']." template 1065", $file));
  			}
  			ob_start();

[PHPiCalendar-Commits] phpicalendar/calendars test.ics,1.10,1.11

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

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

Modified Files:
	test.ics 
Log Message:
kill admin.php; misc other changes; bump rc num

Index: test.ics
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/test.ics,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** test.ics	28 Dec 2008 02:07:53 -0000	1.10
--- test.ics	28 Dec 2008 10:50:57 -0000	1.11
***************
*** 1,5 ****
  BEGIN:VCALENDAR
  VERSION:2.0
! X-WR-CALNAME:testing \,comma
  PRODID:-//Apple Computer\, Inc//iCal 2.0//EN
  X-WR-RELCALID:E47AF849-67C8-49F0-AA36-9FD7495400FD
--- 1,5 ----
  BEGIN:VCALENDAR
  VERSION:2.0
! X-WR-CALNAME:testing\, comma
  PRODID:-//Apple Computer\, Inc//iCal 2.0//EN
  X-WR-RELCALID:E47AF849-67C8-49F0-AA36-9FD7495400FD

[PHPiCalendar-Commits] phpicalendar config.inc.php, 1.194, 1.195 default_config.php, 1.8, 1.9 error.php, 1.5, 1.6 month.php, 1.149, 1.150

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

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

Modified Files:
	config.inc.php default_config.php error.php month.php 
Log Message:
kill admin.php; misc other changes; bump rc num

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.194
retrieving revision 1.195
diff -C2 -d -r1.194 -r1.195
*** config.inc.php	28 Dec 2008 03:20:29 -0000	1.194
--- config.inc.php	28 Dec 2008 10:50:57 -0000	1.195
***************
*** 30,34 ****
  #     'download_uri'         => '', 	
  #     'allow_webcals'          => 'yes',
!      'recursive_path'          => 'yes',
  
  /*     ** Timezones **
--- 30,34 ----
  #     'download_uri'         => '', 	
  #     'allow_webcals'          => 'yes',
! #     'recursive_path'          => 'yes',
  
  /*     ** Timezones **
***************
*** 58,62 ****
  #     'show_completed'       => 'no',
        'allow_login'          => 'yes',	           // Set to yes to prompt for login to unlock calendars.
- #     '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
--- 58,61 ----
***************
*** 81,89 ****
  
  */
! $list_webcals[] = array(
  #	'webcal://dimer.tamu.edu/calendars/seminars/Biochem.ics'
  );
  $more_webcals['recur_tests'] = array();
! $locked_cals[] = array(
  
  );
--- 80,88 ----
  
  */
! $list_webcals = array(
  #	'webcal://dimer.tamu.edu/calendars/seminars/Biochem.ics'
  );
  $more_webcals['recur_tests'] = array();
! $locked_cals = array(
  
  );

Index: default_config.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** default_config.php	28 Dec 2008 02:31:59 -0000	1.8
--- default_config.php	28 Dec 2008 10:50:57 -0000	1.9
***************
*** 3,7 ****
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.3rc1.4';
  	// Configuration file for PHP iCalendar 2.25rc1
  	//
--- 3,7 ----
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.3rc1.6';
  	// Configuration file for PHP iCalendar 2.25rc1
  	//
***************
*** 34,37 ****
--- 34,38 ----
  		$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->cpath	     			= ''; 				// optional subdirectory
  		$this->charset					= 'UTF-8';			// Character set your calendar is in, suggested UTF-8, or iso-8859-1 for most languages.
  		

Index: error.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/error.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** error.php	11 Dec 2008 21:54:52 -0000	1.5
--- error.php	28 Dec 2008 10:50:57 -0000	1.6
***************
*** 4,19 ****
  
  
! 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!';
- 	if (!isset($lang['l_error_window']))	$lang['l_error_window'] = 'There was an error!';
- 	if (!isset($lang['l_error_calendar']))	$lang['l_error_calendar'] = 'The calendar "%s" was being processed when this error occurred.';
- 	if (!isset($lang['l_error_back']))		$lang['l_error_back'] = 'Please use the "Back" button to return.';
- 	if (!isset($lang['l_this_site_is']))	$lang['l_this_site_is'] = 'This site is';
- 	if (!isset($enable_rss))				$enable_rss = 'no';
  		
! 	$error_calendar 	= sprintf($lang['l_error_calendar'], $file);
  	$current_view 		= 'error';
  	$display_date 		= $lang['l_error_title'];
--- 4,12 ----
  
  
! function error($error_msg='There was an error processing the request.', $file='NONE', $error_base='') {
! 	global $getdate, $rss_powered, $lang, $phpiCal_config, $cal;
  	if (!isset($template))					$template = $phpiCal_config->template;
  		
! 	$error_calendar 	= sprintf($lang['l_error_calendar'], print_r($file,true));
  	$current_view 		= 'error';
  	$display_date 		= $lang['l_error_title'];
***************
*** 28,32 ****
  		}
  	}
- 	
  	$page = new Page(BASE.'templates/'.$template.'/error.tpl');
  	
--- 21,24 ----
***************
*** 37,46 ****
  
  	$page->replace_tags(array(
! 		'version'			=> $phpicalendar_version,
! 		'default_path'		=> $default_path.'/',
  		'template'			=> $template,
  		'cal'				=> $cal,
  		'getdate'			=> $getdate,
! 		'charset'			=> $charset,
  		'calendar_name'		=> $calendar_name,
  		'display_date'		=> $display_date,
--- 29,38 ----
  
  	$page->replace_tags(array(
! 		'version'			=> $phpiCal_config->phpicalendar_version,
! 		'default_path'		=> $phpiCal_config->default_path.$error_base,
  		'template'			=> $template,
  		'cal'				=> $cal,
  		'getdate'			=> $getdate,
! 		'charset'			=> $phpiCal_config->charset,
  		'calendar_name'		=> $calendar_name,
  		'display_date'		=> $display_date,
***************
*** 56,60 ****
  		'l_powered_by'		=> $lang['l_powered_by'],
  		'l_error_back'		=> $lang['l_error_back'],
! 		'l_error_window'	=> $lang['l_error_window']
  				
  		));
--- 48,53 ----
  		'l_powered_by'		=> $lang['l_powered_by'],
  		'l_error_back'		=> $lang['l_error_back'],
! 		'l_error_window'	=> $lang['l_error_window'],
! 		'l_this_site_is'	=> $lang['l_this_site_is']			
  				
  		));

Index: month.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v
retrieving revision 1.149
retrieving revision 1.150
diff -C2 -d -r1.149 -r1.150
*** month.php	27 Dec 2008 10:58:50 -0000	1.149
--- month.php	28 Dec 2008 10:50:57 -0000	1.150
***************
*** 54,58 ****
  
  $page = new Page(BASE.'templates/'.$phpiCal_config->template.'/month.tpl');
- 
  $page->replace_files(array(
  	'header'			=> BASE.'templates/'.$phpiCal_config->template.'/header.tpl',
--- 54,57 ----

[PHPiCalendar-Commits] phpicalendar/admin index.php,1.8,1.9

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

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

Modified Files:
	index.php 
Log Message:
kill admin.php; misc other changes; bump rc num

Index: index.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/admin/index.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** index.php	11 Dec 2008 21:54:52 -0000	1.8
--- index.php	28 Dec 2008 10:50:57 -0000	1.9
***************
*** 1,8 ****
  <?php
  define('BASE', '../');
  require_once(BASE.'functions/admin_functions.php');
- require_once(BASE.'functions/ical_parser.php');
  require_once(BASE.'functions/template.php');
! header("Content-Type: text/html; charset=$charset");
  
  if (empty($phpiCal_config->default_path)) {
--- 1,10 ----
  <?php
  define('BASE', '../');
+ $current_view = 'admin';
+ require_once(BASE.'functions/init.inc.php');
  require_once(BASE.'functions/admin_functions.php');
  require_once(BASE.'functions/template.php');
! 
! #echo "<pre>";print_r($_REQUEST);
  
  if (empty($phpiCal_config->default_path)) {
***************
*** 13,23 ****
  	}
  }
! if ($phpiCal_config->allow_admin != 'yes') {
! 	exit(error('The administration menu has been turned off.', $cal, '../'));
! }
! 
! // Load variables from forms and query strings into local scope
! if($_POST) 	{extract($_POST, EXTR_PREFIX_SAME, "post_");}
! if($_GET)  	{extract($_GET, EXTR_PREFIX_SAME, "get_");}
  
  // Logout by clearing session variables
--- 15,21 ----
  	}
  }
! #if ($phpiCal_config->allow_admin != 'yes') {
! 	exit(error('The administration menu has been turned off.', '', '/..'));
! #}
  
  // Logout by clearing session variables
***************
*** 28,37 ****
  }
  
- 
  // if $auth_method == 'server', don't do any authentication
! $username = $_POST['username'];
! $password = $_POST['password'];
  
! if ($auth_method == 'server') {
  	$is_loged_in = TRUE;
  } else {
--- 26,34 ----
  }
  
  // if $auth_method == 'server', don't do any authentication
! $username = @$_POST['username'];
! $password = @$_POST['password'];
  
! if ($phpiCal_config->auth_method == 'server') {
  	$is_loged_in = TRUE;
  } else {
***************
*** 42,46 ****
  	}
  	
! 	if (isset($username) && $_GET['action'] != 'logout') {
  		$is_loged_in = login ($username, $password);
  	}
--- 39,43 ----
  	}
  	
! 	if (isset($username) && @$_GET['action'] != 'logout') {
  		$is_loged_in = login ($username, $password);
  	}
***************
*** 48,58 ****
  
  $login_good = ($is_loged_in) ? '' : 'oops';
! $login_bad	= ((!$is_loged_in) && ($_GET['action'] == 'login')) ? 'oops' : '';
  if(is_loggedin()){
  	// Delete a calendar
  	// Not at all secure - need to strip out path info if used by users besides admin in the future
! 	$delete_msg = '';
! 	if ($_POST['action'] == 'delete') {
! 		foreach ($delete_calendar as $filename) {
  			if (!delete_cal(urldecode($filename))) {
  				$delete_msg = $delete_msg . '<font color="red">' . $lang['l_delete_error'] . ' ' . urldecode(substr($filename,0,-4)) . '</font><br />';
--- 45,56 ----
  
  $login_good = ($is_loged_in) ? '' : 'oops';
! $login_bad	= ((!$is_loged_in) && (@$_GET['action'] == 'login')) ? 'oops' : '';
! $delete_msg = '';
! $addupdate_msg 	= '';
  if(is_loggedin()){
  	// Delete a calendar
  	// Not at all secure - need to strip out path info if used by users besides admin in the future
! 	if (isset($_POST['action']) && $_POST['action'] == 'delete') {
! 		foreach ($_POST['delete_calendar'] as $filename) {
  			if (!delete_cal(urldecode($filename))) {
  				$delete_msg = $delete_msg . '<font color="red">' . $lang['l_delete_error'] . ' ' . urldecode(substr($filename,0,-4)) . '</font><br />';
***************
*** 64,69 ****
  	
  	// Add or Update a calendar
! 	$addupdate_msg 	= '';
! 	if ((isset($_POST['action']))  && ($_POST['action'] == 'addupdate')) {
  		for ($filenumber = 1; $filenumber < 6; $filenumber++) {
  			$file = $_FILES['calfile'];
--- 62,66 ----
  	
  	// Add or Update a calendar
! 	if (isset($_POST['action'])  && $_POST['action'] == 'addupdate') {
  		for ($filenumber = 1; $filenumber < 6; $filenumber++) {
  			$file = $_FILES['calfile'];
***************
*** 102,114 ****
  	'event_js'			=> '',
  	'charset'			=> $phpiCal_config->charset,
! 	'default_path'		=> "../".$phpiCal_config->default_path,
  	'template'			=> $phpiCal_config->template,
  	'cal'				=> $cal,
  	'getdate'			=> $getdate,
  	'calendar_name'		=> $calendar_name,
! 	'display_date'		=> $display_date,
  	'current_view'		=> $current_view,
! 	'sidebar_date'		=> $sidebar_date,
! 	'rss_powered'	 	=> $phpiCal_config->rss_powered,
  	'rss_available' 	=> '',
  	'rss_valid' 		=> '',
--- 99,111 ----
  	'event_js'			=> '',
  	'charset'			=> $phpiCal_config->charset,
! 	'default_path'		=> $phpiCal_config->default_path."/..",
  	'template'			=> $phpiCal_config->template,
  	'cal'				=> $cal,
  	'getdate'			=> $getdate,
  	'calendar_name'		=> $calendar_name,
! 	'display_date'		=> '',
  	'current_view'		=> $current_view,
! #	'sidebar_date'		=> $sidebar_date,
! 	'rss_powered'	 	=> $rss_powered,
  	'rss_available' 	=> '',
  	'rss_valid' 		=> '',

[PHPiCalendar-Commits] phpicalendar/functions/parse parse_tzs.php, 1.6, 1.7 recur_functions.php, 1.15, 1.16

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

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

Modified Files:
	parse_tzs.php recur_functions.php 
Log Message:
kill admin.php; misc other changes; bump rc num

Index: parse_tzs.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/parse_tzs.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** parse_tzs.php	26 Dec 2008 17:07:52 -0000	1.6
--- parse_tzs.php	28 Dec 2008 10:50:58 -0000	1.7
***************
*** 1,7 ****
  <?php
  $ifile = @fopen($filename, "r");
! if ($ifile == FALSE) exit(error($lang['l_error_cantopen'], $filename));
  $nextline = fgets($ifile);
! if (trim($nextline) != 'BEGIN:VCALENDAR') exit(error($lang['l_error_invalidcal'], $filename));
  
  // read file in line by line
--- 1,7 ----
  <?php
  $ifile = @fopen($filename, "r");
! if ($ifile == FALSE) exit(error($lang['l_error_cantopen']." parse_tz", $filename));
  $nextline = fgets($ifile);
! if (trim($nextline) != 'BEGIN:VCALENDAR') exit(error($lang['l_error_invalidcal']." parse_tz", $filename));
  
  // read file in line by line

Index: recur_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** recur_functions.php	27 Dec 2008 10:58:51 -0000	1.15
--- recur_functions.php	28 Dec 2008 10:50:58 -0000	1.16
***************
*** 252,254 ****
  	foreach($times as $time) echo "\ndate:".date("Y-m-d H:i:s",$time);
  	echo "</pre>";
! }
\ No newline at end of file
--- 252,254 ----
  	foreach($times as $time) echo "\ndate:".date("Y-m-d H:i:s",$time);
  	echo "</pre>";
! }

[PHPiCalendar-Commits] phpicalendar/functions/init cpaths.php, 1.5, 1.6 date_range.php, 1.8, 1.9

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

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

Modified Files:
	cpaths.php date_range.php 
Log Message:
kill admin.php; misc other changes; bump rc num

Index: cpaths.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/cpaths.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** cpaths.php	28 Dec 2008 02:31:59 -0000	1.5
--- cpaths.php	28 Dec 2008 10:50:58 -0000	1.6
***************
*** 27,32 ****
  }
  #set up specific webcals for a particular cpath
! if (isset($more_webcals) && is_array($more_webcals[$cpath])){
! 	$list_webcals = array_merge($list_webcals, $more_webcals["$cpath"]);
  }
  $phpiCal_config->setProperty('calendar_path',$calendar_path);
\ No newline at end of file
--- 27,32 ----
  }
  #set up specific webcals for a particular cpath
! if (isset($more_webcals[$cpath]) && is_array($more_webcals[$cpath])){
! 	foreach ($more_webcals[$cpath] as $wcal)$list_webcals[] = $wcal;
  }
  $phpiCal_config->setProperty('calendar_path',$calendar_path);
\ No newline at end of file

Index: date_range.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/date_range.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** date_range.php	27 Dec 2008 23:18:07 -0000	1.8
--- date_range.php	28 Dec 2008 10:50:58 -0000	1.9
***************
*** 34,37 ****
--- 34,38 ----
  		$mArray_end = mktime (0,0,0,$end_month,31,($end_year));
  		break;
+ 	case 'admin':
  	case 'error':
  	case 'preferences':

[PHPiCalendar-Commits] phpicalendar config.inc.php,1.193,1.194

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

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

Modified Files:
	config.inc.php 
Log Message:
get recursive path working

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.193
retrieving revision 1.194
diff -C2 -d -r1.193 -r1.194
*** config.inc.php	28 Dec 2008 02:31:59 -0000	1.193
--- config.inc.php	28 Dec 2008 03:20:29 -0000	1.194
***************
*** 21,24 ****
--- 21,26 ----
         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.
+ 
+ Note that the allow_webcals setting allows webcals to be passed as URLs.  You do NOT need to override the default setting to list specific webcals for inclusion in the SPECIAL CALENDARS section below.
  */
  #     'calendar_path'        => '/Library/WebServer/Documents/phpicalendar/calendars/recur_tests',
***************
*** 27,30 ****
--- 29,34 ----
  #     'cookie_uri'           => '', 
  #     'download_uri'         => '', 	
+ #     'allow_webcals'          => 'yes',
+      'recursive_path'          => 'yes',
  
  /*     ** Timezones **
***************
*** 43,50 ****
  
  #     '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'         => 'year',           // Default view for calendars'     => 'day', 'week', 'month', 'year'
!       'printview_default'    => 'yes',	           // Set print view as the default view. Uses'default_view (listed above).
  #     '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'
--- 47,54 ----
  
  #     'language'             => 'Spanish',
! #     'default_cal'          => 'US Holidays',	   // Exact filename of calendar without .ics.
  #     'template'             => 'green';           // Template support: change this to have a different "skin" for your installation.     
!  #    'default_view'         => 'year',           // Default view for calendars'     => 'day', 'week', 'month', 'year'
! #      'printview_default'    => 'yes',	           // Set print view as the default view. Uses'default_view (listed above).
  #     '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'
***************
*** 60,93 ****
  #     'day_end'              => '2000',	           // End time for day grid
  
! 
  /*     ========= SPECIAL CALENDARS =========
  
! */
!      'allow_webcals'          => 'yes',
  
  
! );
  
! $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[] = 'http://www.google.com/calendar/ical/jim.hu.biobio%40gmail.com/public/basic.ics';                              // Fill in between the quotes exact URL of a 
! $list_webcals[] = 'webcal://dimer.tamu.edu/calendars/seminars/Biochem.ics';						// Fill in between the quotes exact URL of a calendar that you wish 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
--- 64,96 ----
  #     'day_end'              => '2000',	           // End time for day grid
  
! );
  /*     ========= SPECIAL CALENDARS =========
  
! these arrays provide extra calendar options.
  
+        ** Blacklisted Calendars
  
!        
! */
! $blacklisted_cals = array(
! ''
! );                          
! /*     ========= SPECIAL CALENDARS =========
  
! these arrays provide extra calendar options.
  
! */
! $list_webcals[] = array(
! #	'webcal://dimer.tamu.edu/calendars/seminars/Biochem.ics'
! );
! $more_webcals['recur_tests'] = array();
! $locked_cals[] = array(
  
! );
! /*     ========= SPECIAL CALENDARS =========
  
! these arrays provide extra calendar options.
  
+ */
  $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

[PHPiCalendar-Commits] phpicalendar/functions calendar_functions.php, 1.29, 1.30

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

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

Modified Files:
	calendar_functions.php 
Log Message:
get recursive path working

Index: calendar_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** calendar_functions.php	28 Dec 2008 02:31:59 -0000	1.29
--- calendar_functions.php	28 Dec 2008 03:20:29 -0000	1.30
***************
*** 1,4 ****
  <?php
- 
  // This function returns a list of all calendars that the current user
  // has access to. Basically, all local calendars found in the calendar
--- 1,3 ----
***************
*** 49,54 ****
  			foreach ($list_webcals as $file) {
  				// Make sure the URL ends with .ics.
! 				if (!preg_match("/.ics$/i", $file)) continue;
! 				
  				// Add this calendar.
  				array_push($calendars, $file);
--- 48,52 ----
  			foreach ($list_webcals as $file) {
  				// Make sure the URL ends with .ics.
! 				if (!preg_match("/.ics$/i", $file)) continue;			
  				// Add this calendar.
  				array_push($calendars, $file);
***************
*** 101,133 ****
  			// turned on.
  			if (is_dir($file)) {
! 				if ($recursive_path == 'yes') {
! 					array_push($search_paths, $file);
! 				}
  				continue;
! 			}
! 			
  			// Make sure the file is real.
  			if (!is_file($file)) continue;
- 			
  			// Make sure the file ends in .ics.
  			if (!preg_match("/^.*\.ics$/i", $file)) continue;
- 			
  			// Make sure this is not a blacklisted calendar.
  			$cal_name = getCalendarName($file);
  			if (in_array($cal_name, $blacklisted_cals)) continue;
- 			
  			// If HTTP authenticated, make sure this calendar is available
  			// to the user.
! 			if (isset($http_user)) {
! 				if (!in_array($cal_name, $apache_map[$http_user])) continue;
! 			}
! 		
  			// Make sure this calendar is not locked.
! 			if (!$admin &&
! 				in_array($cal_name, $locked_cals) &&
! 				!in_array($cal_name, $unlocked_cals))
! 			{
! 				continue;
! 			}
  			
  			// Add this calendar if we're looking for it, and remove it's name
--- 99,118 ----
  			// turned on.
  			if (is_dir($file)) {
! 				if ($phpiCal_config->recursive_path == 'yes') array_push($search_paths, $file);
  				continue;
! 			}			
  			// Make sure the file is real.
  			if (!is_file($file)) continue;
  			// Make sure the file ends in .ics.
  			if (!preg_match("/^.*\.ics$/i", $file)) continue;
  			// Make sure this is not a blacklisted calendar.
  			$cal_name = getCalendarName($file);
  			if (in_array($cal_name, $blacklisted_cals)) continue;
  			// If HTTP authenticated, make sure this calendar is available
  			// to the user.
! 			if (isset($http_user) && !in_array($cal_name, $apache_map[$http_user])) continue;
! 
  			// Make sure this calendar is not locked.
! 			if (!$admin && in_array($cal_name, $locked_cals) && !in_array($cal_name, $unlocked_cals)) continue;
  			
  			// Add this calendar if we're looking for it, and remove it's name
***************
*** 135,147 ****
  			if ($find_all || in_array($cal_name, $cal_filename_local)) {
  				array_push($calendars, $file);
! 				$cal_filename_local = array_diff($cal_filename_local, array($cal_name));
! 				
  				// If the local list is empty, we're done.
! 				if (empty($cal_filename_local))
! 					break 2;
  			}
  		}
  	}
- 
  	// Return the sorted calendar list.
  	natcasesort($calendars);
--- 120,129 ----
  			if ($find_all || in_array($cal_name, $cal_filename_local)) {
  				array_push($calendars, $file);
! 				$cal_filename_local = array_diff($cal_filename_local, array($cal_name));				
  				// If the local list is empty, we're done.
! 				if (empty($cal_filename_local))	break 2;
  			}
  		}
  	}
  	// Return the sorted calendar list.
  	natcasesort($calendars);
***************
*** 172,177 ****
  }
  
! // This function returns the calendar name for the specified calendar
! // path.
  //
  // $cal_path	= The path to the calendar file.
--- 154,158 ----
  }
  
! // This function returns the calendar name for the specified calendar path.
  //
  // $cal_path	= The path to the calendar file.
***************
*** 257,261 ****
  			// Strip path and .ics suffix.
  			$cal_tmp = getCalendarName($cal_tmp);
- 
  			// Add calendar label.
  			$cal_displayname_tmp .= " $calendar_lang";
--- 238,241 ----
***************
*** 295,297 ****
  	}
  	return $return;
! }
--- 275,277 ----
  	}
  	return $return;
! }
\ No newline at end of file

[PHPiCalendar-Commits] phpicalendar/functions/init cpaths.php, 1.4, 1.5

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

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

Modified Files:
	cpaths.php 
Log Message:
fix for webcals

Index: cpaths.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/cpaths.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** cpaths.php	20 Dec 2008 00:11:56 -0000	1.4
--- cpaths.php	28 Dec 2008 02:31:59 -0000	1.5
***************
*** 27,32 ****
  }
  #set up specific webcals for a particular cpath
! if (isset($phpiCal_config->more_webcals) && is_array($phpiCal_config->more_webcals[$cpath])){
! 	$list_webcals = array_merge($phpiCal_config->list_webcals, $phpiCal_config->more_webcals["$cpath"]);
  }
  $phpiCal_config->setProperty('calendar_path',$calendar_path);
\ No newline at end of file
--- 27,32 ----
  }
  #set up specific webcals for a particular cpath
! if (isset($more_webcals) && is_array($more_webcals[$cpath])){
! 	$list_webcals = array_merge($list_webcals, $more_webcals["$cpath"]);
  }
  $phpiCal_config->setProperty('calendar_path',$calendar_path);
\ No newline at end of file

[PHPiCalendar-Commits] phpicalendar config.inc.php, 1.192, 1.193 default_config.php, 1.7, 1.8

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

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

Modified Files:
	config.inc.php default_config.php 
Log Message:
fix for webcals

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.192
retrieving revision 1.193
diff -C2 -d -r1.192 -r1.193
*** config.inc.php	28 Dec 2008 02:07:53 -0000	1.192
--- config.inc.php	28 Dec 2008 02:31:59 -0000	1.193
***************
*** 75,79 ****
  // add more lines as necessary
  
! $list_webcals[] = 'http://www.google.com/calendar/ical/jim.hu.biobio%40gmail.com/public/basic.ics';                              // 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
--- 75,80 ----
  // add more lines as necessary
  
! $list_webcals[] = 'http://www.google.com/calendar/ical/jim.hu.biobio%40gmail.com/public/basic.ics';                              // Fill in between the quotes exact URL of a 
! $list_webcals[] = 'webcal://dimer.tamu.edu/calendars/seminars/Biochem.ics';						// Fill in between the quotes exact URL of a calendar that you wish 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

Index: default_config.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** default_config.php	27 Dec 2008 23:49:39 -0000	1.7
--- default_config.php	28 Dec 2008 02:31:59 -0000	1.8
***************
*** 75,83 ****
  		$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;
  	}	
--- 75,78 ----

[PHPiCalendar-Commits] phpicalendar/functions calendar_functions.php, 1.28, 1.29 init.inc.php, 1.115, 1.116

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

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

Modified Files:
	calendar_functions.php init.inc.php 
Log Message:
fix for webcals

Index: calendar_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** calendar_functions.php	12 Dec 2008 06:22:58 -0000	1.28
--- calendar_functions.php	28 Dec 2008 02:31:59 -0000	1.29
***************
*** 15,19 ****
  function availableCalendars($username, $password, $cal_filename, $admin = false) {
  	// Import globals.
! 	global $allow_webcals, $allow_login, $calendar_path, $recursive_path, $support_ical, $locked_map, $apache_map, $lang, $_SERVER, $phpiCal_config;
  
  	// Create the list of available calendars.
--- 15,19 ----
  function availableCalendars($username, $password, $cal_filename, $admin = false) {
  	// Import globals.
! 	global $list_webcals, $blacklisted_cals, $locked_cals, $locked_map, $apache_map, $lang, $_SERVER, $phpiCal_config;
  
  	// Create the list of available calendars.
***************
*** 22,26 ****
  	// Grab any HTTP authentication.
  	unset($http_user);
! 	if ((isset($_SERVER['PHP_AUTH_USER'])) && ($allow_login == 'yes')) {
  		$http_user = $_SERVER['PHP_AUTH_USER'];
  	}
--- 22,26 ----
  	// Grab any HTTP authentication.
  	unset($http_user);
! 	if ((isset($_SERVER['PHP_AUTH_USER'])) && ($phpiCal_config->allow_login == 'yes')) {
  		$http_user = $_SERVER['PHP_AUTH_USER'];
  	}
***************
*** 47,51 ****
  	if ($cal_filename_local[0] == $phpiCal_config->ALL_CALENDARS_COMBINED || $admin)	{
  		if (!isset($http_user) && !$admin) {
! 			foreach ($phpiCal_config->list_webcals as $file) {
  				// Make sure the URL ends with .ics.
  				if (!preg_match("/.ics$/i", $file)) continue;
--- 47,51 ----
  	if ($cal_filename_local[0] == $phpiCal_config->ALL_CALENDARS_COMBINED || $admin)	{
  		if (!isset($http_user) && !$admin) {
! 			foreach ($list_webcals as $file) {
  				// Make sure the URL ends with .ics.
  				if (!preg_match("/.ics$/i", $file)) continue;
***************
*** 75,79 ****
  		// The latter is necessary because the calendar name cannot be
  		// used to identify the calendar filename.
! 		if ($find_all || $recursive_path == 'yes' || $support_ical == 'yes') {
  			// Open the directory.
  			$dir_handle = @opendir($search_path)
--- 75,79 ----
  		// The latter is necessary because the calendar name cannot be
  		// used to identify the calendar filename.
! 		if ($find_all || $phpiCal_config->recursive_path == 'yes' || $phpiCal_config->support_ical == 'yes') {
  			// Open the directory.
  			$dir_handle = @opendir($search_path)
***************
*** 115,130 ****
  			// Make sure this is not a blacklisted calendar.
  			$cal_name = getCalendarName($file);
! 			if (in_array($cal_name, $phpiCal_config->blacklisted_cals)) continue;
  			
  			// If HTTP authenticated, make sure this calendar is available
  			// to the user.
  			if (isset($http_user)) {
! 				if (!in_array($cal_name, $phpiCal_config->apache_map[$http_user])) continue;
  			}
  		
  			// Make sure this calendar is not locked.
  			if (!$admin &&
! 				in_array($cal_name, $phpiCal_config->locked_cals) &&
! 				!in_array($cal_name, $phpiCal_config->unlocked_cals))
  			{
  				continue;
--- 115,130 ----
  			// Make sure this is not a blacklisted calendar.
  			$cal_name = getCalendarName($file);
! 			if (in_array($cal_name, $blacklisted_cals)) continue;
  			
  			// If HTTP authenticated, make sure this calendar is available
  			// to the user.
  			if (isset($http_user)) {
! 				if (!in_array($cal_name, $apache_map[$http_user])) continue;
  			}
  		
  			// Make sure this calendar is not locked.
  			if (!$admin &&
! 				in_array($cal_name, $locked_cals) &&
! 				!in_array($cal_name, $unlocked_cals))
  			{
  				continue;

Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** init.inc.php	26 Dec 2008 22:33:33 -0000	1.115
--- init.inc.php	28 Dec 2008 02:31:59 -0000	1.116
***************
*** 113,117 ****
  	// (as defined by $allow_webcals) or if the web calendar shows up in the
  	// list of web calendars defined in config.inc.php.
! 	if ($allow_webcals != 'yes' &&
  		!in_array($cal_webcalPrefix, $list_webcals) &&
  		!in_array($cal_httpPrefix, $list_webcals) &&
--- 113,117 ----
  	// (as defined by $allow_webcals) or if the web calendar shows up in the
  	// list of web calendars defined in config.inc.php.
! 	if ($phpiCal_config->allow_webcals != 'yes' &&
  		!in_array($cal_webcalPrefix, $list_webcals) &&
  		!in_array($cal_httpPrefix, $list_webcals) &&
***************
*** 188,205 ****
  $uid_list = array();
  #uncomment for diagnostics
! #echo "after init.inc.ics<pre>";
! #echo "cals";
! #print_r($cals);echo"\n\n";
! #echo "cal_filenames";
! #print_r($cal_filenames);echo"\n\n";
! #echo "web_cals";
! #print_r($web_cals);echo"\n\n";
! #echo "local_cals";
! #print_r($local_cals);echo"\n\n";
! #echo "cal_filelist";
! #print_r($cal_filelist);
! #echo "cal_displaynames";
! #print_r($cal_displaynames);
  #echo "</pre><hr>";
  
! ?>
--- 188,199 ----
  $uid_list = array();
  #uncomment for diagnostics
! #echo "after init.inc.ics<pre>"; 
! #echo "cals";print_r($cals);echo"\n\n";
! #echo "cal_filenames";print_r($cal_filenames);echo"\n\n";
! #echo "web_cals";print_r($web_cals);echo"\n\n";
! #echo "local_cals";print_r($local_cals);echo"\n\n";
! #echo "cal_filelist";print_r($cal_filelist);
! #echo "cal_displaynames";print_r($cal_displaynames);
  #echo "</pre><hr>";
  
! ?>
\ No newline at end of file

[PHPiCalendar-Commits] phpicalendar/rss rss.php,1.51,1.52

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

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

Modified Files:
	rss.php 
Log Message:
fix undef $rss in rss.php

Index: rss.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** rss.php	20 Dec 2008 03:22:54 -0000	1.51
--- rss.php	28 Dec 2008 02:07:53 -0000	1.52
***************
*** 41,45 ****
  function rss_item(){
  	global $uid,$event_start,$rss_title,$rss_link, $dayofweek, $event_text, $rss_description, $val;
! 	$rss .= '<item>'."\n";
  	$rss .= '<uid>'.$uid.'</uid>'."\n";
  	$rss .= '<event_start>'.$event_start.'</event_start>'."\n";
--- 41,45 ----
  function rss_item(){
  	global $uid,$event_start,$rss_title,$rss_link, $dayofweek, $event_text, $rss_description, $val;
! 	$rss = '<item>'."\n";
  	$rss .= '<uid>'.$uid.'</uid>'."\n";
  	$rss .= '<event_start>'.$event_start.'</event_start>'."\n";

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php, 1.235, 1.236

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

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

Modified Files:
	ical_parser.php 
Log Message:
fix undef $rss in rss.php

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.235
retrieving revision 1.236
diff -C2 -d -r1.235 -r1.236
*** ical_parser.php	27 Dec 2008 23:18:07 -0000	1.235
--- ical_parser.php	28 Dec 2008 02:07:53 -0000	1.236
***************
*** 126,130 ****
  				$nextline = ereg_replace("[\r\n]", "", $nextline);
  			}
! 			$line = trim($line);
  			
  			switch ($line) {
--- 126,130 ----
  				$nextline = ereg_replace("[\r\n]", "", $nextline);
  			}
! 			$line = trim(stripslashes($line));
  			
  			switch ($line) {

[PHPiCalendar-Commits] phpicalendar config.inc.php,1.191,1.192

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

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

Modified Files:
	config.inc.php 
Log Message:
fix undef $rss in rss.php

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.191
retrieving revision 1.192
diff -C2 -d -r1.191 -r1.192
*** config.inc.php	28 Dec 2008 00:46:49 -0000	1.191
--- config.inc.php	28 Dec 2008 02:07:53 -0000	1.192
***************
*** 59,67 ****
  #     '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
--- 59,72 ----
  #     'day_start'            => '0600',	           // Start time for day grid
  #     'day_end'              => '2000',	           // End time for day grid
! 
  
  /*     ========= SPECIAL CALENDARS =========
  
  */
+      'allow_webcals'          => 'yes',
+ 
+ 
+ );
+ 
  $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
***************
*** 70,74 ****
  // 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
--- 75,79 ----
  // add more lines as necessary
  
! $list_webcals[] = 'http://www.google.com/calendar/ical/jim.hu.biobio%40gmail.com/public/basic.ics';                              // 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

[PHPiCalendar-Commits] phpicalendar/calendars test.ics,1.9,1.10

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

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

Modified Files:
	test.ics 
Log Message:
fix undef $rss in rss.php

Index: test.ics
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/test.ics,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** test.ics	27 Dec 2008 11:42:41 -0000	1.9
--- test.ics	28 Dec 2008 02:07:53 -0000	1.10
***************
*** 1,5 ****
  BEGIN:VCALENDAR
  VERSION:2.0
! X-WR-CALNAME:testing
  PRODID:-//Apple Computer\, Inc//iCal 2.0//EN
  X-WR-RELCALID:E47AF849-67C8-49F0-AA36-9FD7495400FD
--- 1,5 ----
  BEGIN:VCALENDAR
  VERSION:2.0
! X-WR-CALNAME:testing \,comma
  PRODID:-//Apple Computer\, Inc//iCal 2.0//EN
  X-WR-RELCALID:E47AF849-67C8-49F0-AA36-9FD7495400FD

[PHPiCalendar-Commits] phpicalendar/languages galego.inc.php, 1.1, 1.2 russian.inc.php, 1.1, 1.2

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

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

Modified Files:
	galego.inc.php russian.inc.php 
Log Message:
language tweaks

Index: galego.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/galego.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** galego.inc.php	16 May 2007 23:35:25 -0000	1.1
--- galego.inc.php	28 Dec 2008 01:00:32 -0000	1.2
***************
*** 7,11 ****
  //
  
! $lang['l_day'] 			= 'Día';
  $lang['l_week'] 			= 'Semana';
  $lang['l_month'] 			= 'Mes';
--- 7,11 ----
  //
  
! $lang['l_day'] 	    		= 'Día';
  $lang['l_week'] 			= 'Semana';
  $lang['l_month'] 			= 'Mes';
***************
*** 28,33 ****
  $lang['l_this_months'] 		= 'Eventos deste mes';
  $lang['l_date'] 			= 'Data';
! $lang['l_summary'] 		= 'Descrición';
! $lang['l_all_day'] 		= 'todo o día';
  $lang['l_notes'] 			= 'Notas';
  $lang['l_this_years'] 		= 'Eventos deste ano';
--- 28,33 ----
  $lang['l_this_months'] 		= 'Eventos deste mes';
  $lang['l_date'] 			= 'Data';
! $lang['l_summary'] 	    	= 'Descrición';
! $lang['l_all_day']   		= 'todo o día';
  $lang['l_notes'] 			= 'Notas';
  $lang['l_this_years'] 		= 'Eventos deste ano';
***************
*** 46,52 ****
  $lang['l_query'] 			= 'Consulta: '; // will be followed by the search query
  $lang['l_no_results'] 		= 'Ningún evento atopado';
! $lang['l_goprint'] 		= 'Formato de impresión';
  $lang['l_time'] 			= 'Hora';
! $lang['l_summary'] 		= 'Resume';
  $lang['l_description'] 		= 'Descrición';
  $lang['l_this_site_is']		= 'Esta páxina é';
--- 46,52 ----
  $lang['l_query'] 			= 'Consulta: '; // will be followed by the search query
  $lang['l_no_results'] 		= 'Ningún evento atopado';
! $lang['l_goprint'] 	    	= 'Formato de impresión';
  $lang['l_time'] 			= 'Hora';
! $lang['l_summary'] 	    	= 'Resume';
  $lang['l_description'] 		= 'Descrición';
  $lang['l_this_site_is']		= 'Esta páxina é';
***************
*** 61,78 ****
  $lang['l_recurring_event']	= 'Evento peri&ocaute;dico';
  $lang['l_exception']		= 'Exceción';
! $lang['l_no_query']		= 'falta a consulta';
  $lang['l_preferences']		= 'Preferenzas';
! $lang['l_printer']		= 'Impresora';
! $lang['l_select_lang']		= 'Escolla o seu idioma por defecto:';
! $lang['l_select_cal']		= 'Escolla o seu calendario por defecto:';
! $lang['l_select_view']		= 'Elixa a súa vista por defeto:';
! $lang['l_select_time']		= 'Elixa a súa hora de inicio por defecto:';
! $lang['l_select_day']		= 'Escolla o seu dáa da semana de inicio:';
! $lang['l_select_style']		= 'Seleccione o seu estilo por defecto:';
  $lang['l_set_prefs']		= 'Gardar preferenzas';
  $lang['l_completed_date']	= 'Finalizado o';
  $lang['l_completed']		= 'Finalizado';
  $lang['l_created']			= 'Creado:';
! $lang['l_due']				= 'Data límite:';
  $lang['l_priority']			= 'Prioridade:';
  $lang['l_priority_high']	= 'Alta';
--- 61,78 ----
  $lang['l_recurring_event']	= 'Evento peri&ocaute;dico';
  $lang['l_exception']		= 'Exceción';
! $lang['l_no_query']	    	= 'falta a consulta';
  $lang['l_preferences']		= 'Preferenzas';
! $lang['l_printer']	    	= 'Impresora';
! $lang['l_select_lang']		= 'Escolla o seu idioma por defecto';
! $lang['l_select_cal']		= 'Escolla o seu calendario por defecto';
! $lang['l_select_view']		= 'Elixa a súa vista por defeto';
! $lang['l_select_time']		= 'Elixa a súa hora de inicio por defecto';
! $lang['l_select_day']		= 'Escolla o seu dáa da semana de inicio';
! $lang['l_select_style']		= 'Seleccione o seu estilo por defecto';
  $lang['l_set_prefs']		= 'Gardar preferenzas';
  $lang['l_completed_date']	= 'Finalizado o';
  $lang['l_completed']		= 'Finalizado';
  $lang['l_created']			= 'Creado:';
! $lang['l_due']				= 'Data límite';
  $lang['l_priority']			= 'Prioridade:';
  $lang['l_priority_high']	= 'Alta';
***************
*** 84,95 ****
  $lang['l_status_cancelled'] = 'CANCELADO'; 
  $lang['l_status_tentative'] = 'TENTATIVA'; 
! $lang['l_todo']			= 'Por facer';
  $lang['l_unfinished']		= 'Sen rematar';
  $lang['l_prefs_set'] 		= 'As súas preferenzas foron gardadas.';
  $lang['l_prefs_unset'] 		= 'Preferenzas non activas. Os cambios activaranse ao recargar a páxina.';
! $lang['l_unset_prefs'] 		= 'Preferenzas sen activar:';
  $lang['l_organizer']		= 'Organizador';
! $lang['l_attendee']		= 'Participante';
! $lang['l_location']		= 'Lugar';
  $lang['l_admin_header']		= 'Administración de PHP iCalendar';
  $lang['l_username']			= 'Usuario';
--- 84,95 ----
  $lang['l_status_cancelled'] = 'CANCELADO'; 
  $lang['l_status_tentative'] = 'TENTATIVA'; 
! $lang['l_todo']	     		= 'Por facer';
  $lang['l_unfinished']		= 'Sen rematar';
  $lang['l_prefs_set'] 		= 'As súas preferenzas foron gardadas.';
  $lang['l_prefs_unset'] 		= 'Preferenzas non activas. Os cambios activaranse ao recargar a páxina.';
! $lang['l_unset_prefs'] 		= 'Preferenzas sen activar';
  $lang['l_organizer']		= 'Organizador';
! $lang['l_attendee'] 		= 'Participante';
! $lang['l_location'] 		= 'Lugar';
  $lang['l_admin_header']		= 'Administración de PHP iCalendar';
  $lang['l_username']			= 'Usuario';
***************
*** 101,105 ****
  $lang['l_delete_cal']		= 'Borra un calendario';
  $lang['l_logout']			= 'Saír';
! $lang['l_cal_file']		= 'Arquivo de Calendario';
  $lang['l_php_error']		= 'Error PHP';
  $upload_error_gen_lang		= 'Houbo un problema co seu envío.';
--- 101,105 ----
  $lang['l_delete_cal']		= 'Borra un calendario';
  $lang['l_logout']			= 'Saír';
! $lang['l_cal_file'] 		= 'Arquivo de Calendario';
  $lang['l_php_error']		= 'Error PHP';
  $upload_error_gen_lang		= 'Houbo un problema co seu envío.';
***************
*** 116,120 ****
  $lang['l_submit']			= 'Enviar';
  $lang['l_delete']			= 'Borrar';
! $all_cal_comb_lang		= 'Todos os calendarios combinados';
  
  // New for 2.0
--- 116,120 ----
  $lang['l_submit']			= 'Enviar';
  $lang['l_delete']			= 'Borrar';
! $all_cal_comb_lang	    	= 'Todos os calendarios combinados';
  
  // New for 2.0
***************
*** 144,148 ****
  $format_recur_lang['monthly']		= array('mes','meses');					// and plural forms
  $format_recur_lang['weekly']		= array('semana','semanas');				// these will be %freq%
! $format_recur_lang['daily']		= array('día','días');				// in the replacement below
  $format_recur_lang['hourly']		= array('hora','horas');
  $format_recur_lang['minutely']		= array('minuto','minutos');
--- 144,148 ----
  $format_recur_lang['monthly']		= array('mes','meses');					// and plural forms
  $format_recur_lang['weekly']		= array('semana','semanas');				// these will be %freq%
! $format_recur_lang['daily'] 		= array('día','días');				// in the replacement below
  $format_recur_lang['hourly']		= array('hora','horas');
  $format_recur_lang['minutely']		= array('minuto','minutos');
***************
*** 162,166 ****
  $daysofweekshort_lang		= array ('Dom','Lun','Mar','Mer','Xov','Ven','Sab');
  $daysofweekreallyshort_lang	= array ('D','L','M','Me','X','V','S');
! $monthsofyear_lang		= array ('Xaneiro','Febreiro','Marzo','Abril','Maio','Xuño','Xullo','Agosto','Setembro','Outubro','Novembro','Decembro');
  $monthsofyearshort_lang		= array ('Xan','Feb','Mar','Abr','Maio','Xuño','Xul','Ago','Set','Out','Nov','Dec');
  
--- 162,166 ----
  $daysofweekshort_lang		= array ('Dom','Lun','Mar','Mer','Xov','Ven','Sab');
  $daysofweekreallyshort_lang	= array ('D','L','M','Me','X','V','S');
! $monthsofyear_lang  		= array ('Xaneiro','Febreiro','Marzo','Abril','Maio','Xuño','Xullo','Agosto','Setembro','Outubro','Novembro','Decembro');
  $monthsofyearshort_lang		= array ('Xan','Feb','Mar','Abr','Maio','Xuño','Xul','Ago','Set','Out','Nov','Dec');
  

Index: russian.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/russian.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** russian.inc.php	20 Dec 2008 00:34:07 -0000	1.1
--- russian.inc.php	28 Dec 2008 01:00:32 -0000	1.2
***************
*** 1,14 ****
  <?php
  
! // English language include
! // For version 2.0 PHP iCalendar
  //
! // Translation by Chad Little (ch...@ch...)
  //
! // Submit new translations to php...@gm...
  
  $lang['l_day'] 				= 'День';
  $lang['l_week'] 			= 'Неделя';
! $lang['l_month'] 			= 'Месяц';
  $lang['l_year'] 			= 'Год';
  $lang['l_calendar'] 		= 'Календарь';
--- 1,14 ----
  <?php
  
! // Русский  подключаемый файл 
! // Для PHP iCalendar версии 2.2
  //
! // Перевод выполнен Николаем Н. Комаровым (komarovNOSPAMpicture-group.ru)
  //
! // Новые переводы можно посылать по адресу php...@gm...
  
  $lang['l_day'] 				= 'День';
  $lang['l_week'] 			= 'Неделя';
! $lang['l_month'] 			= 'Меcяц';
  $lang['l_year'] 			= 'Год';
  $lang['l_calendar'] 		= 'Календарь';
***************
*** 19,138 ****
  $lang['l_last_day'] 		= 'Предыдущий день';
  $lang['l_last_month'] 		= 'Предыдущий месяц';
! $lang['l_last_week'] 		= 'Предыдущий неделя';
  $lang['l_last_year'] 		= 'Предыдущий год';
  $lang['l_subscribe'] 		= 'Подписаться';
  $lang['l_download'] 		= 'Скачать';
! $lang['l_powered_by'] 		= 'Сделано ';
  $lang['l_event'] 			= 'Событие';
! $lang['l_event_start'] 		= 'Начало';
! $lang['l_event_end'] 		= 'Окончание';
! $lang['l_this_months'] 		= 'События месяца';
  $lang['l_date'] 			= 'Дата';
! $lang['l_summary'] 			= 'Итоги';
! $lang['l_all_day'] 			= 'События дня';
  $lang['l_notes'] 			= 'Заметки';
! $lang['l_this_years'] 		= 'События года';
  $lang['l_today'] 			= 'Сегодня';
! $lang['l_this_week'] 		= 'Эта неделя';
! $lang['l_this_month'] 		= 'Этот месяц';
! $lang['l_jump'] 			= 'Перейти к:';
! $lang['l_tomorrows'] 		= 'События на завтра';
! $lang['l_goday'] 			= 'Перейти на сегодня';
! $lang['l_goweek'] 			= 'Перейти на эту неделю';
! $lang['l_gomonth'] 			= 'Перейти на этот месяц';
! $lang['l_goyear'] 			= 'Перейти на этот год';
! $lang['l_search'] 			= 'Поиск'; // the verb
  $lang['l_results'] 			= 'Результаты поиска';
! $lang['l_pick_multiple'] 	= 'Множественный выбор';
  $lang['l_query'] 			= 'Запрос'; // will be followed by the search query
! $lang['l_no_results'] 		= 'Событий не найдено';
  $lang['l_goprint'] 			= 'Версия для печати';
  $lang['l_time'] 			= 'Время';
! $lang['l_summary'] 			= 'Итоги';
  $lang['l_description'] 		= 'Описание';
  $lang['l_this_site_is']		= 'Этот сайт ';
  $lang['l_no_events_day']	= 'Нет событий на сегодня.';
! $lang['l_no_events_week']	= 'Нет событий на эту неделю.';
! $lang['l_no_events_month']	= 'Нет событий на этот месяц.';
  $lang['l_rss_day_date']		= 'g:i A';  // Lists just the time
  $lang['l_rss_week_date	']	= '%b %e';  // Lists just the day
  $lang['l_rss_month_date	']	= '%b %e';  // Lists just the day
  $lang['l_rss_language']		= 'ru-ru';
! $lang['l_search_took']		= 'Затрачено на поиск %s секунд';
  $lang['l_recurring_event']	= 'Повторяющееся событие';
  $lang['l_exception']		= 'Исключение';
! $lang['l_no_query']			= 'Нет запроса';
! $lang['l_preferences']		= 'Настройки';
  $lang['l_printer']			= 'Принтер';
! $lang['l_select_lang']		= 'Выбрать язык';
! $lang['l_select_cal']		= 'Выбрать календарь по умолчанию';
! $lang['l_select_view']		= 'Выбрать вид по умолчанию';
! $lang['l_select_time']		= 'Выбрать время начала';
! $lang['l_select_day']		= 'Выбрать начало недели по умолчанию';
! $lang['l_select_style']		= 'Выбрать стиль по умолчанию';
! $lang['l_set_prefs']		= 'Установить настройки';
! $lang['l_completed_date']	= 'Завершено в';
  $lang['l_completed']		= 'Завершено';
  $lang['l_created']			= 'Создано';
! $lang['l_due']				= 'До';
  $lang['l_priority']			= 'Приоритет';
  $lang['l_priority_high']	= 'Высокий';
  $lang['l_priority_low']		= 'Низкий';
  $lang['l_priority_medium']	= 'Средний';
! $lang['l_priority_none']	= 'Нет';
! $lang['l_status']			= 'Статус';
  $lang['l_status_confirmed'] = 'ПОДТВЕРЖДЕНО' ; 
! $lang['l_status_cancelled'] = 'ОТМЕНЕНО'; 
! $lang['l_status_tentative'] = 'Под вопросом'; 
  $lang['l_todo']				= 'Задачи';
! $lang['l_unfinished']		= 'Незавершенная';
! $lang['l_prefs_set'] 		= 'Ваши установки применены.';
! $lang['l_prefs_unset'] 		= 'Ваши установки отменены. Изменения вступят в силу при следующей загрузке';
! $lang['l_unset_prefs'] 		= 'Отменить настройки';
! $lang['l_organizer']		= 'Организовать';
! $lang['l_attendee']			= 'Исполнено';
! $lang['l_location']			= 'Место';
! $lang['l_admin_header']		= 'Администрирование PHP iCalendar ';
! $lang['l_username']			= 'Логин';
  $lang['l_password']			= 'Пароль';
  $lang['l_login']			= 'Логин';
! $lang['l_invalid_login']	= 'Неправильный логин или пароль.';
  $lang['l_addupdate_cal']	= 'Добавить или обновить календарь';
! $lang['l_addupdate_desc']	= 'Добавить календарь через загрузку нового файла. Обновить календарь через перезапись файла с таким же именем.';
  $lang['l_delete_cal']		= 'Удалить календарь';
! $lang['l_logout']			= 'Выход';
  $lang['l_cal_file']			= 'Файл календаря';
! $lang['l_php_error']		= 'PHP Ошибка';
! $upload_error_gen_lang		= 'Проблема с вашей загрузкой.';
! $upload_error_lang[0]		= 'Проблема с вашей загрузкой.';
! $upload_error_lang[1]		= 'Файл слишком большой.';
! $upload_error_lang[2]		= 'Файл слишком большой.';
! $upload_error_lang[3]		= 'Файл частично загружен.';
! $upload_error_lang[4]		= 'Вы должны выбрать файл для загрузки.';
! $lang['l_upload_error_type'] = 'Только файлы с расширением .ics files могут быть загружены.';
! $lang['l_copy_error']			= 'Ошибка при копировании файла';
! $lang['l_delete_error']			= 'Ошибка при удалении файла';
! $lang['l_delete_success']		= 'файл удален.';
! $lang['l_action_success']		= 'Действие успешно завершено';
! $lang['l_submit']				= 'Подтвердить';
  $lang['l_delete']				= 'Удалить';
! $all_cal_comb_lang			= 'Все вместе';
  
  // New for 2.0
! $lang['l_legend']			= 'Легенда';
! $lang['l_admin_subhead']	= 'Управлять вашим календарем с этой страницы';
! $lang['l_prefs_subhead']	= 'Установить cookie для быстрой аутентификации на этом сайте';
! $lang['l_rss_info']			= 'RSS информация';
! $lang['l_rss_subhead']		= 'Базовые RSS доступны для каждого календаря';
! $lang['l_rss_notenabled']	= 'RSS отключено на этом сайте';
  
  // - navigation
  $lang['l_back'] 		= 'Назад';
! $lang['l_next'] 		= 'Вперед';
! $lang['l_prev'] 		= 'Предыдущая';
! $lang['l_day_view'] 	= 'День';
! $lang['l_week_view'] 	= 'Неделя';
! $lang['l_month_view'] 	= 'Месяц';
! $lang['l_year_view'] 	= 'Год';
  
  // ---------------------------------
--- 19,138 ----
  $lang['l_last_day'] 		= 'Предыдущий день';
  $lang['l_last_month'] 		= 'Предыдущий месяц';
! $lang['l_last_week'] 		= 'Предыдущая неделя';
  $lang['l_last_year'] 		= 'Предыдущий год';
  $lang['l_subscribe'] 		= 'Подписаться';
  $lang['l_download'] 		= 'Скачать';
! $lang['l_powered_by'] 		= 'Работает на движке';
  $lang['l_event'] 			= 'Событие';
! $lang['l_event_start'] 		= 'Время начала';
! $lang['l_event_end'] 		= 'Время окончания';
! $lang['l_this_months'] 		= 'События этого месяца';
  $lang['l_date'] 			= 'Дата';
! $lang['l_summary'] 			= 'Кратко';
! $lang['l_all_day'] 			= 'Событие на весь день';
  $lang['l_notes'] 			= 'Заметки';
! $lang['l_this_years'] 		= 'События этого года';
  $lang['l_today'] 			= 'Сегодня';
! $lang['l_this_week'] 		= 'На этой неделе';
! $lang['l_this_month'] 		= 'В этом месяце';
! $lang['l_jump'] 			= 'Перейти к';
! $lang['l_tomorrows'] 		= 'Завтрашние события';
! $lang['l_goday'] 			= 'Сегодняшнему дню';
! $lang['l_goweek'] 			= 'Текущей неделе';
! $lang['l_gomonth'] 			= 'Текущему месяцу';
! $lang['l_goyear'] 			= 'Текущему году';
! $lang['l_search'] 			= 'Искать'; // the verb
  $lang['l_results'] 			= 'Результаты поиска';
! $lang['l_pick_multiple'] 	= 'Выбор календарей';
  $lang['l_query'] 			= 'Запрос'; // will be followed by the search query
! $lang['l_no_results'] 		= 'События не найдены';
  $lang['l_goprint'] 			= 'Версия для печати';
  $lang['l_time'] 			= 'Время';
! $lang['l_summary'] 			= 'Кратко';
  $lang['l_description'] 		= 'Описание';
  $lang['l_this_site_is']		= 'Этот сайт ';
  $lang['l_no_events_day']	= 'Нет событий на сегодня.';
! $lang['l_no_events_week']	= 'Нет событий на этой неделе.';
! $lang['l_no_events_month']	= 'Нет событий в этом месяце.';
  $lang['l_rss_day_date']		= 'g:i A';  // Lists just the time
  $lang['l_rss_week_date	']	= '%b %e';  // Lists just the day
  $lang['l_rss_month_date	']	= '%b %e';  // Lists just the day
  $lang['l_rss_language']		= 'ru-ru';
! $lang['l_search_took']		= 'Поиска занял %s секунд(ы)';
  $lang['l_recurring_event']	= 'Повторяющееся событие';
  $lang['l_exception']		= 'Исключение';
! $lang['l_no_query']			= 'Запрос не задан';
! $lang['l_preferences']		= 'Настройка';
  $lang['l_printer']			= 'Принтер';
! $lang['l_select_lang']		= 'Язык:';
! $lang['l_select_cal']		= 'Календарь по умолчанию';
! $lang['l_select_view']		= 'Режим просмотра по умолчанию';
! $lang['l_select_time']		= 'Время начала по умолчанию';
! $lang['l_select_day']		= 'Первый день недели по умолчанию';
! $lang['l_select_style']		= 'Стиль по умолчанию';
! $lang['l_set_prefs']		= 'Cохранить настройки';
! $lang['l_completed_date']	= 'Завершено:';
  $lang['l_completed']		= 'Завершено';
  $lang['l_created']			= 'Создано';
! $lang['l_due']				= 'К дате';
  $lang['l_priority']			= 'Приоритет';
  $lang['l_priority_high']	= 'Высокий';
  $lang['l_priority_low']		= 'Низкий';
  $lang['l_priority_medium']	= 'Средний';
! $lang['l_priority_none']	= '(нет)';
! $lang['l_status']			= 'Состояние';
  $lang['l_status_confirmed'] = 'ПОДТВЕРЖДЕНО' ; 
! $lang['l_status_cancelled'] = 'ОТВЕРГНУТО'; 
! $lang['l_status_tentative'] = 'В СОМНЕНИИ'; 
  $lang['l_todo']				= 'Задачи';
! $lang['l_unfinished']		= 'Неокончено';
! $lang['l_prefs_set'] 		= 'Ваши настройки установлены.';
! $lang['l_prefs_unset'] 		= 'Настройки сброшены. Изменения вступят в силу при следующей загрузке страницы.';
! $lang['l_unset_prefs'] 		= 'Сбросить настройки';
! $lang['l_organizer']		= 'Организатор';
! $lang['l_attendee']			= 'Участник';
! $lang['l_location']			= 'Место проведения';
! $lang['l_admin_header']		= 'Администрирование PHP iCalendar';
! $lang['l_username']			= 'Имя пользователя';
  $lang['l_password']			= 'Пароль';
  $lang['l_login']			= 'Логин';
! $lang['l_invalid_login']	= 'Неправильные имя пользователя или пароль.';
  $lang['l_addupdate_cal']	= 'Добавить или обновить календарь';
! $lang['l_addupdate_desc']	= 'Для добавления календаря загрузите на сервер файл. Для обновления файла закачайте файл с тем же именем.';
  $lang['l_delete_cal']		= 'Удалить календарь';
! $lang['l_logout']			= 'Выйти из системы';
  $lang['l_cal_file']			= 'Файл календаря';
! $lang['l_php_error']		= 'Ошибка PHP';
! $upload_error_gen_lang		= 'При закачивании возникла проблема.';
! $upload_error_lang[0]		= 'При закачивании возникла проблема.';
! $upload_error_lang[1]		= 'Файл, который Вы хотите закачать, слишком велик.';
! $upload_error_lang[2]		= ' Файл, который Вы хотите закачать, слишком велик.';
! $upload_error_lang[3]		= 'Ваш файл закачался лишь частично.';
! $upload_error_lang[4]		= 'Вы должны выбрать файл календаря для закачивания.';
! $lang['l_upload_error_type'] = 'Закачивать можно только файлы с расширением .ics.';
! $lang['l_copy_error']			= 'Не удалось скопировать файл';
! $lang['l_delete_error']			= 'Не удалось удалить файл';
! $lang['l_delete_success']		= 'успешно удален.';
! $lang['l_action_success']		= 'Действие выполнено успешно.';
! $lang['l_submit']				= 'Послать';
  $lang['l_delete']				= 'Удалить';
! $all_cal_comb_lang			= 'Все одновременно';
  
  // New for 2.0
! $lang['l_legend']			= 'Легенда (цвета)';
! $lang['l_admin_subhead']	= 'На этой странице можно управлять календарями';
! $lang['l_prefs_subhead']	= 'Устанавливает cookie-файлы для посетителей';
! $lang['l_rss_info']			= 'RSS-информация';
! $lang['l_rss_subhead']		= 'Для каждого календаря доступны простые RSS-потоки';
! $lang['l_rss_notenabled']	= 'На этом сайте RSS не включен';
  
  // - navigation
  $lang['l_back'] 		= 'Назад';
! $lang['l_next'] 		= 'След.';
! $lang['l_prev'] 		= 'Пред.';
! $lang['l_day_view'] 	= 'Просмотр дня';
! $lang['l_week_view'] 	= 'Просмотр недели';
! $lang['l_month_view'] 	= 'Просмотр месяца';
! $lang['l_year_view'] 	= 'Просмотр года';
  
  // ---------------------------------
***************
*** 144,168 ****
  $format_recur_lang['yearly']		= array('год','годы');		// for these, put singular
  $format_recur_lang['monthly']		= array('месяц','месяцы');		// and plural forms
! $format_recur_lang['weekly']		= array('неделя','недели');		// these will be %freq%
! $format_recur_lang['daily']			= array('день','дни');			// in the replacement below
! $format_recur_lang['hourly']		= array('час','часы');
! $format_recur_lang['minutely']		= array('минута','минуты');
! $format_recur_lang['secondly']		= array('секунда','секунды');
  
  $format_recur_lang['start']			= 'Каждые %int% %freq% %for%';	// ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
  $format_recur_lang['until']			= 'до %date%';				// ie, 'until January 4'
! $format_recur_lang['count']			= 'счетчик каждые %int%';		// ie, 'for 5 times'
  
! $format_recur_lang['bymonth']		= 'В месяце: %list%';			// ie, 'In months: January, February, March'
! $format_recur_lang['bymonthday']	= 'В датах: %list%';			// ie, 'On dates: 1, 2, 3, 4'
! $format_recur_lang['byday']			= 'В днях: %list%';			// ie, 'On days: Mon, Tues, Wed, Thurs'
  
  // ---------------------------------
  
! $$daysofweek_lang			= array ('Воскресенье','Понедельник','Вторник','Среда','Четверг','Пятница','Суббота');
! $daysofweekshort_lang		= array ('Вск','Пнд','Втр','Срд','Чтв','Птн','Суб');
! $daysofweekreallyshort_lang	= array ('В','П','В','С','Ч','Т','С');
  $monthsofyear_lang			= array ('Январь','Февраль','Март','Апрель','Май','Июнь','Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь');
! $monthsofyearshort_lang		= array ('Янв','Фев','Мар','Апр','Май','Июн','Июл','Авг','Сен','Окт','Ноя','Дек');
  
  // For time formatting, check out: http://www.php.net/manual/en/function.date.php
--- 144,168 ----
  $format_recur_lang['yearly']		= array('год','годы');		// for these, put singular
  $format_recur_lang['monthly']		= array('месяц','месяцы');		// and plural forms
! $format_recur_lang['weekly']		= array('неделя','недель');		// these will be %freq%
! $format_recur_lang['daily']			= array('день','дней');			// in the replacement below
! $format_recur_lang['hourly']		= array('час','часов');
! $format_recur_lang['minutely']		= array('минута','минут');
! $format_recur_lang['secondly']		= array('секунда','секунд');
  
  $format_recur_lang['start']			= 'Каждые %int% %freq% %for%';	// ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
  $format_recur_lang['until']			= 'до %date%';				// ie, 'until January 4'
! $format_recur_lang['count']			= '%int% раз';		// ie, 'for 5 times'
  
! $format_recur_lang['bymonth']		= 'По месяцам: %list%';			// ie, 'In months: January, February, March'
! $format_recur_lang['bymonthday']	= 'По числам: %list%';			// ie, 'On dates: 1, 2, 3, 4'
! $format_recur_lang['byday']			= 'По дням: %list%';			// ie, 'On days: Mon, Tues, Wed, Thurs'
  
  // ---------------------------------
  
! $daysofweek_lang			= array ('Воскресенье','Понедельник','Вторник','Среда','Четверг','Пятница','Суббота');
! $daysofweekshort_lang		= array ('Вск','Пнд','Втр','Срд','Чтв','Птн','Сбт');
! $daysofweekreallyshort_lang	= array ('В','П','В','С','Ч','П','C');
  $monthsofyear_lang			= array ('Январь','Февраль','Март','Апрель','Май','Июнь','Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь');
! $monthsofyearshort_lang		= array ('Янв','Фев','Мар','Апр','Май','Инь',' Иль','Авг','Сен','Окт','Ноя','Дек');
  
  // For time formatting, check out: http://www.php.net/manual/en/function.date.php
***************
*** 197,210 ****
  
  // Error messages - %s will be replaced with a variable
! $lang['l_error_title'] 			= 'ошибка!';
! $lang['l_error_window'] 		= 'ошибка !';
! $lang['l_error_calendar'] 		= 'Календарь "%s" был обработан с ошибкой.';
! $lang['l_error_path'] 			= 'Невозможно открыть путь: "%s"';
! $lang['l_error_back'] 			= 'Нажмите клавишу "Назад" для возврата.';
! $lang['l_error_remotecal'] 		= 'Этот сервер блокирует удаленные календари.';
! $lang['l_error_restrictedcal'] 	= 'Вы пытаетесь получить доступ к ограниченному календарю.';
! $lang['l_error_invalidcal'] 	= 'Неправильный формат файла календаря.';
! $lang['l_error_cantopen'] 		= 'Невозможно открыть календарь.';
! $lang['l_error_cache']			= 'Нет возможности записать в кэш директорию. Проверьте свою конфигурацию';
  
! ?>
--- 197,210 ----
  
  // Error messages - %s will be replaced with a variable
! $lang['l_error_title'] 			= 'Ошибка!';
! $lang['l_error_window'] 		= 'Произошла ошибка!';
! $lang['l_error_calendar'] 		= 'Когда произошла ошибка, обрабатывался каледарь "%s".';
! $lang['l_error_path'] 			= 'Не удается открыть путь: "%s"';
! $lang['l_error_back'] 			= 'Для возврата используйте кнопку "Назад".';
! $lang['l_error_remotecal'] 		= 'Этот сервер блокирует удаленно расположенные календари, которые не прошли проверку.';
! $lang['l_error_restrictedcal'] 	= 'Вы попытались обратиться к календарю, доступ к которому ограничен.';
! $lang['l_error_invalidcal'] 	= 'Некорректный/поврежденный файл календаря. Попробуйте другой календарь, пожалуйста.';
! $lang['l_error_cantopen'] 		= 'Не удается открыть календарь.';
! $lang['l_error_cache']			= 'Неудается записать данные в каталог с кэшем. Проверьте конфигурацию., пожалуйста.';
  
! ?>
\ No newline at end of file

[PHPiCalendar-Commits] phpicalendar/templates/tan print.tpl, 1.1, 1.2

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

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

Modified Files:
	print.tpl 
Log Message:
add back link to print view

Index: print.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/tan/print.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** print.tpl	18 May 2007 19:03:09 -0000	1.1
--- print.tpl	28 Dec 2008 00:46:50 -0000	1.2
***************
*** 6,18 ****
  			<table width="100%" border="0" cellspacing="0" cellpadding="0">
  				<tr valign="top">
! 					<td align="left" width="400" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></td>
  					<td valign="top" align="right" width="120" class="navback">	
  						<div style="padding-top: 3px;">
  						<table width="90" border="0" cellpadding="0" cellspacing="0">
  							<tr valign="top">
! 								<td><a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview=day"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td>
! 								<td><a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview=week"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td>
! 								<td><a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview=month"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td>
! 								<td><a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview=year"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td>
  							</tr>
  						</table>
--- 6,19 ----
  			<table width="100%" border="0" cellspacing="0" cellpadding="0">
  				<tr valign="top">
! 					<td align="left" width="400" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span><br />
! 					<a class="psf" href="{DEFAULT_VIEW}.php?cal={CAL}&amp;getdate={GETDATE}&amp;cpath={CPATH}">Foo{L_VIEW_CALENDARS}</a></td>
  					<td valign="top" align="right" width="120" class="navback">	
  						<div style="padding-top: 3px;">
  						<table width="90" border="0" cellpadding="0" cellspacing="0">
  							<tr valign="top">
! 								<td><a class="psf" href="print.php?cal={CAL}&amp;cpath={CPATH}&amp;getdate={GETDATE}&amp;printview=day"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td>
! 								<td><a class="psf" href="print.php?cal={CAL}&amp;cpath={CPATH}&amp;getdate={GETDATE}&amp;printview=week"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td>
! 								<td><a class="psf" href="print.php?cal={CAL}&amp;cpath={CPATH}&amp;getdate={GETDATE}&amp;printview=month"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td>
! 								<td><a class="psf" href="print.php?cal={CAL}&amp;cpath={CPATH}&amp;getdate={GETDATE}&amp;printview=year"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td>
  							</tr>
  						</table>

[PHPiCalendar-Commits] phpicalendar config.inc.php, 1.190, 1.191 index.php, 1.17, 1.18 print.php, 1.42, 1.43

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

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

Modified Files:
	config.inc.php index.php print.php 
Log Message:
add back link to print view

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.190
retrieving revision 1.191
diff -C2 -d -r1.190 -r1.191
*** config.inc.php	27 Dec 2008 23:49:39 -0000	1.190
--- config.inc.php	28 Dec 2008 00:46:49 -0000	1.191
***************
*** 45,49 ****
  #     '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'
--- 45,50 ----
  #     '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'         => 'year',           // Default view for calendars'     => 'day', 'week', 'month', 'year'
!       'printview_default'    => 'yes',	           // Set print view as the default view. Uses'default_view (listed above).
  #     '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'
***************
*** 52,58 ****
  #     '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
--- 53,60 ----
  #     'show_todos'           => 'no',
  #     'show_completed'       => 'no',
+       'allow_login'          => 'yes',	           // Set to yes to prompt for login to unlock calendars.
  #     '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

Index: index.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/index.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** index.php	11 Dec 2008 21:54:52 -0000	1.17
--- index.php	28 Dec 2008 00:46:49 -0000	1.18
***************
*** 4,13 ****
  
  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');
--- 4,12 ----
  
  if ($phpiCal_config->printview_default == 'yes') {
! 	$theview ="print.php";
  } else {
  	$check = array ('day', 'week', 'month', 'year');
  	if (in_array($phpiCal_config->default_view, $check)) {
! 		$theview = $phpiCal_config->default_view . '.php';
  	} else {
  		die('illegal view');
***************
*** 15,21 ****
  }
  if(isset($_GET['cpath'])){
! 	$phpiCal_config->default_view .= '?cpath='.$_GET['cpath'];
  }
! header("Location: $phpiCal_config->default_view");
  
  ?>
--- 14,20 ----
  }
  if(isset($_GET['cpath'])){
! 	$theview .= '?cpath='.$_GET['cpath'];
  }
! header("Location: $theview");
  
  ?>

Index: print.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** print.php	20 Dec 2008 03:22:54 -0000	1.42
--- print.php	28 Dec 2008 00:46:49 -0000	1.43
***************
*** 9,13 ****
  $events_week 		= 0;
  $unix_time 			= strtotime($getdate);
! $printview = 'month';
  if (isset($_GET['printview']))	$printview = $_GET['printview'];
  
--- 9,13 ----
  $events_week 		= 0;
  $unix_time 			= strtotime($getdate);
! $printview = $phpiCal_config->default_view;
  if (isset($_GET['printview']))	$printview = $_GET['printview'];
  
***************
*** 58,62 ****
--- 58,64 ----
  	'charset'			=> $phpiCal_config->charset,
  	'default_path'		=> $phpiCal_config->default_path,
+ 	'default_view'		=> $phpiCal_config->default_view,
  	'template'			=> $phpiCal_config->template,
+ 	'cpath'  			=> $phpiCal_config->cpath,
  	'cal'				=> $cal,
  	'getdate'			=> $getdate,
***************
*** 85,88 ****
--- 87,91 ----
  	'l_description'		=> $lang['l_description'],
  	'l_calendar'		=> $lang['l_calendar'],
+ 	'l_view_calendars'	=> $lang['l_view_calendars'],
  	'l_day'				=> $lang['l_day'],
  	'l_week'			=> $lang['l_week'],

[PHPiCalendar-Commits] phpicalendar/templates/default print.tpl, 1.7, 1.8

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

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

Modified Files:
	print.tpl 
Log Message:
add back link to print view

Index: print.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/print.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** print.tpl	21 Mar 2006 09:52:30 -0000	1.7
--- print.tpl	28 Dec 2008 00:46:50 -0000	1.8
***************
*** 6,18 ****
  			<table width="100%" border="0" cellspacing="0" cellpadding="0">
  				<tr valign="top">
! 					<td align="left" width="400" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></td>
  					<td valign="top" align="right" width="120" class="navback">	
  						<div style="padding-top: 3px;">
  						<table width="90" border="0" cellpadding="0" cellspacing="0">
  							<tr valign="top">
! 								<td><a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview=day"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td>
! 								<td><a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview=week"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td>
! 								<td><a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview=month"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td>
! 								<td><a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview=year"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td>
  							</tr>
  						</table>
--- 6,19 ----
  			<table width="100%" border="0" cellspacing="0" cellpadding="0">
  				<tr valign="top">
! 					<td align="left" width="400" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span><br />
! 					<a class="psf" href="{DEFAULT_VIEW}.php?cal={CAL}&amp;getdate={GETDATE}&amp;cpath={CPATH}">{L_VIEW_CALENDARS}</a></td>
  					<td valign="top" align="right" width="120" class="navback">	
  						<div style="padding-top: 3px;">
  						<table width="90" border="0" cellpadding="0" cellspacing="0">
  							<tr valign="top">
! 								<td><a class="psf" href="print.php?cal={CAL}&amp;cpath={CPATH}&amp;getdate={GETDATE}&amp;printview=day"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td>
! 								<td><a class="psf" href="print.php?cal={CAL}&amp;cpath={CPATH}&amp;getdate={GETDATE}&amp;printview=week"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td>
! 								<td><a class="psf" href="print.php?cal={CAL}&amp;cpath={CPATH}&amp;getdate={GETDATE}&amp;printview=month"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td>
! 								<td><a class="psf" href="print.php?cal={CAL}&amp;cpath={CPATH}&amp;getdate={GETDATE}&amp;printview=year"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td>
  							</tr>
  						</table>

[PHPiCalendar-Commits] phpicalendar/languages english.inc.php, 1.68, 1.69

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

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

Modified Files:
	english.inc.php 
Log Message:
add back link to print view

Index: english.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** english.inc.php	27 Dec 2008 23:18:07 -0000	1.68
--- english.inc.php	28 Dec 2008 00:46:50 -0000	1.69
***************
*** 48,51 ****
--- 48,52 ----
  $lang['l_no_results'] 		= 'No events found';
  $lang['l_goprint'] 			= 'Printer Friendly';
+ $lang['l_view_calendars']	= 'Calendar view';
  $lang['l_time'] 			= 'Time';
  $lang['l_summary'] 			= 'Summary';

[PHPiCalendar-Commits] phpicalendar config.inc.php, 1.189, 1.190 default_config.php, 1.6, 1.7 preferences.php, 1.66, 1.67

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

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

Modified Files:
	config.inc.php default_config.php preferences.php 
Log Message:
add timezones to prefs

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.189
retrieving revision 1.190
diff -C2 -d -r1.189 -r1.190
*** config.inc.php	27 Dec 2008 23:18:07 -0000	1.189
--- config.inc.php	27 Dec 2008 23:49:39 -0000	1.190
***************
*** 31,35 ****
  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,
  
--- 31,35 ----
  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,
  

Index: default_config.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** default_config.php	27 Dec 2008 23:18:07 -0000	1.6
--- default_config.php	27 Dec 2008 23:49:39 -0000	1.7
***************
*** 3,7 ****
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.3rc1.3';
  	// Configuration file for PHP iCalendar 2.25rc1
  	//
--- 3,7 ----
  	private static $instance;
  	private function __construct(){
! 		$this->phpicalendar_version = '2.3rc1.4';
  	// Configuration file for PHP iCalendar 2.25rc1
  	//

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** preferences.php	27 Dec 2008 23:18:07 -0000	1.66
--- preferences.php	27 Dec 2008 23:49:39 -0000	1.67
***************
*** 145,148 ****
--- 145,200 ----
  }
  
+ $timezone_subset = array(
+ 	'',
+ 	'GMT',
+ 	'US/Hawaii',
+ 	'US/Pacific',
+ 	'US/Mountain',
+ 	'US/Central',
+ 	'US/Eastern',
+ 	'Canada/Newfoundland',
+ 	'CET',
+ 	'EET',
+ 	'Etc/GMT-1',
+ 	'Etc/GMT-2',
+ 	'Etc/GMT-3',
+ 	'Etc/GMT-4',
+ 	'Etc/GMT-5',
+ 	'Etc/GMT-6',
+ 	'Etc/GMT-7',
+ 	'Etc/GMT-8',
+ 	'Etc/GMT-9',
+ 	'Etc/GMT-10',
+ 	'Etc/GMT-11',
+ 	'Etc/GMT-12',
+ 	'Etc/GMT-13',
+ 	'Etc/GMT-14',
+ 	'Etc/GMT+1',
+ 	'Etc/GMT+2',
+ 	'Etc/GMT+3',
+ 	'Etc/GMT+4',
+ 	'Etc/GMT+5',
+ 	'Etc/GMT+6',
+ 	'Etc/GMT+7',
+ 	'Etc/GMT+8',
+ 	'Etc/GMT+9',
+ 	'Etc/GMT+10',
+ 	'Etc/GMT+11',
+ 	'Etc/GMT+12',
+ 	'MET',
+ 	'Mexico/General',
+ 	'NZ',
+ 	'WET'
+ );
+ $timezone_select = '';
+ foreach ($timezone_subset as $i => $timezone) {
+ 	if ($timezone_subset[$i] == $cookie_timezone) {
+ 		$timezone_select .= "<option value='$timezone' selected='selected'>$timezone</option>\n";
+ 	} else {
+ 		$timezone_select .= "<option value='$timezone.'>$timezone</option>\n";
+ 	}
+ }
+ 
+ 
  $dir_handle = @opendir(BASE.'templates/');
  $style_select = '';

[PHPiCalendar-Commits] phpicalendar/functions timezones.php, 1.6, 1.7

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

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

Modified Files:
	timezones.php 
Log Message:
add timezones to prefs

Index: timezones.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/timezones.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** timezones.php	25 Dec 2008 18:45:26 -0000	1.6
--- timezones.php	27 Dec 2008 23:49:39 -0000	1.7
***************
*** 382,385 ****
--- 382,386 ----
  $tz_array['Europe/Zurich']               	= array('+0100', '+0200');
  $tz_array['GB']                          	= array('+0000', '+0100');
+ $tz_array['GMT']                          	= array('+0000', '+0000');
  $tz_array['GB-Eire']                     	= array('+0000', '+0100');
  $tz_array['HST']                         	= array('-1000', '-1000');

[PHPiCalendar-Commits] phpicalendar/functions/init configs.php, 1.7, 1.8 date_range.php, 1.7, 1.8

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

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

Modified Files:
	configs.php date_range.php 
Log Message:
new rss icons;allow subweek calendars

Index: configs.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/configs.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** configs.php	27 Dec 2008 10:58:51 -0000	1.7
--- configs.php	27 Dec 2008 23:18:07 -0000	1.8
***************
*** 6,9 ****
--- 6,28 ----
  	foreach($configs as $key=>$value) $phpiCal_config->setProperty($key, $value);
  }
+ 
+ # adjust gridlength to allowed values
+ $g = $phpiCal_config->gridLength;
+ if (!in_array($g,array(1,2,3,4,10,12,15,20,30,60)) && $g < 11){
+ 	$g = 10;
+ }elseif($g < 13){
+ 	$g = 12;
+ }elseif($g < 17){
+ 	$g = 15;
+ }elseif($g < 25){
+ 	$g = 20;
+ }elseif($g < 45){
+ 	$g = 30;
+ }else{
+ 	$g = 60;
+ }
+ $phpiCal_config->setProperty('gridLength', $g);
+ 
+ 
  if ($phpiCal_config->cookie_uri == '') {
  	$phpiCal_config->setProperty('cookie_uri', $_SERVER['SERVER_NAME'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'], '/')) );
***************
*** 24,27 ****
--- 43,47 ----
  	if (isset($phpicalendar['cookie_time']))		$phpiCal_config->setProperty('day_start', 			$phpicalendar['cookie_time']); 
  	if (isset($phpicalendar['cookie_endtime']))		$phpiCal_config->setProperty('day_end', 			$phpicalendar['cookie_endtime']); 
+ 	if (isset($phpicalendar['cookie_timezone']))	$phpiCal_config->setProperty('timezone', 			$phpicalendar['timezone']); 
  }
  

Index: date_range.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/date_range.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** date_range.php	26 Dec 2008 08:26:31 -0000	1.7
--- date_range.php	27 Dec 2008 23:18:07 -0000	1.8
***************
*** 34,37 ****
--- 34,38 ----
  		$mArray_end = mktime (0,0,0,$end_month,31,($end_year));
  		break;
+ 	case 'error':
  	case 'preferences':
  		$mArray_begin = time();
***************
*** 46,47 ****
--- 47,52 ----
  		$mArray_end = mktime (0,0,0,1,31,($this_year + 1));
  }
+ if ($phpiCal_config->save_parsed_cals == 'yes') {	
+ 	$mArray_begin = mktime (0,0,0,12,21,($this_year - 1));
+ 	$mArray_end = mktime (0,0,0,1,31,($this_year + 1));
+ }
\ No newline at end of file

[PHPiCalendar-Commits] phpicalendar/templates/green rss_index.tpl, 1.1, NONE

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

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

Removed Files:
	rss_index.tpl 
Log Message:
new rss icons;allow subweek calendars

--- rss_index.tpl DELETED ---