From 335d3c5c9c0b24ff5e07cd1968236a8dbc4f2c70 Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Mon, 20 Feb 2017 18:12:46 +0100 Subject: PHP 7 compatibility from Sourceforge #680 --- includes/event.php | 4 ++-- includes/todo.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'includes') diff --git a/includes/event.php b/includes/event.php index 8b98c26..c5b2924 100644 --- a/includes/event.php +++ b/includes/event.php @@ -31,8 +31,8 @@ $event['event_text'] = sanitizeForWeb(urldecode($event['event_text'])); $event['description'] = sanitizeForWeb(urldecode($event['description'])); $event['location'] = sanitizeForWeb(urldecode($event['location'])); if (isset($event['description'])) { - $event['description'] = ereg_replace("(blocked)?([[:alpha:]]+://([^<>&[:space:]]|&)+[[:alnum:]/])", '\2', $event['description']); - $event['description'] = ereg_replace("(blocked)?(mailto:)?([[:alnum:]_.%+-]+@[[:alnum:].-]+\.[[:alpha:]]{2,4})", '\3', $event['description']); + $event['description'] = preg_replace("#(blocked)?([[:alpha:]]+://([^<>&[:space:]]|&)+[[:alnum:]/])#", '\2', $event['description']); + $event['description'] = preg_replace("#(blocked)?(mailto:)?([[:alnum:]_.%+-]+@[[:alnum:].-]+\.[[:alpha:]]{2,4})#", '\3', $event['description']); } if (isset($organizer) && is_array($organizer)) { diff --git a/includes/todo.php b/includes/todo.php index 1cefcdc..90514aa 100644 --- a/includes/todo.php +++ b/includes/todo.php @@ -18,8 +18,8 @@ $due_date = (isset($vtodo_array['due_date'])) ? localizeDate ($dateFormat_day, $priority = (isset($vtodo_array['priority'])) ? $vtodo_array['priority'] : (''); $cal_title_full = $calendar_name.' '.$lang['l_calendar']; -$description = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]", '\0', $description); -$vtodo_text = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'\0',$vtodo_text); +$description = preg_replace("#[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]#", '\0', $description); +$vtodo_text = preg_replace("#[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]#",'\0',$vtodo_text); if ((!isset($status) || $status == "COMPLETED") && isset($completed_date)) { -- cgit v1.2.3