From aede1f9ab41e8dfc5272a149b1e88a464ce12f89 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 04 Jun 2012 08:15:30 -0400
Subject: [PATCH] Fix possible PHP warning: strpos(): Offset not contained in string
---
program/steps/mail/func.inc | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 33041d4..1e5dbda 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1193,14 +1193,15 @@
// find STYLE tags
while (($pos = stripos($body, '<style', $last_style_pos)) && ($pos2 = stripos($body, '</style>', $pos)))
{
- $pos = strpos($body, '>', $pos)+1;
+ $pos = strpos($body, '>', $pos) + 1;
+ $len = $pos2 - $pos;
// replace all css definitions with #container [def]
- $styles = rcmail_mod_css_styles(
- substr($body, $pos, $pos2-$pos), $cont_id, $allow_remote);
+ $styles = substr($body, $pos, $len);
+ $styles = rcmail_mod_css_styles($styles, $cont_id, $allow_remote);
- $body = substr_replace($body, $styles, $pos, $pos2-$pos);
- $last_style_pos = $pos2;
+ $body = substr_replace($body, $styles, $pos, $len);
+ $last_style_pos = $pos2 + strlen($styles) - $len;
}
// modify HTML links to open a new window if clicked
--
Gitblit v1.9.1