#define HYPERLINKIFY_MAX_LENGTH (1024*50)
-/*
- * we mark the ampersand with \007 when converting text->html
- * because after text->html we do hyperlink detecting, which
- * could be screwed up by the ampersand
- */
-#define MARK_AMP '\007'
-#define MARK_AMP_STR "\007"
/*
* we need these regexps to find URLs in plain text e-mails
const gchar* prefix;
};
-/* note: match MARK_AMP_STR as well, because after txt->html, a '&' will look like $(MARK_AMP_STR)"amp;" */
+
+/*
+ * we mark the ampersand with \007 when converting text->html
+ * because after text->html we do hyperlink detecting, which
+ * could be screwed up by the ampersand.
+ * ie. 1<3 ==> 1\007lt;3
+ */
+#define MARK_AMP '\007'
+#define MARK_AMP_STR "\007"
+
+/* mark & separately, because they are parts of urls.
+ * ie. a&b => a\006amp;b, but a>b => a\007gt;b
+ *
+ * we need to handle '&' separately, because it can be part of URIs
+ * (as in href="http://foo.bar?a=1&b=1"), so inside those URIs
+ * we need to re-replace \006amp; with '&' again, while outside uri's
+ * it will be '&'
+ *
+ * yes, it's messy, but a consequence of doing text->html first, then hyperlinkify
+ */
+#define MARK_AMP_URI '\006'
+#define MARK_AMP_URI_STR "\006"
+
+
+/* note: match MARK_AMP_URI_STR as well, because after txt->html, a '&' will look like $(MARK_AMP_URI_STR)"amp;" */
#define MAIL_VIEWER_URL_MATCH_PATTERNS { \
- { "^(file|rtsp|http|ftp|https)://[-a-z0-9_$.+!*(),;:@%=?/~#" MARK_AMP_STR "]+[-a-z0-9_$%" MARK_AMP_STR "=?/~#]",\
+ { "(file|rtsp|http|ftp|https|mms|mmsh|rtsp|rdp|lastfm)://[-a-z0-9_$.+!*(),;:@%=?/~#" MARK_AMP_URI_STR \
+ "]+[-a-z0-9_$%" MARK_AMP_URI_STR "=?/~#]", \
NULL, NULL },\
- { "^www\\.[-a-z0-9_$.+!*(),;:@%=?/~#" MARK_AMP_STR "]+[-a-z0-9_$%" MARK_AMP_STR "=?/~#]",\
+ { "www\\.[-a-z0-9_$.+!*(),;:@%=?/~#" MARK_AMP_URI_STR "]+[-a-z0-9_$%" MARK_AMP_URI_STR "=?/~#]",\
NULL, "http://" }, \
- { "^ftp\\.[-a-z0-9_$.+!*(),;:@%=?/~#" MARK_AMP_STR "]+[-a-z0-9_$%" MARK_AMP_STR "=?/~#]",\
+ { "ftp\\.[-a-z0-9_$.+!*(),;:@%=?/~#" MARK_AMP_URI_STR "]+[-a-z0-9_$%" MARK_AMP_URI_STR "=?/~#]",\
NULL, "ftp://" },\
- { "^(voipto|callto|chatto|jabberto|xmpp):[-_a-z@0-9.+]+", \
+ { "(jabberto|voipto|sipto|sip|chatto|xmpp):[-_a-z@0-9.+]+", \
NULL, NULL}, \
- { "^mailto:[-_a-z0-9.\\+]+@[-_a-z0-9.]+", \
+ { "mailto:[-_a-z0-9.\\+]+@[-_a-z0-9.]+", \
NULL, NULL},\
- { "^[-_a-z0-9.\\+]+@[-_a-z0-9.]+",\
+ { "[-_a-z0-9.\\+]+@[-_a-z0-9.]+",\
NULL, "mailto:"}\
}
const gchar *to,
const gchar *subject)
{
+ g_return_val_if_fail (sent, NULL);
+
return g_strdup_printf ("%s\n%s %s\n%s %s\n%s %s\n%s %s\n",
FORWARD_STRING,
FROM_STRING, (from)?from:"",
switch (kar) {
case 0:
- case MARK_AMP: /* this is a temp place holder for '&'; we can only
+ case MARK_AMP:
+ case MARK_AMP_URI:
+ /* this is a temp place holder for '&'; we can only
* set the real '&' after hyperlink translation, otherwise
* we might screw that up */
break; /* ignore embedded \0s and MARK_AMP */
case '<' : g_string_append (html, MARK_AMP_STR "lt;"); break;
case '>' : g_string_append (html, MARK_AMP_STR "gt;"); break;
- case '&' : g_string_append (html, MARK_AMP_STR "amp;"); break;
+ case '&' : g_string_append (html, MARK_AMP_URI_STR "amp;"); break; /* special case */
case '"' : g_string_append (html, MARK_AMP_STR "quot;"); break;
/* don't convert ' --> wpeditor will try to re-convert it... */
int i;
/* replace all our MARK_AMPs with real ones */
for (i = 0; i != html->len; ++i)
- if ((html->str)[i] == MARK_AMP)
+ if ((html->str)[i] == MARK_AMP || (html->str)[i] == MARK_AMP_URI)
(html->str)[i] = '&';
}
return;
}
-#if 0
-GSList *
-modest_text_utils_split_addresses_list (const gchar *addresses)
-{
- gchar *current, *start, *last_blank;
- GSList *result = NULL;
-
- start = (gchar *) addresses;
- current = start;
- last_blank = start;
-
- while (*current != '\0') {
- if ((start == current)&&((*current == ' ')||(*current == ',')||(*current == ';'))) {
- start = g_utf8_next_char (start);
- last_blank = current;
- } else if ((*current == ',')||(*current == ';')) {
- gchar *new_address = NULL;
- new_address = g_strndup (start, current - last_blank);
- result = g_slist_prepend (result, new_address);
- start = g_utf8_next_char (current);
- last_blank = start;
- } else if (*current == '\"') {
- if (current == start) {
- current = g_utf8_next_char (current);
- start = g_utf8_next_char (start);
- }
- while ((*current != '\"')&&(*current != '\0'))
- current = g_utf8_next_char (current);
- }
-
- current = g_utf8_next_char (current);
- }
-
- if (start != current) {
- gchar *new_address = NULL;
- new_address = g_strndup (start, current - last_blank);
- result = g_slist_prepend (result, new_address);
- }
-
- result = g_slist_reverse (result);
- return result;
-
-}
-#endif
-
-
-
GSList *
modest_text_utils_split_addresses_list (const gchar *addresses)
const gchar *my_addrs = addresses;
const gchar *end;
gchar *addr;
+
+ g_return_val_if_fail (addresses, NULL);
/* skip any space, ',', ';' at the start */
while (my_addrs && (my_addrs[0] == ' ' || my_addrs[0] == ',' || my_addrs[0] == ';'))
gchar *url = g_strndup (txt->str + match->offset, match->len);
gchar *repl = NULL; /* replacement */
- /* the string still contains $(MARK_AMP_STR)"amp;" for each
+ /* the string still contains $(MARK_AMP_URI_STR)"amp;" for each
* '&' in the original, because of the text->html conversion.
* in the href-URL (and only there), we must convert that back to
* '&'
*/
- gchar *href_url = replace_string (url, MARK_AMP_STR "amp;", '&');
+ gchar *href_url = replace_string (url, MARK_AMP_URI_STR "amp;", '&');
/* the prefix is NULL: use the one that is already there */
repl = g_strdup_printf ("<a href=\"%s%s\">%s</a>",
/* if it's not case sensitive */
if (!insensitive) {
- /* optimization: short cut if first char is ascii */
+ /* optimization: shortcut if first char is ascii */
if (((s1[0] & 0xf0)== 0) && ((s2[0] & 0xf0) == 0))
return s1[0] - s2[0];
projects / modest / blobdiff