aboutsummaryrefslogtreecommitdiffstats
path: root/includes
diff options
context:
space:
mode:
authorDaniel Lange <DLange@git.local>2017-02-20 18:12:46 +0100
committerDaniel Lange <DLange@git.local>2017-02-20 18:12:46 +0100
commit335d3c5c9c0b24ff5e07cd1968236a8dbc4f2c70 (patch)
tree6dfb123b3ff27b46bcdf9ef9acf8fa41bffec946 /includes
parent7a4da3f67cb891cd5408bb4b511a54ccf9662485 (diff)
downloadphpicalendar-335d3c5c9c0b24ff5e07cd1968236a8dbc4f2c70.tar.gz
phpicalendar-335d3c5c9c0b24ff5e07cd1968236a8dbc4f2c70.tar.bz2
phpicalendar-335d3c5c9c0b24ff5e07cd1968236a8dbc4f2c70.zip
PHP 7 compatibility from Sourceforge #680
Diffstat (limited to 'includes')
-rw-r--r--includes/event.php4
-rw-r--r--includes/todo.php4
2 files changed, 4 insertions, 4 deletions
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:]]|&amp;)+[[: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']);
+ $event['description'] = preg_replace("#(blocked)?([[:alpha:]]+://([^<>&[:space:]]|&amp;)+[[:alnum:]/])#", '<a target="_new" href="\2">\2</a>', $event['description']);
+ $event['description'] = preg_replace("#(blocked)?(mailto:)?([[:alnum:]_.%+-]+@[[:alnum:].-]+\.[[:alpha:]]{2,4})#", '<a href="mailto:\3">\3</a>', $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:]/]", '<a target="_new" href="\0">\0</a>', $description);
-$vtodo_text = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$vtodo_text);
+$description = preg_replace("#[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]#", '<a target="_new" href="\0">\0</a>', $description);
+$vtodo_text = preg_replace("#[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]#",'<a target="_new" href="\0">\0</a>',$vtodo_text);
if ((!isset($status) || $status == "COMPLETED") && isset($completed_date)) {

© 2014-2024 Faster IT GmbH | imprint | privacy policy