Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28517/includes
Modified Files:
event.php
Log Message:
Better handling of URLs and email addresses in event descriptions (also strip "blocked" protocols, added by some mail servers)
Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** event.php 26 May 2009 20:50:57 -0000 1.55
--- event.php 29 May 2009 15:30:49 -0000 1.56
***************
*** 32,37 ****
$event['location'] = sanitizeForWeb(urldecode($event['location']));
if (isset($event['description'])) {
! $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]", '<a target="_new" href="\0">\0</a>', $event['description']);
! $event['description'] = ereg_replace("[a-zA-Z0-9_.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}", '<a href="mailto:\0">\0</a>', $event['description']);
}
--- 32,37 ----
$event['location'] = sanitizeForWeb(urldecode($event['location']));
if (isset($event['description'])) {
! $event['description'] = ereg_replace("(blocked)?([[:alpha:]]+://([^<>&[:space:]]|&)+[[:alnum:]/])", '<a target="_new" href="\2">\2</a>', $event['description']);
! $event['description'] = ereg_replace("(blocked)?(mailto:)?([[:alnum:]_.%+-]+@[[:alnum:].-]+\.[[:alpha:]]{2,4})", '<a href="mailto:\3">\3</a>', $event['description']);
}
|
