[PHPiCalendar-Commits] phpicalendar/calendars publish.php,1.8,1.9

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

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

Modified Files:
	publish.php 
Log Message:
fix publish.php for new config system

Index: publish.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/publish.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** publish.php	18 May 2007 20:47:21 -0000	1.8
--- publish.php	1 Jan 2009 18:33:42 -0000	1.9
***************
*** 4,8 ****
  Extension to PHP iCalendar for supporting publishing from Apple iCal
  Date: 11.12.2003
! Author: Dietrich Ayala
  Copyright 2003 Dietrich Ayala

--- 4,8 ----
  Extension to PHP iCalendar for supporting publishing from Apple iCal
  Date: 11.12.2003
! Authors: Dietrich Ayala, Jo Rhett, Jim Hu
  Copyright 2003 Dietrich Ayala

***************
*** 62,66 ****

  Hints:
! 1. PHP 4.3.0 or greater is required
  2. Your version of php and apache MUST support $_SERVER['PATH_INFO']
  3. Depending on your web server environment, you may need to set safe_mode = Off
--- 62,66 ----

  Hints:
! 1. PHP 5.1.0 or greater is required
  2. Your version of php and apache MUST support $_SERVER['PATH_INFO']
  3. Depending on your web server environment, you may need to set safe_mode = Off
***************
*** 73,89 ****
  */

  // include PHP iCalendar configuration variables
! include('../config.inc.php');

  // set calendar path, or just use current directory...make sure there's a trailing slash
! if (isset($calendar_path) && $calendar_path != '') {
! 	if (substr($calendar_path, -1, 1) !='/') $calendar_path = $calendar_path.'/';
  } else {
  	$calendar_path = '';
  }
- // allow/disallow publishing
- 
- $phpicalendar_publishing = isset($phpicalendar_publishing) ? $phpicalendar_publishing : 0;
- define( 'PHPICALENDAR_PUBLISHING', $phpicalendar_publishing );

  // toggle logging
--- 73,97 ----
  */

+ define('BASE', '../');
  // include PHP iCalendar configuration variables
! include_once(BASE.'functions/init.inc.php'); 
! 
! // allow/disallow publishing
! $phpicalendar_publishing = isset($phpiCal_config->phpicalendar_publishing) ? $phpiCal_config->phpicalendar_publishing : 0;
! define( 'PHPICALENDAR_PUBLISHING', $phpicalendar_publishing );
! // only allow publishing if explicitly enabled
! if(PHPICALENDAR_PUBLISHING != 1) {
! 	header('WWW-Authenticate: Basic realm="ERROR: Calendar Publishing is disabled on this server"');
! 	header('HTTP/1.1 401 Unauthorized');
! 	echo 'Calendar Publishing is disabled on this server!';
! 	exit;
! }

  // set calendar path, or just use current directory...make sure there's a trailing slash
! if (isset($phpiCal_config->calendar_path) && $phpiCal_config->calendar_path != '') {
! 	if (substr($phpiCal_config->calendar_path, -1, 1) !='/') $calendar_path = $calendar_path.'/';
  } else {
  	$calendar_path = '';
  }

  // toggle logging
***************
*** 100,104 ****
  // Require authentication 
  if (!isset($_SERVER['REMOTE_USER'])) {
- 
  	// Require authentication 
  	if (isset($_SERVER['HTTP_AUTHORIZATION'])) {
--- 108,111 ----
***************
*** 106,110 ****
  			= explode( ':', base64_decode( substr($_SERVER['HTTP_AUTHORIZATION'], 6) ) );
  	}
- 
  	if (!isset($_SERVER['PHP_AUTH_USER'])) {
  		header('WWW-Authenticate: Basic realm="phpICalendar"');
--- 113,116 ----
***************
*** 113,117 ****
  		exit;
  	} else {
! 		if ($_SERVER['PHP_AUTH_USER'] != $auth_internal_username || $_SERVER['PHP_AUTH_PW'] != $auth_internal_password) {
  			header('WWW-Authenticate: Basic realm="phpICalendar"');
  			header('HTTP/1.1 401 Unauthorized');
--- 119,123 ----
  		exit;
  	} else {
! 		if ($_SERVER['PHP_AUTH_USER'] != $phpiCal_config->auth_internal_username || $_SERVER['PHP_AUTH_PW'] != $phpiCal_config->auth_internal_password) {
  			header('WWW-Authenticate: Basic realm="phpICalendar"');
  			header('HTTP/1.1 401 Unauthorized');
***************
*** 122,240 ****
  }

! // only allow publishing if explicitly enabled
! if(PHPICALENDAR_PUBLISHING != 1) {
! 	header('WWW-Authenticate: Basic realm="ERROR: Calendar Publishing is disabled on this server"');
! 	header('HTTP/1.1 401 Unauthorized');
! 	echo 'You must be authorized!';
! 	exit;
! }
! 
! // unpublishing
! if($_SERVER['REQUEST_METHOD'] == 'DELETE') {
! 	// get calendar filename
! 	$calendar_file = $calendar_path.substr($_SERVER['REQUEST_URI'] , ( strrpos($_SERVER['REQUEST_URI'], '/') + 1) ) ;
! 
! 	$calendar_file = urldecode($calendar_file);
! 	
! 	logmsg('received request to delete '.$calendar_file);
! 	
! 	// remove calendar file
! 	if(!unlink($calendar_file))
! 	{
! 		logmsg('unable to delete the calendar file');
! 	}
! 	else
! 	{
! 		logmsg('deleted');
! 	}
! 	return;
! }
! 
! // publishing
! elseif($_SERVER['REQUEST_METHOD'] == 'PUT'){
! 	logmsg('PUT request');
! 
! 	// get calendar data
! 	if($datain = fopen('php://input','r')){
! 		while(!@feof($datain)){
! 			$data .= fgets($datain,4096);
  		}
! 		
! 		@fclose($datain);
! 	}else{
! 		logmsg('unable to read input data');
! 	}
! 	
! 	if(isset($data)){
! 		if (isset($_SERVER['PATH_INFO'])) {
! 			preg_match("/\/([\w\-\.\+ ]*).ics/i",$_SERVER['PATH_INFO'],$matches);
! 			$calendar_name = urldecode($matches[1]);
  		}
! 
! 		// If we don't have it from path info, use the supplied calendar name
! 		if( ! isset($calendar_name) ) {
! 		
! 			$cal_arr = explode("\n",$data);
! 		
! 			foreach($cal_arr as $k => $v){
! 				if(strstr($v,'X-WR-CALNAME:')){
! 					$arr = explode(':',$v);
! 					$calendar_name = trim($arr[1]);
! 					break;
  				}
  			}
! 		}
! 
! 		logmsg('Received request to update: ' . $calendar_name);
! 
! 		// Remove any invalid characters from the filename
! 		$calendar_name = preg_replace( "/[^\w\.\- ]/", '', $calendar_name );
! 
! 		if( ( ! isset($calendar_name) ) || ( $calendar_name == '' ) ) {
! 			header('HTTP/1.1 401 Invalid calendar name');
! 			header('WWW-Authenticate: Basic realm="ERROR: Invalid calendar name."');
! 			echo 'Invalid calendar name.';
! 		}
! 		
! 		// If we don't have a name, assume default
! 		$calendar_name = isset($calendar_name) ? $calendar_name : 'default';
! 
! 		logmsg('Updating calendar: ' . $calendar_name);
! 
! 		// If this is Apple iCal, an event with a blank summary is private - mark as such
! 		if( preg_match( "/Apple.*iCal/", $_SERVER['HTTP_USER_AGENT'] ) ) {
! 			$data = preg_replace(
! 				"/^\s*SUMMARY:\s*$/m",
! 				"SUMMARY: **PRIVATE**\nCLASS:PRIVATE",
! 				$data
! 			);
! 		}

! 		// write to file
! 		if($dataout = fopen($calendar_path.$calendar_name.'.ics','w+')){
! 			fputs($dataout, $data, strlen($data) );
! 			@fclose($dataout);
! 		}else{
! 			logmsg( 'could not open file '.$calendar_path.$calendar_name.'.ics' );
  		}
! 	}
! 	else {
! 		logmsg('PUT ERROR - No data supplied.');
! 	}
! }
! elseif ($_SERVER['REQUEST_METHOD'] == 'GET') {
! 	if (isset($_SERVER['PATH_INFO'])) {
! 		preg_match("/\/([ A-Za-z0-9._]*).ics/i",$_SERVER['PATH_INFO'],$matches);
! 		$icsfile = urldecode($matches[1]);
! 
! 		// get calendar data
! 		if (file_exists($calendar_path . $icsfile . '.ics') &&
! 			is_readable($calendar_path . $icsfile . '.ics') &&
! 			is_file($calendar_path . $icsfile . '.ics')
! 		) {
! 			echo file_get_contents($calendar_path . $icsfile . '.ics');
! 			logmsg('downloaded calendar ' . $icsfile);
  		}
- 	}
  }

--- 128,219 ----
  }

! switch ($_SERVER['REQUEST_METHOD']){
! 	// unpublishing
! 	case 'DELETE':
! 		// get calendar filename
! 		$calendar_file = $calendar_path.substr($_SERVER['REQUEST_URI'] , ( strrpos($_SERVER['REQUEST_URI'], '/') + 1) ) ;
! 		$calendar_file = urldecode($calendar_file);
! 		logmsg('received request to delete '.$calendar_file);
! 		// remove calendar file
! 		if(!unlink($calendar_file)){
! 			logmsg('unable to delete the calendar file');
! 		}else{
! 			logmsg('deleted');
  		}
! 		break;
! 	// publishing
! 	case 'PUT':
! 		logmsg('PUT request');
! 		// get calendar data
! 		# php://input allows you to read raw POST data
! 		if($datain = fopen('php://input','r')){
! 			while(!@feof($datain)){
! 				$data .= fgets($datain,4096);
! 			}
! 			@fclose($datain);
! 		}else{
! 			logmsg('unable to read input data');
  		}
! 		if(isset($data)){
! 			if (isset($_SERVER['PATH_INFO'])) {
! 				preg_match("/\/([\w\-\.\+ ]*).ics/i",$_SERVER['PATH_INFO'],$matches);
! 				$calendar_name = urldecode($matches[1]);
! 			}
! 			// If we don't have it from path info, use the supplied calendar name
! 			if( ! isset($calendar_name) ) {
! 				$cal_arr = explode("\n",$data);
! 				foreach($cal_arr as $k => $v){
! 					if(strstr($v,'X-WR-CALNAME:')){
! 						$arr = explode(':',$v);
! 						$calendar_name = trim($arr[1]);
! 						break;
! 					}
  				}
  			}
! 			logmsg('Received request to update: ' . $calendar_name);
! 			// Remove any invalid characters from the filename
! 			$calendar_name = preg_replace( "/[^\w\.\- ]/", '', $calendar_name );
! 			if( ( ! isset($calendar_name) ) || ( $calendar_name == '' ) ) {
! 				header('HTTP/1.1 401 Invalid calendar name');
! 				header('WWW-Authenticate: Basic realm="ERROR: Invalid calendar name."');
! 				echo 'Invalid calendar name.';
! 			}
! 			// If we don't have a name, assume default
! 			$calendar_name = isset($calendar_name) ? $calendar_name : 'default';
! 			logmsg('Updating calendar: ' . $calendar_name);
! 			// If this is Apple iCal, an event with a blank summary is private - mark as such
! 			if( preg_match( "/Apple.*iCal/", $_SERVER['HTTP_USER_AGENT'] ) ) {
! 				$data = preg_replace(
! 					"/^\s*SUMMARY:\s*$/m",
! 					"SUMMARY: **PRIVATE**\nCLASS:PRIVATE",
! 					$data
! 				);
! 			}
! 			// write to file
! 			if($dataout = fopen($calendar_path.$calendar_name.'.ics','w+')){
! 				fputs($dataout, $data, strlen($data) );
! 				@fclose($dataout);
! 			}else{
! 				logmsg( 'could not open file '.$calendar_path.$calendar_name.'.ics' );
! 			}

! 		}else {
! 			logmsg('PUT ERROR - No data supplied.');
  		}
! 		break;
! 	case 'GET':
! 		if (isset($_SERVER['PATH_INFO'])) {
! 			preg_match("/\/([ A-Za-z0-9._]*).ics/i",$_SERVER['PATH_INFO'],$matches);
! 			$icsfile = urldecode($matches[1]);
! 	
! 			// get calendar data
! 			if (file_exists($calendar_path . $icsfile . '.ics') &&
! 				is_readable($calendar_path . $icsfile . '.ics') &&
! 				is_file($calendar_path . $icsfile . '.ics')
! 			) {
! 				echo file_get_contents($calendar_path . $icsfile . '.ics');
! 				logmsg('downloaded calendar ' . $icsfile);
! 			}
  		}
  }

***************
*** 257,264 ****
  			$user =  $_SERVER['REMOTE_USER'];

! 		$logline = date('Y-m-d H:i:s ') . $_SERVER['REMOTE_ADDR'] . ' ' . $user . ' ' . ${str} . "\n";

  		fputs($logfile, $logline, strlen($logline) );
  	}
  }
! ?>
--- 236,243 ----
  			$user =  $_SERVER['REMOTE_USER'];

! 		$logline = date('Y-m-d H:i:s ') . $_SERVER['REMOTE_ADDR'] . ' ' . $user . ' ' . $str . "\n";

  		fputs($logfile, $logline, strlen($logline) );
  	}
  }
! ?>
\ No newline at end of file