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

[PHPiCalendar-Commits] phpicalendar/functions date_functions.php, 1.52.2.1, 1.52.2.2 event.js, 1.17.2.1, 1.17.2.2

[<par...@us...>]

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

Modified Files:
      Tag: phpicalendar-editor
	date_functions.php event.js 
Log Message:
Some additional progress on editor

Index: date_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v
retrieving revision 1.52.2.1
retrieving revision 1.52.2.2
diff -C2 -d -r1.52.2.1 -r1.52.2.2
*** date_functions.php	10 Feb 2009 19:59:45 -0000	1.52.2.1
--- date_functions.php	23 Feb 2009 21:28:57 -0000	1.52.2.2
***************
*** 222,226 ****
  			static $popup_edit_index = 0;
  			$return = '<script language="JavaScript" type="text/javascript"><!--
! 				var editData = new EditData("' . $arr['calname'] . '", "' . $uid . '");
  				document.edit_data[' . $popup_edit_index . '] = editData;
  				// --></script>' .
--- 222,226 ----
  			static $popup_edit_index = 0;
  			$return = '<script language="JavaScript" type="text/javascript"><!--
! 				var editData = new EditData("' . basename($_SERVER['SCRIPT_FILENAME']) . '", "' . addslashes($uid) . '", "' . addslashes(serialize($arr)) . '");
  				document.edit_data[' . $popup_edit_index . '] = editData;
  				// --></script>' .

Index: event.js
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/event.js,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -C2 -d -r1.17.2.1 -r1.17.2.2
*** event.js	10 Feb 2009 19:59:45 -0000	1.17.2.1
--- event.js	23 Feb 2009 21:28:57 -0000	1.17.2.2
***************
*** 32,47 ****
  	var data = document.edit_data[num];
  	var form = document.forms.editPopupForm;
! 	form.elements.edit_cal.value = data.edit_cal;
  	form.elements.edit_uid.value = data.edit_uid;
  
  	// open a new window
! 	var w = window.open('', 'Popup', 'scrollbars=yes,width=460,height=275');
  	form.target = 'Popup';
  	form.submit();
  }
  
! function EditData(edit_cal, edit_uid) {
! 	this.edit_cal = edit_cal;
  	this.edit_uid = edit_uid;
  }
  
--- 32,49 ----
  	var data = document.edit_data[num];
  	var form = document.forms.editPopupForm;
! 	form.elements.edit_from.value = data.edit_from;
  	form.elements.edit_uid.value = data.edit_uid;
+ 	form.elements.edit_arr.value = data.edit_arr;
  
  	// open a new window
! 	var w = window.open('', 'Popup', 'scrollbars=yes,width=460,height=325');
  	form.target = 'Popup';
  	form.submit();
  }
  
! function EditData(edit_from, edit_uid, edit_arr) {
! 	this.edit_from = edit_from;
  	this.edit_uid = edit_uid;
+ 	this.edit_arr = edit_arr;
  }
  

[PHPiCalendar-Commits] phpicalendar/functions/init sanitize.php, 1.1, 1.1.2.1

[<par...@us...>]

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

Modified Files:
      Tag: phpicalendar-editor
	sanitize.php 
Log Message:
Some additional progress on editor

Index: sanitize.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/sanitize.php,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** sanitize.php	11 Dec 2008 23:48:39 -0000	1.1
--- sanitize.php	23 Feb 2009 21:28:57 -0000	1.1.2.1
***************
*** 33,36 ****
--- 33,52 ----
  }
  
+ 
+ function sanitizeForWeb($string) {
+     $string = preg_replace('/<br\s*\/?>/', "\n", $string);
+ 
+     $string = str_replace('&', '&amp;', $string);
+     $string = str_replace('<', '&lt;', $string);
+     $string = str_replace('>', '&gt;', $string);
+     $string = str_replace('\'', '&#39;', $string);
+     $string = str_replace('"', '&#34;', $string);
+ 
+     $string = str_replace('<br />', "\n", $string);
+     
+     return $string;
+ }
+ 
+ 
  if (!isset($_SERVER) && isset($HTTP_SERVER_VARS)) {
  	$_SERVER = &$HTTP_SERVER_VARS;

[PHPiCalendar-Commits] phpicalendar/functions/init sanitize.php, 1.1, 1.2

[<par...@us...>]

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

Modified Files:
	sanitize.php 
Log Message:
Fix potential XSS issue

Index: sanitize.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/sanitize.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sanitize.php	11 Dec 2008 23:48:39 -0000	1.1
--- sanitize.php	13 Feb 2009 20:52:28 -0000	1.2
***************
*** 33,36 ****
--- 33,52 ----
  }
  
+ 
+ function sanitizeForWeb($string) {
+     $string = preg_replace('/<br\s*\/?>/', "\n", $string);
+ 
+     $string = str_replace('&', '&amp;', $string);
+     $string = str_replace('<', '&lt;', $string);
+     $string = str_replace('>', '&gt;', $string);
+     $string = str_replace('\'', '&#39;', $string);
+     $string = str_replace('"', '&#34;', $string);
+ 
+     $string = str_replace('<br />', "\n", $string);
+     
+     return $string;
+ }
+ 
+ 
  if (!isset($_SERVER) && isset($HTTP_SERVER_VARS)) {
  	$_SERVER = &$HTTP_SERVER_VARS;

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

[<par...@us...>]

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

Modified Files:
	event.php 
Log Message:
Fix potential XSS issue

Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** event.php	26 Jan 2009 03:51:52 -0000	1.51
--- event.php	13 Feb 2009 20:52:29 -0000	1.52
***************
*** 28,34 ****
  }
  
! $event['event_text']  = urldecode($event['event_text']);
! $event['description'] = urldecode($event['description']);
! $event['location']    = urldecode($event['location']);
  $display ='';
  if (isset($event['description'])) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']);
--- 28,34 ----
  }
  
! $event['event_text']  = sanitizeForWeb(urldecode($event['event_text']));
! $event['description'] = sanitizeForWeb(urldecode($event['description']));
! $event['location']    = sanitizeForWeb(urldecode($event['location']));
  $display ='';
  if (isset($event['description'])) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']);

[PHPiCalendar-Commits] phpicalendar/templates/default edit.tpl, NONE, 1.1.2.1

[<par...@us...>]

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

Added Files:
      Tag: phpicalendar-editor
	edit.tpl 
Log Message:
Edit page, first draft

--- NEW FILE: edit.tpl ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
		"http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
<html>
<head>
	<meta http-equiv="content-type" content="text/html;charset={CHARSET}">
	<title>{CAL}</title>
	<link rel="stylesheet" type="text/css" href="../templates/{TEMPLATE}/default.css">
</head>
<body>
<center>
	<table border="0" width="430" cellspacing="0" cellpadding="0" class="calborder">
		<tr>
			<td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{CAL}</div></td>
		</tr>
		<tr>
			<td align="left" class="V12">
				<div style="margin-left: 10px; margin-bottom:10px;">
					<p><b>{L_CALENDAR}</b>: {UID}</p>
				</div>
			</td>
		</tr>
	</table>
</center>
</body>
</html>

[PHPiCalendar-Commits] phpicalendar/includes edit.php, NONE, 1.1.2.1

[<par...@us...>]

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

Added Files:
      Tag: phpicalendar-editor
	edit.php 
Log Message:
Edit page, first draft

--- NEW FILE: edit.php ---
<?php

define('BASE', '../');
include_once(BASE.'functions/init.inc.php');
require_once(BASE.'functions/date_functions.php');
require_once(BASE.'functions/template.php');

# information for the popup is sent via $_POST by a javascript snippet in
# in function openevent() from functions/date_functions.php
# character encoding has been problematic with popups.
$cal    		= stripslashes($_POST['edit_cal']);
$uid    		= stripslashes($_POST['edit_uid']);

$page = new Page(BASE.'templates/'.$phpiCal_config->template.'/edit.tpl');

$page->replace_tags(array(
	'charset'			=> $phpiCal_config->charset,
	'cal' 				=> $cal,
	'uid'      			=> $uid,
	'template'			=> $phpiCal_config->template,
	'l_calendar' 		=> $lang['l_calendar']

	));

$page->output();

?>

[PHPiCalendar-Commits] phpicalendar/functions date_functions.php, 1.52, 1.52.2.1 event.js, 1.17, 1.17.2.1

[<par...@us...>]

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

Modified Files:
      Tag: phpicalendar-editor
	date_functions.php event.js 
Log Message:
Initial UI changes for editing

Index: date_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v
retrieving revision 1.52
retrieving revision 1.52.2.1
diff -C2 -d -r1.52 -r1.52.2.1
*** date_functions.php	5 Feb 2009 15:38:24 -0000	1.52
--- date_functions.php	10 Feb 2009 19:59:45 -0000	1.52.2.1
***************
*** 37,41 ****
  }
  
! // function to compare to dates in Ymd and return the number of weeks 
  // that differ between them. requires dateOfWeek()
  function weekCompare($now, $then) {
--- 37,41 ----
  }
  
! // function to compare to dates in Ymd and return the number of weeks
  // that differ between them. requires dateOfWeek()
  function weekCompare($now, $then) {
***************
*** 49,53 ****
  }
  
! // function to compare to dates in Ymd and return the number of days 
  // that differ between them.
  function dayCompare($now, $then) {
--- 49,53 ----
  }
  
! // function to compare to dates in Ymd and return the number of days
  // that differ between them.
  function dayCompare($now, $then) {
***************
*** 58,66 ****
  	$diff_hours = $diff_minutes/60;
  	$diff_days = round($diff_hours/24);
! 	
  	return $diff_days;
  }
  
! // function to compare to dates in Ymd and return the number of months 
  // that differ between them.
  function monthCompare($now, $then) {
--- 58,66 ----
  	$diff_hours = $diff_minutes/60;
  	$diff_days = round($diff_hours/24);
! 
  	return $diff_days;
  }
  
! // function to compare to dates in Ymd and return the number of months
  // that differ between them.
  function monthCompare($now, $then) {
***************
*** 98,102 ****
  	$month = date("n", $timestamp)-1;
  	$day = date("j", $timestamp);
! 	$dayofweek = date("w", $timestamp);	
  	$weeknumber = date("W", $timestamp);
   	$replacements = array(
--- 98,102 ----
  	$month = date("n", $timestamp)-1;
  	$day = date("j", $timestamp);
! 	$dayofweek = date("w", $timestamp);
  	$weeknumber = date("W", $timestamp);
   	$replacements = array(
***************
*** 110,116 ****
   		'%d' => sprintf("%02d", $day)
   	);
!  	$date = str_replace(array_keys($replacements), array_values($replacements), $format);	
! 	return $date;	
! 	
  }
  // calcOffset takes an offset (ie, -0500) and returns it in the number of seconds
--- 110,116 ----
   		'%d' => sprintf("%02d", $day)
   	);
!  	$date = str_replace(array_keys($replacements), array_values($replacements), $format);
! 	return $date;
! 
  }
  // calcOffset takes an offset (ie, -0500) and returns it in the number of seconds
***************
*** 156,160 ****
  	return $offset;
  }
! /* Returns a string to make event text with a link to popup boxes 
  	$arr is a master array item
  	$lines is the number of lines to restrict the event_text to, using word_wrap
--- 156,160 ----
  	return $offset;
  }
! /* Returns a string to make event text with a link to popup boxes
  	$arr is a master array item
  	$lines is the number of lines to restrict the event_text to, using word_wrap
***************
*** 162,170 ****
  	$link_class is a css class
  	$pre_text and $post_text are to add tags around the link text (e.g. <b> or<i>)
! 	
  	$title is the tooltip for the link
  */
  function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $link_class = '', $pre_text = '', $post_text = '') {
! 	global $cpath, $timeFormat, $dateFormat_week;
  	$return = '';
  	$event_text = stripslashes(urldecode($arr["event_text"]));
--- 162,170 ----
  	$link_class is a css class
  	$pre_text and $post_text are to add tags around the link text (e.g. <b> or<i>)
! 
  	$title is the tooltip for the link
  */
  function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $link_class = '', $pre_text = '', $post_text = '') {
! 	global $cpath, $timeFormat, $dateFormat_week, $phpiCal_config, $username, $password, $invalid_login, $lang;
  	$return = '';
  	$event_text = stripslashes(urldecode($arr["event_text"]));
***************
*** 217,220 ****
--- 217,233 ----
  		}
  		$return .= $pre_text.$event_text.$post_text.'</a>'."\n";
+ 
+ 		// Require a valid user login to edit calendar events
+ 		if (($phpiCal_config->allow_edit == 'yes') && ($invalid_login === false) && ($username != '') && ($password != '')) {
+ 			static $popup_edit_index = 0;
+ 			$return = '<script language="JavaScript" type="text/javascript"><!--
+ 				var editData = new EditData("' . $arr['calname'] . '", "' . $uid . '");
+ 				document.edit_data[' . $popup_edit_index . '] = editData;
+ 				// --></script>' .
+ 				'<a href="#" title="' . $lang['l_edit_event'] . '" onclick="openEditWindow(' . $popup_edit_index . '); return false;">' .
+ 				'<img alt="' . $lang['l_edit'] . '" src="' . BASE . 'templates/' . $phpiCal_config->template . '/images/pencil.gif" border="0" />' .
+ 				'</a> ' . $return;
+ 			$popup_edit_index++;
+ 		}
  	}
  
***************
*** 228,233 ****
  	$property	= The property being examined, e.g. DTSTART, DTEND.
  	$field		= The full field being examined, e.g. DTSTART;TZID=US/Pacific
! 	
! See:http://phpicalendar.org/documentation/index.php/Property_Value_Data_Types#4.3.5___Date-Time	
  */
  function extractDateTime($data, $property, $field) {
--- 241,246 ----
  	$property	= The property being examined, e.g. DTSTART, DTEND.
  	$field		= The full field being examined, e.g. DTSTART;TZID=US/Pacific
! 
! See:http://phpicalendar.org/documentation/index.php/Property_Value_Data_Types#4.3.5___Date-Time
  */
  function extractDateTime($data, $property, $field) {
***************
*** 244,255 ****
  		$tz_dt = 'GMT';
  	}
! 	
  	// Extract date-only values.
  	if ((preg_match('/^'.$property.';VALUE=DATE:/i', $field)) || (ereg ('^([0-9]{4})([0-9]{2})([0-9]{2})$', $data)))  {
  		// Pull out the date value. Minimum year is 1970.
  		ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $data, $dt_check);
! 		if ($dt_check[1] < 1970) { 
  			$dt_check[1] = '1970';
! 		}		
  		# convert to date-time
  		$data = $dt_check[1].$dt_check[2].$dt_check[3]."T000000";
--- 257,268 ----
  		$tz_dt = 'GMT';
  	}
! 
  	// Extract date-only values.
  	if ((preg_match('/^'.$property.';VALUE=DATE:/i', $field)) || (ereg ('^([0-9]{4})([0-9]{2})([0-9]{2})$', $data)))  {
  		// Pull out the date value. Minimum year is 1970.
  		ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $data, $dt_check);
! 		if ($dt_check[1] < 1970) {
  			$dt_check[1] = '1970';
! 		}
  		# convert to date-time
  		$data = $dt_check[1].$dt_check[2].$dt_check[3]."T000000";
***************
*** 261,265 ****
  	preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})T{0,1}([0-9]{0,2})([0-9]{0,2})/', $data, $regs);
  	if (!isset ($regs[1])) return;
! 	if ($regs[1] < 1970) { 
  		$regs[1] = '1970';
  	}
--- 274,278 ----
  	preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})T{0,1}([0-9]{0,2})([0-9]{0,2})/', $data, $regs);
  	if (!isset ($regs[1])) return;
! 	if ($regs[1] < 1970) {
  		$regs[1] = '1970';
  	}
***************
*** 283,287 ****
  	$date = date('Ymd', $unixtime);
  	if ($allday == '') $time = date('Hi', $unixtime);
! 		
  	// Return the results.
  	return array($unixtime, $date, $time, $allday, $tz_dt);
--- 296,300 ----
  	$date = date('Ymd', $unixtime);
  	if ($allday == '') $time = date('Hi', $unixtime);
! 
  	// Return the results.
  	return array($unixtime, $date, $time, $allday, $tz_dt);
***************
*** 301,303 ****
  	}
  	return $data;
! }?>
\ No newline at end of file
--- 314,316 ----
  	}
  	return $data;
! }?>

Index: event.js
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/event.js,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -d -r1.17 -r1.17.2.1
*** event.js	19 May 2007 16:18:13 -0000	1.17
--- event.js	10 Feb 2009 19:59:45 -0000	1.17.2.1
***************
*** 10,14 ****
  	form.elements.cpath.value = data.cpath;
  	form.elements.event_data.value = data.event_data;
! 	
  	// open a new window
  	var w = window.open('', 'Popup', 'scrollbars=yes,width=460,height=275');
--- 10,14 ----
  	form.elements.cpath.value = data.cpath;
  	form.elements.event_data.value = data.event_data;
! 
  	// open a new window
  	var w = window.open('', 'Popup', 'scrollbars=yes,width=460,height=275');
***************
*** 24,33 ****
  	this.event_data = event_data;
  }
- //-->
- </script>
- <script language="JavaScript" type="text/javascript">
- <!--
  
! function openTodoInfo(num) {	
  	// populate the hidden form
  	var data = document.todo_popup_data[num];
--- 24,53 ----
  	this.event_data = event_data;
  }
  
! document.popup_data = new Array();
! 
! 
! function openEditWindow(num) {
! 	// populate the hidden form
! 	var data = document.edit_data[num];
! 	var form = document.forms.editPopupForm;
! 	form.elements.edit_cal.value = data.edit_cal;
! 	form.elements.edit_uid.value = data.edit_uid;
! 
! 	// open a new window
! 	var w = window.open('', 'Popup', 'scrollbars=yes,width=460,height=275');
! 	form.target = 'Popup';
! 	form.submit();
! }
! 
! function EditData(edit_cal, edit_uid) {
! 	this.edit_cal = edit_cal;
! 	this.edit_uid = edit_uid;
! }
! 
! document.edit_data = new Array();
! 
! 
! function openTodoInfo(num) {
  	// populate the hidden form
  	var data = document.todo_popup_data[num];
***************
*** 41,44 ****
--- 61,65 ----
  	form.submit();
  }
+ 
  function TodoData(todo_data,todo_text) {
  	this.todo_data = todo_data;
***************
*** 46,50 ****
  }
  
- document.popup_data = new Array();
  document.todo_popup_data = new Array();
  //-->
--- 67,70 ----

[PHPiCalendar-Commits] phpicalendar/templates/default/images pencil.gif, NONE, 1.1.2.1

[<par...@us...>]

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

Added Files:
      Tag: phpicalendar-editor
	pencil.gif 
Log Message:
Initial UI changes for editing

--- NEW FILE: pencil.gif ---
(This appears to be a binary file; contents omitted.)

[PHPiCalendar-Commits] phpicalendar/templates/grey/images pencil.gif, NONE, 1.1.2.1

[<par...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/templates/grey/images
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23263/templates/grey/images

Added Files:
      Tag: phpicalendar-editor
	pencil.gif 
Log Message:
Initial UI changes for editing

--- NEW FILE: pencil.gif ---
(This appears to be a binary file; contents omitted.)

[PHPiCalendar-Commits] phpicalendar/templates/tan/images pencil.gif, NONE, 1.1.2.1

[<par...@us...>]

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

Added Files:
      Tag: phpicalendar-editor
	pencil.gif 
Log Message:
Initial UI changes for editing

--- NEW FILE: pencil.gif ---
(This appears to be a binary file; contents omitted.)

[PHPiCalendar-Commits] phpicalendar/templates/red/images pencil.gif, NONE, 1.1.2.1

[<par...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/templates/red/images
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23263/templates/red/images

Added Files:
      Tag: phpicalendar-editor
	pencil.gif 
Log Message:
Initial UI changes for editing

--- NEW FILE: pencil.gif ---
(This appears to be a binary file; contents omitted.)

[PHPiCalendar-Commits] phpicalendar/templates/default header.tpl, 1.16, 1.16.2.1

[<par...@us...>]

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

Modified Files:
      Tag: phpicalendar-editor
	header.tpl 
Log Message:
Initial UI changes for editing

Index: header.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/header.tpl,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -d -r1.16 -r1.16.2.1
*** header.tpl	20 Dec 2008 00:33:14 -0000	1.16
--- header.tpl	10 Feb 2009 19:59:45 -0000	1.16.2.1
***************
*** 8,12 ****
  	<!-- switch rss_available on -->
  	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
! 	<!-- switch rss_available off -->		
  	{EVENT_JS}
  </head>
--- 8,12 ----
  	<!-- switch rss_available on -->
  	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
! 	<!-- switch rss_available off -->
  	{EVENT_JS}
  </head>
***************
*** 19,22 ****
--- 19,26 ----
    <input type="hidden" name="event_data" id="event_data" value="" />
  </form>
+ <form name="editPopupForm" id="editPopupForm" method="post" action="includes/edit.php" style="display: none;">
+   <input type="hidden" name="edit_cal" id="edit_cal" value="" />
+   <input type="hidden" name="edit_uid" id="edit_uid" value="" />
+ </form>
  <form name="todoPopupForm" id="todoPopupForm" method="post" action="includes/todo.php" style="display: none;">
    <input type="hidden" name="todo_data" id="todo_data" value="" />

[PHPiCalendar-Commits] phpicalendar/languages english.inc.php, 1.73, 1.73.2.1

[<par...@us...>]

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

Modified Files:
      Tag: phpicalendar-editor
	english.inc.php 
Log Message:
Initial UI changes for editing

Index: english.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v
retrieving revision 1.73
retrieving revision 1.73.2.1
diff -C2 -d -r1.73 -r1.73.2.1
*** english.inc.php	2 Jan 2009 07:12:12 -0000	1.73
--- english.inc.php	10 Feb 2009 19:59:45 -0000	1.73.2.1
***************
*** 88,94 ****
  $lang['l_priority_none']	= 'None';
  $lang['l_status']			= 'Status';
! $lang['l_status_confirmed'] = 'CONFIRMED' ; 
! $lang['l_status_cancelled'] = 'CANCELLED'; 
! $lang['l_status_tentative'] = 'TENTATIVE'; 
  $lang['l_todo']				= 'To do items';
  $lang['l_unfinished']		= 'Unfinished';
--- 88,94 ----
  $lang['l_priority_none']	= 'None';
  $lang['l_status']			= 'Status';
! $lang['l_status_confirmed'] = 'CONFIRMED' ;
! $lang['l_status_cancelled'] = 'CANCELLED';
! $lang['l_status_tentative'] = 'TENTATIVE';
  $lang['l_todo']				= 'To do items';
  $lang['l_unfinished']		= 'Unfinished';
***************
*** 144,147 ****
--- 144,152 ----
  $lang['l_year_view'] 	= 'Year View';
  
+ 
+ // New is version 2.32
+ $lang['l_edit']			= 'Edit';
+ $lang['l_edit_event']	= 'Edit Event';
+ 
  // ---------------------------------
  
***************
*** 190,196 ****
  /*
  Notes about dateFormat_*
! 	The pieces are similar to that of the PHP function strftime(), 
  	however only the following is supported at this time:
! 	
  	%A - the full week day name as specified in $daysofweek_lang
  	%a - the shortened week day name as specified in $daysofweekshort_lang
--- 195,201 ----
  /*
  Notes about dateFormat_*
! 	The pieces are similar to that of the PHP function strftime(),
  	however only the following is supported at this time:
! 
  	%A - the full week day name as specified in $daysofweek_lang
  	%a - the shortened week day name as specified in $daysofweekshort_lang
***************
*** 217,219 ****
  $lang['l_prefs_off']			= 'Preferences are disabled on this installation.';
  
! ?>
\ No newline at end of file
--- 222,224 ----
  $lang['l_prefs_off']			= 'Preferences are disabled on this installation.';
  
! ?>

[PHPiCalendar-Commits] phpicalendar default_config.php, 1.21, 1.21.2.1

[<par...@us...>]

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

Modified Files:
      Tag: phpicalendar-editor
	default_config.php 
Log Message:
Initial UI changes for editing

Index: default_config.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C2 -d -r1.21 -r1.21.2.1
*** default_config.php	2 Feb 2009 04:11:59 -0000	1.21
--- default_config.php	10 Feb 2009 19:59:45 -0000	1.21.2.1
***************
*** 10,14 ****
  #=================Initialize global variables=================================
  // Define some magic strings.
! 		$this->ALL_CALENDARS_COMBINED = 'all_calendars_combined971';	
  		$this->template 				= 'default';		// Template support
  		$this->default_view 			= 'day';			// Default view for calendars = 'day', 'week', 'month', 'year'
--- 10,14 ----
  #=================Initialize global variables=================================
  // Define some magic strings.
! 		$this->ALL_CALENDARS_COMBINED = 'all_calendars_combined971';
  		$this->template 				= 'default';		// Template support
  		$this->default_view 			= 'day';			// Default view for calendars = 'day', 'week', 'month', 'year'
***************
*** 35,39 ****
  		$this->cpath	     			= ''; 				// optional subdirectory
  		$this->charset					= 'UTF-8';			// Character set your calendar is in, suggested UTF-8, or iso-8859-1 for most languages.
! 		
  		// Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
  		$this->allow_webcals 			= 'no';				// Allow http:// and webcal:// prefixed URLs to be used as the $this->cal for remote viewing of "subscribe-able" calendars. This does not have to be enabled to allow specific ones below.
--- 35,39 ----
  		$this->cpath	     			= ''; 				// optional subdirectory
  		$this->charset					= 'UTF-8';			// Character set your calendar is in, suggested UTF-8, or iso-8859-1 for most languages.
! 
  		// Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
  		$this->allow_webcals 			= 'no';				// Allow http:// and webcal:// prefixed URLs to be used as the $this->cal for remote viewing of "subscribe-able" calendars. This does not have to be enabled to allow specific ones below.
***************
*** 52,66 ****
  		$this->support_ical				= 'no';			// Set to yes to support the Apple iCal calendar database structure.
  		$this->recursive_path			= 'no';			// Set to yes to recurse into subdirectories of the calendar path.
! 		
  		// Calendar Caching (decreases page load times)
  		$this->save_parsed_cals 		= 'no';				// Saves a copy of the cal in /tmp after it's been parsed. Improves performance.
  		$this->tmp_dir					= '/tmp';			// The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X). Any php-writable folder works.
  		$this->webcal_hours				= '24';				// Number of hours to cache webcals. Setting to '0' will always re-parse webcals.
! 		
  		// Webdav style publishing
  		$this->phpicalendar_publishing 	= '0';				// Set to '1' to enable remote webdav style publish. See 'calendars/publish.php' for complete information;
! 		
  		// Administration settings (/admin/)
! 		$this->allow_admin				= 'no';			// Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $this->auth_method			
  		$this->auth_method				= 'internal';			// Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $this->auth_internal_username and $this->auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic.
  		$this->auth_internal_username	= 'admin';			// Only used if $this->auth_method='internal'. The username for the administrator.
--- 52,67 ----
  		$this->support_ical				= 'no';			// Set to yes to support the Apple iCal calendar database structure.
  		$this->recursive_path			= 'no';			// Set to yes to recurse into subdirectories of the calendar path.
! 		$this->allow_edit				= 'no';			// Set to yes to allow authenticated users to edit calendar events.
! 
  		// Calendar Caching (decreases page load times)
  		$this->save_parsed_cals 		= 'no';				// Saves a copy of the cal in /tmp after it's been parsed. Improves performance.
  		$this->tmp_dir					= '/tmp';			// The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X). Any php-writable folder works.
  		$this->webcal_hours				= '24';				// Number of hours to cache webcals. Setting to '0' will always re-parse webcals.
! 
  		// Webdav style publishing
  		$this->phpicalendar_publishing 	= '0';				// Set to '1' to enable remote webdav style publish. See 'calendars/publish.php' for complete information;
! 
  		// Administration settings (/admin/)
! 		$this->allow_admin				= 'no';			// Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $this->auth_method
  		$this->auth_method				= 'internal';			// Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $this->auth_internal_username and $this->auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic.
  		$this->auth_internal_username	= 'admin';			// Only used if $this->auth_method='internal'. The username for the administrator.
***************
*** 72,83 ****
  		// Calendar colors
  		//
! 		// You can increase the number of unique colors by adding additional images (monthdot_n.gif) 
  		// and in the css file (default.css) classes .alldaybg_n, .eventbg_n and .eventbg2_n
  		// Colors will repeat from the beginning for calendars past $this->unique_colors (7 by default), with no limit.
! 		$this->unique_colors			= '7';	
! 		
  		return true;
! 	}	
! 	
  	public static function getInstance(){
  		if (empty(self::$instance)){
--- 73,84 ----
  		// Calendar colors
  		//
! 		// You can increase the number of unique colors by adding additional images (monthdot_n.gif)
  		// and in the css file (default.css) classes .alldaybg_n, .eventbg_n and .eventbg2_n
  		// Colors will repeat from the beginning for calendars past $this->unique_colors (7 by default), with no limit.
! 		$this->unique_colors			= '7';
! 
  		return true;
! 	}
! 
  	public static function getInstance(){
  		if (empty(self::$instance)){
***************
*** 86,90 ****
  		return self::$instance;
  	}
! 	
  	# val can be an array
  	public function setProperty($key,$val){
--- 87,91 ----
  		return self::$instance;
  	}
! 
  	# val can be an array
  	public function setProperty($key,$val){

[PHPiCalendar-Commits] phpicalendar/templates/green/images pencil.gif, NONE, 1.1.2.1

[<par...@us...>]

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

Added Files:
      Tag: phpicalendar-editor
	pencil.gif 
Log Message:
Initial UI changes for editing

--- NEW FILE: pencil.gif ---
(This appears to be a binary file; contents omitted.)

[PHPiCalendar-Commits] phpicalendar/functions userauth_functions.php, 1.9, 1.10

[<par...@us...>]

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

Modified Files:
	userauth_functions.php 
Log Message:
Return username and password (if available) when using HTTP auth

Index: userauth_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/userauth_functions.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** userauth_functions.php	5 Feb 2009 22:30:49 -0000	1.9
--- userauth_functions.php	9 Feb 2009 16:10:11 -0000	1.10
***************
*** 5,9 ****
  function login_querys() {
  	global $QUERY_STRING;
! 	
  	// Remove the username, password, and action values.
  	$querys = preg_replace('/(username|password|action)=[^&]+/', '', $QUERY_STRING);
--- 5,9 ----
  function login_querys() {
  	global $QUERY_STRING;
! 
  	// Remove the username, password, and action values.
  	$querys = preg_replace('/(username|password|action)=[^&]+/', '', $QUERY_STRING);
***************
*** 19,30 ****
  function logout_querys() {
  	global $QUERY_STRING;
! 	
  	// Make sure the action is logout.
  	$querys = preg_replace('/action=[^&]+/', 'action=logout', $QUERY_STRING);
  	if ($querys == $QUERY_STRING) $querys .= '&action=logout';
! 	
  	// Remove references to the username or password.
  	$querys = preg_replace('/(username|password)=[^&]+/', '', $querys);
! 	
  	// Return the logout query string.
  	$querys = preg_replace('/&&/', '', $querys);
--- 19,30 ----
  function logout_querys() {
  	global $QUERY_STRING;
! 
  	// Make sure the action is logout.
  	$querys = preg_replace('/action=[^&]+/', 'action=logout', $QUERY_STRING);
  	if ($querys == $QUERY_STRING) $querys .= '&action=logout';
! 
  	// Remove references to the username or password.
  	$querys = preg_replace('/(username|password)=[^&]+/', '', $querys);
! 
  	// Return the logout query string.
  	$querys = preg_replace('/&&/', '', $querys);
***************
*** 45,55 ****
  function user_login() {
  	global $phpiCal_config, $locked_map;
! 	
  	// Initialize return values.
  	$invalid_login = false;
  	$username = ''; $password = '';
! 	
  	// If not HTTP authenticated, try login via cookies or the web page.
  	if (isset($_SERVER['PHP_AUTH_USER'])) {
  		return array($username, $password, $invalid_login);
  	}
--- 45,58 ----
  function user_login() {
  	global $phpiCal_config, $locked_map;
! 
  	// Initialize return values.
  	$invalid_login = false;
  	$username = ''; $password = '';
! 
  	// If not HTTP authenticated, try login via cookies or the web page.
  	if (isset($_SERVER['PHP_AUTH_USER'])) {
+ 		$username = $_SERVER['PHP_AUTH_USER'];
+ 		if (isset($_SERVER['PHP_AUTH_PW'])) $password = $_SERVER['PHP_AUTH_PW'];
+ 
  		return array($username, $password, $invalid_login);
  	}
***************
*** 63,67 ****
  		}
  	}
! 	
  	// Look for session authentication.
  	if ($phpiCal_config->login_cookies != 'yes') {
--- 66,70 ----
  		}
  	}
! 
  	// Look for session authentication.
  	if ($phpiCal_config->login_cookies != 'yes') {
***************
*** 75,91 ****
  		}
  	}
! 	
  	// Look for a new username and password.
! # Should only take these from post?	
  #	if (isset($_GET['username'], $_GET['password'])){
  #		$username = $_GET['username'];
  #		$password = $_GET['password'];
! #	} else 
! 	
  	if (isset($_POST['username'], $_POST['password'])){
  		$username = $_POST['username'];
  		$password = $_POST['password'];
  	}
! 	
  	// Check to make sure the username and password is valid.
  	if (!array_key_exists("$username:$password", $locked_map)) {
--- 78,94 ----
  		}
  	}
! 
  	// Look for a new username and password.
! # Should only take these from post?
  #	if (isset($_GET['username'], $_GET['password'])){
  #		$username = $_GET['username'];
  #		$password = $_GET['password'];
! #	} else
! 
  	if (isset($_POST['username'], $_POST['password'])){
  		$username = $_POST['username'];
  		$password = $_POST['password'];
  	}
! 
  	// Check to make sure the username and password is valid.
  	if (!array_key_exists("$username:$password", $locked_map)) {
***************
*** 94,98 ****
  		return array($username, $password, true);
  	}
! 	
  	// Set the login cookie or session authentication values.
  	if ($login_cookies == 'yes') {
--- 97,101 ----
  		return array($username, $password, true);
  	}
! 
  	// Set the login cookie or session authentication values.
  	if ($login_cookies == 'yes') {
***************
*** 103,107 ****
  		$_SESSION['password'] = $password;
  	}
! 	
  	// Return the username and password.
  	return array($username, $password, $invalid_login);
--- 106,110 ----
  		$_SESSION['password'] = $password;
  	}
! 
  	// Return the username and password.
  	return array($username, $password, $invalid_login);
***************
*** 114,118 ****
  function user_logout() {
  	global $phpiCal_config;
! 	
  	// Clear the login cookie or session authentication values.
  	if ($phpiCal_config->login_cookies == 'yes') {
--- 117,121 ----
  function user_logout() {
  	global $phpiCal_config;
! 
  	// Clear the login cookie or session authentication values.
  	if ($phpiCal_config->login_cookies == 'yes') {
***************
*** 124,133 ****
  			setcookie(session_name(), session_id(), time()+(60*60*24*7*12*10), '/', $phpiCal_config->cookie_uri, 0);
  		}
! 	
  		// Clear the session authentication values.
  		unset($_SESSION['username']);
  		unset($_SESSION['password']);
  	}
! 	
  	// Return empty username and password.
  	return array('', '');
--- 127,136 ----
  			setcookie(session_name(), session_id(), time()+(60*60*24*7*12*10), '/', $phpiCal_config->cookie_uri, 0);
  		}
! 
  		// Clear the session authentication values.
  		unset($_SESSION['username']);
  		unset($_SESSION['password']);
  	}
! 
  	// Return empty username and password.
  	return array('', '');

[PHPiCalendar-Commits] phpicalendar/functions userauth_functions.php, 1.8, 1.9

[<par...@us...>]

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

Modified Files:
	userauth_functions.php 
Log Message:
Fix cookie_uri setting when login_cookies is enabled

Index: userauth_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/userauth_functions.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** userauth_functions.php	31 Dec 2008 11:16:34 -0000	1.8
--- userauth_functions.php	5 Feb 2009 22:30:49 -0000	1.9
***************
*** 98,102 ****
  	if ($login_cookies == 'yes') {
  		$the_cookie = serialize(array('username' => $username, 'password' => $password));
! 		setcookie('phpicalendar_login', $the_cookie, time()+(60*60*24*7*12*10), '/', $cookie_uri, 0);
  	} else {
  		$_SESSION['username'] = $username;
--- 98,102 ----
  	if ($login_cookies == 'yes') {
  		$the_cookie = serialize(array('username' => $username, 'password' => $password));
! 		setcookie('phpicalendar_login', $the_cookie, time()+(60*60*24*7*12*10), '/', $phpiCal_config->cookie_uri, 0);
  	} else {
  		$_SESSION['username'] = $username;

[PHPiCalendar-Commits] phpicalendar/templates/red calendar_nav.tpl, 1.2, 1.3

[<par...@us...>]

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

Modified Files:
	calendar_nav.tpl 
Log Message:
Invalid HTML: Bug #2564836

Index: calendar_nav.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/red/calendar_nav.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** calendar_nav.tpl	19 Dec 2008 21:15:53 -0000	1.2
--- calendar_nav.tpl	5 Feb 2009 15:43:19 -0000	1.3
***************
*** 91,95 ****
  						</tr>
  						<tr>
! 							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
  						</tr>
  					</table>
--- 91,95 ----
  						</tr>
  						<tr>
! 							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
  						</tr>
  					</table>

[PHPiCalendar-Commits] phpicalendar/templates/tan calendar_nav.tpl, 1.2, 1.3

[<par...@us...>]

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

Modified Files:
	calendar_nav.tpl 
Log Message:
Invalid HTML: Bug #2564836

Index: calendar_nav.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/tan/calendar_nav.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** calendar_nav.tpl	19 Dec 2008 21:15:53 -0000	1.2
--- calendar_nav.tpl	5 Feb 2009 15:43:19 -0000	1.3
***************
*** 91,95 ****
  						</tr>
  						<tr>
! 							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
  						</tr>
  					</table>
--- 91,95 ----
  						</tr>
  						<tr>
! 							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
  						</tr>
  					</table>

[PHPiCalendar-Commits] phpicalendar/templates/default calendar_nav.tpl, 1.17, 1.18

[<par...@us...>]

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

Modified Files:
	calendar_nav.tpl 
Log Message:
Invalid HTML: Bug #2564836

Index: calendar_nav.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/calendar_nav.tpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** calendar_nav.tpl	19 Dec 2008 21:15:53 -0000	1.17
--- calendar_nav.tpl	5 Feb 2009 15:43:18 -0000	1.18
***************
*** 91,95 ****
  						</tr>
  						<tr>
! 							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
  						</tr>
  					</table>
--- 91,95 ----
  						</tr>
  						<tr>
! 							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
  						</tr>
  					</table>

[PHPiCalendar-Commits] phpicalendar/templates/grey calendar_nav.tpl, 1.2, 1.3

[<par...@us...>]

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

Modified Files:
	calendar_nav.tpl 
Log Message:
Invalid HTML: Bug #2564836

Index: calendar_nav.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/grey/calendar_nav.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** calendar_nav.tpl	19 Dec 2008 21:15:53 -0000	1.2
--- calendar_nav.tpl	5 Feb 2009 15:43:19 -0000	1.3
***************
*** 91,95 ****
  						</tr>
  						<tr>
! 							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
  						</tr>
  					</table>
--- 91,95 ----
  						</tr>
  						<tr>
! 							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
  						</tr>
  					</table>

[PHPiCalendar-Commits] phpicalendar/templates/green calendar_nav.tpl, 1.2, 1.3

[<par...@us...>]

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

Modified Files:
	calendar_nav.tpl 
Log Message:
Invalid HTML: Bug #2564836

Index: calendar_nav.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/green/calendar_nav.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** calendar_nav.tpl	19 Dec 2008 21:15:53 -0000	1.2
--- calendar_nav.tpl	5 Feb 2009 15:43:18 -0000	1.3
***************
*** 91,95 ****
  						</tr>
  						<tr>
! 							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
  						</tr>
  					</table>
--- 91,95 ----
  						</tr>
  						<tr>
! 							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
  						</tr>
  					</table>

[PHPiCalendar-Commits] phpicalendar/templates/green print.tpl, 1.2, 1.3

[<par...@us...>]

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

Modified Files:
	print.tpl 
Log Message:
Fix print-view cpath overriding: Bug #2564813

Index: print.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/green/print.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** print.tpl	29 Dec 2008 05:23:46 -0000	1.2
--- print.tpl	5 Feb 2009 15:41:22 -0000	1.3
***************
*** 7,19 ****
  				<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}" title="{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}" title="{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}" title="{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}" title="{L_YEAR}" border="0" /></a></td>
  							</tr>
  						</table>
--- 7,19 ----
  				<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}">{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;getdate={GETDATE}&amp;printview=day"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{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}" title="{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}" title="{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}" title="{L_YEAR}" border="0" /></a></td>
  							</tr>
  						</table>

[PHPiCalendar-Commits] phpicalendar/templates/tan print.tpl, 1.3, 1.4

[<par...@us...>]

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

Modified Files:
	print.tpl 
Log Message:
Fix print-view cpath overriding: Bug #2564813

Index: print.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/tan/print.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** print.tpl	29 Dec 2008 05:23:46 -0000	1.3
--- print.tpl	5 Feb 2009 15:41:23 -0000	1.4
***************
*** 7,19 ****
  				<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}" title="{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}" title="{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}" title="{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}" title="{L_YEAR}" border="0" /></a></td>
  							</tr>
  						</table>
--- 7,19 ----
  				<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}">{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;getdate={GETDATE}&amp;printview=day"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{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}" title="{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}" title="{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}" title="{L_YEAR}" border="0" /></a></td>
  							</tr>
  						</table>

[PHPiCalendar-Commits] phpicalendar/templates/red print.tpl, 1.2, 1.3

[<par...@us...>]

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

Modified Files:
	print.tpl 
Log Message:
Fix print-view cpath overriding: Bug #2564813

Index: print.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/red/print.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** print.tpl	29 Dec 2008 05:23:46 -0000	1.2
--- print.tpl	5 Feb 2009 15:41:22 -0000	1.3
***************
*** 7,19 ****
  				<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}" title="{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}" title="{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}" title="{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}" title="{L_YEAR}" border="0" /></a></td>
  							</tr>
  						</table>
--- 7,19 ----
  				<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}">{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;getdate={GETDATE}&amp;printview=day"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{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}" title="{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}" title="{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}" title="{L_YEAR}" border="0" /></a></td>
  							</tr>
  						</table>