[PHPiCalendar-Commits] phpicalendar/functions template.php, 1.117, 1.118

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

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

Modified Files:
	template.php 
Log Message:
Better handling of URLs and email addresses in event descriptions (also strip "blocked" protocols, added by some mail servers)

Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** template.php	27 May 2009 16:47:40 -0000	1.117
--- template.php	29 May 2009 15:30:48 -0000	1.118
***************
*** 91,96 ****
  							$description 	= sanitizeForWeb(stripslashes(urldecode($new_val2['description'])));
  							if (!empty($description)) {
! 								$description = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>', $description);
! 								$description = ereg_replace("[a-zA-Z0-9_.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}", '<a href="mailto:\0">\0</a>', $description);
  							}
  
--- 91,96 ----
  							$description 	= sanitizeForWeb(stripslashes(urldecode($new_val2['description'])));
  							if (!empty($description)) {
! 								$description = ereg_replace("(blocked)?([[:alpha:]]+://([^<>&[:space:]]|&amp;)+[[:alnum:]/])", '<a target="_new" href="\2">\2</a>', $description);
! 								$description = ereg_replace("(blocked)?(mailto:)?([[:alnum:]_.%+-]+@[[:alnum:].-]+\.[[:alpha:]]{2,4})", '<a href="mailto:\3">\3</a>', $description);
  							}