[PHPiCalendar-Commits] phpicalendar README,1.82,1.83 config.inc.php,1.157,1.158 error.php,1.1,1.2 preferences.php,1.53,1.54

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8197

Modified Files:
	README config.inc.php error.php preferences.php 
Log Message:
More error messages. Fixed default paths everywhere.



Index: README
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/README,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** README	2 Oct 2004 01:23:52 -0000	1.82
--- README	25 Oct 2004 17:16:07 -0000	1.83
***************
*** 82,85 ****
--- 82,92 ----
  Changes:
  --------
+ 2.0
+ 	-Enhanced error messaging.
+ 	-Added Afrikaans Language.
+ 	-Todos can be turned off again.
+ 	-Todos won't show private todos.
+ 	-RSS page respects https servers.
+ 
  2.0 beta
  	-Updated translations:

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.157
retrieving revision 1.158
diff -C2 -d -r1.157 -r1.158
*** config.inc.php	25 Oct 2004 02:21:26 -0000	1.157
--- config.inc.php	25 Oct 2004 17:16:08 -0000	1.158
***************
*** 26,30 ****
  $cookie_uri				= ''; 				// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar -- AUTO SETTING -- Only set if you are having cookie issues.
  $download_uri			= ''; 				// The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars -- AUTO SETTING -- Only set if you are having subscribe issues.
! $default_path			= 'http://www.example.com/phpicalendar'; 						// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar
  $charset				= 'UTF-8';			// Character set your calendar is in, suggested UTF-8, or iso-8859-1 for most languages.
  
--- 26,30 ----
  $cookie_uri				= ''; 				// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar -- AUTO SETTING -- Only set if you are having cookie issues.
  $download_uri			= ''; 				// The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars -- AUTO SETTING -- Only set if you are having subscribe issues.
! $default_path			= ''; 				// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar
  $charset				= 'UTF-8';			// Character set your calendar is in, suggested UTF-8, or iso-8859-1 for most languages.
  
***************
*** 51,55 ****
  $phpicalendar_publishing = '';				// Set to '1' to enable remote webdav style publish. See 'calendars/publish.php' for complete information;
  
! // Administration settings (admin.php)
  $allow_admin			= 'yes';				// Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $auth_method			
  $auth_method			= 'ftp';			// Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $auth_internal_username and $auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic.
--- 51,55 ----
  $phpicalendar_publishing = '';				// Set to '1' to enable remote webdav style publish. See 'calendars/publish.php' for complete information;
  
! // Administration settings (/admin/)
  $allow_admin			= 'yes';				// Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $auth_method			
  $auth_method			= 'ftp';			// Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $auth_internal_username and $auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic.

Index: error.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/error.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** error.php	25 Oct 2004 02:21:26 -0000	1.1
--- error.php	25 Oct 2004 17:16:08 -0000	1.2
***************
*** 4,9 ****
  
  
! function error($error_msg='There was an error processing the request.', $file='NONE') {
! 	global $template, $language, $enable_rss, $lang;
  	if (!isset($template))					$template = 'default';
  	if (!isset($lang['l_powered_by']))		$lang['l_powered_by'] = 'Powered by';
--- 4,9 ----
  
  
! function error($error_msg='There was an error processing the request.', $file='NONE', $error_base='./') {
! 	global $template, $language, $enable_rss, $lang, $charset, $default_path;
  	if (!isset($template))					$template = 'default';
  	if (!isset($lang['l_powered_by']))		$lang['l_powered_by'] = 'Powered by';
***************
*** 18,22 ****
  	$current_view 		= 'error';
  	$display_date 		= $lang['l_error_title'];
! 	$calendar_name 		= $lang['l_error_title'];	
  	
  	$page = new Page(BASE.'templates/'.$template.'/error.tpl');
--- 18,30 ----
  	$current_view 		= 'error';
  	$display_date 		= $lang['l_error_title'];
! 	$calendar_name 		= $lang['l_error_title'];
! 	
! 	if (empty($default_path)) {
! 		if (isset($_SERVER['HTTPS']) || strtolower($_SERVER['HTTPS']) == 'on' ) {
! 			$default_path = 'https://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/rss/'));
! 		} else {
! 			$default_path = 'http://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/rss/'));
! 		}
! 	}
  	
  	$page = new Page(BASE.'templates/'.$template.'/error.tpl');
***************
*** 28,35 ****
  
  	$page->replace_tags(array(
! 		'default_path'		=> '',
  		'template'			=> $template,
  		'cal'				=> $cal,
  		'getdate'			=> $getdate,
  		'calendar_name'		=> $calendar_name,
  		'display_date'		=> $display_date,
--- 36,44 ----
  
  	$page->replace_tags(array(
! 		'default_path'		=> $error_base,
  		'template'			=> $template,
  		'cal'				=> $cal,
  		'getdate'			=> $getdate,
+ 		'charset'			=> $charset,
  		'calendar_name'		=> $calendar_name,
  		'display_date'		=> $display_date,

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** preferences.php	2 Sep 2004 18:44:43 -0000	1.53
--- preferences.php	25 Oct 2004 17:16:08 -0000	1.54
***************
*** 7,10 ****
--- 7,14 ----
  $display_date = $preferences_lang;
  
+ if ($allow_preferences != 'yes') {
+ 	exit(error('Preferences are not available for this installation.', $cal));
+ }
+ 
  if ($cookie_uri == '') {
  	$cookie_uri = $_SERVER['SERVER_NAME'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'], '/'));