[PHPiCalendar-Commits] phpicalendar/rss index.php,1.32,1.33 rss.php,1.21,1.22

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

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

Modified Files:
	index.php rss.php 
Log Message:
More error messages. Fixed default paths everywhere.



Index: index.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/index.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** index.php	2 Sep 2004 18:44:44 -0000	1.32
--- index.php	25 Oct 2004 17:16:09 -0000	1.33
***************
*** 5,9 ****
  require_once(BASE.'functions/calendar_functions.php');
  
! $default_path = 'http://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/rss/'));
  
  $current_view = "rssindex";
--- 5,19 ----
  require_once(BASE.'functions/calendar_functions.php');
  
! if ($enable_rss != 'yes') {
! 	exit(error('RSS is not available for this installation.', $cal, '../'));
! }
! 
! 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/'));
! 	}
! }
  
  $current_view = "rssindex";
***************
*** 45,48 ****
--- 55,59 ----
  	'rss_powered'	 	=> $rss_powered,
  	'rss_list'	 		=> $rss_list,
+ 	'charset'	 		=> $charset,
  	'rss_available' 	=> '',
  	'rssdisable'	 	=> '',

Index: rss.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** rss.php	1 Oct 2004 23:42:41 -0000	1.21
--- rss.php	25 Oct 2004 17:16:09 -0000	1.22
***************
*** 5,12 ****
  
  if ($enable_rss != 'yes') {
! 	die ("RSS feeds are not enabled on this site.");
  }
  
- $default_path = 'http://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/rss/'));
  $start_week_time = strtotime(dateOfWeek($getdate, $week_start_day));
  $end_week_time = $start_week_time + (6 * 25 * 60 * 60);
--- 5,19 ----
  
  if ($enable_rss != 'yes') {
! 	exit(error('RSS is not available for this installation.', $cal, '../'));
! }
! 
! 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/'));
! 	}
  }
  
  $start_week_time = strtotime(dateOfWeek($getdate, $week_start_day));
  $end_week_time = $start_week_time + (6 * 25 * 60 * 60);