From c8c53f4ad1b4759841ab929eb4b3e770c5132eb1 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 22 Dec 2011 05:32:04 -0500
Subject: [PATCH] Make emtpy/invalid links non-clickable
---
program/steps/mail/func.inc | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index d44e9c3..3784456 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1231,7 +1231,8 @@
$end = '>';
// Remove non-printable characters in URL (#1487805)
- $attrib['href'] = preg_replace('/[\x00-\x1F]/', '', $attrib['href']);
+ if ($attrib['href'])
+ $attrib['href'] = preg_replace('/[\x00-\x1F]/', '', $attrib['href']);
if ($tag == 'link' && preg_match('/^https?:\/\//i', $attrib['href'])) {
$tempurl = 'tmp-' . md5($attrib['href']) . '.css';
@@ -1246,6 +1247,10 @@
JS_OBJECT_NAME,
JQ($mailto[1].$mailto[3]));
}
+ else if (empty($attrib['href']) && !$attrib['name']) {
+ $attrib['href'] = './#NOP';
+ $attrib['onclick'] = 'return false';
+ }
else if (!empty($attrib['href']) && $attrib['href'][0] != '#') {
$attrib['target'] = '_blank';
}
--
Gitblit v1.9.1